From 351db21d34249a5afee505652f393bf44815db61 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Wed, 28 Sep 2016 21:39:19 -0400 Subject: [PATCH 0001/1749] 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 016d6eaa9d6e001c80f642df468037f4359faf40 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS)" Date: Mon, 24 Oct 2016 11:00:07 +0100 Subject: [PATCH 0002/1749] XTerm: fix app-defaults, fixes menu options --- pkgs/applications/misc/xterm/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index adc0c3c9fb63..6a9dc386be18 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig +{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper , enableDecLocator ? true }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE - ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit + ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit makeWrapper ]; patches = [ @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { "--enable-luit" "--enable-mini-luit" "--with-tty-group=tty" + "--with-app-defaults=$(out)/lib/X11/app-defaults" ] ++ stdenv.lib.optional enableDecLocator "--enable-dec-locator"; # Work around broken "plink.sh". @@ -44,6 +45,12 @@ stdenv.mkDerivation rec { echo '#define USE_UTMP_SETGID 1' ''; + postInstall = '' + for bin in $out/bin/*; do + wrapProgram $bin --set XAPPLRESDIR $out/lib/X11/app-defaults/ + done + ''; + meta = { homepage = http://invisible-island.net/xterm; license = "BSD"; From 95539284860205e8e7433da079bf634050f03f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Tue, 25 Oct 2016 07:27:05 +0000 Subject: [PATCH 0003/1749] xen service: fix iptables race condition in xen-bridge.service The calls to iptables in xen-bridge.service were missing the -w switch, which caused them to fail if another script was calling iptables at the same time. Fix it by adding the -w switch. Addresses https://github.com/NixOS/nixpkgs/issues/19849 . --- nixos/modules/virtualisation/xen-dom0.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index a0b2d5363eb2..ead24496bdf1 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -331,11 +331,11 @@ in EOF # DHCP - ${pkgs.iptables}/bin/iptables -I INPUT -i ${cfg.bridge.name} -p tcp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT - ${pkgs.iptables}/bin/iptables -I INPUT -i ${cfg.bridge.name} -p udp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p tcp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p udp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT # DNS - ${pkgs.iptables}/bin/iptables -I INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT - ${pkgs.iptables}/bin/iptables -I INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT ${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge.name} ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} ${cfg.bridge.address} @@ -347,11 +347,11 @@ in ${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge.name} # DNS - ${pkgs.iptables}/bin/iptables -D INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT - ${pkgs.iptables}/bin/iptables -D INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT # DHCP - ${pkgs.iptables}/bin/iptables -D INPUT -i ${cfg.bridge.name} -p udp --sport 68 --dport 67 -j ACCEPT - ${pkgs.iptables}/bin/iptables -D INPUT -i ${cfg.bridge.name} -p tcp --sport 68 --dport 67 -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p udp --sport 68 --dport 67 -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p tcp --sport 68 --dport 67 -j ACCEPT ''; }; From fc3eed2cb01825d8024a535b8129ec0eeb0b1b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Wed, 26 Oct 2016 16:26:01 +0000 Subject: [PATCH 0004/1749] xen service: fix wrong netmask handed out by xen-bridge.service The dnsmasq instance run by the xen-bridge.service errorenously hands out 172.16.0.0 as the netmask over DHCP to the VMs. This commit removes the option responsible for that from dnsmasq.conf, so that the proper netmask is inferred by dnsmasq instead. Addresses https://github.com/NixOS/nixpkgs/issues/19883 --- nixos/modules/virtualisation/xen-dom0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index a0b2d5363eb2..03e26dd8fb6e 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -324,7 +324,7 @@ in domain-needed dhcp-hostsfile=/var/run/xen/dnsmasq.etherfile dhcp-authoritative - dhcp-range=$XEN_BRIDGE_IP_RANGE_START,$XEN_BRIDGE_IP_RANGE_END,$XEN_BRIDGE_NETWORK_ADDRESS + dhcp-range=$XEN_BRIDGE_IP_RANGE_START,$XEN_BRIDGE_IP_RANGE_END dhcp-no-override no-ping dhcp-leasefile=/var/run/xen/dnsmasq.leasefile From 9434ec54414c6cbfd3be6e6f8d3b7fec74e75aae Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 29 Oct 2016 14:47:32 -0400 Subject: [PATCH 0005/1749] root: fix environment setup 1) s/envHook/postHook/ 2) patch to not set $p that fixes nested ```nix-shell -p root``` calls --- pkgs/applications/science/misc/root/default.nix | 3 +++ pkgs/applications/science/misc/root/setup-hook.sh | 2 +- .../applications/science/misc/root/thisroot.patch | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/science/misc/root/thisroot.patch diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 45d7686b3e52..d1106a758473 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r"; }) ./sw_vers.patch + + # this prevents thisroot.sh from setting $p, which interferes with stdenv setup + ./thisroot.patch ]; preConfigure = '' diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh index 197dc78c3c2c..fc2b697d8a82 100644 --- a/pkgs/applications/science/misc/root/setup-hook.sh +++ b/pkgs/applications/science/misc/root/setup-hook.sh @@ -6,4 +6,4 @@ thisroot () { source @out@/bin/thisroot.sh } -envHooks+=(thisroot) +postHooks+=(thisroot) diff --git a/pkgs/applications/science/misc/root/thisroot.patch b/pkgs/applications/science/misc/root/thisroot.patch new file mode 100644 index 000000000000..57cd5838e64a --- /dev/null +++ b/pkgs/applications/science/misc/root/thisroot.patch @@ -0,0 +1,15 @@ +diff --git a/config/thisroot.sh b/config/thisroot.sh +index 85dee20..532cb28 100644 +--- a/config/thisroot.sh ++++ b/config/thisroot.sh +@@ -15,8 +15,8 @@ drop_from_path() + return 1 + fi + +- p=$1 +- drop=$2 ++ local p=$1 ++ local drop=$2 + + newpath=`echo $p | sed -e "s;:${drop}:;:;g" \ + -e "s;:${drop};;g" \ From 2e1871fdd9e9a5484f34ac78e542d3cafff23043 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 2 Nov 2016 11:41:18 +0100 Subject: [PATCH 0006/1749] alsa-lib: 1.1.1 -> 1.1.2 --- pkgs/os-specific/linux/alsa-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index a839158d0cfd..b525cbfc261b 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "alsa-lib-1.1.1"; + name = "alsa-lib-1.1.2"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2" "http://alsa.cybermirror.org/lib/${name}.tar.bz2" ]; - sha256 = "0sa24fy3qf3jg63xxvfb7j8halj1qmdbcak2lyfx8bpd8hqnriwa"; + sha256 = "1mk1v2av6ibyydgr6f2mxrwy7clgnf0c68s9y2zvh1ibi7csr3fk"; }; patches = [ From 01fe648552a295b89474cd10ad4890219973d71f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 2 Nov 2016 11:42:12 +0100 Subject: [PATCH 0007/1749] alsa-plugins: 1.1.0 -> 1.1.1 --- pkgs/os-specific/linux/alsa-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 22c3d4647747..7f065a1b9b06 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: stdenv.mkDerivation rec { - name = "alsa-plugins-1.1.0"; + name = "alsa-plugins-1.1.1"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2" "http://alsa.cybermirror.org/plugins/${name}.tar.bz2" ]; - sha256 = "3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee"; + sha256 = "1w81z5jlwqhd1l2m7qrq69lc4k9dnrg1wn52jsl2hrf3hbhd394f"; }; # ToDo: a52, etc.? From af0f12299be0ea50450ee7e287ce490c100b4927 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 2 Nov 2016 11:42:43 +0100 Subject: [PATCH 0008/1749] alsa-utils: 1.1.0 -> 1.1.2 --- pkgs/os-specific/linux/alsa-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index d47c9fa2c1a1..3c2b53e0e3f1 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "alsa-utils-${version}"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2" "http://alsa.cybermirror.org/utils/${name}.tar.bz2" ]; - sha256 = "3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1"; + sha256 = "0wcha78c2sm8qqk5r3w83cvm8fp6fb1zpd35kmcm24kxhz007xks"; }; patchPhase = '' From dc9dca4b21be068dfd87c8cbbc8b3f9325624e12 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 2 Nov 2016 11:57:35 +0100 Subject: [PATCH 0009/1749] bristol: patch for new alsaLib --- pkgs/applications/audio/bristol/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index e19acab36b5a..3b94235889cf 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { xorg.xproto ]; + patchPhase = "sed -i '41,43d' libbristolaudio/audioEngineJack.c"; # disable alsa/iatomic + + configurePhase = "./configure --prefix=$out --enable-jack-default-audio --enable-jack-default-midi"; + preInstall = '' sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol sed -e "s@\`which brighton\`@$out/bin/brighton@g" -i bin/startBristol From b683623d272de42676601040b36219e5295a9b6d Mon Sep 17 00:00:00 2001 From: bamberino Date: Wed, 2 Nov 2016 23:35:13 +0100 Subject: [PATCH 0010/1749] teamspeak-server: 3.0.12.4 -> 3.0.13.5 Please validate. --- .../networking/instant-messengers/teamspeak/server.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index f95d3f0490aa..73e8ab83f725 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: let - version = "3.0.12.4"; + version = "3.0.13.5"; arch = if stdenv.is64bit then "amd64" else "x86"; libDir = if stdenv.is64bit then "lib64" else "lib"; in @@ -15,8 +15,8 @@ stdenv.mkDerivation { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" ]; sha256 = if stdenv.is64bit - then "1n8vgbgnfbllfvsl82ai6smv6hl32a3nd071j2dp79agjz4fic3b" - else "19vkcgb0h71amixry8r72qqwaxwplzyz9nrxg5bdjjg8r2mkh4bc"; + then "bd5933dd17d17f93d56f69332927cd1ce6f34439ec464a0ce2ca73102d85080c" + else "848e1a44af3c2b00840a280ba558a13407f4844432ddfd262ee8a7800365386b"; }; buildInputs = [ makeWrapper ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation { meta = { description = "TeamSpeak voice communication server"; - homepage = http://teamspeak.com/; + homepage = https://teamspeak.com/; license = stdenv.lib.licenses.unfreeRedistributable; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.arobyn ]; From 7b84331f22ab11d71f238882c0daf7b26fa43eee Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 2 Nov 2016 19:35:33 -0400 Subject: [PATCH 0011/1749] bullet: darwin compatibility --- pkgs/development/libraries/bullet/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 37b403548c9d..a8d350d9e37d 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, mesa, freeglut }: +{ stdenv, fetchFromGitHub, cmake, mesa, freeglut, darwin }: stdenv.mkDerivation rec { name = "bullet-${version}"; @@ -11,9 +11,24 @@ stdenv.mkDerivation rec { sha256 = "1zz3vs6i5975y9mgb1k1vxrjbf1028v0nc11p646dsvv2vplxx5r"; }; - buildInputs = [ cmake mesa freeglut ]; + buildInputs = [ cmake ] ++ + (if stdenv.isDarwin + then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ] + else [mesa freeglut]); - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" ]; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt + sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt + ''; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" ] ++ + stdenv.lib.optionals stdenv.isDarwin [ + "-DMACOSX_DEPLOYMENT_TARGET=\"10.9\"" + "-DOPENGL_FOUND=true" + "-DOPENGL_LIBRARIES=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" + "-DOPENGL_INCLUDE_DIR=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" + "-DOPENGL_gl_LIBRARY=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" + "-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework"]; enableParallelBuilding = true; @@ -21,11 +36,11 @@ stdenv.mkDerivation rec { description = "A professional free 3D Game Multiphysics Library"; longDescription = '' Bullet 3D Game Multiphysics Library provides state of the art collision - detection, soft body and rigid body dynamics. + detection, soft body and rigid body dynamics. ''; homepage = http://code.google.com/p/bullet/; license = stdenv.lib.licenses.zlib; maintainers = with stdenv.lib.maintainers; [ aforemny ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } From 4f01beb5312096c2eab6f09b771513306ecb381c Mon Sep 17 00:00:00 2001 From: Johannes Bornhold Date: Thu, 3 Nov 2016 01:24:10 +0100 Subject: [PATCH 0012/1749] Adjust ruby gem defaults for scrypt on darwin Without the adjustment I was not able to build scrypt. It was failing because of missing symbols due to the parameter '-arch i386' being appended to the clang calls. --- pkgs/development/ruby-modules/gem-config/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 742c9e497575..42a3fac56226 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -152,6 +152,14 @@ in buildInputs = [ cmake pkgconfig openssl libssh2 zlib ]; }; + scrypt = attrs: + if stdenv.isDarwin then { + dontBuild = false; + postPatch = '' + sed -i -e "s/-arch i386//" Rakefile ext/scrypt/Rakefile + ''; + } else {}; + snappy = attrs: { buildInputs = [ args.snappy ]; }; @@ -212,4 +220,3 @@ in }; } - From 1e2f37e9f43794b161e5a16dd16460a324158215 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 3 Nov 2016 08:30:49 +0100 Subject: [PATCH 0013/1749] godef: init at 20160620-ee532b9 Signed-off-by: Vincent Demeester --- lib/maintainers.nix | 1 + pkgs/development/tools/godef/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/godef/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6ff645995407..752d9d6a8f91 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -455,6 +455,7 @@ vbgl = "Vincent Laporte "; vbmithr = "Vincent Bernardoff "; vcunat = "Vladimír Čunát "; + vdemeester = "Vincent Demeester "; veprbl = "Dmitry Kalinkin "; viric = "Lluís Batlle i Rossell "; vizanto = "Danny Wilson "; diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix new file mode 100644 index 000000000000..ddb136ed86ea --- /dev/null +++ b/pkgs/development/tools/godef/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "godef-${version}"; + version = "20160620-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "ee532b944160bb27b6f23e4f5ef38b8fdaa2a6bd"; + + goPackagePath = "github.com/rogpeppe/godef"; + excludedPackages = "go/printer/testdata"; + + src = fetchgit { + inherit rev; + url = "https://github.com/rogpeppe/godef"; + sha256 = "1r8c4ijjnwvb9pci4wasmq88yj0ginwly2542kw4hyg2c87j613l"; + }; + + meta = { + description = "Print where symbols are defined in Go source code"; + homepage = "https://github.com/rogpeppe/godef/"; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + licence = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f72a57f9bb11..ad1a5a6547d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7077,7 +7077,7 @@ in #GMP ex-satellite, so better keep it near gmp mpfr = callPackage ../development/libraries/mpfr/default.nix { }; - + mpfi = callPackage ../development/libraries/mpfi { }; # A GMP fork @@ -11228,6 +11228,8 @@ in godep = callPackage ../development/tools/godep { }; + godef = callPackage ../development/tools/godef { }; + goimports = callPackage ../development/tools/goimports { }; govers = callPackage ../development/tools/govers { }; From a31bf8961a3f0b2cfe28e0240698cd19258c24f5 Mon Sep 17 00:00:00 2001 From: "Andrew R. M" Date: Sat, 8 Oct 2016 23:59:42 -0400 Subject: [PATCH 0014/1749] grub bootloader: add forceInstall option Using the --force option on GRUB isn't recommended, but there are very specific instances where it makes sense. One example is installing on a partitionless disk. --- nixos/modules/system/boot/loader/grub/grub.nix | 12 +++++++++++- .../system/boot/loader/grub/install-grub.pl | 17 +++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index c3be7407d592..588e54a9d3a0 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -53,7 +53,7 @@ let inherit (args) devices; inherit (efi) canTouchEfiVariables; inherit (cfg) - version extraConfig extraPerEntryConfig extraEntries + version extraConfig extraPerEntryConfig extraEntries forceInstall extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios; path = (makeBinPath ([ @@ -404,6 +404,16 @@ in ''; }; + forceInstall = mkOption { + default = false; + type = types.bool; + description = '' + Whether to try and forcibly install GRUB even if problems are + detected. It is not recommended to enable this unless you know what + you are doing. + ''; + }; + trustedBoot = { enable = mkOption { diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index b93395300b72..24442ca12a30 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -65,6 +65,7 @@ my $efiSysMountPoint = get("efiSysMountPoint"); my $gfxmodeEfi = get("gfxmodeEfi"); my $gfxmodeBios = get("gfxmodeBios"); my $bootloaderId = get("bootloaderId"); +my $forceInstall = get("forceInstall"); $ENV{'PATH'} = get("path"); die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; @@ -531,13 +532,14 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { foreach my $dev (@deviceTargets) { next if $dev eq "nodev"; print STDERR "installing the GRUB $grubVersion boot loader on $dev...\n"; - if ($grubTarget eq "") { - system("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", Cwd::abs_path($dev)) == 0 - or die "$0: installation of GRUB on $dev failed\n"; - } else { - system("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", "--target=$grubTarget", Cwd::abs_path($dev)) == 0 - or die "$0: installation of GRUB on $dev failed\n"; + my @command = ("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", Cwd::abs_path($dev)); + if ($forceInstall eq "true") { + push @command, "--force"; } + if ($grubTarget ne "") { + push @command, "--target=$grubTarget"; + } + (system @command) == 0 or die "$0: installation of GRUB on $dev failed\n"; } } @@ -546,6 +548,9 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) { print STDERR "installing the GRUB $grubVersion EFI boot loader into $efiSysMountPoint...\n"; my @command = ("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint"); + if ($forceInstall eq "true") { + push @command, "--force"; + } if ($canTouchEfiVariables eq "true") { push @command, "--bootloader-id=$bootloaderId"; } else { From 7850a6b0ecc62470a0bc911d27928607604a5c6e Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 2 Nov 2016 21:16:12 -0400 Subject: [PATCH 0015/1749] freeimage: darwin compatibility --- .../libraries/freeimage/default.nix | 39 +++++++++++++------ 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 2a75f7693e15..42105c7022c2 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,31 +1,48 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, darwin}: stdenv.mkDerivation { name = "freeimage-3.17.0"; src = fetchurl { url = mirror://sourceforge/freeimage/FreeImage3170.zip; sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v"; }; - buildInputs = [ unzip ]; - prePatch = '' - sed -e s@/usr/@$out/@ \ + buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + prePatch = if stdenv.isDarwin + then '' + sed -e 's/gcc-4.0/clang/g' \ + -e 's/g++-4.0/clang++/g' \ + -e 's/COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS/COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__/' \ + -e "s|PREFIX = /usr/local|PREFIX = $out|" \ + -e 's|-Wl,-syslibroot /Developer/SDKs/MacOSX10.5.sdk||g' \ + -e 's|-Wl,-syslibroot /Developer/SDKs/MacOSX10.6.sdk||g' \ + -e 's|-isysroot /Developer/SDKs/MacOSX10.6.sdk||g' \ + -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||g' \ + -e 's| $(STATICLIB)-ppc $(STATICLIB)-i386||g' \ + -e 's| $(SHAREDLIB)-ppc $(SHAREDLIB)-i386||g' \ + -e 's| install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR)||' \ + -e 's| -m 644 -o root -g wheel||g' \ + -i ./Makefile.osx + # Fix LibJXR performance timers + sed 's|^SRCS = \(.*\)$|SRCS = \1 Source/LibJXR/image/sys/perfTimerANSI.c|' -i ./Makefile.srcs + '' + else '' + sed -e s@/usr/@$out/@ \ -e 's@-o root -g root@@' \ -e 's@ldconfig@echo not running ldconfig@' \ -i Makefile.gnu Makefile.fip - - # Fix gcc 5.1 macro problems - # https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef%5E!/ - sed -i -e 's/"\(#[^"]*\)"/" \1 "/g' Source/LibWebP/src/dsp/* + # Fix gcc 5.1 macro problems + # https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef%5E!/ + sed -i -e 's/"\(#[^"]*\)"/" \1 "/g' Source/LibWebP/src/dsp/* ''; - postBuild = "make -f Makefile.fip"; + postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip"; preInstall = "mkdir -p $out/include $out/lib"; - postInstall = "make -f Makefile.fip install"; + postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip install"; meta = { description = "Open Source library for accessing popular graphics image file formats"; homepage = http://freeimage.sourceforge.net/; license = "GPL"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } From 0ba77712fc818dda1d191326908095e9897fe7c9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 23 Oct 2016 16:04:56 +0200 Subject: [PATCH 0016/1749] opa: 4309 -> 4310 --- pkgs/development/compilers/opa/default.nix | 31 +++++++++++++--------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index a69694778442..9501b5a3a06e 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchgit, which, perl, jdk +{ stdenv, fetchFromGitHub, which, perl, jdk , ocamlPackages, openssl , coreutils, zlib, ncurses, makeWrapper -, gcc, binutils, gnumake, nodejs} : +, gcc, binutils, gnumake, nodejs +}: stdenv.mkDerivation rec { pname = "opa"; - version = "4309"; + version = "4310"; name = "${pname}-${version}"; - src = fetchgit { - url = https://github.com/MLstate/opalang.git; - rev = "047f58bfd4be35ee30176156b3718c707a6c0f76"; - sha256 = "1laynwf64713q2vhdkxw679dah6hl3bvmrj8cj836a9k9z7jcc1r"; + src = fetchFromGitHub { + owner = "MLstate"; + repo = "opalang"; + rev = "a13d45af30bc955c40c4b320353fb21e4ecacbc5"; + sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3"; }; # Paths so the opa compiler code generation will use the same programs as were @@ -27,6 +29,12 @@ stdenv.mkDerivation rec { echo 'let opa_git_sha = "xxxx"' cat ./compiler/buildinfos/buildInfos.ml.post )> ./compiler/buildinfos/buildInfos.ml + for p in configure tools/platform_helper.sh + do + substituteInPlace $p --replace 'IS_MAC=1' 'IS_LINUX=1' + done + export CAMLP4O=${ocamlPackages.camlp4}/bin/camlp4o + export CAMLP4ORF=${ocamlPackages.camlp4}/bin/camlp4orf ''; prefixKey = "-prefix "; @@ -36,10 +44,10 @@ stdenv.mkDerivation rec { buildInputs = [ which perl jdk openssl coreutils zlib ncurses makeWrapper gcc binutils gnumake nodejs ] ++ (with ocamlPackages; [ - ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph + ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph camlp4 ]); - NIX_LDFLAGS = "-lgcc_s"; + NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; postInstall = '' # Have compiler use same tools for code generation as used to build it. @@ -62,9 +70,6 @@ stdenv.mkDerivation rec { homepage = http://opalang.org/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.kkallio ]; - platforms = with stdenv.lib.platforms; linux; - # opa was built with nodejs 0.10 which reached end of LTS - # in October 216, it doesn't built with nodejs 4.x - broken = true; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8ab2993447e..c33e71b72504 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5114,6 +5114,7 @@ in opa = callPackage ../development/compilers/opa { nodejs = nodejs-4_x; + ocamlPackages = ocamlPackages_4_02; }; inherit (ocaml-ng.ocamlPackages_4_01_0) opam_1_0_0; From d89c3acced7c5ccad00bd1940813cfba95f41adb Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 4 Nov 2016 06:02:11 +0200 Subject: [PATCH 0017/1749] wineUnstable: 1.9.20 -> 1.9.22 Also update staging as well --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 40845a0988cd..f3b12dc48f82 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -30,9 +30,9 @@ in rec { }; unstable = fetchurl rec { - version = "1.9.20"; + version = "1.9.22"; url = "https://dl.winehq.org/wine/source/1.9/wine-${version}.tar.bz2"; - sha256 = "1pvrlawp079qg74q348v9p2qzlj4aqibxxwn4vqid69j883g6s97"; + sha256 = "0hgc85d695mi1z4hyk561q2s9pblhdy6h5a23rh459y7qwd8xgx3"; inherit (stable) mono; gecko32 = fetchurl rec { version = "2.47"; @@ -48,7 +48,7 @@ in rec { staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "1hk20axv0hppi5rqgslibwfjmcpjks3xa2dxi5v1y27qqhphvxpl"; + sha256 = "1yqrxx4zaxc8khnnqfgz53apfa9mc315114psq3kvai01lz4a7p8"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; From 46e6e2ba170e1c462fd752080c3e7c4bd93ba324 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 12 Sep 2016 16:29:13 +0800 Subject: [PATCH 0018/1749] heroku: [WIP] 3.43.2 -> 3.43.12 and wrap the downloaded binary The heroku tool has changed and now downloads a binary to do bulk of the work. This PR also downloads the binary to wrap it properly, but due to https://github.com/NixOS/patchelf/issues/66 we cannot ```patchelf``` the binary and it doesn't work. So for now we instead wrap it in a buildFHSUserEnv so at least things are working again. Once the patchelf issue has been solved, I'll update this again. --- pkgs/development/tools/heroku/default.nix | 92 +++++++++++++++++------ 1 file changed, 69 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 0993ee7b5443..e78c7a7ff9a5 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -1,28 +1,74 @@ -{ stdenv, fetchurl, postgresql, ruby, makeWrapper, nodejs-6_x }: +{ stdenv, fetchurl, bash, buildFHSUserEnv, makeWrapper, writeTextFile +, nodejs-6_x, postgresql, ruby }: with stdenv.lib; -stdenv.mkDerivation rec { - version = "3.43.2"; + +let + version = "3.43.12"; + bin_ver = "5.4.7-8dc2c80"; + + arch = { + "x86_64-linux" = "linux-amd64"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + + sha256 = { + "x86_64-linux" = "0iqjxkdw53dvy54ahmr9yijlxrp5nbikh9z7iss93z753cgxdl06"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + + fhsEnv = buildFHSUserEnv { + name = "heroku-fhs-env"; + }; + + heroku = stdenv.mkDerivation rec { + inherit version; + name = "heroku"; + + meta = { + homepage = "https://toolbelt.heroku.com"; + description = "Everything you need to get started using Heroku"; + maintainers = with maintainers; [ aflatter mirdhyn ]; + license = licenses.mit; + platforms = with platforms; unix; + }; + + src = fetchurl { + url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz"; + sha256 = "1z7z8sl2hkrc8rdvx3h00fbcrxs827xlfp6fji0ap97a6jc0v9x4"; + }; + + bin = fetchurl { + url = "https://cli-assets.heroku.com/branches/stable/${bin_ver}/heroku-v${bin_ver}-${arch}.tar.gz"; + inherit sha256; + }; + + installPhase = '' + cli=$out/share/heroku/cli + mkdir -p $cli + + tar xzf $src -C $out --strip-components=1 + tar xzf $bin -C $cli --strip-components=1 + + wrapProgram $out/bin/heroku \ + --set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \ + --set XDG_DATA_HOME $out/share \ + --set XDG_DATA_DIRS $out/share + + # When https://github.com/NixOS/patchelf/issues/66 is fixed, reinstate this and dump the fhsuserenv + #patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + # $cli/bin/heroku + ''; + + buildInputs = [ fhsEnv ruby postgresql makeWrapper ]; + + doUnpack = false; + }; + +in writeTextFile { name = "heroku-${version}"; - - meta = { - homepage = "https://toolbelt.heroku.com"; - description = "Everything you need to get started using Heroku"; - maintainers = with maintainers; [ aflatter mirdhyn ]; - license = licenses.mit; - platforms = with platforms; unix; - }; - - src = fetchurl { - url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz"; - sha256 = "1sapbxg7pzi89c95k0vsp8k5bysggkjf58jwck2xs0y4ly36wbnc"; - }; - - installPhase = '' - mkdir -p $out - cp -R * $out/ - wrapProgram $out/bin/heroku --set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node + destination = "/bin/heroku"; + executable = true; + text = '' + #!${bash}/bin/bash -e + ${fhsEnv}/bin/heroku-fhs-env ${heroku}/bin/heroku ''; - - buildInputs = [ ruby postgresql makeWrapper ]; } From 30c1ad5ca378ff46bc90f37bf04e14f9765d6f23 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Fri, 4 Nov 2016 14:18:50 +0100 Subject: [PATCH 0019/1749] opencv3: added in extra flag for enabling cuda with dependencies opencv3: added in optional buildFlag for enabling cuda opencv3: added CUDA enabling flags to cmakeFlags opencv3: added CUDA-speicifc FAST_MATH flag for enabling CUDA-accelerated math functions opencv3: change enableCUDA default to false opencv:added in cuda-enabling functionality. --- pkgs/development/libraries/opencv/3.x.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 0167011ed49a..701aa8e26b4a 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -14,6 +14,7 @@ , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableEigen ? false, eigen +, enableCuda ? false, cudatoolkit, gcc49 }: let @@ -74,6 +75,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen + ++ lib.optional enableCuda [ cudatoolkit gcc49 ] ; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -90,7 +92,10 @@ stdenv.mkDerivation rec { (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) (opencvFlag "OPENEXR" enableEXR) - ] ++ lib.optionals enableContrib [ "-DOPENCV_EXTRA_MODULES_PATH=${contribSrc}/modules" ]; + (opencvFlag "CUDA" enableCuda) + (opencvFlag "CUBLAS" enableCuda) + ] ++ lib.optionals enableContrib [ "-DOPENCV_EXTRA_MODULES_PATH=${contribSrc}/modules" ] + ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ]; enableParallelBuilding = true; From cfa48ce56887028d2c93cef9480f2e044fc7b1c7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 01:15:35 +0100 Subject: [PATCH 0020/1749] ocaml-x509: 0.5.0 -> 0.5.3 This commit also refactors the expression. --- .../ocaml-modules/x509/default.nix | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index c44ccb18982a..bca266d5fee1 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,28 +1,30 @@ -{ stdenv, fetchzip, ocaml, findlib, asn1-combinators, nocrypto, ounit }: +{stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, asn1-combinators, nocrypto, ounit, ocaml_oasis, ppx_sexp_conv}: -let version = "0.5.0"; in +buildOcaml rec { + name = "x509"; + version = "0.5.3"; -stdenv.mkDerivation { - name = "ocaml-x509-${version}"; - - src = fetchzip { - url = "https://github.com/mirleft/ocaml-x509/archive/${version}.tar.gz"; - sha256 = "0i9618ph4i2yk5dvvhiqhm7wf3qmd6b795mxwff8jf856gb2gdyn"; + src = fetchFromGitHub { + owner = "mirleft"; + repo = "ocaml-x509"; + rev = "${version}"; + sha256 = "07cc3z6h87460z3f4vz8nlczw5jkc4vjhix413z9x6nral876rn7"; }; - buildInputs = [ ocaml findlib ounit ]; + buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ]; propagatedBuildInputs = [ asn1-combinators nocrypto ]; configureFlags = "--enable-tests"; + configurePhase = "./configure --prefix $out $configureFlags"; + doCheck = true; checkTarget = "test"; createFindlibDestdir = true; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/mirleft/ocaml-x509; description = "X509 (RFC5280) handling in OCaml"; - platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = licenses.bsd2; + maintainers = with maintainers; [ vbgl ]; }; } From 4e59b1a23c75af602f13455d8ffb6456a40e08b4 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 6 Nov 2016 11:01:39 +0800 Subject: [PATCH 0021/1749] k3d: 0.8.0.5 -> 0.8.0.6 --- pkgs/applications/graphics/k3d/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index a446ab5dd185..ba43a2e7f2ae 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchFromGitHub, unzip, ftgl, glew, asciidoc +{ stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: stdenv.mkDerivation rec { - version = "0.8.0.5"; + version = "0.8.0.6"; name = "k3d-${version}"; src = fetchFromGitHub { owner = "K-3D"; repo = "k3d"; rev = name; - sha256 = "0q05d51vhnmrq887n15frpwkhx8w7n20h2sc1lpr338jzpryihb3"; + sha256 = "0vdjjg6h8mxm2n8mvkkg2mvd27jn2xx90hnmx23cbd35mpz9p4aa"; }; - + + patches = [ + (fetchpatch { /* glibmm 2.50 fix */ + url = https://github.com/K-3D/k3d/commit/c65889d0652490d88a573e47de7a9324bf27bff2.patch; + sha256 = "162icv1hicr2dirkb9ijacvg9bhz5j30yfwg7b45ijavk8rns62j"; + }) + ]; + cmakeFlags = "-DK3D_BUILD_DOCS=false -DK3D_BUILD_GUIDE=false"; preConfigure = '' From 1667046505070067884668e0f2b96aab4c193165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Nov 2016 15:10:32 +0100 Subject: [PATCH 0022/1749] vim: factor common.nix from {default,configurable}.nix The derivations are unchanged. --- pkgs/applications/editors/vim/common.nix | 23 ++++++++++++ .../applications/editors/vim/configurable.nix | 36 ++++++------------- pkgs/applications/editors/vim/default.nix | 25 +++---------- 3 files changed, 38 insertions(+), 46 deletions(-) create mode 100644 pkgs/applications/editors/vim/common.nix diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix new file mode 100644 index 000000000000..7ceca4a89024 --- /dev/null +++ b/pkgs/applications/editors/vim/common.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub }: +rec { + version = "8.0.0005"; + + src = fetchFromGitHub { + owner = "vim"; + repo = "vim"; + rev = "v${version}"; + sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0"; + }; + + enableParallelBuilding = true; + + hardeningDisable = [ "fortify" ]; + + meta = with lib; { + description = "The most popular clone of the VI editor"; + homepage = http://www.vim.org; + license = licenses.vim; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 4ab0ca3f27c9..dc7fa3fa3984 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,7 +1,7 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc -args@{pkgs, source ? "default", fetchurl, fetchFromGitHub, stdenv, ncurses, pkgconfig, gettext -, composableDerivation, lib, config, glib, gtk2, python, perl, tcl, ruby +args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext +, composableDerivation, writeText, lib, config, glib, gtk2, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE @@ -11,8 +11,9 @@ args@{pkgs, source ? "default", fetchurl, fetchFromGitHub, stdenv, ncurses, pkgc , ... }: with args; -let inherit (args.composableDerivation) composableDerivation edf; - nixosRuntimepath = pkgs.writeText "nixos-vimrc" '' +let + inherit (args.composableDerivation) composableDerivation edf; + nixosRuntimepath = writeText "nixos-vimrc" '' set nocompatible syntax on @@ -37,25 +38,18 @@ let inherit (args.composableDerivation) composableDerivation edf; source /etc/vim/vimrc endif ''; + + common = callPackage ./common.nix {}; in composableDerivation { } (fix: rec { name = "vim_configurable-${version}"; - version = "8.0.0005"; - enableParallelBuilding = true; # test this + inherit (common) version hardeningDisable enableParallelBuilding meta; - src = - builtins.getAttr source { - "default" = - # latest release - args.fetchFromGitHub { - owner = "vim"; - repo = "vim"; - rev = "v${version}"; - sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0"; - }; + src = builtins.getAttr source { + "default" = common.src; # latest release "vim-nox" = { @@ -185,15 +179,5 @@ composableDerivation { ''; dontStrip = 1; - - hardeningDisable = [ "fortify" ]; - - meta = with stdenv.lib; { - description = "The most popular clone of the VI editor"; - homepage = http://www.vim.org; - license = licenses.vim; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; }) diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 1511b3865792..cf84609921e5 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, ncurses, gettext, pkgconfig +{ stdenv, fetchurl, callPackage, ncurses, gettext, pkgconfig # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; @@ -8,18 +8,13 @@ # apple frameworks , Carbon, Cocoa }: +let + common = callPackage ./common.nix {}; +in stdenv.mkDerivation rec { name = "vim-${version}"; - version = "8.0.0005"; - src = fetchFromGitHub { - owner = "vim"; - repo = "vim"; - rev = "v${version}"; - sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0"; - }; - - enableParallelBuilding = true; + inherit (common) version src hardeningDisable enableParallelBuilding meta; buildInputs = [ ncurses pkgconfig ] ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; @@ -30,8 +25,6 @@ stdenv.mkDerivation rec { "--enable-nls" ]; - hardeningDisable = [ "fortify" ]; - postInstall = '' ln -s $out/bin/vim $out/bin/vi mkdir -p $out/share/vim @@ -62,12 +55,4 @@ stdenv.mkDerivation rec { # patchPhase = '' # sed -i -e 's/as_fn_error.*int32.*/:/' src/auto/configure # ''; - - meta = with stdenv.lib; { - description = "The most popular clone of the VI editor"; - homepage = http://www.vim.org; - license = licenses.vim; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; } From 51feecbe88742dd4496c96981d1a87a12c1022e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Nov 2016 15:45:48 +0100 Subject: [PATCH 0023/1749] vim_configurable: misc improvements - fix wrongly used *native* build inputs; - remove confusing `prePatch = "cd src";` ; - adapt RPATH handling to multiple-output changes; - don't list full compiler flags in vim --version, as that would keep references to -dev paths. Together, the closure of the default feature-set drops almost by 100 MB. The lean vim attribute would *not* lose any references due to patching --version, so we only apply it for vim_configurable. --- .../editors/vim/cflags-prune.diff | 15 +++++++ .../applications/editors/vim/configurable.nix | 39 +++++++------------ 2 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 pkgs/applications/editors/vim/cflags-prune.diff diff --git a/pkgs/applications/editors/vim/cflags-prune.diff b/pkgs/applications/editors/vim/cflags-prune.diff new file mode 100644 index 000000000000..6bec4fec09ef --- /dev/null +++ b/pkgs/applications/editors/vim/cflags-prune.diff @@ -0,0 +1,15 @@ +diff --git a/src/Makefile b/src/Makefile +index 864f54b..fd85f76 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -2806,8 +2806,8 @@ auto/pathdef.c: Makefile auto/config.mk + -@echo '#include "vim.h"' >> $@ + -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ + -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ +- -@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' | $(QUOTESED) >> $@ +- -@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' | $(QUOTESED) >> $@ ++ -@echo 'char_u *all_cflags = (char_u *)"see nix-store --read-log $(out)";' | $(QUOTESED) >> $@ ++ -@echo 'char_u *all_lflags = (char_u *)"see nix-store --read-log $(out)";' | $(QUOTESED) >> $@ + -@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@ + -@if test -n "$(COMPILEDBY)"; then \ + echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \ diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index dc7fa3fa3984..793f554970f3 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -61,31 +61,27 @@ composableDerivation { }.src; }; - prePatch = "cd src"; + patches = [ ./cflags-prune.diff ]; configureFlags = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ]; - nativeBuildInputs - = [ ncurses pkgconfig gtk2 libX11 libXext libSM libXpm libXt libXaw libXau + nativeBuildInputs = [ pkgconfig ]; + + buildInputs + = [ ncurses gtk2 libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ]; # most interpreters aren't tested yet.. (see python for example how to do it) flags = { ftNix = { - # because we cd to src in the main patch phase, we can't just add this - # patch to the list, we have to apply it manually - postPatch = '' - cd ../runtime - patch -p2 < ${./ft-nix-support.patch} - cd .. - ''; + patches = [ ./ft-nix-support.patch ]; }; } // edf { name = "darwin"; enable = { - nativeBuildInputs = [ CoreServices CoreData Cocoa Foundation libobjc cf-private ]; + buildInputs = [ CoreServices CoreData Cocoa Foundation libobjc cf-private ]; NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; }; @@ -99,7 +95,7 @@ composableDerivation { name = "python"; feat = "python${if python ? isPy3 then "3" else ""}interp"; enable = { - nativeBuildInputs = [ python ]; + buildInputs = [ python ]; } // lib.optionalAttrs stdenv.isDarwin { configureFlags = [ "--enable-python${if python ? isPy3 then "3" else ""}interp=yes" @@ -108,13 +104,13 @@ composableDerivation { }; } - // edf { name = "tcl"; feat = "tclinterp"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter. - // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter. + // edf { name = "tcl"; feat = "tclinterp"; enable = { buildInputs = [tcl]; }; } #Include Tcl interpreter. + // edf { name = "ruby"; feat = "rubyinterp"; enable = { buildInputs = [ruby]; };} #Include Ruby interpreter. // edf { name = "lua"; feat = "luainterp"; enable = { - nativeBuildInputs = [lua]; + buildInputs = [lua]; configureFlags = [ "--with-lua-prefix=${args.lua}" "--enable-luainterp" @@ -166,16 +162,11 @@ composableDerivation { */ postInstall = stdenv.lib.optionalString stdenv.isLinux '' - rpath=`patchelf --print-rpath $out/bin/vim`; - for i in $nativeBuildInputs; do - echo adding $i/lib - rpath=$rpath:$i/lib - done - echo $nativeBuildInputs - echo $rpath - patchelf --set-rpath $rpath $out/bin/{vim,gvim} + patchelf --set-rpath \ + "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ + "$out"/bin/{vim,gvim} - ln -sfn ${nixosRuntimepath} $out/share/vim/vimrc + ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc ''; dontStrip = 1; From 996d8ddd9907433b93b13f518abb0a6f36fa248e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Nov 2016 16:29:20 +0100 Subject: [PATCH 0024/1749] vim*: fix :Man a bit --- pkgs/applications/editors/vim/common.nix | 7 +++++++ pkgs/applications/editors/vim/configurable.nix | 2 +- pkgs/applications/editors/vim/default.nix | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 7ceca4a89024..c91df72f18c7 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -13,6 +13,13 @@ rec { hardeningDisable = [ "fortify" ]; + postPatch = + # Use man from $PATH; escape sequences are still problematic. + '' + substituteInPlace runtime/ftplugin/man.vim \ + --replace "/usr/bin/man " "man " + ''; + meta = with lib; { description = "The most popular clone of the VI editor"; homepage = http://www.vim.org; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 793f554970f3..d0a0c63d9d06 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -46,7 +46,7 @@ composableDerivation { name = "vim_configurable-${version}"; - inherit (common) version hardeningDisable enableParallelBuilding meta; + inherit (common) version postPatch hardeningDisable enableParallelBuilding meta; src = builtins.getAttr source { "default" = common.src; # latest release diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index cf84609921e5..8c9a725ddd66 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { name = "vim-${version}"; - inherit (common) version src hardeningDisable enableParallelBuilding meta; + inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; buildInputs = [ ncurses pkgconfig ] ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; From d8652a053b018b14239e45d72e3d5a7eb30d2964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Nov 2016 18:23:14 +0100 Subject: [PATCH 0025/1749] vimPlugins: auto-update - Rename couldn't be fetched; new URL should be OK. - Two plugins got re-ordered (added ad-hoc, apparently). - ctrlp* is suspected to contain non-generated code; I left it untouched this round but it should be fixed. /cc @carlsverre for 71a94dfd9 --- pkgs/misc/vim-plugins/default.nix | 402 +++++++++++++------------ pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 2 files changed, 203 insertions(+), 201 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index a8abd86e1941..a230902916c2 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -133,11 +133,11 @@ rec { }; Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gist-2015-10-25"; + name = "Gist-2016-10-10"; src = fetchgit { url = "git://github.com/mattn/gist-vim"; - rev = "88c331e2e07765090112a396e5e119b39b5aa754"; - sha256 = "0z7qnkgv8ryyiwikz6v6vpqypr2gh2hih27cil02rs4ci4041w74"; + rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63"; + sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17"; }; dependencies = []; @@ -177,11 +177,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2016-10-04"; + name = "Syntastic-2016-10-30"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "75b1095586b1cb685ccb0e69004bcd4ae75b37da"; - sha256 = "1hlw6ahlfm4k837zy079acv4lih2r2l9d8fwzb8d970r55p6qffb"; + rev = "734fde7f0b84ff3f670ab5772ed1b8b0c8c16770"; + sha256 = "18nw0zw8h537d189n0z244fllbyyb9fw47brnmsw82w90b771723"; }; dependencies = []; @@ -199,44 +199,44 @@ rec { }; Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2016-09-25"; + name = "Tagbar-2016-11-07"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "2955f71856536d503c79c15daab3de890a6d83e9"; - sha256 = "16hz3mvfz4q4sxg2vq2m2gkmpwhchql14yxw1ws05qqnyy0jbxk2"; + rev = "01f57ac5643b0365021ab891f78519d849867a5e"; + sha256 = "0k0006r895m19kpwqy1ibiia5qm47v4h3mgrlr349wlzqibhmws1"; }; dependencies = []; }; The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2016-08-31"; + name = "The_NERD_Commenter-2016-10-10"; src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; - rev = "fdc611c8f4dbb5bed57fe95d076cf82e9bcb5e7d"; - sha256 = "0qdryph7mjny3vcb6255q75fykxps7wvyzibfb3lxrkvqv6i1dlr"; + rev = "97cb982f1f0d0631b34b71b065e162916bee4036"; + sha256 = "136nirs1zi0pjz06yyw2q72ypwmmj25fkl9fjaqgc5q472d77d0v"; }; dependencies = []; }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2016-10-04"; + name = "The_NERD_tree-2016-10-21"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "f26eaf83551631e683e339f00e2c97bd6e8356d7"; - sha256 = "0vljxnnlm7sdhb61z4114lzjy6gi59y3ym5fynplvccsbv0s47r2"; + rev = "eee431dbd44111c858c6d33ffd366cae1f17f8b3"; + sha256 = "1fyz3fp2v77piydadcg47pbb7dds9b015kj1baqaxr4gn2gfwq7f"; }; dependencies = []; }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2016-09-19"; + name = "UltiSnips-2016-10-24"; src = fetchgit { url = "git://github.com/SirVer/ultisnips"; - rev = "97a280417b9ebcd098283b46ba9f144c6344bb8d"; - sha256 = "030n4f5mwxlq6qfizh82s5h8zlfm3qdh0lc3rc01p0nwbgpvyrg3"; + rev = "71c39721de9cb2d67478e8b8c1a543e006fb67df"; + sha256 = "13lm1fb007ny70pxsvc5wf9s0n90lvimya1n2nn2pyxsnwm416fw"; }; dependencies = []; @@ -342,11 +342,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2016-08-08"; + name = "fugitive-2016-11-05"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "aac85a268e89a6c8be79341e130ac90256fadbd6"; - sha256 = "1hsq8lgw1gn99y0rr214bcc9vlw0kx8yajci7dimwhbh817kq5v4"; + rev = "b3a8be6975dcc27b523b030bf5d35d9c737aef18"; + sha256 = "1qizj0xmpaj32b9f8p2d76s5rsvm8cxv0rh5yiczlgfvflbi587r"; }; dependencies = []; @@ -375,44 +375,44 @@ rec { }; vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2016-09-09"; + name = "vim-autoformat-2016-11-02"; src = fetchgit { url = "git://github.com/Chiel92/vim-autoformat"; - rev = "f6fabad46f34afd75ae74995c10813eab7021bbf"; - sha256 = "1n9ij49npiksdhzdkv2wn6cx2kyn62f3j2ins0ng85kzgh83a0jc"; + rev = "15ee797ad37093e9841b41c121c8d93cf1dedf93"; + sha256 = "10alg9a8mhasqp26mg7xlran1x474ip3k03s2sjhlvizy6mv5rba"; }; dependencies = []; }; vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2016-08-07"; + name = "vim-nix-2016-11-02"; src = fetchgit { url = "git://github.com/LnL7/vim-nix"; - rev = "a61495a762feacc00f24cab4392b09cc3250decf"; - sha256 = "0icq9nawm6s4qzb9q62y3fdq4ixbfwmmgk141fnfqzq6ya1azxac"; + rev = "b06cccd8ff61149b13d3fc8b7e0d06caa55c9888"; + sha256 = "0d1wxxijyyl449f81asl9d31kg0wvs3m0fypin172ahgpf3lyar4"; }; dependencies = []; }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2016-10-01"; + name = "deoplete-nvim-2016-11-04"; src = fetchgit { url = "git://github.com/Shougo/deoplete.nvim"; - rev = "0e663c022a8f9b318ad494de4246754ad34effb3"; - sha256 = "1w3riv8x8x4hgdyhabcis25f1scapgw9r4xzlnfrz809l25wwxds"; + rev = "5fc5ed772de138439322d728b103a7cb225cbf82"; + sha256 = "1nn9k9rk6m3x48mm6mlji374vkrgwz1rf3pp8smd1hj30dy0njfk"; }; dependencies = []; }; Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Spacegray-vim-2016-06-04"; + name = "Spacegray-vim-2016-10-30"; src = fetchgit { url = "git://github.com/ajh17/Spacegray.vim"; - rev = "adb621e3d1df5f55d60383717bbae4533fda9c62"; - sha256 = "15n92rllri11ckdy1dykllx7xpgscvhfqa55z5sl66zicnrv89c9"; + rev = "79936a4434bf57b64c2d73320e62b4e67d84af74"; + sha256 = "0dg037aw99yjdirw6f8v6da1lyf5ba2c6bni2wnka6bmzqx0k53r"; }; dependencies = []; @@ -430,22 +430,22 @@ rec { }; vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-css-color-2016-09-06"; + name = "vim-css-color-2016-10-11"; src = fetchgit { url = "git://github.com/ap/vim-css-color"; - rev = "499a3767d5d5af8cd427007d2a38623d339f2f85"; - sha256 = "026n85pi85jx5ph1v2ss2fhzm2x02v9kx7w97367p3vmd2cggba3"; + rev = "27903efc1b5330230d5c8c336c26ac7a8ac2e5dc"; + sha256 = "0kr9xf2y001d42x7fam50qbd09fb3rr374qv8m2p5z2d9c21par1"; }; dependencies = []; }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2016-10-03"; + name = "neomake-2016-11-04"; src = fetchgit { url = "git://github.com/benekastah/neomake"; - rev = "4771be7bee6023568f80dc21fdda071693b81cca"; - sha256 = "1bkn98iwfx6fhccnwxjh694w2yjfvczkrbm7h6mjkl8n8zka93kc"; + rev = "0c8795de4519600c204227fdf86c83ca499db783"; + sha256 = "0vif3jxrxpq8imnhbkl82fb7vvfi4illxxm6drl6wd5wijfwq39k"; }; dependencies = []; @@ -474,44 +474,44 @@ rec { }; spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "spacevim-2016-09-15"; + name = "spacevim-2016-10-25"; src = fetchgit { url = "git://github.com/ctjhoa/spacevim"; - rev = "b90e12ebc43fdc4cf6b75004d319c25b29efdf8f"; - sha256 = "1hz84amsl9374mdsgg6szrsnf15kmqa3n2hmcagy5xmbj7fz1msc"; + rev = "51d936482ce0710f6211aefca45cd33ab59d8444"; + sha256 = "156sc8ynj1mg75i7n3dpm5nqlwcw727m41jw32fm3pahr3yq3ydq"; }; dependencies = []; }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2016-10-02"; + name = "ctrlp-vim-2016-11-07"; src = fetchgit { url = "git://github.com/ctrlpvim/ctrlp.vim"; - rev = "c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2"; - sha256 = "0m23yrmgbwaj35yh38sj43r16q090l4vbgijpyv1danmf7ws6q1f"; + rev = "88b61e77a285d10d0163bd383d3bb2909ea2ddca"; + sha256 = "0zb5hcsbgvbsp5h0alkqyqbikzicl29mraw787p2chbps10n1qjw"; }; dependencies = []; }; agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "agda-vim-2016-09-06"; + name = "agda-vim-2016-10-22"; src = fetchgit { url = "git://github.com/derekelkins/agda-vim"; - rev = "03e8cc9a8c7a58c431a32f50e80fe0fefe0c3f41"; - sha256 = "0qkfxyddp3j14hz1vmm499dnkrgqzr2xsaxi6dz61alq65r4xbl9"; + rev = "5c698a0dcc4881ea8fbe672e60aaca70d4c8b6f4"; + sha256 = "0ii9gmwnc97zjis7d0a230gbh4pqvx4ja83aypmpmy67s3sxhwvf"; }; dependencies = []; }; vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jade-2016-06-28"; + name = "vim-jade-2016-10-31"; src = fetchgit { url = "git://github.com/digitaltoad/vim-jade"; - rev = "f3950a72ea92f2c372846e763dad1f1151a38fb1"; - sha256 = "1wa7zf24szmwchk608s5ikv14jzch9nl8isrn9ji9sz2511w50wp"; + rev = "cc1bddc890f4856aa0511fdfd7c55d2e66f688b5"; + sha256 = "1d5rbaslvr14lcdffrxp0ycsm2nzvq5zyjk0x0nzwhzvvs4fqi40"; }; dependencies = []; @@ -528,6 +528,17 @@ rec { }; + editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "editorconfig-vim-2016-07-16"; + src = fetchgit { + url = "git://github.com/editorconfig/editorconfig-vim"; + rev = "a459b8cfef00100da40fd69c8ae92c4d1e63e1d2"; + sha256 = "03slzk7jgr348f59pxghmd9giwla63lxmwvripg99zrlgl0pvp5g"; + }; + dependencies = []; + + }; + acp = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "acp-2013-02-05"; src = fetchgit { @@ -551,11 +562,11 @@ rec { }; vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2016-08-18"; + name = "vim-localvimrc-2016-10-07"; src = fetchgit { url = "git://github.com/embear/vim-localvimrc"; - rev = "2d4c622da0bd04669cd149c6f424d0771708e8d6"; - sha256 = "0j5344riafqr330q9jiglcqaffmcppq6r1512866cmkk000r6lc0"; + rev = "f0c9b8d0b6f0d4c83d9dba5137772bd6c97afb4e"; + sha256 = "02dzh8gckbpdifh7nmfzwn6qs3swjm783ld4h7dl1ky6xq4f06mv"; }; dependencies = []; @@ -584,11 +595,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2016-10-04"; + name = "vim-go-2016-10-23"; src = fetchgit { url = "git://github.com/fatih/vim-go"; - rev = "1f8e10cebdacfd7a6809741a9eb04b5e1c3bc6ec"; - sha256 = "1iyqa0pklba5badxmak8b8wp0xryk9fi8qky1fj9m8lchv7s69nn"; + rev = "10c805b83f160eb9e7f9cbe00d26c1b6d06ba636"; + sha256 = "0316kzmwb2p91rwz31ddr7r5bd52aa7jxzkb3vdhdb7f3bmcwx3q"; }; dependencies = []; @@ -606,44 +617,44 @@ rec { }; floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "floobits-neovim-2016-06-20"; + name = "floobits-neovim-2016-10-07"; src = fetchgit { url = "git://github.com/floobits/floobits-neovim"; - rev = "cd9247f2ddeab1f9da247d495127b1a836415783"; - sha256 = "12r0xmb5fl6gj47dr8xwiw0pan4xdwjxjjnyi5smfy4sg29lzwl7"; + rev = "85d3493d05ac1d7f5606d40fbe619df16af917bc"; + sha256 = "16c12dgk60mmhyijfk4f33k8i48r1hpjlnxlvdk5kymv7b2xq0fa"; }; dependencies = []; }; psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "psc-ide-vim-2016-09-07"; + name = "psc-ide-vim-2016-11-05"; src = fetchgit { url = "git://github.com/frigoeu/psc-ide-vim"; - rev = "3c376289d368b7175cb6c10e2960f08830ee4cb4"; - sha256 = "0mzczy73asw66qz3zqbf48i95qfjrv1rhky9zyl5qcwlay1gyfvj"; + rev = "bb7f0ef6620899cb6256e3ee5956d3b30769488b"; + sha256 = "1x47phq0shap338as120vf0srl69fas11kggzsxjg1dxblg69iww"; }; dependencies = []; }; vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsonnet-2016-10-01"; + name = "vim-jsonnet-2016-10-11"; src = fetchgit { url = "git://github.com/google/vim-jsonnet"; - rev = "fb99d65bb42438fa65fb46051243bbae20a75e31"; - sha256 = "19c2jwpabsx16m23mzfspazlj565ra3xzsibm9283k46dlax9mwh"; + rev = "bf1997a5607912cc121fe617a6fef76d3d872aa4"; + sha256 = "04vgbzknz7x6r8gwvlajjqd653fvv1x4szib00bnzw87vsagdiiy"; }; dependencies = []; }; vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-leader-guide-2016-10-03"; + name = "vim-leader-guide-2016-11-06"; src = fetchgit { url = "git://github.com/hecal3/vim-leader-guide"; - rev = "0d08f2f5603d61b0099d2323e0ca4ab30f8a4d49"; - sha256 = "0035yzgswqfamcvrbxcjbxs5lywcg5vsrddlnawx8x0rzm4az5nh"; + rev = "b1dd2667cb74147c06853c39530984fbc629eb48"; + sha256 = "0xacamv3dcnkdh9xclvw76fp20rxgqb1m3068l582c6g5p7lj0yi"; }; dependencies = []; @@ -661,22 +672,22 @@ rec { }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2016-09-20"; + name = "calendar-vim-2016-11-06"; src = fetchgit { url = "git://github.com/itchyny/calendar.vim"; - rev = "38b2cf96acf2cb1dc033de4b499f5b223adebacd"; - sha256 = "1yi16vj3if5l55f7pava75fd412skj7nmj4r73dpkqa36dg0xljw"; + rev = "ca4b4b2ed364831ba27d50f17b44d1e9506715ef"; + sha256 = "1i2ywg0h3rb6f05k7ahng9bvjg7hxqdg1nzcijs5m6kxkn8kjj2k"; }; dependencies = []; }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2016-10-05"; + name = "lightline-vim-2016-11-06"; src = fetchgit { url = "git://github.com/itchyny/lightline.vim"; - rev = "9e8d9f68dfe9b19eba343f796ffd16933a4dc77d"; - sha256 = "02sc5sv0clm79b0p0ayk20j750c6gmw0akg6k9lz9dp9aryx8r9i"; + rev = "836d4c84f76e7066bcfa4c6c60449714cf2b2c45"; + sha256 = "0qdhpwr4iyifmk0l463s4k5nm8k744ycvxmxgz3s38vkn8q5y06w"; }; dependencies = []; @@ -716,22 +727,22 @@ rec { }; vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-orgmode-2016-07-12"; + name = "vim-orgmode-2016-11-03"; src = fetchgit { url = "git://github.com/jceb/vim-orgmode"; - rev = "e76c0f07e9193e08df2b8eeb95ef6240b494797f"; - sha256 = "00ys1qf8hbigrdxshs5xvg662xcd6qaiw2g1nr21pfs682qdjsyf"; + rev = "304fd3ced3b929a8507e460b99b0bf4e6a9b3c7d"; + sha256 = "13r4mnqng5hsiarqdrr3vqa4frf6jlwlaxpl72czvpyrvd4mvc2m"; }; dependencies = []; }; vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-buffergator-2016-04-07"; + name = "vim-buffergator-2016-10-19"; src = fetchgit { url = "git://github.com/jeetsukumaran/vim-buffergator"; - rev = "611966d1ced784d5659c5dc07e984fabd95d917f"; - sha256 = "1brb6qwlgxq4zcmrqp7wf2zvfvdq4zm8ynzg8wg9rq5cmyp8f61z"; + rev = "c07d16dd3df10bbb5adc3e9b009e341bfa1f673e"; + sha256 = "0bj70lkqizfzmaxwrxcqv1151kx37v2v57aaqy4vcnfn04wq3h95"; }; dependencies = []; @@ -748,6 +759,17 @@ rec { }; + auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "auto-pairs-2016-07-17"; + src = fetchgit { + url = "git://github.com/jiangmiao/auto-pairs"; + rev = "1b3a1efb078fdf74d4013308b63de57dfda0cc8e"; + sha256 = "1g5gb9xvc9xw3rxg8p4w3qcsdl3xfpi5ax380916aq237kmrnzdk"; + }; + dependencies = []; + + }; + vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-nerdtree-tabs-2016-09-19"; src = fetchgit { @@ -793,11 +815,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2016-09-30"; + name = "fzf-vim-2016-10-29"; src = fetchgit { url = "git://github.com/junegunn/fzf.vim"; - rev = "7d1b007cb234d181fd09a50e40e50cb49642861b"; - sha256 = "1011n55n6anfd5cc4cafr1clkdbb2yd9lyzpk7yb4jzmvjvsx64b"; + rev = "0bc9b231fbab6749f18f2f34cc21c649b9a7d3ed"; + sha256 = "1gpy744qd7hch1ab7kfzz1njg74hasvh53w7kbm7ni5sw7pn5w64"; }; dependencies = []; @@ -859,33 +881,33 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2016-10-03"; + name = "vimtex-2016-11-04"; src = fetchgit { url = "git://github.com/lervag/vimtex"; - rev = "abf50a3f04dff85e2e1fb7f8f5123e54dce32706"; - sha256 = "0vln1y2w13fjsvqd5pqjkqx62q3gbhmgkx49i5rdx9vblmg77n7y"; + rev = "fa1adca64aea62d512bbc9e0b0f4b88ac8667ed4"; + sha256 = "0gnz4jh5gagnk06jndmxqmjhymbnpjz18wx5i071q7imkv0420s4"; }; dependencies = []; }; vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2016-05-07"; + name = "vim-easymotion-2016-10-19"; src = fetchgit { url = "git://github.com/lokaltog/vim-easymotion"; - rev = "5c6f3cd9a713491e6b32752a05c45198aa91540a"; - sha256 = "0nr50c6hsg43bc86gkiram5whkggjpszffl8xkqxdmlspz9h96v3"; + rev = "11632455de8caa40f264501df8f0a3e249cf0595"; + sha256 = "1lmmahpsghfqnri7wi2i9370q4dfzpdbafabi97vfxyyclxj4bz9"; }; dependencies = []; }; rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow-2016-08-08"; + name = "rainbow-2016-10-28"; src = fetchgit { url = "git://github.com/luochen1990/rainbow"; - rev = "eeb35ccece20f2648b44580c484c6e57eec3c92b"; - sha256 = "0s1ygjm5czzj1idrw4f13gg60zljznb6bs7fps4i3wl2mbmw5641"; + rev = "906094f73a46ab4636806541b50c5d4182fa09e1"; + sha256 = "1za2pwv24yiap2655wagyg4yd69g1xqwayazablwj7x1wvqdvd5p"; }; dependencies = []; @@ -907,22 +929,22 @@ rec { }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2016-07-21"; + name = "vim-startify-2016-10-31"; src = fetchgit { url = "git://github.com/mhinz/vim-startify"; - rev = "3f7b8d7b5e8b9f7670f7bcfab3596cb72930ca5e"; - sha256 = "00shnn7wmi3y3354ppd4dgjkxzdnj6cc9wa5sp998y7jlxnc84i9"; + rev = "9732427469c6933cbedeb7e662c70a2aaf4e63d2"; + sha256 = "022ibyqq140130x8c2901sskh03q516ghnc25i41qv6b2hcsq1ad"; }; dependencies = []; }; lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lushtags-2016-04-26"; + name = "lushtags-2016-10-12"; src = fetchgit { url = "git://github.com/mkasa/lushtags"; - rev = "641e4163d078e7c3844f2ac82a8153a3ef06484b"; - sha256 = "1zqgvflkw0pnrv6bzvlsd98sc2m7nk5w3bzqdzj3xdi8ahqx239g"; + rev = "ef6410cd66c6729e6f4795222bdc0e406251f27a"; + sha256 = "094cl57zfqjq7gpv4151zxipb6kd1czwx4nv6x8wsl3n0z4p3jkx"; }; dependencies = []; @@ -962,11 +984,11 @@ rec { }; haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2016-09-08"; + name = "haskell-vim-2016-11-05"; src = fetchgit { url = "git://github.com/neovimhaskell/haskell-vim"; - rev = "962d39f9ef24b9f7af65f10058fd4fff31eb26b4"; - sha256 = "159lr2cl27chpcicdisaz8fk0iy8lz5c0p9mi2lw1advinjxz3zb"; + rev = "cf2f339d2b551547d4f5a365db17f0f12b99a0c0"; + sha256 = "1zdq7rc7bklz88df2cwgw7n43z0mn4fylx7gyfmi8sfm1bx5avnj"; }; dependencies = []; @@ -995,11 +1017,11 @@ rec { }; vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2016-10-01"; + name = "vim-racer-2016-10-18"; src = fetchgit { url = "git://github.com/racer-rust/vim-racer"; - rev = "78774aee6be126f5dcf576042ac4872e04a1a3a7"; - sha256 = "10rv21g72pkaakxqr016l9r42hjiys1rhhhbnv3pmmfqv38ifx0a"; + rev = "6c87080bdb145595e37c304fd8b570b349eda381"; + sha256 = "1hjf8j7jnf2vb62w6zv3xm0hdhjmm0hxqq18symxfqpkii1kwx6c"; }; dependencies = []; @@ -1017,33 +1039,33 @@ rec { }; vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2016-09-28"; + name = "vim-grammarous-2016-10-07"; src = fetchgit { url = "git://github.com/rhysd/vim-grammarous"; - rev = "580785b4313613c1fd47ac291d92e1458f3ac2e3"; - sha256 = "0fxnzyb0svmgb3jc9dh6kfxli59kx3289hgwzcclfcff0m9df7q0"; + rev = "81ff81d1ac5e2ea059600588165ba9b2ecb854eb"; + sha256 = "1xpm1j64f5c62d7dnpkc9lfg6qh0nwjbnk3a5gqmz3iy4z1hsdwb"; }; dependencies = []; }; rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-vim-2016-09-30"; + name = "rust-vim-2016-10-28"; src = fetchgit { url = "git://github.com/rust-lang/rust.vim"; - rev = "2030019e1a5d0593dc662a0c37f3d06c4de8c252"; - sha256 = "1d53aw4lprvf7qmk87jar8w7dkqara8k3hdm3qjhjlc1a7qv6i9v"; + rev = "59e5e2f8b7df21eb438124b95c7295da9c53e1d7"; + sha256 = "1zdx29l6lhini9562j75g3d41yvjf78pi8cady16i7644hw11r0m"; }; dependencies = []; }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2016-09-23"; + name = "neoformat-2016-11-05"; src = fetchgit { url = "git://github.com/sbdchd/neoformat"; - rev = "c15243abdbfef8d0c6d626d6f3676f3694e13131"; - sha256 = "18qsw1z98mg0x3rdvd0j95vyl0n4kacxz4viv600aiisv20s30i3"; + rev = "8a4d9783879e404bd0a9e185dfec2cd6cd529c31"; + sha256 = "076cm2cg4kyps7n5d3kp2vjcwvkay20f1pl26yvdsjac14w6x9l9"; }; dependencies = []; @@ -1061,44 +1083,44 @@ rec { }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2016-09-30"; + name = "neocomplete-vim-2016-10-19"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "16d650348538f780d282863ecbdcc45319d36522"; - sha256 = "0var0md485r6kfrsdbd9zmmid6z7zvqhl5n71q8fjnvsgsb9v6a6"; + rev = "4bf7526a1c8cca9f8614e8a09178f334eaca0481"; + sha256 = "1qpxqvdiglisl8bnh1wli957lwr56mq96pm266qmwj6d38h8yby7"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2016-09-26"; + name = "neosnippet-snippets-2016-11-05"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "be02928b14cae1effbe4388da4d5a75215344ba6"; - sha256 = "1r3v229plm8qizy0m83rrl0y4b5m2lawc3c22q4zpm9l28hxk084"; + rev = "4431bf176650696d5a8dd93814812afd0d06212c"; + sha256 = "0fbwzlvdbrmia97pyzgyffbqrimp2dxjn6cc45ia1kqgnhwdk4pd"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2016-09-11"; + name = "neosnippet-vim-2016-11-04"; src = fetchgit { url = "git://github.com/shougo/neosnippet.vim"; - rev = "a1508f88729e1c5912dd12417553f178494c4dd2"; - sha256 = "14pjz6grz56ab65al2h9vn9nlqr6r9cqa8qghdg3rj0sy40lyz7a"; + rev = "22bf9611263fcc9fd2c4bd61031053624ff82714"; + sha256 = "0f0j0spw8zkvrfhbdlk020y19fh4awhhqwc3ylnxday3q5avxa16"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2016-09-30"; + name = "unite-vim-2016-11-04"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "504edce8c33207c522d6fe8f7864e0c25f25757f"; - sha256 = "0nn3h8nj258s55qwgsskcw028lnsl66x32mq0k6yyklwljplfn1s"; + rev = "f3f6df24c04faf29ae4d716aa776f85e88e7ea38"; + sha256 = "1yyw1blg82g6d8dbl6f4kgfka3d5lh0vgjmp310aysqdhnfag2az"; }; dependencies = []; @@ -1124,11 +1146,11 @@ rec { }; vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2016-09-05"; + name = "vimshell-vim-2016-10-20"; src = fetchgit { url = "git://github.com/shougo/vimshell.vim"; - rev = "371f0774907713959fedbdb37973a55e60428f42"; - sha256 = "0jgfqsk2g6hlmks7c5ig0wlpzmdv6dlf91kdiiqfnli9xsfaq0i8"; + rev = "b42ba02a491d6a4b6daa3178a747e59e7b1800c7"; + sha256 = "1vpxyfyc9p8h5pwmkdqfvvyxgddbzbmycnzpn9kbyxz89r8k94kj"; }; dependencies = [ "vimproc-vim" ]; }; @@ -1178,11 +1200,11 @@ rec { }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2016-09-22"; + name = "vim-quickrun-2016-10-16"; src = fetchgit { url = "git://github.com/thinca/vim-quickrun"; - rev = "25b23f3519aabf2515fa4c70390bbea507516377"; - sha256 = "1rb1i8bv2g95l5pp5rmaf4xidqjbkk05dz8kb6b9fdzjnskr0mca"; + rev = "c4c368c835b91c012b011dde613a914c0e167fd0"; + sha256 = "0hk7y7gkcxkzgp102x2b3igx7pq194h6ixahmv8s9qv5ndv2km4s"; }; dependencies = []; @@ -1244,11 +1266,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2016-10-04"; + name = "youcompleteme-2016-11-04"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "c1cd62dc3c522d49b1989aceb64566326db2fcf2"; - sha256 = "01bqgg7zlfhyri0cwx24mf2rbvr063c7sm5fz1kkccpqr77xiz7h"; + rev = "4f2494e87ebd5a6e9b5dc10a436d4d943f137fe6"; + sha256 = "03fl5ccql6v6da27wns0fiqcyhn0rmwx5vz7l3xqq1xg3x44m5n2"; }; dependencies = []; buildInputs = [ @@ -1287,22 +1309,22 @@ rec { }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2016-10-03"; + name = "vim-airline-themes-2016-10-26"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline-themes"; - rev = "3e8ecba0dea8b4ea35e81780a9aa00f2ca6823e8"; - sha256 = "0dcf5pbysbfwrjf0ypnavw25h4k78y990l2j1ks1zbv6mpgg0kkw"; + rev = "e03e9f62d25f9afb04c88ec6ca66cf2098242016"; + sha256 = "0c6qnh7xjp7qiw5hdz4a3n9v4fk7vynm592aqs4cmhhgjfv1s845"; }; dependencies = []; }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2016-09-13"; + name = "vim-pandoc-2016-11-05"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc"; - rev = "035d0154fc9d5c974f810ee88a4b223c7e8bec31"; - sha256 = "00hrwdm5p5bjgwi29xv3hs84sxajwzy9iql6yg02qw3pgzyfa7gv"; + rev = "a92155e8d3a5d8d4e4636783bdebb72ab465b89a"; + sha256 = "0f4mf40h9h55nishgml833mj1n99wpxbahzgmmx3avfvhxcr97hm"; }; dependencies = []; @@ -1320,11 +1342,11 @@ rec { }; vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-syntax-2016-07-27"; + name = "vim-pandoc-syntax-2016-11-05"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc-syntax"; - rev = "34339e2a5fe936549fa758546c40d7a906537a4b"; - sha256 = "0mwhl2dn3hzj8275kaf01yjn401qb7nhi12lkdj7bdzmq856i1y1"; + rev = "c76442ccbdd7889184683dc1d39c16c612c2c19f"; + sha256 = "1ad60ls4xrbf01sjprksrx2j9x2y4m6gd7hq3p9ygrcmcxw64khm"; }; dependencies = []; @@ -1419,22 +1441,22 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2016-09-17"; + name = "vim-wakatime-2016-11-01"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "927ba8d2299a65ddab3e79644c48d06386dac2d5"; - sha256 = "1qlzp5gdchvzvnjshh2sz2933wwhky8jdvg3j0rv6yyr95n14zff"; + rev = "5fb34105de863ca90f3f8568b85fa017a42568af"; + sha256 = "1flsdmf60fp8z0k080qfzdcpcb761zrj5qa3np2y9w24wbff9m5p"; }; dependencies = []; buildInputs = [ python ]; }; command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2016-06-14"; + name = "command-t-2016-10-27"; src = fetchgit { url = "git://github.com/wincent/command-t"; - rev = "354c429dad34f7d163663943c948f819588b53d3"; - sha256 = "1vkvc6ckza5b4ck52hv4rjclqi7x4f06dxkbqcqnia490m685v9q"; + rev = "d2467c84af8a1f1a2d0366127550d0a241dd2548"; + sha256 = "1r81a0wlj9aqx0s11h6ddkdwbahxbg1l425jdyrwvxwd973nwkj6"; }; dependencies = []; buildInputs = [ perl ruby ]; @@ -1458,11 +1480,11 @@ rec { }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2016-10-04"; + name = "deoplete-jedi-2016-10-22"; src = fetchgit { url = "git://github.com/zchee/deoplete-jedi"; - rev = "9df866cdf35eee085a3531c838659246ede686e9"; - sha256 = "1qi91q0znz5qfq4f0rs07nkf5mf4x55gwb8fkk0hlfnly0qgba80"; + rev = "57e5b61578d4d0a27fa75fd5f8dc21d110d60989"; + sha256 = "050ck7k37lbvw44z7hdk530cswcqywrdfvw5v1bs37mjnh3l9dnj"; }; dependencies = []; @@ -1502,11 +1524,11 @@ rec { }; pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen-2016-01-26"; + name = "pathogen-2016-10-13"; src = fetchgit { url = "git://github.com/tpope/vim-pathogen"; - rev = "8c91196cfd9c8fe619f35fac6f2ac81be10677f8"; - sha256 = "17d1903spczg2rk0qzg94vvq41dwhmnxwajqgzcx4lmf606cfspi"; + rev = "7ba2e1b67a8f8bcbafedaf6763580390dfd93436"; + sha256 = "1g15wzyw9b93n3icwpscx4b4qkn23snbmqjqp867ba0w0z3h6hpv"; }; dependencies = []; @@ -1546,11 +1568,11 @@ rec { }; sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sleuth-2015-06-07"; + name = "sleuth-2016-11-06"; src = fetchgit { url = "git://github.com/tpope/vim-sleuth"; - rev = "a17462708aa40a7fc0afd4effa559087d8a2c908"; - sha256 = "12s7nl3c15i9wyinhzw9biymsyw74akx96nzix9p9979nxhmi09m"; + rev = "62c4f261874dd44e6cdc6788b4a6bc59f9dfe746"; + sha256 = "13w4gv2k91ahdc25vhi0ilqphlnix1q5gddcihi8k7fapx990a9k"; }; dependencies = []; @@ -1853,11 +1875,11 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2016-09-28"; + name = "vim-airline-2016-11-04"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline"; - rev = "2be9a044e09f68bef0eb4dff27af7d22405968fe"; - sha256 = "0n9p2pdh9cw6lfhf43nh71g8r73smnq65c0kadr88ywa54y92bxg"; + rev = "258430db82329c1298750af91391c1b21a5a5b58"; + sha256 = "16m884mfrhmnn12nclmdngkcknkhy1kcn4dhpkk7fs5i89yik1rj"; }; dependencies = []; @@ -1897,11 +1919,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2016-09-30"; + name = "vim-gitgutter-2016-10-27"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "4f9c5b0f3e2a20081edc1ec60a79640f7d55e3e0"; - sha256 = "1bd7vvljgrbs6phwa8axpzzfhf4kcczmp0i1wwv3rn35sklnqc47"; + rev = "1742a8f568df549f4daeda90174b54d0c371501f"; + sha256 = "1d4d4lpf43dd5fpn3cqb3lrfr4k6ilmanmk9cymwf9byri3s4xdv"; }; dependencies = []; @@ -1952,44 +1974,44 @@ rec { }; vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2016-07-25"; + name = "vim-signature-2016-10-17"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; - rev = "537651a3a6dac10442f3e5ea2bb55a0bfd3324a6"; - sha256 = "0s0m75h8jqk0jykhhnjpw02ynvxw5pnsyjv0zb7n0azv96dvvznk"; + rev = "f1f7108aacac5dc3a7e3b697c489f8271fa054b8"; + sha256 = "0y9ls3m9l2f5jwkbfn26xhw1brp03c9ylmzxfnw28z2bfh5778iy"; }; dependencies = []; }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2016-09-28"; + name = "vim-signify-2016-10-07"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "faf7a0307180ec10418fa0eae85e68b526eed267"; - sha256 = "18wklbvx632d106wbnkh06qpvkkh6zdxsgp5cvrqwfk73scwkgh5"; + rev = "a7e3219de8f603aaec35b30027778aa417fcb691"; + sha256 = "1dq369s2bavwkv59cklbjz2zr6vk5ahqs53x1pj0l1xx3rg9h3aq"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2016-10-04"; + name = "vim-snippets-2016-11-05"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "0acb605c5fa6058403fb2510c807b17b9a27d460"; - sha256 = "0jdjcqigsv6dsvpc4zbavpwhx71f1g84zmwysgvsyraiqdiakq7z"; + rev = "93c3241c79886d027c802c93804e597f5b9d742f"; + sha256 = "0m0k2czyhf9lwla4pyzf6jrb0h1xclcww1pqwnmbf1g10ns7n2zh"; }; dependencies = []; }; vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2016-10-01"; + name = "vim-webdevicons-2016-11-06"; src = fetchgit { url = "git://github.com/ryanoasis/vim-devicons"; - rev = "77bf4cef436955fb40719526746f3ba718c6fa36"; - sha256 = "0i3rdz08xs8nia0n0m9xd2hdipnb8khrr9zb3bxvhvzd32rfqfv5"; + rev = "4fbf39a8984ed9a450b5cd078d65955de472bace"; + sha256 = "0m549vm5qzk1hiixf4p740fkqw58y46pdimb5jhpm484sqyggvj5"; }; dependencies = []; @@ -2029,35 +2051,15 @@ rec { }; vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2016-08-05"; + name = "vundle-2016-10-22"; src = fetchgit { url = "git://github.com/gmarik/vundle"; - rev = "fef1c2f31862c44cf5295ef86c086efba4af20a9"; - sha256 = "18prk9axxj418hjh1yflijww39bgbvf3vq7z6a1501wq88d7z8zs"; + rev = "88688fe453038ac1ac26e31646cfbec50fca2fb7"; + sha256 = "1i46xjn0zklcrdp4yf856jpl7lwf14x4y67qhnc41q12rcvimvr5"; }; dependencies = []; }; - auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "auto-pairs-2016-07-17"; - src = fetchgit { - url = "git://github.com/jiangmiao/auto-pairs"; - rev = "1b3a1efb078fdf74d4013308b63de57dfda0cc8e"; - sha256 = "1g5gb9xvc9xw3rxg8p4w3qcsdl3xfpi5ax380916aq237kmrnzdk"; - }; - dependencies = []; - }; - - editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "editorconfig-vim-2016-07-16"; - src = fetchgit { - url = "git://github.com/editorconfig/editorconfig-vim"; - rev = "a459b8cfef00100da40fd69c8ae92c4d1e63e1d2"; - sha256 = "03slzk7jgr348f59pxghmd9giwla63lxmwvripg99zrlgl0pvp5g"; - }; - dependencies = []; - - }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index bebfbd1b7c02..099b4c12ff98 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -2,7 +2,6 @@ "CheckAttach" "Gist" "Hoogle" -"Rename" "Solarized" "Supertab" "Syntastic" @@ -106,6 +105,7 @@ "github:vim-pandoc/vim-pandoc-after" "github:vim-pandoc/vim-pandoc-syntax" "github:vim-scripts/Colour-Sampler-Pack" +"github:vim-scripts/Rename" "github:vim-scripts/a.vim" "github:vim-scripts/align" "github:vim-scripts/changeColorScheme.vim" From f28dd2c735844679ada3055af2359ca7c854d0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Nov 2016 18:54:06 +0100 Subject: [PATCH 0026/1749] vim-youcompleteme: clang 3.8 -> 3.9 It seems to work fine on my NixOS. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 082b2f5e89d4..d72c1779cdec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17284,7 +17284,7 @@ in vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { inherit (darwin.apple_sdk.frameworks) Cocoa; - llvmPackages = llvmPackages_38; + llvmPackages = llvmPackages_39; }); vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 { From 8e86d3d45193cc13b0699a3b260716c8092e4e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Nov 2016 20:21:11 +0100 Subject: [PATCH 0027/1749] vim-plugins: add clighter8 --- pkgs/misc/vim-plugins/default.nix | 14 ++++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + .../vim2nix/additional-nix-code/clighter8 | 4 ++++ 3 files changed, 19 insertions(+) create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8 diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index a230902916c2..f9ea101d3eb0 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -440,6 +440,20 @@ rec { }; + clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "clighter8-2016-11-08"; + src = fetchgit { + url = "git://github.com/bbchung/clighter8"; + rev = "a264494b6dd3e7636fa31b8aee9b3a42a635a69f"; + sha256 = "1dg22yfr0za7milqzm7xywa6j9dfs2kvkjlwa046jjkjaqzlfx48"; + }; + dependencies = []; + preFixup = '' + sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \ + -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim + ''; + }; + neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neomake-2016-11-04"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 099b4c12ff98..263970be386a 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -27,6 +27,7 @@ "github:ajh17/Spacegray.vim" "github:alvan/vim-closetag" "github:ap/vim-css-color" +"github:bbchung/clighter8" "github:benekastah/neomake" "github:bitc/vim-hdevtools" "github:christoomey/vim-tmux-navigator" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8 b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8 new file mode 100644 index 000000000000..8965ebe29810 --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8 @@ -0,0 +1,4 @@ + preFixup = '' + sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \ + -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim + ''; From d0d5a6dbcc84fc051ba3b804c7d2a178dbf87c47 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Mon, 7 Nov 2016 20:42:26 +0100 Subject: [PATCH 0028/1749] libgeotiff: enable darwin support --- pkgs/development/libraries/libgeotiff/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 496306c254d2..389f899e3ef7 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = http://www.remotesensing.org/geotiff/geotiff.html; license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } From 9141b8cad1b36511856732aaf00a5f788f1edbc0 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Mon, 7 Nov 2016 20:42:53 +0100 Subject: [PATCH 0029/1749] gdal: enable darwin support Also some minor tweaks: There didn't seem any need to use -O0 optimization level anymore. Also the option "with-libpng" should have been "with-png" all along. --- pkgs/development/libraries/gdal/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index ce3e0f61972f..173e6411182d 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -20,14 +20,13 @@ composableDerivation.composableDerivation {} (fixed: rec { hardeningDisable = [ "format" ]; - # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. # Unset CC and CXX as they confuse libtool. - preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; + preConfigure = "unset CC CXX"; configureFlags = [ "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) - "--with-libpng=${libpng.dev}" # optional + "--with-png=${libpng.dev}" # optional "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" @@ -53,6 +52,6 @@ composableDerivation.composableDerivation {} (fixed: rec { homepage = http://www.gdal.org/; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; }) From 6de20a7fe4d076cadea078b77cd2bc3d52e409aa Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 7 Nov 2016 14:36:41 -0600 Subject: [PATCH 0030/1749] virtualbox-demo: Add modesetting to drivers This needs to be included for VirtualBox to detect that it needs to start the video driver. "modesetting" is also set in virtualbox-image.nix but this line seems to take precedence over that one (even though the virtualbox-image.nix has a higher override?) This should fix the problems that I and a few others have been having with the .ova files built for nixos.org. Fixes #20007. --- nixos/modules/installer/virtualbox-demo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index 49ec08996104..5316cfce906b 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -18,5 +18,5 @@ with lib; # Add some more video drivers to give X11 a shot at working in # VMware and QEMU. - services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ]; + services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ]; } From 031d639b4d2119fa5d6ffaa1e24d7243ec959b69 Mon Sep 17 00:00:00 2001 From: Guillaume Koenig Date: Mon, 7 Nov 2016 08:38:34 +0100 Subject: [PATCH 0031/1749] encryptr: init at 2.0.0 --- pkgs/tools/security/encryptr/default.nix | 57 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 61 insertions(+) create mode 100644 pkgs/tools/security/encryptr/default.nix diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix new file mode 100644 index 000000000000..95d0299e8733 --- /dev/null +++ b/pkgs/tools/security/encryptr/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype +, pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes +, libXrender, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr +, expat, libcap, systemd , dbus, gtk2 , gdk_pixbuf, libnotify +}: + +let + arch = if stdenv.system == "x86_64-linux" then "amd" + else if stdenv.system == "i686-linux" then "i386" + else throw "Encryptr for ${stdenv.system} not supported!"; + + sha256 = if stdenv.system == "x86_64-linux" then "1j3g467g7ar86hpnh6q9mf7mh2h4ia94mwhk1283zh739s2g53q2" + else if stdenv.system == "i686-linux" then "02j9hg9b1jlv25q1sjfhv8d46mii33f94dj0ccn83z9z18q4y2cm" + else throw "Encryptr for ${stdenv.system} not supported!"; + +in stdenv.mkDerivation rec { + name = "encryptr-${version}"; + version = "2.0.0"; + + src = fetchurl { + url = "https://spideroak.com/dist/encryptr/signed/linux/targz/encryptr-${version}_${arch}.tar.gz"; + inherit sha256; + }; + + dontBuild = true; + + rpath = stdenv.lib.makeLibraryPath [ + glib nss nspr gconf fontconfig freetype pango cairo libX11 libXi + libXcursor libXext libXfixes libXrender libXcomposite alsaLib + libXdamage libXtst libXrandr expat libcap dbus gtk2 gdk_pixbuf + libnotify stdenv.cc.cc + ]; + + installPhase = '' + mkdir -pv $out/bin $out/lib + cp -v {encryptr-bin,icudtl.dat,nw.pak} $out/bin + mv -v $out/bin/encryptr{-bin,} + cp -v lib* $out/lib + ln -sv ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0 + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath $out/lib:${rpath} \ + $out/bin/encryptr + ''; + + # If stripping, node-webkit does not find + # its application and shows a generic page + dontStrip = true; + + meta = with stdenv.lib; { + homepage = https://spideroak.com/solutions/encryptr; + description = "Free, private and secure password management tool and e-wallet"; + license = licenses.unfree; + maintainers = with maintainers; [ guillaumekoenig ]; + platform = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b47d7c72246d..a6143e168e74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -495,6 +495,10 @@ in elvish = callPackage ../shells/elvish { }; + encryptr = callPackage ../tools/security/encryptr { + gconf = gnome2.GConf; + }; + enpass = callPackage ../tools/security/enpass { }; genymotion = callPackage ../development/mobile/genymotion { }; From 459448727eb74c6db10f97692f57a2bb07381c1b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Nov 2016 10:02:37 +0100 Subject: [PATCH 0032/1749] gnutar: Fix comment --- pkgs/tools/archivers/gnutar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 80c84236b8db..447ef1f623fc 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "097hx7sbzp8qirl4m930lw84kn0wmxhmq7v1qpra3mrg0b8cyba0"; }; - patches = [ ./CVE-2016-6321.patch ]; # FIXME: remove on another stdenv rebuild + patches = [ ./CVE-2016-6321.patch ]; # avoid retaining reference to CF during stdenv bootstrap configureFlags = stdenv.lib.optionals stdenv.isDarwin [ From e13ffad38368d4d5b068aba130d81b2d284d0d28 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 6 Nov 2016 13:29:57 +0000 Subject: [PATCH 0033/1749] pythonPackages: hsaudiotag: init at 1.1.1 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b44676c72e45..741599528955 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7424,6 +7424,25 @@ in { }; }; + hsaudiotag = buildPythonPackage (rec { + name = "hsaudiotag-1.1.1"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "mirror://pypi/h/hsaudiotag/${name}.tar.gz"; + sha256 = "15hgm128p8nysfi0jb127awga3vlj0iw82l50swjpvdh01m7rda8"; + }; + + # no tests + doCheck = false; + + meta = { + description = "A pure Python library that lets one to read metadata from media files"; + homepage = http://hg.hardcoded.net/hsaudiotag/; + license = licenses.bsd3; + }; + }); + httpauth = buildPythonPackage rec { version = "0.3"; name = "httpauth-${version}"; From e5044310a1725b72bdc4ada8aea14dd58bc379a6 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 6 Nov 2016 13:30:02 +0000 Subject: [PATCH 0034/1749] pythonPackages: hsaudiotag3k: init at 1.1.3 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 741599528955..55853e6a026b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7443,6 +7443,25 @@ in { }; }); + hsaudiotag3k = buildPythonPackage (rec { + name = "hsaudiotag3k-1.1.3"; + disabled = !isPy3k; + + src = pkgs.fetchurl { + url = "mirror://pypi/h/hsaudiotag3k/${name}.tar.gz"; + sha256 = "0bv5k5594byr2bmhh77xv10fkdpckcmxg3w380yp30aqf83rcsx3"; + }; + + # no tests + doCheck = false; + + meta = { + description = "A pure Python library that lets one to read metadata from media files"; + homepage = http://hg.hardcoded.net/hsaudiotag/; + license = licenses.bsd3; + }; + }); + httpauth = buildPythonPackage rec { version = "0.3"; name = "httpauth-${version}"; From 08a5c363487e52584ded2ff9a5d54c81edc553b0 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 6 Nov 2016 13:30:06 +0000 Subject: [PATCH 0035/1749] pythonPackages: send2trash: init at 1.3.0 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55853e6a026b..53b06cdd2d8f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30336,6 +30336,24 @@ in { }; }; + send2trash = buildPythonPackage (rec { + name = "Send2Trash-1.3.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/S/Send2Trash/${name}.tar.gz"; + sha256 = "1zjq5ki02l0vl4f1xymsnqyxipx6q81a435p46db07l3mqg4dx1k"; + }; + + # no tests + doCheck = false; + + meta = { + description = "Send file to trash natively under Mac OS X, Windows and Linux"; + homepage = https://github.com/hsoft/send2trash; + license = licenses.bsd3; + }; + }); + sigtools = buildPythonPackage rec { name = "sigtools-${version}"; version = "1.1a3"; From 79fb5d45a4e65ec21d56326b028f56907e97c49e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 6 Nov 2016 13:30:10 +0000 Subject: [PATCH 0036/1749] pythonPackages: plyvel: init at 0.9 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53b06cdd2d8f..b442aded9f01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16341,6 +16341,27 @@ in { }; }); + plyvel = buildPythonPackage (rec { + name = "plyvel-0.9"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/plyvel/${name}.tar.gz"; + sha256 = "1scq75qyks9vmjd19bx57f2y60mkdr44ajvb12p3cjg439l96zaq"; + }; + + buildInputs = with self; [ pkgs.leveldb ] + ++ optional isPy3k pytest; + + # no tests for python2 + doCheck = isPy3k; + + meta = { + description = "Fast and feature-rich Python interface to LevelDB"; + homepage = https://github.com/wbolster/plyvel; + license = licenses.bsd3; + }; + }); + osc = buildPythonPackage (rec { name = "osc-0.133+git"; disabled = isPy3k; From 823f28cd1c64f6d8257a6486c085a356445c2db8 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 8 Nov 2016 21:12:19 +0900 Subject: [PATCH 0037/1749] flashplayer: 11.2.202.643 -> 11.2.202.644 --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 4d598bbb3a9d..17168241ed9a 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -70,11 +70,11 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "11.2.202.643"; + version = "11.2.202.644"; src = fetchurl { url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip"; - sha256 = "02imhdzhali42m8d1rw3bqscvi70707mssss7c43dm2kf67z6y8s"; + sha256 = "0hf0hwg4kvz99g9d2arg5dwm3nx0hjnpngz9ay1mihhgjksy585b"; }; nativeBuildInputs = [ unzip ]; From 101ca1f454d3a0c7f564215063c8f68f5bd08636 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 5 Nov 2016 13:33:43 +0100 Subject: [PATCH 0038/1749] quiterss: init at 0.18.4 --- .../newsreaders/quiterss/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/networking/newsreaders/quiterss/default.nix diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix new file mode 100644 index 000000000000..53520909b09c --- /dev/null +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, qt5, qmakeHook, makeQtWrapper, pkgconfig, sqlite }: + +stdenv.mkDerivation rec { + name = "quiterss-${version}"; + version = "0.18.4"; + + src = fetchFromGitHub { + owner = "QuiteRSS"; + repo = "quiterss"; + rev = "${version}"; + sha256 = "0gk4s41npg8is0jf4yyqpn8ksqrhwxq97z40iqcbd7dzsiv7bkvj"; + }; + + buildInputs = [ qt5.qtbase qt5.qttools qt5.qtwebkit qmakeHook makeQtWrapper pkgconfig sqlite.dev ]; + + postInstall = '' + wrapQtProgram "$out/bin/quiterss" + ''; + + meta = with stdenv.lib; { + description = "A Qt-based RSS/Atom news feed reader"; + longDescription = '' + QuiteRSS is a open-source cross-platform RSS/Atom news feeds reader + written on Qt/C++ + ''; + homepage = "https://quiterss.org"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b47d7c72246d..bdaca93c29cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14260,6 +14260,8 @@ in quirc = callPackage ../tools/graphics/quirc {}; + quiterss = qt5.callPackage ../applications/networking/newsreaders/quiterss {}; + quodlibet = callPackage ../applications/audio/quodlibet { }; quodlibet-with-gst-plugins = callPackage ../applications/audio/quodlibet { From 63ef0c7463d8d9d4e5c9eadc769f1ba5960b1552 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 17:01:31 +0100 Subject: [PATCH 0039/1749] xapianBindings: remove - no package uses it - uses composable derivation, and some changes are needed for python 3 support --- .../libraries/xapian/bindings/default.nix | 88 ------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 93 deletions(-) delete mode 100644 pkgs/development/libraries/xapian/bindings/default.nix diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix deleted file mode 100644 index 7187f9b575fd..000000000000 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv, composableDerivation, fetchurl, xapian, pkgconfig, zlib -, python ? null, sphinx ? null, php ? null, ruby ? null }: - -assert (python != null) -> (sphinx != null); - -let inherit (composableDerivation) wwf; in - -composableDerivation.composableDerivation {} rec { - - name = "xapian-bindings-${version}"; - version = (builtins.parseDrvName xapian.name).version; - - src = fetchurl { - url = "http://oligarchy.co.uk/xapian/${version}/${name}.tar.xz"; - sha256 = "0lv2zblayfax4v7z3sj067b0av0phf3gc2s2d1cvkw0bkl07mv1s"; - }; - - buildInputs = [ xapian pkgconfig zlib ]; - - # most interpreters aren't tested yet.. (see python for example how to do it) - flags = - wwf { - name = "python"; - enable = { - buildInputs = [ python sphinx ]; - - # Our `sphinx-build` binary is a shell wrapper around - # `sphinx-build` python code. Makefile tries to execute it - # using python2 and fails. Fixing that here. - patchPhase = '' - for a in python/Makefile* ; do - substituteInPlace $a \ - --replace '$(PYTHON2) $(SPHINX_BUILD)' '$(SPHINX_BUILD)' - done - ''; - - # export same env vars as in pythonNew - preConfigure = '' - export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages - mkdir -p $out/nix-support - echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook - echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook - ''; - }; - } - // wwf { - name = "php"; - enable = { - buildInputs = [ php ]; - preConfigure = '' - export PHP_EXTENSION_DIR=$out/lib/php # TODO use a sane directory. Its not used anywhere by now - ''; - }; - } - // wwf { - name = "ruby"; - enable = { - buildInputs = [ ruby ]; - preConfigure = '' - export RUBY_LIB=$out/${ruby.libPath} - export RUBY_LIB_ARCH=$RUBY_LIB - mkdir -p $out/nix-support - echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook - echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook - ''; - }; - } - - # note: see configure --help to get see which env vars can be used - # // wwf { name = "tcl"; enable = { buildInputs = [ tcl ];};} - # // wwf { name = "csharp"; } - # // wwf { name = "java"; } - ; - - cfg = { - pythonSupport = true; - phpSupport = false; - rubySupport = true; - }; - - meta = { - description = "Bindings for the Xapian library"; - homepage = xapian.meta.homepage; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b47d7c72246d..67a9655dfa9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9517,11 +9517,6 @@ in xapian = callPackage ../development/libraries/xapian { }; - xapianBindings = callPackage ../development/libraries/xapian/bindings { # TODO perl php Java, tcl, C#, python - php = php56; - sphinx = pythonPackages.sphinx; - }; - xapian-omega = callPackage ../development/libraries/xapian/tools/omega { libmagic = file; }; From be31980848dee782c4504b88c57edcfbb72c6f6b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 10:36:12 +0100 Subject: [PATCH 0040/1749] libxslt: build python bindings and add a pythonPackages.libxslt alias. --- .../development/libraries/libxslt/default.nix | 22 ++++++++++++++----- pkgs/top-level/python-packages.nix | 3 +++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 2afbfc2fe997..df0543194791 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs }: +{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs +, pythonSupport ? true, python2 +}: + +assert pythonSupport -> python2 != null; +assert pythonSupport -> libxml2.pythonSupport; stdenv.mkDerivation rec { name = "libxslt-1.1.29"; @@ -10,26 +15,33 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; - outputs = [ "bin" "dev" "out" "doc" ]; + outputs = [ "bin" "dev" "out" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; - buildInputs = [ libxml2 ]; + buildInputs = [ libxml2.dev ] ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ]; propagatedBuildInputs = [ findXMLCatalogs ]; configureFlags = [ - "--without-python" "--without-crypto" "--without-debug" "--without-mem-debug" "--without-debugger" - ]; + ] ++ stdenv.lib.optional pythonSupport "--with-python=${python2}"; postFixup = '' moveToOutput bin/xslt-config "$dev" moveToOutput lib/xsltConf.sh "$dev" moveToOutput share/man/man1 "$bin" + '' + stdenv.lib.optionalString pythonSupport '' + mkdir -p $py/nix-support + echo ${libxml2.py} >> $py/nix-support/propagated-native-build-inputs + moveToOutput lib/python2.7 "$py" ''; + passthru = { + inherit pythonSupport; + }; + meta = with stdenv.lib; { homepage = http://xmlsoft.org/XSLT/; description = "A C library and tools to do XSL transformations"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d21281c598a..8d03fc06da02 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13447,6 +13447,9 @@ in { clblas = pkgs.clblas-cuda; }; + libxslt = if isPy3k then throw "libxslt not supported for interpreter ${python.executable}" else + (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;}).py; + limnoria = buildPythonPackage rec { name = "limnoria-${version}"; version = "2016.05.06"; From d2111660c557bcd59c1be25ff01190365c389c7c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 10:36:37 +0100 Subject: [PATCH 0041/1749] libxml2: add a pythonPackages.libxml2 alias for the bindings --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d03fc06da02..3ff8960a21bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13447,6 +13447,9 @@ in { clblas = pkgs.clblas-cuda; }; + libxml2 = if isPy3k then throw "libxml2 not supported for interpreter ${python.executable}" else + (pkgs.libxml2.override{supportPython=true; python2=python;}).py; + libxslt = if isPy3k then throw "libxslt not supported for interpreter ${python.executable}" else (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;}).py; From 6b70ac81bbe823c220afea101ab814bf26e59fdd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 10:55:21 +0100 Subject: [PATCH 0042/1749] libxml2: supportPython -> pythonSupport since that is more commonly used in Nixpkgs. --- pkgs/development/libraries/libxml2/default.nix | 16 ++++++++-------- pkgs/top-level/emscripten-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 4831f150f45b..80354b10f3b9 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, zlib, xz, python2, findXMLCatalogs, libiconv, fetchpatch -, supportPython ? (! stdenv ? cross) }: +, pythonSupport ? (! stdenv ? cross) }: let python = python2; @@ -28,10 +28,10 @@ in stdenv.mkDerivation rec { }; outputs = [ "bin" "dev" "out" "doc" ] - ++ lib.optional supportPython "py"; - propagatedBuildOutputs = "out bin" + lib.optionalString supportPython " py"; + ++ lib.optional pythonSupport "py"; + propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; - buildInputs = lib.optional supportPython python + buildInputs = lib.optional pythonSupport python # Libxml2 has an optional dependency on liblzma. However, on impure # platforms, it may end up using that from /usr/lib, and thus lack a # RUNPATH for that, leading to undefined references for its users. @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib findXMLCatalogs ]; - configureFlags = lib.optional supportPython "--with-python=${python}" + configureFlags = lib.optional pythonSupport "--with-python=${python}" ++ [ "--exec_prefix=$dev" ]; enableParallelBuilding = true; @@ -55,9 +55,9 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ findXMLCatalogs libiconv ]; }; - preInstall = lib.optionalString supportPython + preInstall = lib.optionalString pythonSupport ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; - installFlags = lib.optionalString supportPython + installFlags = lib.optionalString pythonSupport ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"''; postFixup = '' @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { moveToOutput share/man/man1 "$bin" ''; - passthru = { inherit version; pythonSupport = supportPython; }; + passthru = { inherit version; pythonSupport = pythonSupport; }; meta = { homepage = http://xmlsoft.org/; diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index 633b4f8a211b..ed9e09802b7d 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -10,7 +10,7 @@ with pkgs; rec { libxml2 = (pkgs.libxml2.override { stdenv = emscriptenStdenv; - supportPython = false; + pythonSupport = false; }).overrideDerivation (old: { buildInputs = old.buildInputs ++ [ autoreconfHook pkgconfig zlib nodejs ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ff8960a21bb..071ca6f2bd52 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13448,7 +13448,7 @@ in { }; libxml2 = if isPy3k then throw "libxml2 not supported for interpreter ${python.executable}" else - (pkgs.libxml2.override{supportPython=true; python2=python;}).py; + (pkgs.libxml2.override{pythonSupport=true; python2=python;}).py; libxslt = if isPy3k then throw "libxslt not supported for interpreter ${python.executable}" else (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;}).py; From 05f31e5c8a988b47d959d3d15a4d7b5d5d3ad288 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 8 Nov 2016 17:42:27 +0000 Subject: [PATCH 0043/1749] fix documentation typo in doc/languages-frameworks/haskell.md --- doc/languages-frameworks/haskell.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 904e3a5069ee..6728f4abba0e 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -633,7 +633,7 @@ Now the builds succeeds. Of course, in the concrete example of `ghc-events` this whole exercise is not an ideal solution, because `ghc-events` can analyze the output emitted by any version of GHC later than 6.12 regardless of the compiler version that was used -to build the `ghc-events' executable, so strictly speaking there's no reason to +to build the `ghc-events` executable, so strictly speaking there's no reason to prefer one built with GHC 7.8.x in the first place. However, for users who cannot use GHC 7.10.x at all for some reason, the approach of downgrading to an older version might be useful. From ab61c1b97c3356d27207dd281e31628bfa0449cb Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 8 Nov 2016 18:59:30 +0100 Subject: [PATCH 0044/1749] distrho: unstable 2015-07-19 -> 2016-06-26 --- pkgs/applications/audio/distrho/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 12099825757d..5d4e19700d8d 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -2,12 +2,12 @@ , libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { - name = "distrho-ports-git-2015-07-18"; + name = "distrho-ports-unstable-2016-06-26"; src = fetchgit { url = "https://github.com/DISTRHO/DISTRHO-Ports.git"; - rev = "53458838505efef91ed069d0a7d970b6b3588eba"; - sha256 = "1wjzgy5yyi52fn4si2m8zrbbzqsh3p75avfx744jmxj5gpq5qa92"; + rev = "e3969853ec9ba897c50ac060f0167313e2a18b29"; + sha256 = "0id4p8dlnlv5271yvmyawfr754nzah7xhvjkj633lw5yr3mq707m"; }; patchPhase = '' From 09f87eeb7f48ea15d800d73e2a4229a1d47f26a2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Oct 2016 19:52:07 +0200 Subject: [PATCH 0045/1749] gn: Init at 0.0.0.20161008 This is the standalone version of GN used currently solely for building Chromium. An upstream bug report is available at https://crbug.com/504074 to support a standalone build without needing various components from the Chromium source tree. Because there isn't a standalone vrsion available, I'm choosing 0.0.0.${date} as the version scheme here so that we don't conflict with versioned releases from upstream someday[TM]. Signed-off-by: aszlig --- .../tools/build-managers/gn/default.nix | 80 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/tools/build-managers/gn/default.nix diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix new file mode 100644 index 000000000000..a579b45cf626 --- /dev/null +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -0,0 +1,80 @@ +{ stdenv, fetchgit, fetchurl, python, ninja, libevent, xdg-user-dirs }: + +let + date = "20161008"; + + sourceTree = { + "src/base" = { + rev = "e71a514e60b085cc92bf6ef951ec329f52c79f9f"; + sha256 = "0zycbssmd2za0zij8czcs1fr66fi12f1g5ysc8fzkf8khbs5h6a9"; + }; + "src/build" = { + rev = "17093d45bf738e9ae4b6294492860ee65218a657"; + sha256 = "0i9py78c3f46sc789qvdhmgjgyrghysbqjgr67iypwphw52jv2dz"; + }; + "src/tools/gn" = { + rev = "9ff32cf3f1f4ad0212ac674b6303e7aa68f44f3f"; + sha256 = "14jr45k5fgcqk9d18fd77sijlqavvnv0knndh74zyb0b60464hz1"; + }; + "testing/gtest" = { + rev = "585ec31ea716f08233a815e680fc0d4699843938"; + sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc"; + }; + }; + + mkDepend = path: attrs: fetchgit { + url = "https://chromium.googlesource.com/chromium/${path}"; + inherit (attrs) rev sha256; + }; + +in stdenv.mkDerivation rec { + name = "gn-${version}"; + version = "0.0.0.${date}"; + + unpackPhase = '' + ${with stdenv.lib; concatStrings (mapAttrsToList (path: sha256: '' + dest=source/${escapeShellArg (removePrefix "src/" path)} + mkdir -p "$(dirname "$dest")" + cp --no-preserve=all -rT ${escapeShellArg (mkDepend path sha256)} "$dest" + '') sourceTree)} + ( mkdir -p source/third_party + cd source/third_party + unpackFile ${xdg-user-dirs.src} + mv * xdg_user + ) + ''; + + sourceRoot = "source"; + + postPatch = '' + # GN's bootstrap script relies on shebangs (which are relying on FHS paths), + # except when on Windows. So instead of patchShebang-ing it, let's just + # force the same behaviour as on Windows. + sed -i -e '/^def *check_call/,/^[^ ]/ { + s/is_win/True/ + }' tools/gn/bootstrap/bootstrap.py + + # Patch out Chromium-bundled libevent and xdg_user_dirs + sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \ + tools/gn/bootstrap/bootstrap.py + ''; + + NIX_LDFLAGS = "-levent"; + + nativeBuildInputs = [ python ninja ]; + buildInputs = [ libevent ]; + + buildPhase = '' + python tools/gn/bootstrap/bootstrap.py -v -s --no-clean + ''; + + installPhase = '' + install -vD out_bootstrap/gn "$out/bin/gn" + ''; + + meta = { + description = "A meta-build system that generates NinjaBuild files"; + homepage = "https://chromium.googlesource.com/chromium/src/tools/gn/"; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b89d1f3a582a..d2ee0c9c7e5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6079,6 +6079,8 @@ in global = callPackage ../development/tools/misc/global { }; + gn = callPackage ../development/tools/build-managers/gn { }; + gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; gnum4 = callPackage ../development/tools/misc/gnum4 { }; From d0e8f3c5034ef90933987ab0ba094c5364b7c8de Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Oct 2016 10:50:36 +0200 Subject: [PATCH 0046/1749] chromium: Add preliminary support for GN This only uses the most basic GN flags which should represent the GYP flags we had before. In order to get rid most of the GYP cruft, we now have common.nix and common-gn.nix which are mostly the same, just that the latter is only for GN builds. The GN implementation is far from complete and currently not even builds, so we need more work to get the beta and dev channels building. Signed-off-by: aszlig --- .../browsers/chromium/common-gn.nix | 202 ++++++++++++++++++ .../networking/browsers/chromium/default.nix | 7 +- 2 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/browsers/chromium/common-gn.nix diff --git a/pkgs/applications/networking/browsers/chromium/common-gn.nix b/pkgs/applications/networking/browsers/chromium/common-gn.nix new file mode 100644 index 000000000000..e795c2735b03 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/common-gn.nix @@ -0,0 +1,202 @@ +{ stdenv, gn, ninja, which + +# default dependencies +, bzip2, flac, speex, libopus +, libevent, expat, libjpeg, snappy +, libpng, libxml2, libxslt, libcap +, xdg_utils, yasm, minizip, libwebp +, libusb1, pciutils, nss, re2, zlib, libvpx + +, python, pythonPackages, perl, pkgconfig +, nspr, systemd, kerberos +, utillinux, alsaLib +, bison, gperf +, glib, gtk2, dbus_glib +, libXScrnSaver, libXcursor, libXtst, mesa +, protobuf, speechd, libXdamage, cups + +# optional dependencies +, libgcrypt ? null # gnomeSupport || cupsSupport +, libexif ? null # only needed for Chromium before version 51 + +# package customization +, enableSELinux ? false, libselinux ? null +, enableNaCl ? false +, enableHotwording ? false +, gnomeSupport ? false, gnome ? null +, gnomeKeyringSupport ? false, libgnome_keyring3 ? null +, proprietaryCodecs ? true +, cupsSupport ? true +, pulseSupport ? false, libpulseaudio ? null +, hiDPISupport ? false + +, upstream-info +}: + +buildFun: + +with stdenv.lib; + +let + # The additional attributes for creating derivations based on the chromium + # source tree. + extraAttrs = buildFun base; + + mkGnFlags = + let + # Serialize Nix types into GN types according to this document: + # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/language.md + mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; + sanitize = value: + if value == true then "true" + else if value == false then "false" + else if isList value then "[${concatMapStringsSep ", " sanitize value}]" + else if isInt value then toString value + else if isString value then mkGnString value + else throw "Unsupported type for GN value `${value}'."; + toFlag = key: value: "${key}=${sanitize value}"; + in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); + + gnSystemLibraries = [ + "flac" "libjpeg" "libpng" "libvpx" "libwebp" "libxml" "libxslt" "re2" + "snappy" "yasm" "zlib" + ]; + + opusWithCustomModes = libopus.override { + withCustomModes = true; + }; + + defaultDependencies = [ + bzip2 flac speex opusWithCustomModes + libevent expat libjpeg snappy + libpng libxml2 libxslt libcap + xdg_utils yasm minizip libwebp + libusb1 re2 zlib libvpx + ]; + + # build paths and release info + packageName = extraAttrs.packageName or extraAttrs.name; + buildType = "Release"; + buildPath = "out/${buildType}"; + libExecPath = "$out/libexec/${packageName}"; + + base = rec { + name = "${packageName}-${version}"; + inherit (upstream-info) version; + inherit packageName buildType buildPath; + + src = upstream-info.main; + + nativeBuildInputs = [ gn which python perl pkgconfig ]; + + buildInputs = defaultDependencies ++ [ + nspr nss systemd + utillinux alsaLib + bison gperf kerberos + glib gtk2 dbus_glib + libXScrnSaver libXcursor libXtst mesa + pciutils protobuf speechd libXdamage + pythonPackages.ply pythonPackages.jinja2 + ] ++ optional gnomeKeyringSupport libgnome_keyring3 + ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] + ++ optional enableSELinux libselinux + ++ optionals cupsSupport [ libgcrypt cups ] + ++ optional pulseSupport libpulseaudio; + + patches = [ + ./patches/widevine.patch + ./patches/glibc-2.24.patch + (if versionOlder version "52.0.0.0" + then ./patches/nix_plugin_paths_50.patch + else ./patches/nix_plugin_paths_52.patch) + ]; + + postPatch = '' + # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX + substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ + --replace \ + 'return sandbox_binary;' \ + 'return base::FilePath(GetDevelSandboxPath());' + + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + device/udev_linux/udev?_loader.cc + + sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ + gpu/config/gpu_info_collector_linux.cc + + sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ + chrome/browser/ui/webui/engagement/site_engagement_ui.cc + + sed -i -e '/#include/ { + i #include + :l; n; bl + }' gpu/config/gpu_control_list.cc + + patchShebangs . + '' + optionalString (versionAtLeast version "52.0.0.0") '' + sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ + third_party/pdfium/xfa/fxbarcode/utils.h + ''; + + gnFlags = mkGnFlags ({ + linux_use_bundled_binutils = false; + linux_use_bundled_gold = false; + linux_use_gold_flags = true; + is_debug = false; + + proprietary_codecs = false; + use_sysroot = false; + use_gnome_keyring = gnomeKeyringSupport; + use_gconf = gnomeSupport; + use_gio = gnomeSupport; + enable_nacl = enableNaCl; + enable_hotwording = enableHotwording; + selinux = enableSELinux; + use_cups = cupsSupport; + } // { + treat_warnings_as_errors = false; + is_clang = false; + enable_hidpi = hiDPISupport; + + # Google API keys, see: + # http://www.chromium.org/developers/how-tos/api-keys + # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, + # please get your own set of keys. + google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; + google_default_client_id = "404761575300.apps.googleusercontent.com"; + google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; + } // optionalAttrs proprietaryCodecs { + # enable support for the H.264 codec + proprietary_codecs = true; + enable_hangout_services_extension = true; + ffmpeg_branding = "Chrome"; + } // optionalAttrs pulseSupport { + use_pulseaudio = true; + link_pulseaudio = true; + } // (extraAttrs.gnFlags or {})); + + configurePhase = '' + # This is to ensure expansion of $out. + libExecPath="${libExecPath}" + python build/linux/unbundle/replace_gn_files.py \ + --system-libraries ${toString gnSystemLibraries} + gn gen --args=${escapeShellArg gnFlags} out/Release + ''; + + buildPhase = let + buildCommand = target: '' + "${ninja}/bin/ninja" -C "${buildPath}" \ + -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ + "${target}" + '' + optionalString (target == "mksnapshot" || target == "chrome") '' + paxmark m "${buildPath}/${target}" + ''; + targets = extraAttrs.buildTargets or []; + commands = map buildCommand targets; + in concatStringsSep "\n" commands; + }; + +# Remove some extraAttrs we supplied to the base attributes already. +in stdenv.mkDerivation (base // removeAttrs extraAttrs [ + "name" "gnFlags" "buildTargets" +]) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 7402a8bae29b..c03011c07c19 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -18,10 +18,15 @@ let callPackage = newScope chromium; + # XXX: This is an ugly hack for the transition to GN: + inherit (stdenv.lib) versionAtLeast; + gnRequired = versionAtLeast chromium.upstream-info.version "54.0.0.0"; + common = if gnRequired then ./common-gn.nix else ./common.nix; + chromium = { upstream-info = (callPackage ./update.nix {}).getChannel channel; - mkChromiumDerivation = callPackage ./common.nix { + mkChromiumDerivation = callPackage common { inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport hiDPISupport; From 7a3a16dd8040e7ba675b50ca47d023ee61f087d3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Oct 2016 10:56:22 +0200 Subject: [PATCH 0047/1749] chromium: Remove plugin paths patch for version 50 The oldest version we build is version 53, so we no longer need this patch. Signed-off-by: aszlig --- .../browsers/chromium/common-gn.nix | 4 +- .../networking/browsers/chromium/common.nix | 4 +- .../patches/nix_plugin_paths_50.patch | 75 ------------------- 3 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch diff --git a/pkgs/applications/networking/browsers/chromium/common-gn.nix b/pkgs/applications/networking/browsers/chromium/common-gn.nix index e795c2735b03..68798071ea1f 100644 --- a/pkgs/applications/networking/browsers/chromium/common-gn.nix +++ b/pkgs/applications/networking/browsers/chromium/common-gn.nix @@ -106,9 +106,7 @@ let patches = [ ./patches/widevine.patch ./patches/glibc-2.24.patch - (if versionOlder version "52.0.0.0" - then ./patches/nix_plugin_paths_50.patch - else ./patches/nix_plugin_paths_52.patch) + ./patches/nix_plugin_paths_52.patch ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8a561e75f790..8f6e324765fa 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -131,9 +131,7 @@ let patches = [ ./patches/widevine.patch ./patches/glibc-2.24.patch - (if versionOlder version "52.0.0.0" - then ./patches/nix_plugin_paths_50.patch - else ./patches/nix_plugin_paths_52.patch) + ./patches/nix_plugin_paths_52.patch ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch deleted file mode 100644 index 062098a85225..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index 74bf041..5f34198 100644 ---- a/chrome/common/chrome_paths.cc -+++ b/chrome/common/chrome_paths.cc -@@ -66,21 +66,14 @@ static base::LazyInstance - g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; - - // Gets the path for internal plugins. --bool GetInternalPluginsDirectory(base::FilePath* result) { --#if defined(OS_MACOSX) -- // If called from Chrome, get internal plugins from a subdirectory of the -- // framework. -- if (base::mac::AmIBundled()) { -- *result = chrome::GetFrameworkBundlePath(); -- DCHECK(!result->empty()); -- *result = result->Append("Internet Plug-Ins"); -- return true; -- } -- // In tests, just look in the module directory (below). --#endif -- -- // The rest of the world expects plugins in the module directory. -- return PathService::Get(base::DIR_MODULE, result); -+bool GetInternalPluginsDirectory(base::FilePath* result, -+ const std::string& ident) { -+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; -+ const char* value = getenv(full_env.c_str()); -+ if (value == NULL) -+ return PathService::Get(base::DIR_MODULE, result); -+ else -+ *result = base::FilePath(value); - } - - #if defined(OS_WIN) -@@ -253,11 +246,11 @@ bool PathProvider(int key, base::FilePath* result) { - create_dir = true; - break; - case chrome::DIR_INTERNAL_PLUGINS: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "ALL")) - return false; - break; - case chrome::DIR_PEPPER_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) - return false; - cur = cur.Append(kPepperFlashBaseDirectory); - break; -@@ -314,7 +307,7 @@ bool PathProvider(int key, base::FilePath* result) { - // We currently need a path here to look up whether the plugin is disabled - // and what its permissions are. - case chrome::FILE_NACL_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "NACL")) - return false; - cur = cur.Append(kInternalNaClPluginFileName); - break; -@@ -349,7 +342,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.DirName(); - } - #else -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PNACL")) - return false; - #endif - cur = cur.Append(FILE_PATH_LITERAL("pnacl")); -@@ -366,7 +359,7 @@ bool PathProvider(int key, base::FilePath* result) { - // In the component case, this is the source adapter. Otherwise, it is the - // actual Pepper module that gets loaded. - case chrome::FILE_WIDEVINE_CDM_ADAPTER: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE")) - return false; - cur = cur.AppendASCII(kWidevineCdmAdapterFileName); - break; From 872b4782e929c2eda9076bda9b0b53c4a91c9c8a Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 14 Oct 2016 14:12:49 +0200 Subject: [PATCH 0048/1749] chromium: 53 -> 54 --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index dfac55a18b6f..295651e7c24a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0f6cqvhlg06lrf4bzaiwzm9yi3fi1dk5jrzvjcg7alw3mzrmh2wv"; - sha256bin64 = "02cv9vc1l2nlwa4a0lc7cj9c9czrwp1jd8d024bq16a5fvmhl01l"; - version = "54.0.2840.50"; + sha256 = "1bdjnyc88lpvd0gf5xdmngniijv57phmnih4h896dn2y89dvzv9j"; + sha256bin64 = "0kc16xzh1g0nsxq8gjnh6a2p0a69q2irplwkbgi9wx9ldxl4rg88"; + version = "55.0.2883.21"; }; dev = { - sha256 = "06kcymwi0wfir7w10g8viayk2h0b5a66dav76mlia4lm30p502kz"; - sha256bin64 = "0mgamiffnnkaw8c68b5kyna84x7hlhrzmqfc36kzf434fmm8v5d6"; - version = "55.0.2873.0"; + sha256 = "02zlz4b9rpd57hfzw5jpnzdx746cckdmkfqj8wmij8kxfjrl67m9"; + sha256bin64 = "00bg43k00shcabwv9wv1ipy9y0gwrr769rb18gpkj39xrmv3qzh7"; + version = "56.0.2897.0"; }; stable = { - sha256 = "1hyw0z7dsfaxyy8b4mvnfjy5yj0160hzz9m0wj3vn9zvkfvmhan5"; - sha256bin64 = "0n0px7yi94gdxq7p6pjqfdz04bnh3mcvbaccjaglj6h5p0jc8abq"; - version = "53.0.2785.143"; + sha256 = "0zfxwygqjhq37agqpn34nvjwa8ijm7xc9l6hwv89m5rs1gmx60nj"; + sha256bin64 = "1mlqxglbqdqnhsmy1p6jn1z9md0lsia6lrhw11q7d523masvbb1m"; + version = "54.0.2840.71"; }; } From b43142c958577163ee193401589053141ea2c649 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 29 Oct 2016 03:29:42 +0200 Subject: [PATCH 0049/1749] chromium: remove pepperflash fixes NixOS#19565 --- .../networking/browsers/chromium/default.nix | 2 +- .../networking/browsers/chromium/plugins.nix | 45 +++++-------------- 2 files changed, 12 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c03011c07c19..a16326fc98c8 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -35,7 +35,7 @@ let browser = callPackage ./browser.nix { inherit channel; }; plugins = callPackage ./plugins.nix { - inherit enablePepperFlash enableWideVine; + inherit enableWideVine; }; }; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index ac7f8111212e..f611bfd02759 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,6 +1,5 @@ { stdenv , jshon -, enablePepperFlash ? false , enableWideVine ? false , upstream-info @@ -37,14 +36,12 @@ let echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags" ''; - plugins = stdenv.mkDerivation { - name = "chromium-binary-plugins"; + widevine = stdenv.mkDerivation { + name = "chromium-binary-plugin-widevine"; src = upstream-info.binary; phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; - outputs = [ "flash" "widevine" ]; - out = "flash"; # outputs TODO: is this a hack? unpackCmd = let chan = if upstream-info.channel == "dev" then "chrome-unstable" @@ -53,7 +50,6 @@ let in '' mkdir -p plugins ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \ - ./opt/google/${chan}/PepperFlash \ ./opt/google/${chan}/libwidevinecdm.so \ ./opt/google/${chan}/libwidevinecdmadapter.so ''; @@ -67,13 +63,12 @@ let rpaths = [ stdenv.cc.cc ]; mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; in '' - for sofile in PepperFlash/libpepflashplayer.so \ - libwidevinecdm.so libwidevinecdmadapter.so; do + for sofile in libwidevinecdm.so libwidevinecdmadapter.so; do chmod +x "$sofile" patchelf --set-rpath "${mkrpath rpaths}" "$sofile" done - patchelf --set-rpath "$widevine/lib:${mkrpath rpaths}" \ + patchelf --set-rpath "$out/lib:${mkrpath rpaths}" \ libwidevinecdmadapter.so ''; @@ -81,38 +76,20 @@ let wvName = "Widevine Content Decryption Module"; wvDescription = "Playback of encrypted HTML audio/video content"; wvMimeTypes = "application/x-ppapi-widevine-cdm"; - wvModule = "@widevine@/lib/libwidevinecdmadapter.so"; + wvModule = "@out@/lib/libwidevinecdmadapter.so"; wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}"; in '' - flashVersion="$( - "${jshon}/bin/jshon" -F PepperFlash/manifest.json -e version -u - )" - - install -vD PepperFlash/libpepflashplayer.so \ - "$flash/lib/libpepflashplayer.so" - - ${mkPluginInfo { - output = "flash"; - allowedVars = [ "flash" "flashVersion" ]; - flags = [ - "--ppapi-flash-path=@flash@/lib/libpepflashplayer.so" - "--ppapi-flash-version=@flashVersion@" - ]; - }} - install -vD libwidevinecdm.so \ - "$widevine/lib/libwidevinecdm.so" + "$out/lib/libwidevinecdm.so" install -vD libwidevinecdmadapter.so \ - "$widevine/lib/libwidevinecdmadapter.so" + "$out/lib/libwidevinecdmadapter.so" ${mkPluginInfo { - output = "widevine"; flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ]; - envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@widevine@/lib"; + envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@out@/lib"; }} ''; - - passthru.enabled = optional enablePepperFlash plugins.flash - ++ optional enableWideVine plugins.widevine; }; -in plugins +in { + enabled = optional enableWideVine widevine; +} From 5f18ccb001caf62e9c4908354a1fea44bb11300b Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 29 Oct 2016 04:01:04 +0200 Subject: [PATCH 0050/1749] chromium: Remove flag for hiDPISupport This should now be the upstream default and there also is no more flag for GN to set it, so we'll no longer need it on our side as well. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/common-gn.nix | 2 -- pkgs/applications/networking/browsers/chromium/common.nix | 2 -- pkgs/applications/networking/browsers/chromium/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common-gn.nix b/pkgs/applications/networking/browsers/chromium/common-gn.nix index 68798071ea1f..b574edef205e 100644 --- a/pkgs/applications/networking/browsers/chromium/common-gn.nix +++ b/pkgs/applications/networking/browsers/chromium/common-gn.nix @@ -28,7 +28,6 @@ , proprietaryCodecs ? true , cupsSupport ? true , pulseSupport ? false, libpulseaudio ? null -, hiDPISupport ? false , upstream-info }: @@ -154,7 +153,6 @@ let } // { treat_warnings_as_errors = false; is_clang = false; - enable_hidpi = hiDPISupport; # Google API keys, see: # http://www.chromium.org/developers/how-tos/api-keys diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8f6e324765fa..3ff90d28b9f8 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -28,7 +28,6 @@ , proprietaryCodecs ? true , cupsSupport ? true , pulseSupport ? false, libpulseaudio ? null -, hiDPISupport ? false , upstream-info }: @@ -179,7 +178,6 @@ let } // { werror = ""; clang = false; - enable_hidpi = hiDPISupport; # Google API keys, see: # http://www.chromium.org/developers/how-tos/api-keys diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index a16326fc98c8..fd42c1b927b0 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -12,7 +12,6 @@ , enableWideVine ? false , cupsSupport ? true , pulseSupport ? false -, hiDPISupport ? false }: let @@ -28,8 +27,7 @@ let mkChromiumDerivation = callPackage common { inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome - gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport - hiDPISupport; + gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport; }; browser = callPackage ./browser.nix { inherit channel; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2ee0c9c7e5c..764c4822cb42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12277,7 +12277,6 @@ in pulseSupport = config.pulseaudio or true; enablePepperFlash = config.chromium.enablePepperFlash or false; enableWideVine = config.chromium.enableWideVine or false; - hiDPISupport = config.chromium.hiDPISupport or false; gnome = gnome2; }; From 8391241e0c90c8e5ee90d86d6cc1c9146e575768 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 29 Oct 2016 04:05:53 +0200 Subject: [PATCH 0051/1749] chromium: Build with GN unconditionally Previously I've added the extra file common-gn.nix in addition to common.nix, so we can possibly have a smooth transition from current stable to the new version 54. Unfortunately, version 53 is already EOL and we have to move to version 54 as soon as possible so we can only use GN and thus it doesn't make sense to provide expressions for GYP anymore. Signed-off-by: aszlig --- .../browsers/chromium/common-gn.nix | 198 ------------------ .../networking/browsers/chromium/common.nix | 112 ++++------ .../networking/browsers/chromium/default.nix | 7 +- 3 files changed, 42 insertions(+), 275 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/common-gn.nix diff --git a/pkgs/applications/networking/browsers/chromium/common-gn.nix b/pkgs/applications/networking/browsers/chromium/common-gn.nix deleted file mode 100644 index b574edef205e..000000000000 --- a/pkgs/applications/networking/browsers/chromium/common-gn.nix +++ /dev/null @@ -1,198 +0,0 @@ -{ stdenv, gn, ninja, which - -# default dependencies -, bzip2, flac, speex, libopus -, libevent, expat, libjpeg, snappy -, libpng, libxml2, libxslt, libcap -, xdg_utils, yasm, minizip, libwebp -, libusb1, pciutils, nss, re2, zlib, libvpx - -, python, pythonPackages, perl, pkgconfig -, nspr, systemd, kerberos -, utillinux, alsaLib -, bison, gperf -, glib, gtk2, dbus_glib -, libXScrnSaver, libXcursor, libXtst, mesa -, protobuf, speechd, libXdamage, cups - -# optional dependencies -, libgcrypt ? null # gnomeSupport || cupsSupport -, libexif ? null # only needed for Chromium before version 51 - -# package customization -, enableSELinux ? false, libselinux ? null -, enableNaCl ? false -, enableHotwording ? false -, gnomeSupport ? false, gnome ? null -, gnomeKeyringSupport ? false, libgnome_keyring3 ? null -, proprietaryCodecs ? true -, cupsSupport ? true -, pulseSupport ? false, libpulseaudio ? null - -, upstream-info -}: - -buildFun: - -with stdenv.lib; - -let - # The additional attributes for creating derivations based on the chromium - # source tree. - extraAttrs = buildFun base; - - mkGnFlags = - let - # Serialize Nix types into GN types according to this document: - # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/language.md - mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; - sanitize = value: - if value == true then "true" - else if value == false then "false" - else if isList value then "[${concatMapStringsSep ", " sanitize value}]" - else if isInt value then toString value - else if isString value then mkGnString value - else throw "Unsupported type for GN value `${value}'."; - toFlag = key: value: "${key}=${sanitize value}"; - in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); - - gnSystemLibraries = [ - "flac" "libjpeg" "libpng" "libvpx" "libwebp" "libxml" "libxslt" "re2" - "snappy" "yasm" "zlib" - ]; - - opusWithCustomModes = libopus.override { - withCustomModes = true; - }; - - defaultDependencies = [ - bzip2 flac speex opusWithCustomModes - libevent expat libjpeg snappy - libpng libxml2 libxslt libcap - xdg_utils yasm minizip libwebp - libusb1 re2 zlib libvpx - ]; - - # build paths and release info - packageName = extraAttrs.packageName or extraAttrs.name; - buildType = "Release"; - buildPath = "out/${buildType}"; - libExecPath = "$out/libexec/${packageName}"; - - base = rec { - name = "${packageName}-${version}"; - inherit (upstream-info) version; - inherit packageName buildType buildPath; - - src = upstream-info.main; - - nativeBuildInputs = [ gn which python perl pkgconfig ]; - - buildInputs = defaultDependencies ++ [ - nspr nss systemd - utillinux alsaLib - bison gperf kerberos - glib gtk2 dbus_glib - libXScrnSaver libXcursor libXtst mesa - pciutils protobuf speechd libXdamage - pythonPackages.ply pythonPackages.jinja2 - ] ++ optional gnomeKeyringSupport libgnome_keyring3 - ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] - ++ optional enableSELinux libselinux - ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio; - - patches = [ - ./patches/widevine.patch - ./patches/glibc-2.24.patch - ./patches/nix_plugin_paths_52.patch - ]; - - postPatch = '' - # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX - substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ - --replace \ - 'return sandbox_binary;' \ - 'return base::FilePath(GetDevelSandboxPath());' - - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ - device/udev_linux/udev?_loader.cc - - sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ - gpu/config/gpu_info_collector_linux.cc - - sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ - chrome/browser/ui/webui/engagement/site_engagement_ui.cc - - sed -i -e '/#include/ { - i #include - :l; n; bl - }' gpu/config/gpu_control_list.cc - - patchShebangs . - '' + optionalString (versionAtLeast version "52.0.0.0") '' - sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ - third_party/pdfium/xfa/fxbarcode/utils.h - ''; - - gnFlags = mkGnFlags ({ - linux_use_bundled_binutils = false; - linux_use_bundled_gold = false; - linux_use_gold_flags = true; - is_debug = false; - - proprietary_codecs = false; - use_sysroot = false; - use_gnome_keyring = gnomeKeyringSupport; - use_gconf = gnomeSupport; - use_gio = gnomeSupport; - enable_nacl = enableNaCl; - enable_hotwording = enableHotwording; - selinux = enableSELinux; - use_cups = cupsSupport; - } // { - treat_warnings_as_errors = false; - is_clang = false; - - # Google API keys, see: - # http://www.chromium.org/developers/how-tos/api-keys - # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, - # please get your own set of keys. - google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; - google_default_client_id = "404761575300.apps.googleusercontent.com"; - google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; - } // optionalAttrs proprietaryCodecs { - # enable support for the H.264 codec - proprietary_codecs = true; - enable_hangout_services_extension = true; - ffmpeg_branding = "Chrome"; - } // optionalAttrs pulseSupport { - use_pulseaudio = true; - link_pulseaudio = true; - } // (extraAttrs.gnFlags or {})); - - configurePhase = '' - # This is to ensure expansion of $out. - libExecPath="${libExecPath}" - python build/linux/unbundle/replace_gn_files.py \ - --system-libraries ${toString gnSystemLibraries} - gn gen --args=${escapeShellArg gnFlags} out/Release - ''; - - buildPhase = let - buildCommand = target: '' - "${ninja}/bin/ninja" -C "${buildPath}" \ - -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ - "${target}" - '' + optionalString (target == "mksnapshot" || target == "chrome") '' - paxmark m "${buildPath}/${target}" - ''; - targets = extraAttrs.buildTargets or []; - commands = map buildCommand targets; - in concatStringsSep "\n" commands; - }; - -# Remove some extraAttrs we supplied to the base attributes already. -in stdenv.mkDerivation (base // removeAttrs extraAttrs [ - "name" "gnFlags" "buildTargets" -]) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3ff90d28b9f8..b574edef205e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,13 +1,13 @@ -{ stdenv, ninja, which +{ stdenv, gn, ninja, which # default dependencies , bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy , libpng, libxml2, libxslt, libcap , xdg_utils, yasm, minizip, libwebp -, libusb1, pciutils, nss +, libusb1, pciutils, nss, re2, zlib, libvpx -, python2Packages, perl, pkgconfig +, python, pythonPackages, perl, pkgconfig , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf @@ -37,47 +37,29 @@ buildFun: with stdenv.lib; let - inherit (python2Packages) python gyp ply jinja2; - # The additional attributes for creating derivations based on the chromium # source tree. extraAttrs = buildFun base; - mkGypFlags = + mkGnFlags = let + # Serialize Nix types into GN types according to this document: + # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/language.md + mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; sanitize = value: - if value == true then "1" - else if value == false then "0" - else "${value}"; - toFlag = key: value: "-D${key}=${sanitize value}"; + if value == true then "true" + else if value == false then "false" + else if isList value then "[${concatMapStringsSep ", " sanitize value}]" + else if isInt value then toString value + else if isString value then mkGnString value + else throw "Unsupported type for GN value `${value}'."; + toFlag = key: value: "${key}=${sanitize value}"; in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); - gypFlagsUseSystemLibs = { - use_system_bzip2 = true; - use_system_flac = true; - use_system_libevent = true; - use_system_libexpat = true; - # XXX: System libjpeg fails to link for version 52.0.2743.10 - use_system_libjpeg = versionOlder upstream-info.version "52.0.2743.10"; - use_system_libpng = false; - use_system_libwebp = true; - use_system_libxml = true; - use_system_opus = true; - use_system_snappy = true; - use_system_speex = true; - use_system_stlport = true; - use_system_xdg_utils = true; - use_system_yasm = true; - use_system_zlib = false; - use_system_protobuf = false; # needs newer protobuf - - use_system_harfbuzz = false; - use_system_icu = false; # Doesn't support ICU 52 yet. - use_system_libusb = false; # http://crbug.com/266149 - use_system_skia = false; - use_system_sqlite = false; # http://crbug.com/22208 - use_system_v8 = false; - }; + gnSystemLibraries = [ + "flac" "libjpeg" "libpng" "libvpx" "libwebp" "libxml" "libxslt" "re2" + "snappy" "yasm" "zlib" + ]; opusWithCustomModes = libopus.override { withCustomModes = true; @@ -88,7 +70,7 @@ let libevent expat libjpeg snappy libpng libxml2 libxslt libcap xdg_utils yasm minizip libwebp - libusb1 + libusb1 re2 zlib libvpx ]; # build paths and release info @@ -104,23 +86,16 @@ let src = upstream-info.main; - unpackCmd = '' - tar xf "$src" \ - --anchored \ - --no-wildcards-match-slash \ - --exclude='*/tools/gyp' - ''; + nativeBuildInputs = [ gn which python perl pkgconfig ]; buildInputs = defaultDependencies ++ [ - which - python perl pkgconfig nspr nss systemd utillinux alsaLib bison gperf kerberos glib gtk2 dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage - gyp ply jinja2 + pythonPackages.ply pythonPackages.jinja2 ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux @@ -140,12 +115,6 @@ let 'return sandbox_binary;' \ 'return base::FilePath(GetDevelSandboxPath());' - sed -i -r \ - -e 's/-f(stack-protector)(-all)?/-fno-\1/' \ - -e 's|/bin/echo|echo|' \ - -e "/python_arch/s/: *'[^']*'/: '""'/" \ - build/common.gypi chrome/chrome_tests.gypi - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ device/udev_linux/udev?_loader.cc @@ -154,30 +123,36 @@ let sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ chrome/browser/ui/webui/engagement/site_engagement_ui.cc + + sed -i -e '/#include/ { + i #include + :l; n; bl + }' gpu/config/gpu_control_list.cc + + patchShebangs . '' + optionalString (versionAtLeast version "52.0.0.0") '' sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ third_party/pdfium/xfa/fxbarcode/utils.h ''; - gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { + gnFlags = mkGnFlags ({ linux_use_bundled_binutils = false; linux_use_bundled_gold = false; linux_use_gold_flags = true; + is_debug = false; proprietary_codecs = false; use_sysroot = false; use_gnome_keyring = gnomeKeyringSupport; use_gconf = gnomeSupport; use_gio = gnomeSupport; - use_pulseaudio = pulseSupport; - linux_link_pulseaudio = pulseSupport; - disable_nacl = !enableNaCl; + enable_nacl = enableNaCl; enable_hotwording = enableHotwording; selinux = enableSELinux; use_cups = cupsSupport; } // { - werror = ""; - clang = false; + treat_warnings_as_errors = false; + is_clang = false; # Google API keys, see: # http://www.chromium.org/developers/how-tos/api-keys @@ -191,22 +166,17 @@ let proprietary_codecs = true; enable_hangout_services_extension = true; ffmpeg_branding = "Chrome"; - } // optionalAttrs (stdenv.system == "x86_64-linux") { - target_arch = "x64"; - python_arch = "x86-64"; - } // optionalAttrs (stdenv.system == "i686-linux") { - target_arch = "ia32"; - python_arch = "ia32"; - } // (extraAttrs.gypFlags or {})); + } // optionalAttrs pulseSupport { + use_pulseaudio = true; + link_pulseaudio = true; + } // (extraAttrs.gnFlags or {})); configurePhase = '' - echo "Precompiling .py files to prevent race conditions..." >&2 - python -m compileall -q -f . > /dev/null 2>&1 || : # ignore errors - # This is to ensure expansion of $out. libExecPath="${libExecPath}" - python build/linux/unbundle/replace_gyp_files.py ${gypFlags} - python build/gyp_chromium -f ninja --depth . ${gypFlags} + python build/linux/unbundle/replace_gn_files.py \ + --system-libraries ${toString gnSystemLibraries} + gn gen --args=${escapeShellArg gnFlags} out/Release ''; buildPhase = let @@ -224,5 +194,5 @@ let # Remove some extraAttrs we supplied to the base attributes already. in stdenv.mkDerivation (base // removeAttrs extraAttrs [ - "name" "gypFlags" "buildTargets" + "name" "gnFlags" "buildTargets" ]) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index fd42c1b927b0..bf4e4cf8ae36 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -17,15 +17,10 @@ let callPackage = newScope chromium; - # XXX: This is an ugly hack for the transition to GN: - inherit (stdenv.lib) versionAtLeast; - gnRequired = versionAtLeast chromium.upstream-info.version "54.0.0.0"; - common = if gnRequired then ./common-gn.nix else ./common.nix; - chromium = { upstream-info = (callPackage ./update.nix {}).getChannel channel; - mkChromiumDerivation = callPackage common { + mkChromiumDerivation = callPackage ./common.nix { inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport; }; From 5f53fddf1ef784e2279bd4236c9f7566a038e89c Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 29 Oct 2016 14:28:06 +0200 Subject: [PATCH 0052/1749] chromium: Remove some libs from system depenencies Seems that these libraries aren't the ones Chromium is expecting to be, so let's switch to use the bundled version of these libraries instead. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/common.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b574edef205e..ce3b0f84cbbb 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -57,8 +57,7 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gnSystemLibraries = [ - "flac" "libjpeg" "libpng" "libvpx" "libwebp" "libxml" "libxslt" "re2" - "snappy" "yasm" "zlib" + "flac" "libwebp" "libxml" "libxslt" "snappy" "yasm" ]; opusWithCustomModes = libopus.override { @@ -70,7 +69,7 @@ let libevent expat libjpeg snappy libpng libxml2 libxslt libcap xdg_utils yasm minizip libwebp - libusb1 re2 zlib libvpx + libusb1 re2 zlib ]; # build paths and release info From b84e3379fed770557a983b4c1f7642b0fc7b11de Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 1 Nov 2016 11:39:34 +0100 Subject: [PATCH 0053/1749] chromium: Bring back pepper flash from Adobe So far we had the bundled Flash player plugin that came with Chrome, but since version 54 the Chrome package doesn't include PPAPI Flash anymore. Instead we're going to download the PPAPI Flash plugin directly from Adobe and try to use them for all release channels of Chromium. Of course it would be nice if we'd have an updater for it but for now it's important that we don't break things for people who are currently forced to use Flash. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 2 +- .../networking/browsers/chromium/plugins.nix | 57 ++++++++++++++++--- 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index bf4e4cf8ae36..b59cda875b69 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -28,7 +28,7 @@ let browser = callPackage ./browser.nix { inherit channel; }; plugins = callPackage ./plugins.nix { - inherit enableWideVine; + inherit enablePepperFlash enableWideVine; }; }; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index f611bfd02759..9b779ab98928 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,5 +1,7 @@ { stdenv , jshon +, fetchzip +, enablePepperFlash ? false , enableWideVine ? false , upstream-info @@ -8,6 +10,8 @@ with stdenv.lib; let + mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; + # Generate a shell fragment that emits flags appended to the # final makeWrapper call for wrapping the browser's main binary. # @@ -59,16 +63,13 @@ let ! find -iname '*.so' -exec ldd {} + | grep 'not found' ''; - patchPhase = let - rpaths = [ stdenv.cc.cc ]; - mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; - in '' + patchPhase = '' for sofile in libwidevinecdm.so libwidevinecdmadapter.so; do chmod +x "$sofile" - patchelf --set-rpath "${mkrpath rpaths}" "$sofile" + patchelf --set-rpath "${mkrpath [ stdenv.cc.cc ]}" "$sofile" done - patchelf --set-rpath "$out/lib:${mkrpath rpaths}" \ + patchelf --set-rpath "$out/lib:${mkrpath [ stdenv.cc.cc ]}" \ libwidevinecdmadapter.so ''; @@ -90,6 +91,48 @@ let }} ''; }; + + flash = stdenv.mkDerivation rec { + name = "flashplayer-ppapi-${version}"; + version = "23.0.0.205"; + + src = fetchzip { + url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; + sha256 = "0gj5d8475qcplm3iqs3hkq0i6qkmbhci1zp3ljnhafc6xz0avyhj"; + stripRoot = false; + }; + + patchPhase = '' + chmod +x libpepflashplayer.so + patchelf --set-rpath "${mkrpath [ stdenv.cc.cc ]}" libpepflashplayer.so + ''; + + doCheck = true; + checkPhase = '' + ! find -iname '*.so' -exec ldd {} + | grep 'not found' + ''; + + installPhase = '' + flashVersion="$( + "${jshon}/bin/jshon" -F manifest.json -e version -u + )" + + install -vD libpepflashplayer.so "$out/lib/libpepflashplayer.so" + + ${mkPluginInfo { + allowedVars = [ "out" "flashVersion" ]; + flags = [ + "--ppapi-flash-path=@out@/lib/libpepflashplayer.so" + "--ppapi-flash-version=@flashVersion@" + ]; + }} + ''; + + dontStrip = true; + }; + in { - enabled = optional enableWideVine widevine; + enabled = optional enableWideVine widevine + ++ optional enablePepperFlash flash; } From 66ce15a3b163753c7d0c2e237bdaa4e515d77500 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 1 Nov 2016 07:59:30 +0100 Subject: [PATCH 0054/1749] chromium: Update all channels to latest versions Overview of updated versions: stable: 54.0.2840.71 -> 54.0.2840.90 beta: 55.0.2883.21 -> 55.0.2883.35 dev: 56.0.2897.0 -> 56.0.2906.0 This is to get our Chromium versions in par with the latest upstream ones before merging in the GN migration changes. Signed-off-by: aszlig --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 295651e7c24a..5fa9bb86c51d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1bdjnyc88lpvd0gf5xdmngniijv57phmnih4h896dn2y89dvzv9j"; - sha256bin64 = "0kc16xzh1g0nsxq8gjnh6a2p0a69q2irplwkbgi9wx9ldxl4rg88"; - version = "55.0.2883.21"; + sha256 = "11a98nknz7lh5jmjslznccg11nr0wla4c9l40fvxqxjm2gs6qags"; + sha256bin64 = "0qdydj0i9ll72f5m9r48gc3dyc22q6qas5nq8h0mbnrxrwd9dnyj"; + version = "55.0.2883.35"; }; dev = { - sha256 = "02zlz4b9rpd57hfzw5jpnzdx746cckdmkfqj8wmij8kxfjrl67m9"; - sha256bin64 = "00bg43k00shcabwv9wv1ipy9y0gwrr769rb18gpkj39xrmv3qzh7"; - version = "56.0.2897.0"; + sha256 = "1pfgb5dnygyxiwfq6ini5s159c178zz7235npaag7k8gcc10ybnz"; + sha256bin64 = "14s185361inkqh8ykl94xhgv01z68gxqh7j6gyb4jbr0rhcsd9pl"; + version = "56.0.2906.0"; }; stable = { - sha256 = "0zfxwygqjhq37agqpn34nvjwa8ijm7xc9l6hwv89m5rs1gmx60nj"; - sha256bin64 = "1mlqxglbqdqnhsmy1p6jn1z9md0lsia6lrhw11q7d523masvbb1m"; - version = "54.0.2840.71"; + sha256 = "01h1qkdw5dpwz61dybpf4bhag198j082lzwpkdx2nj55k2j3lawl"; + sha256bin64 = "18mxgzi79qhi07wgyyx6bb0lqm9pzkw85ypg6vmqv8gh0abn7dn1"; + version = "54.0.2840.90"; }; } From cf2654b2e0dedd31c6ec14458953c85530db8cec Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 7 Nov 2016 08:34:06 +0900 Subject: [PATCH 0055/1749] either type: improve merge function --- lib/types.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index 26523f59f256..9366d394da73 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -333,7 +333,15 @@ rec { name = "either"; description = "${t1.description} or ${t2.description}"; check = x: t1.check x || t2.check x; - merge = mergeOneOption; + merge = loc: defs: + let + defList = map (d: d.value) defs; + in + if all (x: t1.check x) defList + then t1.merge loc defs + else if all (x: t2.check x) defList + then t2.merge loc defs + else mergeOneOption loc defs; typeMerge = f': let mt1 = t1.typeMerge (elemAt f'.wrapped 0).functor; mt2 = t2.typeMerge (elemAt f'.wrapped 1).functor; From 72d1e3ca08491a0c1df35812763e515f50a7e82d Mon Sep 17 00:00:00 2001 From: Samuel Rivas Date: Tue, 8 Nov 2016 21:53:32 +0100 Subject: [PATCH 0056/1749] terraform: 0.7.8-> 0.7.9 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index c7f2bc83c4dc..6d5c04e601ef 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.8"; + version = "0.7.9"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "0b42qji85h49aabzlb21vkcfpykrf8g4k2a51jhz9y28ywpbx5n4"; + sha256 = "0fqd6k88zhhq0ncnpr3y3k55wrxpd75fizs54cjgjd873b90sm8h"; }; postInstall = '' From a7c986cf69927a24de1eba280ad699f066749b8f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 8 Nov 2016 15:00:09 -0600 Subject: [PATCH 0057/1749] kdeWrapper: reduce environment pollution --- pkgs/development/libraries/kde-frameworks/kde-env.nix | 9 --------- .../libraries/kde-frameworks/kde-wrapper.nix | 10 ++++++++-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kde-env.nix b/pkgs/development/libraries/kde-frameworks/kde-env.nix index a48ba32be224..5ddf89a0129f 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-env.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-env.nix @@ -26,15 +26,6 @@ stdenv.mkDerivation { done done - for p in $propagated; do - for s in applications dbus-1 desktop-directories icons mime polkit-1; do - if [ -d "$p/share/$s" ]; then - propagatedUserEnvPkgs+=" $p" - break - fi - done - done - runHook postInstall ''; } diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix index d340a5edbf7e..153ca31fd625 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix @@ -37,7 +37,13 @@ stdenv.mkDerivation { fi done - mkdir -p "$out/nix-support" - ln -s "$env/nix-support/propagated-user-env-packages" "$out/nix-support/" + if [ -a "$drv/share" ]; then + ln -s "$drv/share" "$out" + fi + + if [ -a "$drv/nix-support/propagated-user-env-packages" ]; then + mkdir -p "$out/nix-support" + ln -s "$drv/nix-support/propagated-user-env-packages" "$out/nix-support/" + fi ''; } From ec31e2cc2780465732396eb17ac882f4b22ccbd7 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Wed, 9 Nov 2016 08:02:38 +1100 Subject: [PATCH 0058/1749] Fix bcftools installation prefix --- pkgs/applications/science/biology/bcftools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 71ceca122244..7ae62b15d34a 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "HSTDIR=${htslib}" - "prefix=$out" + "prefix=$(out)" "CC=cc" ]; From 8c4aee4c79dfdc72232db9cfb3d533fdf67cfd3c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 8 Nov 2016 16:13:56 -0500 Subject: [PATCH 0059/1749] z3: 4.4.1 -> 4.5.0 --- .../applications/science/logic/z3/default.nix | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 0e43abdd681d..fa5c9ba175e0 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -4,33 +4,21 @@ let python = python2; in stdenv.mkDerivation rec { name = "z3-${version}"; - version = "4.4.1"; + version = "4.5.0"; src = fetchFromGitHub { owner = "Z3Prover"; repo = "z3"; rev = "z3-${version}"; - sha256 = "1ix100r1h00iph1bk5qx5963gpqaxmmx42r2vb5zglynchjif07c"; + sha256 = "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp"; }; buildInputs = [ python ]; enableParallelBuilding = true; - configurePhase = "${python.interpreter} scripts/mk_make.py --prefix=$out && cd build"; - - # z3's install phase is stupid because it tries to calculate the - # python package store location itself, meaning it'll attempt to - # write files into the nix store, and fail. - soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so"; - installPhase = '' - mkdir -p $out/bin $out/${python.sitePackages} $out/include - cp ../src/api/z3*.h $out/include - cp ../src/api/c++/z3*.h $out/include - cp z3 $out/bin - cp libz3${soext} $out/lib - cp libz3${soext} $out/${python.sitePackages} - cp z3*.pyc $out/${python.sitePackages} - cp ../src/api/python/*.py $out/${python.sitePackages} + configurePhase = '' + ${python.interpreter} scripts/mk_make.py --prefix=$out --python --pypkgdir=$out/${python.sitePackages} + cd build ''; meta = { From cd351e25aad03adfff2b0abd934170911476fe8c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 22 Oct 2016 16:54:49 +0200 Subject: [PATCH 0060/1749] gnome3.anjuta: use python2 --- pkgs/desktops/gnome-3/3.20/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix index e935552b9f5f..4facdbfd3e3c 100644 --- a/pkgs/desktops/gnome-3/3.20/default.nix +++ b/pkgs/desktops/gnome-3/3.20/default.nix @@ -307,7 +307,7 @@ let #### Dev http://ftp.gnome.org/pub/GNOME/devtools/ - anjuta = callPackage ./devtools/anjuta { }; + anjuta = callPackage ./devtools/anjuta { python=pkgs.python2; }; devhelp = callPackage ./devtools/devhelp { }; From 95c54db3977e7b2526d5864a59e8153bba5612db Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 22 Oct 2016 17:02:59 +0200 Subject: [PATCH 0061/1749] virtualbox: use python2 and remove python buildInput. Python should only be added when `pythonBindings` is true. --- pkgs/applications/virtualization/virtualbox/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 64275448651c..9e51fd0abe20 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -4,7 +4,7 @@ , which, alsaLib, curl, libvpx, gawk, nettools, dbus , xorriso, makeself, perl, pkgconfig , javaBindings ? false, jdk ? null -, pythonBindings ? false, python ? null +, pythonBindings ? false, python2 ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null , pulseSupport ? false, libpulseaudio ? null , enableHardening ? false @@ -15,6 +15,7 @@ with stdenv.lib; let + python = python2; buildType = "release"; inherit (importJSON ./upstream-info.json) version extpackRev extpack main; @@ -48,7 +49,7 @@ in stdenv.mkDerivation { buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL - libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl + libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl pkgconfig which libXmu libpng patchelfUnstable ] ++ optional javaBindings jdk ++ optional pythonBindings python From 660585b32d90c1a215421c27472b1863812cbe7d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 14:57:45 +0100 Subject: [PATCH 0062/1749] compiz: use python2 --- pkgs/applications/window-managers/compiz/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index b641a571b249..e9f5d9bdbf26 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -5,14 +5,15 @@ , libstartup_notification, libpthreadstubs, libxcb, intltool , ORBit2, libXau, libICE, libSM , dbus, dbus_glib, librsvg, mesa -, libXdmcp, libnotify, pythonPackages +, libXdmcp, libnotify, python2Packages , hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf , xdg_utils , gettext, boost, pyrex , makeWrapper }: let - inherit (pythonPackages) python dbus-python pygtk; + # FIXME: Use python.withPackages so we can get rid of PYTHONPATH wrapper + inherit (python2Packages) python dbus-python pygtk; s = # Generated upstream information rec { From 0674ed1b6b501e6df294c130103af77940af51e5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 15:06:17 +0100 Subject: [PATCH 0063/1749] bup: use python2 --- pkgs/tools/backup/bup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 075f1653adf8..4e035ab67acb 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchurl, makeWrapper -, perl, pandoc, pythonPackages, git +, perl, pandoc, python2Packages, git , par2cmdline ? null, par2Support ? false }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1hsxzrjvqa3pd74vmz8agiiwynrzynp1i726h0fzdsakc4adya4l"; }; - buildInputs = [ git pythonPackages.python ]; + buildInputs = [ git python2Packages.python ]; nativeBuildInputs = [ pandoc perl makeWrapper ]; postPatch = '' @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/bup \ --prefix PATH : ${git}/bin \ --prefix PYTHONPATH : ${concatStringsSep ":" (map (x: "$(toPythonPath ${x})") - (with pythonPackages; + (with python2Packages; [ setuptools tornado ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))} ''; From dd5256993e902787c4e0d6faf664f6d22a25e653 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 15:16:06 +0100 Subject: [PATCH 0064/1749] certbot: use python2 --- pkgs/tools/admin/certbot/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix index 80805666a3a4..998b8d2e13de 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/tools/admin/certbot/default.nix @@ -1,6 +1,8 @@ -{ stdenv, pythonPackages, fetchFromGitHub, dialog }: +{ stdenv, python2Packages, fetchFromGitHub, dialog }: -pythonPackages.buildPythonApplication rec { +# Latest version of certbot supports python3 and python3 version of pythondialog + +python2Packages.buildPythonApplication rec { name = "certbot-${version}"; version = "0.6.0"; @@ -11,7 +13,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1x0prlldkgg0hxmya4m5h3k3c872wr0jylmzpr3m04mk339yiw0c"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ ConfigArgParse acme configobj @@ -26,7 +28,7 @@ pythonPackages.buildPythonApplication rec { zope_component zope_interface ]; - buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]); + buildInputs = [ dialog ] ++ (with python2Packages; [ nose mock gnureadline ]); patchPhase = '' substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail" From 88a03eb72571f1de44f8ddcd5a13a1d0566608a6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 15:17:06 +0100 Subject: [PATCH 0065/1749] qgis: use python2 --- pkgs/applications/gis/qgis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index cce683067e70..680cf921ce26 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl -, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper +, qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper , qjson, qca2, txt2tags, openssl , withGrass ? false, grass }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ (stdenv.lib.optional withGrass grass) ++ - (with pythonPackages; [ numpy psycopg2 requests2 pythonPackages.qscintilla sip ]); + (with python2Packages; [ numpy psycopg2 requests2 python2Packages.qscintilla sip ]); nativeBuildInputs = [ cmake makeWrapper ]; From 5f265dc9c5b657fdc31c56e722040824f6d036ba Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 15:20:33 +0100 Subject: [PATCH 0066/1749] electrum: use python2 --- pkgs/applications/misc/electrum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index bc562b7d5778..458aed051a28 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "electrum-${version}"; version = "2.7.11"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0qy2ynyw57jgi7fw3xzsyy608yk4bhsda7qfw0j26zqinv52mrsb"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ dns ecdsa jsonrpclib From cc05895fe5d522e873255c303b80832bef956360 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 15:26:33 +0100 Subject: [PATCH 0067/1749] v8: use python2 --- pkgs/top-level/all-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c20868a5503a..d53382232afd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9349,27 +9349,27 @@ in }); v8_3_14 = callPackage ../development/libraries/v8/3.14.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_3_30_33 = callPackage ../development/libraries/v8/3.30.33.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_4_5 = callPackage ../development/libraries/v8/4.5.nix { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8 = callPackage ../development/libraries/v8 { - inherit (pythonPackages) gyp; + inherit (python2Packages) python gyp; }; v8_static = lowPrio (self.v8.override { static = true; }); From 1f501a2ced8285d3513e8c299357dcef718c85ea Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 15:29:20 +0100 Subject: [PATCH 0068/1749] xpra: use python2 --- pkgs/tools/X11/xpra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 871d5a9dbd8c..4ae367abf612 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pythonPackages, pkgconfig +{ stdenv, lib, fetchurl, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp @@ -8,7 +8,7 @@ with lib; let - inherit (pythonPackages) python cython buildPythonApplication; + inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-0.17.6"; namePrefix = ""; @@ -39,7 +39,7 @@ in buildPythonApplication rec { makeWrapper ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python netifaces numpy websockify pygobject3 gst-python ]; From e7f91951693f1214e822025a44dba51e68d8d474 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 15:39:15 +0100 Subject: [PATCH 0069/1749] grass: use python2 --- pkgs/applications/gis/grass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index fb6c76be0794..44e07cc22c0b 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas -, proj, gdal, geos, sqlite, postgresql, mysql, pythonPackages +, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ] - ++ (with pythonPackages; [ python dateutil wxPython30 numpy ]); + ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); configureFlags = [ "--with-proj-share=${proj}/share/proj" @@ -59,7 +59,7 @@ stdenv.mkDerivation { postInstall = '' wrapProgram $out/bin/grass70 \ --set PYTHONPATH $PYTHONPATH \ - --set GRASS_PYTHON ${pythonPackages.python}/bin/${pythonPackages.python.executable} + --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} ln -s $out/grass-*/lib $out/lib ''; From a18ac150a3ee9383bc71e2e37469942915d3ec54 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 15:40:39 +0100 Subject: [PATCH 0070/1749] virtinst: use python2 --- pkgs/applications/virtualization/virtinst/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 04223d9a9e9d..75f90c234e83 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl }: +{ stdenv, fetchurl, python2Packages, intltool, libxml2Python, curl }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "175laiy49dni8hzi0cn14bbsdsigvgr9h6d9z2bcvbpa29spldvf"; }; - pythonPath = with pythonPackages; + pythonPath = with python2Packages; [ setuptools eventlet greenlet gflags netaddr carrot routes PasteDeploy m2crypto ipy twisted distutils_extra simplejson glanceclient cheetah lockfile httplib2 @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ pythonPackages.python - pythonPackages.wrapPython - pythonPackages.mox + [ python2Packages.python + python2Packages.wrapPython + python2Packages.mox intltool ] ++ pythonPath; From 559864a951c9f4f32f1447759a64ccde5cd75940 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 22:40:38 +0100 Subject: [PATCH 0071/1749] meld: use python2 --- pkgs/applications/version-management/meld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 503ae4e90b9c..d13457ef927a 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, itstool, pythonPackages, intltool, wrapGAppsHook +{ stdenv, fetchurl, itstool, python2Packages, intltool, wrapGAppsHook , libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file }: @@ -6,7 +6,7 @@ let minor = "3.16"; version = "${minor}.2"; - inherit (pythonPackages) python buildPythonApplication pycairo pygobject3; + inherit (python2Packages) python buildPythonApplication pycairo pygobject3; in buildPythonApplication rec { name = "meld-${version}"; From 61158e28338bab57db43d2b31719dc52af58b4b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 22:42:11 +0100 Subject: [PATCH 0072/1749] mod_wsgi: use python2 --- pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 4cccf237b9e2..1d8507fc4eb3 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheHttpd, python }: +{ stdenv, fetchurl, apacheHttpd, python2 }: stdenv.mkDerivation rec { name = "mod_wsgi-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "14xz422jlakdhxzsl8xs9if86yf1fnkwdg0havjyqs7my0w4qrzh"; }; - buildInputs = [ apacheHttpd python ]; + buildInputs = [ apacheHttpd python2 ]; patchPhase = '' sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \ From ef320da79c2f5d8a3cf12aa58a16602b3e80e92d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 22:43:02 +0100 Subject: [PATCH 0073/1749] zeitgeist: use python2 --- pkgs/development/libraries/zeitgeist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 879e1ccaec3f..bb6af73356de 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala_0_23 , intltool, libtool, python, dbus_libs, telepathy_glib -, gtk3, json_glib, librdf_raptor2, pythonPackages, dbus_glib }: +, gtk3, json_glib, librdf_raptor2, python2Packages, dbus_glib }: stdenv.mkDerivation rec { version = "0.9.15"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib sqlite gnome3.gnome_common intltool libtool python dbus_libs telepathy_glib vala_0_23 dbus_glib - gtk3 json_glib librdf_raptor2 pythonPackages.rdflib ]; + gtk3 json_glib librdf_raptor2 python2Packages.rdflib ]; prePatch = "patchShebangs ."; From d2e60d1f93c037dd337f32e5d80f1b70915eca57 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 8 Nov 2016 20:18:15 +0100 Subject: [PATCH 0074/1749] chromium: Fix building with WineVine components Before version 54, the WideVine CDM plugin was built unconditionally and it seems since version 54 this now is dependent upon a GYP/GN flag on whether to include the CDM shared library or not. Also, we now use a patch from Gentoo which should hopefully get the CDM plugin to work properly, at least according to their bugtracker: https://bugs.gentoo.org/show_bug.cgi?id=547630 Signed-off-by: aszlig --- .../networking/browsers/chromium/browser.nix | 5 ++++ .../networking/browsers/chromium/common.nix | 5 ++-- .../networking/browsers/chromium/default.nix | 3 ++- .../browsers/chromium/patches/widevine.patch | 24 +++++++++++-------- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 9eb25c316f95..58e5ab98c168 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -18,6 +18,11 @@ mkChromiumDerivation (base: rec { cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" + if [ -e "$buildPath/libwidevinecdmadapter.so" ]; then + cp -v "$buildPath/libwidevinecdmadapter.so" \ + "$libExecPath/libwidevinecdmadapter.so" + fi + mkdir -p "$sandbox/bin" cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ce3b0f84cbbb..e70f180f4893 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -23,6 +23,7 @@ , enableSELinux ? false, libselinux ? null , enableNaCl ? false , enableHotwording ? false +, enableWideVine ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome_keyring3 ? null , proprietaryCodecs ? true @@ -102,10 +103,9 @@ let ++ optional pulseSupport libpulseaudio; patches = [ - ./patches/widevine.patch ./patches/glibc-2.24.patch ./patches/nix_plugin_paths_52.patch - ]; + ] ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX @@ -147,6 +147,7 @@ let use_gio = gnomeSupport; enable_nacl = enableNaCl; enable_hotwording = enableHotwording; + enable_widevine = enableWideVine; selinux = enableSELinux; use_cups = cupsSupport; } // { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index b59cda875b69..1556603db2cf 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -22,7 +22,8 @@ let mkChromiumDerivation = callPackage ./common.nix { inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome - gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport; + gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport + enableWideVine; }; browser = callPackage ./browser.nix { inherit channel; }; diff --git a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch b/pkgs/applications/networking/browsers/chromium/patches/widevine.patch index 45048cada875..90a13928e3bd 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/widevine.patch @@ -1,12 +1,16 @@ -diff -upr chromium-42.0.2311.90.orig/third_party/widevine/cdm/widevine_cdm_version.h chromium-42.0.2311.90/third_party/widevine/cdm/widevine_cdm_version.h ---- chromium-42.0.2311.90.orig/third_party/widevine/cdm/widevine_cdm_version.h 2015-04-15 01:18:59.000000000 +0300 -+++ chromium-42.0.2311.90/third_party/widevine/cdm/widevine_cdm_version.h 2015-04-15 09:09:49.157260050 +0300 -@@ -14,4 +14,8 @@ - // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available - // as a string, e.g., "1.0.123.456"). +Minimal WideVine patch from Gentoo: + +https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r1.patch + +BTS: https://bugs.gentoo.org/show_bug.cgi?id=547630 + +--- a/third_party/widevine/cdm/stub/widevine_cdm_version.h ++++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h +@@ -10,6 +10,7 @@ + + #include "third_party/widevine/cdm/widevine_cdm_common.h" + ++#define WIDEVINE_CDM_VERSION_STRING "unknown" + #define WIDEVINE_CDM_AVAILABLE -+#include "third_party/widevine/cdm/widevine_cdm_common.h" -+#define WIDEVINE_CDM_AVAILABLE -+#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@" -+ #endif // WIDEVINE_CDM_VERSION_H_ From 6f8a72bbff0dcdf78df96ad366f52956bcc5c7e7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 8 Nov 2016 21:19:49 +0100 Subject: [PATCH 0075/1749] chromium: Add Gtk 3 for versions >= 56 Versions before 56 already had experimental support for Gtk 3 and since version 56, Gtk 3 _seemed_ to become the default. Although it's now requiring *both* Gtk 2 and Gtk3, so let's supply the dependency for now to get it to build. In the future however we might want to add use_gtk3 to the GN flags and get rid of Gtk 2 completely. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e70f180f4893..07ad1bef25f0 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -11,7 +11,7 @@ , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf -, glib, gtk2, dbus_glib +, glib, gtk2, gtk3, dbus_glib , libXScrnSaver, libXcursor, libXtst, mesa , protobuf, speechd, libXdamage, cups @@ -100,7 +100,8 @@ let ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio; + ++ optional pulseSupport libpulseaudio + ++ optional (versionAtLeast version "56.0.0.0") gtk3; patches = [ ./patches/glibc-2.24.patch From 8de2eeec33f7a31fe992f3c94d928bf3a8f2621b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Nov 2016 02:18:46 +0100 Subject: [PATCH 0076/1749] icmake: 9.00.00 -> 9.02.02 --- pkgs/development/tools/build-managers/icmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 03968d15b125..9185f5b9eaab 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "9.00.00"; + version = "9.02.02"; src = fetchFromGitHub { - sha256 = "028rxx4ygy0z48m30m5pdach7kcp41swchhs8i15wag1mppllcy2"; + sha256 = "0f7w3b8r2h6ckgzc6wbfbw5yyxia0f3j3acmzi1yzylj6ak05mmd"; rev = version; repo = "icmake"; owner = "fbb-git"; From 677a32e838c77da00867899a8c5119f5ea33bf22 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Nov 2016 03:08:23 +0100 Subject: [PATCH 0077/1749] bobcat: 4.02.00 -> 4.03.00 --- pkgs/development/libraries/bobcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index fbc7df68d446..dcd35613d545 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "bobcat-${version}"; - version = "4.02.00"; + version = "4.03.00"; src = fetchFromGitHub { - sha256 = "1hl5b2g4cmxcafkcpr4vs0c705cy254g0h410zi5wxnygjam8adn"; + sha256 = "0jkwq3f6g3vbim2jg5wfzhin89r4crnypqggp8cqimjmpkyfqnv0"; rev = version; repo = "bobcat"; owner = "fbb-git"; From e1220105e3c59ad61874118c6389fd3be2144973 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 7 Nov 2016 17:30:57 +0100 Subject: [PATCH 0078/1749] netsniff-ng: 0.6.1 -> 0.6.2 --- pkgs/tools/networking/netsniff-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 742e6a93b655..5ca3079a084f 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "netsniff-ng-${version}"; - version = "0.6.1"; + version = "0.6.2"; # Upstream recommends and supports git src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; rev = "v${version}"; - sha256 = "0nl0xq7dwhryrd8i5iav8fj4x9jrna0afhfim5nrx2kwp5yylnvi"; + sha256 = "1lz4hwgwdq3znlqjmvl7cw3g3ilbayn608h0hwqdf7v2jq6n67kg"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl From 11dacb7e2c4383ff0bffa7d7a10157aaac0a0378 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Nov 2016 19:14:45 +0100 Subject: [PATCH 0079/1749] mcelog: 142 -> 144 --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 590d2b4a8542..dee201c17783 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "142"; + version = "144"; src = fetchFromGitHub { - sha256 = "1cqx7w75d570vxqi2gk9bkqqclakkhp4kjanv5j3nhqwg3p38zyv"; + sha256 = "05b1x9z6x9yz3xmb93qvwwssjbvp28bawy8as9bfm29pyhzdxx6k"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; From 583af41f3c484d57daf3fcbd9dcf979eae0f3f73 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Nov 2016 19:16:58 +0100 Subject: [PATCH 0080/1749] remotebox: 2.1 -> 2.2 --- pkgs/applications/virtualization/remotebox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index 63389153a0ab..a99e6f569564 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "remotebox-${version}"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; - sha256 = "0pyi433pwbpyh58p08q8acav7mk90gchgjghvl9f8wqafx7bp404"; + sha256 = "0g7lx5zk9fk5k8alpag45z2zw9bnrlx1zfs63rc3ilfyvm4k4zc5"; }; buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ]; From ea301adfd1bf1cdd6fceca8e6c4a6e111a46ed02 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 7 Nov 2016 18:07:40 +0100 Subject: [PATCH 0081/1749] pagemon: 0.01.08 -> 0.01.10 --- pkgs/os-specific/linux/pagemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index 4246e5123217..414338702cc8 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pagemon-${version}"; - version = "0.01.08"; + version = "0.01.10"; src = fetchFromGitHub { - sha256 = "079x8ah33nh4faqcy0jy24x30l40j5m00d57aawaayaq18smqs3f"; + sha256 = "04dbcr7bzgp4kvhw1rsn084cz4qbfhf7ifyh3ikgdka9w98057h1"; rev = "V${version}"; repo = "pagemon"; owner = "ColinIanKing"; From 44774e1da2b6b412824d4c2e10a3f71cc9f590f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 7 Nov 2016 18:41:57 +0100 Subject: [PATCH 0082/1749] pythonPackages.pgspecial: 1.5.0 -> 1.6.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 f24ad5ccbaed..f2bb2c753e8a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18324,10 +18324,10 @@ in { pgspecial = buildPythonPackage rec { name = "pgspecial-${version}"; - version = "1.5.0"; + version = "1.6.0"; src = pkgs.fetchurl { - sha256 = "14bqlwcnbyn3ikzg5wr7iqrlfwbcy5vaa5n1mmgg305yal34lk6d"; + sha256 = "09ilalpgcl86f79648qsjm87dqi97bc70y51nrf0b3i1py3mhs2m"; url = "mirror://pypi/p/pgspecial/${name}.tar.gz"; }; From 3e2ba413c0b5daba959d5bbfc6982d8d5d2e0be0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 7 Nov 2016 18:42:16 +0100 Subject: [PATCH 0083/1749] pythonPackages.sqlparse: 0.1.19 -> 0.2.2 --- 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 f2bb2c753e8a..77c4c4fcbdf7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24316,11 +24316,11 @@ in { sqlparse = buildPythonPackage rec { name = "sqlparse-${version}"; - version = "0.1.19"; + version = "0.2.2"; src = pkgs.fetchurl { url = "mirror://pypi/s/sqlparse/${name}.tar.gz"; - sha256 = "1s2fvaxgh9kqzrd6iwy5h7i61ckn05plx9np13zby93z3hdbx5nq"; + sha256 = "08dszglfhf1c4rwqinkbp4x55v0b90rgm1fxc1l4dy965imjjinl"; }; buildInputs = with self; [ pytest ]; From 220bdd33c7faa5d98762f65da86db7ea327858b6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 7 Nov 2016 18:42:33 +0100 Subject: [PATCH 0084/1749] pythonPackages.pgcli: 1.1.0 -> 1.3.1 --- 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 77c4c4fcbdf7..308695a042d6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18286,10 +18286,10 @@ in { pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "1.1.0"; + version = "1.3.1"; src = pkgs.fetchFromGitHub { - sha256 = "155avdckg93w3rmx0mz17wi6vcaba3lcppv9qwa6xlxfds9yzvlq"; + sha256 = "18i5pwli36d5d0xh1d7dc80iq85w7vcalphg8hipjclhg2h72bp0"; rev = "v${version}"; repo = "pgcli"; owner = "dbcli"; From cef68b475e8176a4871de5b7ad4d214ebe5c4ba2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Nov 2016 08:42:38 +0100 Subject: [PATCH 0085/1749] haskell-diff-parse: jailbreak to fix test suite build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4f93b2f857c7..e618059a7d44 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1071,4 +1071,7 @@ self: super: { # Test suite occasionally runs for 1+ days on Hydra. distributed-process-tests = dontCheck super.distributed-process-tests; + # https://github.com/mulby/diff-parse/issues/9 + diff-parse = doJailbreak super.diff-parse; + } From 4e7eb75a79a48b0d7068f1949f8c7c42553181d7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 9 Nov 2016 09:41:10 +0100 Subject: [PATCH 0086/1749] nixos/tests/chromium: Fix popup detection Sometimes it happens that the "Type to search or enter a URL to navigate" popup doesn't show, but all we need to know at this time is whether Chromium has finished starting up. So checking for the "startup done" page is a better option here. Signed-off-by: aszlig --- nixos/tests/chromium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 9a6414f81c39..55b1fb5a7222 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -118,7 +118,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { "ulimit -c unlimited; ". "chromium $args \"$url\" & disown" ); - $machine->waitForText(qr/Type to search or enter a URL to navigate/); + $machine->waitForText(qr/startup done/); $machine->waitUntilSucceeds("${xdo "check-startup" '' search --sync --onlyvisible --name "startup done" # close first start help popup From 167e0a7d460e1e8b52a1299e6cff245d8f2079b2 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 9 Nov 2016 09:07:55 -0200 Subject: [PATCH 0087/1749] lumina: install the translation files --- pkgs/desktops/lumina/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 66229420cf62..dcacabc39c1e 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox" ''; - qmakeFlags = [ "LINUX_DISTRO=NixOS" ]; + qmakeFlags = [ "LINUX_DISTRO=NixOS" "CONFIG+=WITH_I18N" ]; enableParallelBuilding = true; From 6042d6e39d40beb93ccb86a6113ba0344288d6cb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 9 Nov 2016 12:52:56 +0100 Subject: [PATCH 0088/1749] Remove file named '\' This looks like it was accidental. Fixes #20253. --- "pkgs/development/libraries/mpir/\\" | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 "pkgs/development/libraries/mpir/\\" diff --git "a/pkgs/development/libraries/mpir/\\" "b/pkgs/development/libraries/mpir/\\" deleted file mode 100644 index b7872ece6aed..000000000000 --- "a/pkgs/development/libraries/mpir/\\" +++ /dev/null @@ -1,20 +0,0 @@ -{stdenv, fetchurl}: -stdenv.mkDerivation rec { - name = "mpir-${version}"; - version = "1"; - inherit buildInputs; - src = fetchurl { - url = "http://mpir.org/mpir-${version}.tar.bz2"; - sha256 = "0000000000000000000000000000000000000000000000000000000000000000"; - }; - meta = { - inherit version; - description = ''A highly optimised library for bignum arithmetic forked from GMP''; - license = stdenv.lib.licenses. ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - downloadPage = "http://mpir.org/downloads.html"; - homepage = "http://mpir.org/"; - updateWalker = true; - }; -} From 4a7cf195a4d17fd1199098d71e9a735eae4fbd5b Mon Sep 17 00:00:00 2001 From: Tim Digel Date: Wed, 26 Oct 2016 11:46:12 +0200 Subject: [PATCH 0089/1749] molly-guard: init at 0.6.3 --- lib/maintainers.nix | 1 + .../os-specific/linux/molly-guard/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 44 insertions(+) create mode 100644 pkgs/os-specific/linux/molly-guard/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 28ff28fba71b..cf72b0495968 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -116,6 +116,7 @@ deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>"; demin-dmitriy = "Dmitriy Demin "; DerGuteMoritz = "Moritz Heidkamp "; + DerTim1 = "Tim Digel "; desiderius = "Didier J. Devroye "; devhell = "devhell <\"^\"@regexmail.net>"; dezgeg = "Tuomas Tynkkynen "; diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix new file mode 100644 index 000000000000..ac083e545fed --- /dev/null +++ b/pkgs/os-specific/linux/molly-guard/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, dpkg, busybox, systemd }: + +stdenv.mkDerivation rec { + name = "molly-guard-${version}"; + version = "0.6.3"; + + src = fetchurl { + url = "https://launchpad.net/ubuntu/+source/molly-guard/${version}/+build/8892607/+files/molly-guard_${version}_all.deb"; + sha256 = "1d1x60m6kh9wfh9lc22g5s0j40aivwgsczykk27ymwl1pvk58dxn"; + }; + + buildInputs = [ dpkg ]; + + sourceRoot = "."; + + unpackCmd = '' + dpkg-deb -x "$src" . + ''; + + installPhase = '' + sed -i "s|/lib/molly-guard|${systemd}/sbin|g" lib/molly-guard/molly-guard + sed -i "s|run-parts|${busybox}/bin/run-parts|g" lib/molly-guard/molly-guard + sed -i "s|/etc/molly-guard/|$out/etc/molly-guard/|g" lib/molly-guard/molly-guard + cp -r ./ $out/ + ''; + + postFixup = '' + for modus in init halt poweroff reboot runlevel shutdown telinit; do + ln -sf $out/lib/molly-guard/molly-guard $out/bin/$modus; + done; + ''; + + meta = with stdenv.lib; { + description = "Attempts to prevent you from accidentally shutting down or rebooting machines"; + homepage = https://anonscm.debian.org/git/collab-maint/molly-guard.git/; + license = licenses.artistic2; + platforms = platforms.linux; + maintainers = with maintainers; [ DerTim1 ]; + priority = -10; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92bd700f9661..4e46a0818a12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2738,6 +2738,8 @@ in modsecurity_standalone = callPackage ../tools/security/modsecurity { }; + molly-guard = callPackage ../os-specific/linux/molly-guard { }; + monit = callPackage ../tools/system/monit { }; moreutils = callPackage ../tools/misc/moreutils { From 27e2cd286ebf69d30a22b878fdac446039390d5f Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Wed, 9 Nov 2016 15:27:50 +0100 Subject: [PATCH 0090/1749] pythonPackages.docker_pycreds: init at 0.2.1 --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 308695a042d6..76bae5918c98 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6102,6 +6102,28 @@ in { }; }; + docker_pycreds = buildPythonPackage rec { + name = "docker-pycreds-${version}"; + version = "0.2.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/d/docker-pycreds/${name}.tar.gz"; + sha256 = "0j3k5wk3bww5y0f2rvgzsin0q98k0i9j308vpsmxidw0y8n3m0wk"; + }; + + doCheck = false; # require docker-credential-helpers binaries + + propagatedBuildInputs = with self; [ + six + ]; + + meta = { + description = "Python bindings for the docker credentials store API."; + homepage = https://github.com/shin-/dockerpy-creds; + license = licenses.asl20; + }; + }; + docker_registry_core = buildPythonPackage rec { name = "docker-registry-core-2.0.3"; disabled = isPy3k; From 8d36794046f9796f7c71c97c3057dd1acc4ea89b Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Wed, 9 Nov 2016 15:32:54 +0100 Subject: [PATCH 0091/1749] pythonPackages.docker: 1.9.0 -> 1.10.6 --- pkgs/top-level/python-packages.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76bae5918c98..f64e56982a36 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6066,14 +6066,22 @@ in { docker = buildPythonPackage rec { name = "docker-py-${version}"; - version = "1.9.0"; + version = "1.10.6"; + disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/d/docker-py/${name}.tar.gz"; - sha256 = "0zkdgz6akzfdda29y4bwa444r0sr2py5pwvvh6bnsy25lwabkikd"; + sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc"; }; - propagatedBuildInputs = with self; [ six requests2 websocket_client ipaddress backports_ssl_match_hostname ]; + propagatedBuildInputs = with self; [ + six + requests2 + websocket_client + ipaddress + backports_ssl_match_hostname + docker_pycreds + ]; # Version conflict doCheck = false; From 9b06e35d33383e4ead778a46547e4c11caf7eb4e Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Tue, 8 Nov 2016 20:25:39 -0400 Subject: [PATCH 0092/1749] fossil scm version patch The attached patch advances the version of the fossil expression in Nixpkgs to the latest release 1.36 From fdd5d610e35eed355f5f3fec9d3675aa60f36292 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Tue, 8 Nov 2016 20:23:22 -0400 Subject: [PATCH] fossil : advance to version 1.36 --- pkgs/applications/version-management/fossil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index d940e9b56594..14a492f6cc2b 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -2,15 +2,15 @@ , tcllib, withJson ? true}: stdenv.mkDerivation rec { - name = "fossil-1.35"; + name = "fossil-1.36"; src = fetchurl { urls = [ - https://www.fossil-scm.org/download/fossil-src-1.35.tar.gz + https://fossil-scm.org/index.html/uv/download/fossil-src-1.36.tar.gz ]; name = "${name}.tar.gz"; - sha256 = "07ds6rhq69bhydpm9a01mgdhxf88p9b6y5hdnhn8gjc7ba92zyf1"; + sha256 = "04px1mnq5dlc6gaihxj5nj6k7ac43wfryzifaairjh74qmgc6xi6"; }; buildInputs = [ zlib openssl readline sqlite which ed ] From 20d16f86cc4798b03c7ca9cd6e628964348143a1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 16:23:05 +0100 Subject: [PATCH 0093/1749] pythonPackages.pillow: 3.3.1 -> 3.4.2 Solves vulnerabilities mentioned in https://github.com/NixOS/nixpkgs/issues/20274 --- pkgs/top-level/python-packages.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f64e56982a36..41681ea44336 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18647,11 +18647,12 @@ in { pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; pillow = buildPythonPackage rec { - name = "Pillow-3.3.1"; + name = "Pillow-${version}"; + version = "3.4.2"; src = pkgs.fetchurl { url = "mirror://pypi/P/Pillow/${name}.tar.gz"; - sha256 = "3491ca65d9fdba4db094ab3f8e17170425e7dd670e507921a665a1975d1b3df1"; + sha256 = "0ee9975c05602e755ff5000232e0335ba30d507f6261922a658ee11b1cec36d1"; }; # Check is disabled because of assertion errors, see @@ -18686,18 +18687,14 @@ in { meta = { homepage = "https://python-pillow.github.io/"; - description = "Fork of The Python Imaging Library (PIL)"; - longDescription = '' The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library supports many file formats, and provides powerful image processing and graphics capabilities. ''; - license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with maintainers; [ goibhniu prikhi ]; }; }; From ce55d91a17bcf83373f1d54070d56fa0acb0c4a0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 9 Nov 2016 16:31:52 +0100 Subject: [PATCH 0094/1749] perl-Math-BigInt: 1.999726 -> 1.999727 --- 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 2c4e70c7cd18..4ef49116bee5 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.999726"; + name = "Math-BigInt-1.999727"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "dc3d9502c8633939000d04e7fbabcfc10fb8febb31c8e874a7bd60201c2228c4"; + sha256 = "4539b8e55f828a9f370b46cd6ef6618c95cb15302384a8f84c2a1fec66d4e33e"; }; meta = { description = "Arbitrary size integer/float math package"; From 04d30023cfc5ee9e6797c60b58fbfa4121cc03a2 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 9 Nov 2016 16:32:10 +0100 Subject: [PATCH 0095/1749] fira-code: 1.203 -> 1.204 --- pkgs/data/fonts/fira-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 4fae5378463f..e14505f61bdd 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fira-code-${version}"; - version = "1.203"; + version = "1.204"; src = fetchurl { url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip"; - sha256 = "0pjziaklmkpl67ybp45q9ndya5adf9x8svhdv9643dq9jsrxbkj1"; + sha256 = "17wky221b3igrqhmxgmqiyv1xdfn0nw471vzhpkrvv1w2w1w1k18"; }; sourceRoot = "otf"; From 9f251e1cb138f4a299b1da4257ba119311373ff4 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 9 Nov 2016 18:05:11 +0100 Subject: [PATCH 0096/1749] eclipse-plugin-acejump: 1.0.0.201501181511 -> 1.0.0.201610261941 --- pkgs/applications/editors/eclipse/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index bc3f7b064d49..42396b72e7cb 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -83,16 +83,16 @@ rec { acejump = buildEclipsePlugin rec { name = "acejump-${version}"; - version = "1.0.0.201501181511"; + version = "1.0.0.201610261941"; srcFeature = fetchurl { url = "https://tobiasmelcher.github.io/acejumpeclipse/features/acejump.feature_${version}.jar"; - sha256 = "127xqrnns4h96g21c9zg0iblxprx3fg6fg0w5f413rf84415z884"; + sha256 = "1szswjxp9g70ibfbv3p8dlq1bngq7nc22kp657z9i9kp8309md2d"; }; srcPlugin = fetchurl { url = "https://tobiasmelcher.github.io/acejumpeclipse/plugins/acejump_${version}.jar"; - sha256 = "0mz79ca32yryidd1wijirvnmfg4j5q4g84vdspdi56z0r4xrja13"; + sha256 = "1cn64xj2bm69vnn9db2xxh6kq148v83w5nx3183mrqb59ym3v9kf"; }; meta = with stdenv.lib; { From 4809263cb10a9d10df7974f7a4ccb8b042859e5f Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 9 Nov 2016 18:54:34 +0100 Subject: [PATCH 0097/1749] pythonPackages.sqlmap: 1.0.9.post5 -> 1.0.11 --- 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 41681ea44336..9560205004b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23163,11 +23163,11 @@ in { }; sqlmap = buildPythonPackage { - name = "sqlmap-1.0.9.post5"; + name = "sqlmap-1.0.11"; src = pkgs.fetchurl { - url = "mirror://pypi/s/sqlmap/sqlmap-1.0.9.post5.tar.gz"; - sha256 = "0g8sjky8anrmcisc697b5qndp88qmay35kng9sz9x46wd3agm9pa"; + url = "mirror://pypi/s/sqlmap/sqlmap-1.0.11.tar.gz"; + sha256 = "1x4amyjqnd9j5g2kp9nvg8pr5sqzbhr8gd0m6d671bshvgj568vr"; }; meta = with pkgs.stdenv.lib; { From 383ae9055a95420e1d80500adb44ba9712c36867 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Wed, 9 Nov 2016 19:09:08 +0100 Subject: [PATCH 0098/1749] libreoffice-fresh: 5.2.2.2 -> 5.2.3.3 --- .../applications/office/libreoffice/default-primary-src.nix | 6 +++--- pkgs/applications/office/libreoffice/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index 553719a1c60a..52b81595e434 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,8 +3,8 @@ rec { major = "5"; minor = "2"; - patch = "2"; - tweak = "2"; + patch = "3"; + tweak = "3"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1q6rv935g633ngg10hzi23sg0wqfq2apyffagk7mj1kan2hflljr"; + sha256 = "1h9j3j7drhr49nw2p6by5vvrr8nc8rpldn3yp724mwkb2rfkdwd8"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 8a69ca8eeb3b..cbe159857eb6 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0nxwf3b63gzb04svb6z1hi3qf95i90pwda5gpmlrfrq6250n3bpi"; + sha256 = "0j0ajli1cbfwbgzrcqkx3db174jv1fgm22ds0gqlgkci9cffa0c4"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1gm23i0snhcm4svciypm0qiviiqv9zpiyplkh22baccs7li3kih1"; + sha256 = "0fndi6cv8rw426c3l071z130ks9sqf6ca5yas7am9d666mmy4fs4"; }; }; From 16a90832cd52dc2a6aa30cb15a128babddd095c9 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 9 Nov 2016 20:01:54 +0100 Subject: [PATCH 0099/1749] darwin.Libsystem: export _mach_init_routine --- .../Libsystem/default.nix | 18 +++++++++++------- .../Libsystem/system_symbols | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_symbols diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index aac213bb8047..92c54d9b679e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -56,9 +56,8 @@ appleDerivation rec { # The startup object files cp ${Csu}/lib/* $out/lib - # Narrowly speaking, these would work if we re-exported libsystem_c and libsystem_kernel, - # but we also need to run the original central libsystem constructor (which initializes - # a ton of crap for its consitutent libraries) so we link against the central library here. + # We can't re-exported libsystem_c and libsystem_kernel directly, + # so we link against the central library here. mkdir -p $out/lib/system ld -macosx_version_min 10.7 -arch x86_64 -dylib \ -o $out/lib/system/libsystem_c.dylib \ @@ -70,8 +69,14 @@ appleDerivation rec { /usr/lib/libSystem.dylib \ -reexported_symbols_list ${./system_kernel_symbols} - libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }') + # The umbrella libSystem also exports some symbols, + # but we don't want to pull in everything from the other libraries. + ld -macosx_version_min 10.7 -arch x86_64 -dylib \ + -o $out/lib/libSystem_internal.dylib \ + /usr/lib/libSystem.dylib \ + -reexported_symbols_list ${./system_symbols} + libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }') for i in $libs; do if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then @@ -79,14 +84,13 @@ appleDerivation rec { fi done - ld -macosx_version_min 10.7 \ - -arch x86_64 \ - -dylib \ + ld -macosx_version_min 10.7 -arch x86_64 -dylib \ -o $out/lib/libSystem.B.dylib \ -compatibility_version 1.0 \ -current_version 1226.10.1 \ -reexport_library $out/lib/system/libsystem_c.dylib \ -reexport_library $out/lib/system/libsystem_kernel.dylib \ + -reexport_library $out/lib/libSystem_internal.dylib \ $args ln -s libSystem.B.dylib $out/lib/libSystem.dylib diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_symbols b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_symbols new file mode 100644 index 000000000000..75a00acac493 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_symbols @@ -0,0 +1 @@ +_mach_init_routine From ecfb8df7a77beeb8ed8e7238d928909665d2b183 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 9 Nov 2016 20:02:09 +0100 Subject: [PATCH 0100/1749] libressl_2_3: 2.3.8 -> 2.3.9 --- pkgs/development/libraries/libressl/2.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix index 1c101365950a..aa5841156897 100644 --- a/pkgs/development/libraries/libressl/2.3.nix +++ b/pkgs/development/libraries/libressl/2.3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.3.8"; + version = "2.3.9"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1hjglpaw1bparlzyjczn0rak32n8hl53317izq81683x5kns8smf"; + sha256 = "1z4nh45zdh1gllhgbvlgd2vk4srhbaswyn82l3dzcfmi9rk17zx6"; }; enableParallelBuilding = true; From 52f1a3789839281ab0f7fad9506f34d6dd379225 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 9 Nov 2016 20:02:45 +0100 Subject: [PATCH 0101/1749] libressl_2_4: 2.4.3 -> 2.4.4 --- pkgs/development/libraries/libressl/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix index 6db9df2a59e2..a0d8511e2b87 100644 --- a/pkgs/development/libraries/libressl/2.4.nix +++ b/pkgs/development/libraries/libressl/2.4.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "03ln2ac9cv0pbz3109yjk7cr5yxqfk8ld6g61k9sgrs7wbrjcmxx"; + sha256 = "1ldzxqc0bds9mwnirrckhx42y3k0v5cx997nnbfa2gkk6ilszkvg"; }; enableParallelBuilding = true; From bac11893993088ade3bce7cbafe21c6dd82c27a5 Mon Sep 17 00:00:00 2001 From: Daniel Haraj Date: Wed, 9 Nov 2016 14:26:43 -0500 Subject: [PATCH 0102/1749] haskell.compiler.ghcHEAD: fix patchPhase #10752 --- ...pass-linker-flags-via-response-files.patch | 20 +++++++++++++++++++ pkgs/development/compilers/ghc/head.nix | 6 +++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch diff --git a/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch new file mode 100644 index 000000000000..ebbb9326a829 --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch @@ -0,0 +1,20 @@ +--- ghc/compiler/main/SysTools.hs 2016-11-09 14:03:05.304528147 -0500 ++++ ghc2/compiler/main/SysTools.hs 2016-11-09 14:00:19.712934686 -0500 +@@ -421,7 +421,7 @@ + args1 = map Option (getOpts dflags opt_c) + args2 = args0 ++ args1 ++ args + mb_env <- getGccEnv args2 +- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env ++ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env + where + -- discard some harmless warnings from gcc that we can't turn off + cc_filter = unlines . doFilter . lines +@@ -911,7 +911,7 @@ + args1 = map Option (getOpts dflags opt_l) + args2 = args0 ++ linkargs ++ args1 ++ args + mb_env <- getGccEnv args2 +- runSomethingResponseFile dflags ld_filter "Linker" p args2 mb_env ++ runSomethingFiltered dflags ld_filter "Linker" p args2 mb_env + where + ld_filter = case (platformOS (targetPlatform dflags)) of + OSSolaris2 -> sunos_ld_filter diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 31c66f175841..d57b6e575da5 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -6,18 +6,18 @@ let inherit (bootPkgs) ghc; in stdenv.mkDerivation rec { - version = "8.1.20161108"; + version = "8.1.20161109"; name = "ghc-${version}"; rev = "2e8463b232054b788b73e6551947a9434aa76009"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1x1vnb2zr2qrak72bdqh65d00q351yhn8xvv5i4i359cf2xjmgfd"; + sha256 = "12nxai5qqnw42syhd0vzl2f9f8z28rc0fsa7g771dyzpqglak90l"; }; patches = [ - ./ghc-8.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 + ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 ]; postUnpack = '' From 2c754df9b3cdba3f5827e1b1dbda240820ab5ad4 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 9 Nov 2016 21:26:25 +0100 Subject: [PATCH 0103/1749] clipster: init at unstable 2016-09-12 --- pkgs/tools/misc/clipster/default.nix | 50 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/tools/misc/clipster/default.nix diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix new file mode 100644 index 000000000000..27df38c566bf --- /dev/null +++ b/pkgs/tools/misc/clipster/default.nix @@ -0,0 +1,50 @@ +{fetchFromGitHub , stdenv, makeWrapper, python, gtk3, libwnck3 }: + +stdenv.mkDerivation rec { + name = "clipster-unstable-${version}"; + version = "2016-09-12"; + + src = fetchFromGitHub { + owner = "mrichar1"; + repo = "clipster"; + rev = "6526a849a0af4c392f4e8e5b18aacdda9c1a8e80"; + sha256 = "0illdajp5z50h7lvglv0p72cpv4c592xmpamrg8kkjpg693bp873"; + }; + + pythonEnv = python.withPackages(ps: with ps; [ dbus-python pygtk pygobject3 ]); + + buildInputs = [ pythonEnv gtk3 libwnck3 makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin/ + cp clipster $out/bin/ + wrapProgram "$out/bin/clipster" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" + ''; + + meta = with stdenv.lib; { + description = "lightweight python clipboard manager"; + longDescription = '' + Clipster was designed to try to add a good selection of useful features, while avoiding bad design decisions or becoming excessively large. + Its feature list includes: + - Event driven, rather than polling. More efficient, helps with power management. + - Control over when it write to disk, for similar reasons. + - Command-line options/config for everything. + - No global keybindings - that's the job of a Window Manager + - Sensible handling of unusual clipboard events. Some apps (Chrome, Emacs) trigger a clipboard 'update event' for every character you select, rather than just one event when you stop selecting. + - Preserves the last item in clipboard after an application closes. (Many apps clear the clipboard on exit). + - Minimal dependencies, no complicated build/install requirements. + - utf-8 support + - Proper handling of embedded newlines and control codes. + - Smart matching of urls, emails, regexes. (extract_*) + - Option to synchronise the SELECTION and CLIPBOARD clipboards. (sync_selections) + - Option to track one or both clipboards. (active_selections) + - Option to ignore clipboard updates form certain applications. (filter_classes) + - Ability to delete items in clipboard history. + ''; + license = licenses.agpl3; + homepage = https://github.com/mrichar1/clipster; + platforms = platforms.linux; + maintainers = [maintainers.magnetophon]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e46a0818a12..0635fd00aecf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -749,6 +749,8 @@ in chntpw = callPackage ../tools/security/chntpw { }; + clipster = callPackage ../tools/misc/clipster { }; + coprthr = callPackage ../development/libraries/coprthr { flex = flex_2_5_35; }; From ce78681cb6efd90fb21ad330e246c85bc1c95b24 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Thu, 10 Nov 2016 05:27:41 +0800 Subject: [PATCH 0104/1749] k3d: update upstream url --- pkgs/applications/graphics/k3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index ba43a2e7f2ae..d8052f93345a 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A 3D editor with support for procedural editing"; - homepage = "http://k-3d.org/"; + homepage = http://www.k-3d.org/; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; From 1bf7440b548499c17681ef8235e0b718c132d23c Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Thu, 10 Nov 2016 00:11:42 +0100 Subject: [PATCH 0105/1749] nodejs: cleanup files no longer needed (#20212) --- .../development/web/nodejs/default-arch.patch | 24 ------------------- pkgs/development/web/nodejs/v5.nix | 12 ---------- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/development/web/nodejs/default-arch.patch delete mode 100644 pkgs/development/web/nodejs/v5.nix diff --git a/pkgs/development/web/nodejs/default-arch.patch b/pkgs/development/web/nodejs/default-arch.patch deleted file mode 100644 index e6d5b5428d77..000000000000 --- a/pkgs/development/web/nodejs/default-arch.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py -index 30f27d5..eb178a5 100644 ---- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py -+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py -@@ -1018,12 +1018,15 @@ class XcodeSettings(object): - # Since the value returned by this function is only used when ARCHS is not - # set, then on iOS we return "i386", as the default xcode project generator - # does not set ARCHS if it is not set in the .gyp file. -- if self.isIOS: -+ try: -+ if self.isIOS: -+ return 'i386' -+ version, build = self._XcodeVersion() -+ if version >= '0500': -+ return 'x86_64' - return 'i386' -- version, build = self._XcodeVersion() -- if version >= '0500': -+ except: - return 'x86_64' -- return 'i386' - - class MacPrefixHeader(object): - """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature. diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix deleted file mode 100644 index 7cd406abd2cd..000000000000 --- a/pkgs/development/web/nodejs/v5.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool -, callPackage -}@args: - -import ./nodejs.nix (args // rec { - version = "5.12.0"; - src = fetchurl { - url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "4f926373f11f2a25156eee1804ec012eb912c42e5d34fc2909889da22efdadfe"; - }; -}) From 10445bc753f4b8705b77aaa72b4fbd38042bd2c9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 00:29:13 +0100 Subject: [PATCH 0106/1749] zeromq: 4.1.4 -> 4.2.0 --- pkgs/development/libraries/zeromq/4.x.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index d99879d14a7e..ab95f4ec3f35 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, libuuid, pkgconfig, libsodium }: stdenv.mkDerivation rec { - name = "zeromq-4.1.4"; + name = "zeromq-${version}"; + version = "4.2.0"; src = fetchurl { - url = "http://download.zeromq.org/${name}.tar.gz"; - sha256 = "0y73dxgf4kaysmkvrkxqq9qk5znklxyghh749jw4qbjwwbyl97z9"; + url = "https://github.com/zeromq/libzmq/releases/download/v${version}/${name}.tar.gz"; + sha256 = "05y1s0938x5w838z79b4f9w6bspz9anldjx9dzvk32cpxvq3pf2k"; }; nativeBuildInputs = [ pkgconfig ]; @@ -17,6 +18,6 @@ stdenv.mkDerivation rec { description = "The Intelligent Transport Layer"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ wkennington fpletz ]; }; } From 2c44af9721d5512dd469a8af0a8c2bbac14b3e2d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 00:29:28 +0100 Subject: [PATCH 0107/1749] phpPackages.zmq: 1.1.3 -> 1.1.4, php7 compatibility --- pkgs/top-level/php-packages.nix | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 74d4e1707a11..6313ff5372cd 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -112,32 +112,13 @@ let sha256 = "0qpfbkfy4wlnsfq4vc4q5wvaia83l89ky33s08gqrcfp3p1adn88"; }; - zmq = if isPhp7 then zmqPhp7 else zmq11; + zmq = buildPecl { + name = "zmq-1.1.3"; - zmq11 = assert !isPhp7; buildPecl { - name = "zmq-1.1.2"; - - sha256 = "0ccz73p8pkda3y9p9qbr3m19m0yrf7k2bvqgbaly3ibgh9bazc69"; + sha256 = "1kj487vllqj9720vlhfsmv32hs2dy2agp6176mav6ldx31c3g4n4"; configureFlags = [ - "--with-zmq=${pkgs.zeromq2}" - ]; - - buildInputs = [ pkgs.pkgconfig ]; - }; - - # Not released yet - zmqPhp7 = assert isPhp7; buildPecl rec { - name = "zmq-php7"; - - src = fetchgit { - url = "https://github.com/mkoppanen/php-zmq"; - rev = "94d2b87d195f870775b153b42c29f30da049f4db"; - sha256 = "51a25b1029800d8abe03c5c08c50d6aee941c95c741dc22d2f853052511f4296"; - }; - - configureFlags = [ - "--with-zmq=${pkgs.zeromq2}" + "--with-zmq=${pkgs.zeromq}" ]; buildInputs = [ pkgs.pkgconfig ]; From bdf89d28186096e86079552f2e7fbcdbe496480b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 00:35:47 +0100 Subject: [PATCH 0108/1749] jzmq: 2.1.0 -> 3.1.0 --- .../libraries/java/jzmq/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index d7316ba3927a..eb4406572788 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -1,29 +1,30 @@ -{stdenv, fetchgit, automake, autoconf, libtool, pkgconfig, zeromq2, jdk}: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zeromq3, jdk }: stdenv.mkDerivation rec { - name = "jzmq-2.1.0"; + name = "jzmq-${version}"; + version = "3.1.0"; - src = fetchgit { - url = git://github.com/zeromq/jzmq.git; - rev = "946fd39780423b2df6e5efd9fa2cd863fd79c9db"; - sha256 = "08pqh673fcqwm68hmnsmzrz4vzlwr0x9hdysic5k5mh7z411xzmp"; + src = fetchFromGitHub { + owner = "zeromq"; + repo = "jzmq"; + rev = "v${version}"; + sha256 = "1wlzs604mgmqmrgpk4pljx2nrlxzdfi3r8k59qlm90fx8qkqkc63"; }; - buildInputs = [ automake autoconf libtool pkgconfig zeromq2 jdk ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ pkgconfig zeromq3 jdk ]; - preConfigurePhases = ["./autogen.sh"]; preConfigure = '' - sed -i -e 's|(JAVAC)|(JAVAC) -encoding utf8|' src/Makefile.in ${if stdenv.system == "x86_64-darwin" then '' sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure '' else ""} ''; - - maintainers = [ stdenv.lib.maintainers.vizanto ]; meta = { homepage = "http://www.zeromq.org"; description = "Java bindings for ZeroMQ"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.lgpl3; + maintainers = [ stdenv.lib.maintainers.vizanto ]; }; } From cc5d6041256cff79177f26900f92b392957b600d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 00:36:18 +0100 Subject: [PATCH 0109/1749] zeromq2: remove, not maintained anymore --- pkgs/development/libraries/zeromq/2.x.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 20 deletions(-) delete mode 100644 pkgs/development/libraries/zeromq/2.x.nix diff --git a/pkgs/development/libraries/zeromq/2.x.nix b/pkgs/development/libraries/zeromq/2.x.nix deleted file mode 100644 index dd7404486d36..000000000000 --- a/pkgs/development/libraries/zeromq/2.x.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchurl, libuuid}: - -stdenv.mkDerivation rec { - name = "zeromq-2.2.0"; - - src = fetchurl { - url = "http://download.zeromq.org/${name}.tar.gz"; - sha256 = "0ds6c244wik1lyfrfr2f4sha30fly4xybr02r9r4z156kvmlm423"; - }; - - buildInputs = [ libuuid ]; - - meta = { - branch = "2"; - homepage = "http://www.zeromq.org"; - description = "The Intelligent Transport Layer"; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0635fd00aecf..196546f959f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9604,7 +9604,6 @@ in static = true; })); - zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {}; zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; zeromq = zeromq4; From b71589e4ca704a30612c9dbfc879b8160c3303e1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 9 Nov 2016 18:53:52 -0500 Subject: [PATCH 0110/1749] kotlin: 1.0.4 -> 1.0.5 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index f0f8fa3b7ff2..e1de97e17c40 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: stdenv.mkDerivation rec { - version = "1.0.4"; + version = "1.0.5"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha512 = "39mcyw3rdgrhfkxl0xygh74idl2pvw3dy0n9d3z4aj6hq4pxkn1dclmpfbrfa333vjpzfhlqwl578vmly9vah7m6z6g4j12gkdijiyf"; + sha512 = "0bkgxr4an1fq890s3bw4izwc8ly29xk28gdibvnp2q9qd15rwrny5dgns697rnbw2gg0nn08q5p33asvbkac001cfabfphamjwndvc9"; }; propagatedBuildInputs = [ jre ] ; From 1034339acee5218846235f0a6676204993a40b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 10 Nov 2016 01:34:30 +0100 Subject: [PATCH 0111/1749] discord: 0.0.10 -> 0.0.11 (#20294) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2ca16eb4458b..aaabb4ab111b 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango , systemd, libXScrnSaver }: -let version = "0.0.10"; in +let version = "0.0.11"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://cdn-canary.discordapp.com/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "1wkbbnbqbwgixdbm69dlirhgjnn8llqyzil01nqwpknh1qwd06pr"; + sha256 = "1lk53vm14vr5pb8xxcx6hinpc2mkdns2xxv0bfzxvlmhfr6d6y18"; }; libPath = stdenv.lib.makeLibraryPath [ From f1ebae152d01eaa4920a48a998d2bf7dfb6c23fa Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 10 Nov 2016 01:42:18 +0100 Subject: [PATCH 0112/1749] mutt: fix smime_keys hard-coded openssl path (#20275) smime_keys uses hard-coded path to openssl, use path in /nix/store for openssl --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 2bc9b3babbdc..2bea04ceedb8 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { sha256 = "1pyns0xw52s4yma1a93pdcl4dirs55q2m1hd7w1r11nlhf7giip9"; }; + patchPhase = optionalString (openssl != null) '' + sed -i 's#/usr/bin/openssl#${openssl}/bin/openssl#' smime_keys.pl + ''; + buildInputs = [ ncurses which perl ] ++ optional headerCache gdbm From b19edd6d0b96c16954d18fc872b377d9bcda83cc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 9 Nov 2016 19:44:42 -0500 Subject: [PATCH 0113/1749] ammonite-repl: 0.7.8 -> 0.7.9 --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 7cb4afbc12e2..c2cf9506c786 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ammonite-repl-${version}"; - version = "0.7.8"; + version = "0.7.9"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${version}"; - sha256 = "0s34p168h5c7ij61rbmaygb95r654yj4j0wh6qya53k4ywl32vkp"; + sha256 = "1jfb5rmab45j0bizfmjhygsjzijv3zcrygws3cr5awjd6js6jg27"; }; propagatedBuildInputs = [ jre ] ; From 0364fbe633bb9de57fc167eb8ba7f34b486a58c3 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 9 Nov 2016 19:54:09 +0100 Subject: [PATCH 0114/1749] openshift: 1.3.0 -> 1.3.1 --- pkgs/applications/networking/cluster/openshift/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 1985d6ad3f2a..e4307c9aabc6 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, go, which }: let - version = "1.3.0"; + version = "1.3.1"; versionMajor = "1"; versionMinor = "3"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "07s7xv8x8pch68j7lsw29im0axi07x32ag9wh9aqa0y570q9xgxy"; + sha256 = "1kxa1k38hvi1vg52p82mmkmp9k4bbbm2pryzapsxwga7d8x4bnbh"; }; buildInputs = [ go which ]; @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; homepage = http://www.openshift.org; maintainers = with maintainers; [offline]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } From dc48622398664bd8f3782a7983b8b752ddeb8d9c Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 9 Nov 2016 19:56:37 +0100 Subject: [PATCH 0115/1749] kubernetes: 1.4.0 -> 1.4.5 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 860ecd1d0784..5430902477f2 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -17,13 +17,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.4.0"; + version = "1.4.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0q7xwdjsmfrz7pnmylkbkr2yxsl2gzzy17aapfznl2hb1ms81kys"; + sha256 = "13lzprvifppnz2r189di7ff2jhvd071b6hxyny12p2hw1b3knnvb"; }; buildInputs = [ makeWrapper which go rsync go-bindata ]; From 4831e116e2961f488fda60049612f68c57eb674d Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 9 Nov 2016 19:56:02 +0100 Subject: [PATCH 0116/1749] gitlab-runner: 1.7.0 -> 1.7.1 --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) mode change 100755 => 100644 pkgs/development/tools/continuous-integration/gitlab-runner/default.nix diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix old mode 100755 new mode 100644 index c66c0fc93b79..0a0f732ccda7 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "1.7.0"; + version = "1.7.1"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "1qc0kmb6wxsy73vf0k2x95jlfb5dicgxw8c63mfn7ryxrh8a42z5"; + sha256 = "1gcd8rhyxg5sa9g27gih28hi9y6cpjgw1j21jmjm06wzyjdlrsi8"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0jbgpv4y0fmvl1plri4ifj1vmk6rr82pncrccpz2k640nlniyhqi"; + sha256 = "0i0kd5xm2ii7rzis9h4h99vpi1anjvhcjw732l0rxg4anyxzywjj"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "18wlab63fmmq9kgr0zmkgsr1kj6rjdqmyg87b7ryb9f40gmygcvj"; + sha256 = "14lx00w502scpb5crxscsm8kvdld1wrxn60a9c45fcccjwl2kkcl"; }; buildInputs = [ go-bindata ]; From edc5cdc3c840e73224ee0555558d30189cde8fc7 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Wed, 9 Nov 2016 02:29:43 +0800 Subject: [PATCH 0117/1749] opencc: init at 1.0.4 --- pkgs/tools/text/opencc/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/text/opencc/default.nix diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix new file mode 100644 index 000000000000..0e2cac36f765 --- /dev/null +++ b/pkgs/tools/text/opencc/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, cmake, python }: + +stdenv.mkDerivation { + name = "opencc-1.0.4"; + src = fetchurl { + url = "https://github.com/BYVoid/OpenCC/archive/ver.1.0.4.tar.gz"; + sha256 = "0553b7461ebd379d118d45d7f40f8a6e272750115bdbc49267595a05ee3481ac"; + }; + + buildInputs = [ cmake python ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=OFF" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/BYVoid/OpenCC"; + license = licenses.asl20; + description = "A project for conversion between Traditional and Simplified Chinese"; + longDescription = '' + Open Chinese Convert (OpenCC) is an opensource project for conversion between + Traditional Chinese and Simplified Chinese, supporting character-level conversion, + phrase-level conversion, variant conversion and regional idioms among Mainland China, + Taiwan and Hong kong. + ''; + maintainers = [ maintainers.mingchuan ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a91aed01ddf..486c573b9586 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2992,6 +2992,8 @@ in oh-my-zsh = callPackage ../shells/oh-my-zsh { }; + opencc = callPackage ../tools/text/opencc { }; + opencryptoki = callPackage ../tools/security/opencryptoki { }; opendbx = callPackage ../development/libraries/opendbx { }; From 2ebe748113473d774c750a23e59c02953ea732b4 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 9 Nov 2016 19:55:16 +0100 Subject: [PATCH 0118/1749] go: 1.7.1 -> 1.7.3 --- pkgs/development/compilers/go/1.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index 3def735ec8d3..72665cd09354 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.7.1"; + version = "1.7.3"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "121cvpjpbyl3lyd6j5lnnq6pr8vl7ar5zvap1132c522lxgxw356"; + sha256 = "0dcappkx4ichl249swwdyk7l078ajng0gl6a885va85z8m1jnvbs"; }; # perl is used for testing go vet From d0c1e42c1e8a5c925e80701302bd1c7508b746b8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 9 Nov 2016 19:54:13 -0500 Subject: [PATCH 0119/1749] atom: 1.11.2 -> 1.12.0 --- pkgs/applications/editors/atom/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index a044f82baaf1..ae571debe769 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv }: +{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv, libXScrnSaver, libxkbfile }: stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.11.2"; + version = "1.12.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1mvlj1j0hyvm5di95nn0x99lm5arw2amm1s1va1m73zss3bzlhpm"; + sha256 = "0grl5lw05gjw9381pr8asgqp9f912li28v0bvl8j6i0ynfy67jmk"; name = "${name}.deb"; }; @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { rm -r $out/share/lintian rm -r $out/usr/ wrapProgram $out/bin/atom \ - --prefix "PATH" : "${gvfs}/bin" + --prefix "PATH" : "${gvfs}/bin" \ + --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ + --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libxkbfile ]}/libxkbfile.so.1 fixupPhase From 6a7e6cdd664b92aaf94331711585c9d4104d1264 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 9 Nov 2016 19:57:32 -0500 Subject: [PATCH 0120/1749] oh-my-zsh: 2016-10-25 -> 2016-11-03 --- pkgs/shells/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 73a3367f9f7e..b7a122b06834 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "oh-my-zsh-${version}"; - version = "2016-10-25"; + version = "2016-11-03"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "0ee89d965ecaa4f32cf2d1039e9d84a73eb206cf"; - sha256 = "1c90yl9kc1a7690bry1jbs48vsdlkxvbnvzgarx5wj99fygb8w2f"; + rev = "0b340bc3a5c58609a07987b296f773eaea17b274"; + sha256 = "1ifflqpbsk2gadbl0aqdmnm18bp21i9zcvjzlpldwma6crnfag68"; }; phases = "installPhase"; From 05d74cb857319dfbbf2561ebf6748586c958c2d4 Mon Sep 17 00:00:00 2001 From: Tobias Pflug Date: Sun, 6 Nov 2016 12:58:29 +0100 Subject: [PATCH 0121/1749] dunst: add svg-support patch See https://github.com/knopwob/dunst/pull/223 --- pkgs/applications/misc/dunst/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 0c51cb132629..221bd3c4bf5e 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , pkgconfig, which, perl , cairo, dbus, freetype, gdk_pixbuf, glib, libX11, libXScrnSaver , libXext, libXinerama, libnotify, libxdg_basedir, pango, xproto +, librsvg }: stdenv.mkDerivation rec { @@ -15,11 +16,17 @@ stdenv.mkDerivation rec { sha256 = "102s0rkcdz22hnacsi3dhm7kj3lsw9gnikmh3a7wk862nkvvwjmk"; }; + patches = [(fetchpatch { + name = "add-svg-support.patch"; + url = "https://github.com/knopwob/dunst/commit/63b11141185d1d07a6d12212257a543e182d250a.patch"; + sha256 = "0giiaj5zjim7xqcav5ij5gn4x6nnchkllwcx0ln16j0p3vbi4y4x"; + })]; + nativeBuildInputs = [ perl pkgconfig which ]; buildInputs = [ cairo dbus freetype gdk_pixbuf glib libX11 libXScrnSaver libXext - libXinerama libnotify libxdg_basedir pango xproto + libXinerama libnotify libxdg_basedir pango xproto librsvg ]; outputs = [ "out" "man" ]; From 34e04bf401f89d34ebcf6675e6be63603c2ccc1e Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Thu, 3 Nov 2016 11:14:55 +0100 Subject: [PATCH 0122/1749] azure-vhd-utils: init at 20160614 --- pkgs/tools/misc/azure-vhd-utils/default.nix | 27 +++++++++++++++++++ pkgs/tools/misc/azure-vhd-utils/deps.nix | 29 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 58 insertions(+) create mode 100644 pkgs/tools/misc/azure-vhd-utils/default.nix create mode 100644 pkgs/tools/misc/azure-vhd-utils/deps.nix diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix new file mode 100644 index 000000000000..fcdd9a81d720 --- /dev/null +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -0,0 +1,27 @@ +# This file was generated by go2nix. +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "azure-vhd-utils-${version}"; + version = "20160614-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8"; + + goPackagePath = "github.com/Microsoft/azure-vhd-utils"; + + src = fetchgit { + inherit rev; + url = "https://github.com/Microsoft/azure-vhd-utils"; + sha256 = "0b9kbavlb92rhnb1swwq8bdn4l9a994rmf1ywyfq4yc0kd3gnhgh"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/Microsoft/azure-vhd-utils; + description = "Read, inspect and upload VHD files for Azure"; + longDescription = "Go package to read Virtual Hard Disk (VHD) file, a CLI interface to upload local VHD to Azure storage and to inspect a local VHD"; + license = licenses.mit; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/tools/misc/azure-vhd-utils/deps.nix b/pkgs/tools/misc/azure-vhd-utils/deps.nix new file mode 100644 index 000000000000..d07af99d5e59 --- /dev/null +++ b/pkgs/tools/misc/azure-vhd-utils/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "github.com/Azure/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-sdk-for-go"; + rev = "0884ebb4c8e7c980527348a4d134a65286042afc"; + sha256 = "0ixsq409akq1ff12352kp5gkbh370rpbw0m0pbwjr42cqvnzs9k0"; + }; + } + { + goPackagePath = "github.com/Microsoft/azure-vhd-utils-for-go"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/azure-vhd-utils-for-go"; + rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8"; + sha256 = "0b9kbavlb92rhnb1swwq8bdn4l9a994rmf1ywyfq4yc0kd3gnhgh"; + }; + } + { + goPackagePath = "github.com/codegangsta/cli"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/cli"; + rev = "f614c177b70c0f0e92c368d623c8770bf337c5d6"; + sha256 = "1l70f07v0dsp2k2pm0lmr42fp4y72j1g0czf4fkxwhvgbly3al98"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 486c573b9586..e51f081437f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -461,6 +461,8 @@ in azure-cli = nodePackages.azure-cli; + azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; From a50784b34e771aa4a6c5f4eeb8c25295c15e4ed4 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 8 Nov 2016 01:17:47 -0400 Subject: [PATCH 0123/1749] openssl: add custom build of 1.0.2 for steam --- .../development/libraries/openssl/default.nix | 15 ++- .../openssl/openssl-fix-cpuid_setup.patch | 105 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 121 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index ea89bb859e5f..efb9a9e1d4ee 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -9,7 +9,7 @@ let opensslCrossSystem = stdenv.cross.openssl.system or (throw "openssl needs its platform name cross building"); - common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec { + common = args@{ version, sha256, patches ? [], configureFlags ? [], makeDepend ? false }: stdenv.mkDerivation rec { name = "openssl-${version}"; src = fetchurl { @@ -45,7 +45,10 @@ let ] ++ stdenv.lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" - ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"; + ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" + ++ args.configureFlags or []; + + postConfigure = if makeDepend then "make depend" else null; makeFlags = [ "MANDIR=$(man)/share/man" ]; @@ -121,4 +124,12 @@ in { sha256 = "1xznrqvb1dbngv2k2nb6da6fdw00c01sy2i36yjdxr4vpxrf0pd4"; }; + openssl_1_0_2-steam = common { + version = "1.0.2j"; + sha256 = "0cf4ar97ijfc7mg35zdgpad6x8ivkdx9qii6mz35khi1ps9g5bz7"; + configureFlags = [ "no-engine" ]; + makeDepend = true; + patches = [ ./openssl-fix-cpuid_setup.patch ]; + }; + } diff --git a/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch b/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch new file mode 100644 index 000000000000..4a2384ca3da0 --- /dev/null +++ b/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch @@ -0,0 +1,105 @@ +diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c +index 1925428..d2e42d2 100644 +--- a/crypto/cryptlib.c ++++ b/crypto/cryptlib.c +@@ -676,10 +676,15 @@ typedef unsigned __int64 IA32CAP; + # else + typedef unsigned long long IA32CAP; + # endif ++ ++/* Compat function for STEAM */ ++extern IA32CAP OPENSSL_ia32_cpuid_new(unsigned int*); ++IA32CAP OPENSSL_ia32_cpuid(void) { return OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P); } ++ + void OPENSSL_cpuid_setup(void) + { + static int trigger = 0; +- IA32CAP OPENSSL_ia32_cpuid(unsigned int *); ++ IA32CAP OPENSSL_ia32_cpuid_new(unsigned int *); + IA32CAP vec; + char *env; + +@@ -697,9 +702,9 @@ void OPENSSL_cpuid_setup(void) + vec = strtoul(env + off, NULL, 0); + # endif + if (off) +- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P) & ~vec; ++ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P) & ~vec; + else if (env[0] == ':') +- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P); ++ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P); + + OPENSSL_ia32cap_P[2] = 0; + if ((env = strchr(env, ':'))) { +@@ -713,7 +718,7 @@ void OPENSSL_cpuid_setup(void) + OPENSSL_ia32cap_P[2] = vecx; + } + } else +- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P); ++ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P); + + /* + * |(1<<10) sets a reserved bit to signal that variable +diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h +index fba180a..b927c79 100644 +--- a/crypto/cryptlib.h ++++ b/crypto/cryptlib.h +@@ -99,6 +99,9 @@ extern "C" { + # define HEX_SIZE(type) (sizeof(type)*2) + + void OPENSSL_cpuid_setup(void); ++#pragma GCC visibility push(hidden) ++unsigned long long OPENSSL_ia32_cpuid(void); ++#pragma GCC visibility pop + extern unsigned int OPENSSL_ia32cap_P[]; + void OPENSSL_showfatal(const char *fmta, ...); + void *OPENSSL_stderr(void); +diff --git a/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl +index d208d02..d4c0b24 100644 +--- a/crypto/x86_64cpuid.pl ++++ b/crypto/x86_64cpuid.pl +@@ -52,10 +52,10 @@ OPENSSL_rdtsc: + ret + .size OPENSSL_rdtsc,.-OPENSSL_rdtsc + +-.globl OPENSSL_ia32_cpuid +-.type OPENSSL_ia32_cpuid,\@function,1 ++.globl OPENSSL_ia32_cpuid_new ++.type OPENSSL_ia32_cpuid_new,\@function,1 + .align 16 +-OPENSSL_ia32_cpuid: ++OPENSSL_ia32_cpuid_new: + mov %rbx,%r8 # save %rbx + + xor %eax,%eax +@@ -181,7 +181,7 @@ OPENSSL_ia32_cpuid: + mov %r8,%rbx # restore %rbx + or %r9,%rax + ret +-.size OPENSSL_ia32_cpuid,.-OPENSSL_ia32_cpuid ++.size OPENSSL_ia32_cpuid_new,.-OPENSSL_ia32_cpuid_new + + .globl OPENSSL_cleanse + .type OPENSSL_cleanse,\@abi-omnipotent +diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl +index e95f627..0781010 100644 +--- a/crypto/x86cpuid.pl ++++ b/crypto/x86cpuid.pl +@@ -8,7 +8,7 @@ require "x86asm.pl"; + + for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } + +-&function_begin("OPENSSL_ia32_cpuid"); ++&function_begin("OPENSSL_ia32_cpuid_new"); + &xor ("edx","edx"); + &pushf (); + &pop ("eax"); +@@ -153,7 +153,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } + &mov ("eax","esi"); + &mov ("edx","ebp"); + &set_label("nocpuid"); +-&function_end("OPENSSL_ia32_cpuid"); ++&function_end("OPENSSL_ia32_cpuid_new"); + + &external_label("OPENSSL_ia32cap_P"); + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b89d1f3a582a..59c4a2e8c1aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8692,6 +8692,7 @@ in wolfssl = callPackage ../development/libraries/wolfssl { }; openssl = openssl_1_0_2; + openssl-steam = openssl_1_0_2-steam; inherit (callPackages ../development/libraries/openssl { fetchurl = fetchurlBoot; @@ -8702,7 +8703,8 @@ in }) openssl_1_0_1 openssl_1_0_2 - openssl_1_1_0; + openssl_1_1_0 + openssl_1_0_2-steam; openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { cryptodevHeaders = linuxPackages.cryptodev.override { From a120bad30cbd63019971e9d03edd82423131852c Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 8 Nov 2016 01:18:25 -0400 Subject: [PATCH 0124/1749] steam: use custom openssl --- pkgs/games/steam/runtime-wrapped.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 2cdbfb096e2c..38d73f59deec 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -58,7 +58,6 @@ let SDL SDL2_image glew110 - openssl libidn # Other things from runtime @@ -88,6 +87,7 @@ let alsaLib openalSoft libva + openssl-steam ] ++ lib.optional newStdcpp gcc.cc; ourRuntime = if runtimeOnly then [] From 2673604708a15d2ec3fa74ee5a965c645c562932 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 02:38:50 +0100 Subject: [PATCH 0125/1749] i3: 4.12 -> 4.13 Fixes #20296. --- .../window-managers/i3/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index ada6e8e742e2..b6de07bff8ad 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,25 +1,31 @@ { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms -, xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl -, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon +, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev +, yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon , xorgserver, xvfb_run, dmenu, i3status }: stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.12"; + version = "4.13"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "1d3q3lgpjbkmcwzjhp0dfr0jq847silcfg087slcnj95ikh1r7p1"; + sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl"; }; + nativeBuildInputs = [ which pkgconfig makeWrapper ]; + buildInputs = [ - which pkgconfig makeWrapper libxcb xcbutilkeysyms xcbutil xcbutilwm libxkbcommon + libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC xorgserver xvfb_run ]; + configureFlags = [ "--disable-builddir" ]; + + enableParallelBuilding = true; + postPatch = '' patchShebangs . ''; @@ -45,12 +51,8 @@ stdenv.mkDerivation rec { ! grep -q '^not ok' testcases/latest/complete-run.log ''; - configurePhase = "makeFlags=PREFIX=$out"; - postInstall = '' wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" - mkdir -p $out/man/man1 - cp man/*.1 $out/man/man1 for program in $out/bin/i3-sensible-*; do sed -i 's/which/command -v/' $program done @@ -59,7 +61,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiling window manager"; homepage = "http://i3wm.org"; - maintainers = with maintainers; [ garbas modulistic ]; + maintainers = with maintainers; [ garbas modulistic fpletz ]; license = licenses.bsd3; platforms = platforms.all; From ba27636b5837a1840ab97b914d1ef6b3f8d55a49 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Thu, 10 Nov 2016 12:19:47 +1000 Subject: [PATCH 0126/1749] nodejs: disable PaX mprotect hardening (#20301) Closes #19951 --- pkgs/development/web/nodejs/nodejs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index a45a95680b1c..b71f39ca420f 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -56,6 +56,7 @@ in ''; postInstall = '' + paxmark m $out/bin/node PATH=$out/bin:$PATH patchShebangs $out ''; From 6476f11f4080daa237145713d3d2dad0a7de1ae0 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Thu, 10 Nov 2016 12:44:22 +1000 Subject: [PATCH 0127/1749] grsecurity patch update to kernel 4.8.6 --- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 6bba248374ba..98f89508fc1f 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.7.10"; - grrev = "201611011946"; - sha256 = "0nva1007r4shlcxzflbxvd88yzvb98si2kjlgnhdqphyz1c0qhql"; + { kver = "4.8.6"; + grrev = "201611091800"; + sha256 = "09kz4mjsrjixwvr8hf4q1lwk1miqb3mq6i6adzrha7c5s6c940x0"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 3190a6c45208bbad97ffe056f01155a2a65ac403 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 03:22:31 +0100 Subject: [PATCH 0128/1749] libwmf: add patch to fix CVE-2016-9011 cc #20274 --- pkgs/development/libraries/libwmf/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index 229563d46af8..5683e88b0205 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, zlib, imagemagick, libpng, pkgconfig, glib, freetype -, libjpeg, libxml2 }: +{ stdenv, fetchurl, fetchpatch, zlib, imagemagick, libpng, pkgconfig, glib +, freetype, libjpeg, libxml2 }: stdenv.mkDerivation { name = "libwmf-0.2.8.4"; @@ -14,6 +14,11 @@ stdenv.mkDerivation { patches = [ ./CVE-2006-3376.patch ./CVE-2009-1364.patch ./CVE-2015-0848+4588+4695+4696.patch + (fetchpatch { + name = "libwmf-0.2.8.4-CVE-2016-9011-debian.patch"; + url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=842090;filename=libwmf-0.2.8.4-CVE-2016-9011-debian.patch;msg=10"; + sha256 = "15vnqrj1dlvn0g8ccrxj2r2cyb1rv0qf0kfangxfgsi5h8is0c2b"; + }) ]; meta = { From 14a3d2d2fff0717f12cb22a738149762bcc8a11c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 03:49:22 +0100 Subject: [PATCH 0129/1749] 389-ds-base: add patch to fix CVE-2016-5416 cc #20274 --- pkgs/servers/ldap/389/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 8d719bec4f5e..6ba60ff17726 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap, db, cyrus_sasl -, svrcore, icu, net_snmp, kerberos, pcre, perlPackages +{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, pam, nspr, nss, openldap +, db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages }: let version = "1.3.5.4"; @@ -19,7 +19,15 @@ stdenv.mkDerivation rec { # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump - patches = [ ./perl-path.patch ]; + patches = [ ./perl-path.patch + # https://fedorahosted.org/389/ticket/48354 + (fetchpatch { + name = "389-ds-base-CVE-2016-5416.patch"; + url = "https://fedorahosted.org/389/changeset/3c2cd48b7d2cb0579f7de6d460bcd0c9bb1157bd/?format=diff&new=3c2cd48b7d2cb0579f7de6d460bcd0c9bb1157bd"; + addPrefixes = true; + sha256 = "1kv3a3di1cihkaf8xdbb5mzvhm4c3frx8rc5mji8xgjyj9ni6xja"; + }) + ]; preConfigure = '' # Create perl paths for library imports in perl scripts From 0bdc0143fe87bc9357a5ad8e5379010aa67df1de Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 10 Nov 2016 03:44:41 +0000 Subject: [PATCH 0130/1749] nixpkgs: proverif 1.94 -> 1.95 Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/proverif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix index 4f5e91550787..8726f5affea7 100644 --- a/pkgs/applications/science/logic/proverif/default.nix +++ b/pkgs/applications/science/logic/proverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "proverif-${version}"; - version = "1.94"; + version = "1.95"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz"; - sha256 = "0dv2hgk76y0ap7dwf80qd94dmxjw47c50iavxgq5702k1d6qap56"; + sha256 = "01viwi6sccdxk723ycy1shklz8g29j5i3wj2mcwb3j7advvqmws2"; }; buildInputs = [ ocaml ]; From e79264002a1b240eb27e7e356bc38993d64e6a92 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 10 Nov 2016 03:45:02 +0000 Subject: [PATCH 0131/1749] nixpkgs: bitkeeper 7.3ce -> 7.3.1ce Signed-off-by: Austin Seipp --- pkgs/applications/version-management/bitkeeper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index e5937977994e..86e555a989c7 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "bitkeeper-${version}"; - version = "7.3ce"; + version = "7.3.1ce"; src = fetchurl { - url = "https://www.bitkeeper.org/downloads/${version}/bk-${version}.tar.gz"; - sha256 = "0lk4vydpq5bi52m81h327gvzdzybf8kkak7yjwmpj6kg1jn9blaz"; + url = "https://www.bitkeeper.org/downloads/${version}/bk-${version}.src.tar.gz"; + sha256 = "0l6jwvcg4s1q00vb01hdv58jgv03l8x5mhjl73cwgfiff80zx147"; }; hardeningDisable = [ "fortify" ]; From b15409d6f6071c6a62570c5cefe81300cbc3eb0f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 06:16:42 +0100 Subject: [PATCH 0132/1749] gitlab: 8.12.8 -> 8.13.5 --- .../gitlab-shell/default.nix | 4 +- .../gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/Gemfile | 61 +++-- .../version-management/gitlab/Gemfile.lock | 97 ++++---- .../version-management/gitlab/default.nix | 4 +- .../version-management/gitlab/gemset.nix | 222 +++++------------- pkgs/top-level/all-packages.nix | 8 +- 7 files changed, 139 insertions(+), 261 deletions(-) diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index 2293d11331df..3bcf8cd4e1b2 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab }: stdenv.mkDerivation rec { - version = "3.6.1"; + version = "3.6.6"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "0j4kwsfzb7l871fma1b1q9h33vyng2nnghn5zz192sv4yp0w2pvq"; + sha256 = "1dg9ldsyly2r3amkl0d96m084az360b7nz9rhhf61x06d4z09xif"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 6fe65bb50abf..54be33beff5a 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - version = "0.8.2"; + version = "0.8.5"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "03y7f9x88sa8gxqaglriwn2793dn3i8dx4qhaarnm0gyrfl3rjag"; + sha256 = "0q6kd59sb5wm63r8zdvbkn4j6fk2n743pjhkbmg4rzngvjivxqzr"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index f9d95e121f5f..ef131cb719aa 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -6,10 +6,8 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Responders respond_to and respond_with gem 'responders', '~> 2.0' -# Specify a sprockets version due to increased performance -# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069 -gem 'sprockets', '~> 3.6.0' -gem 'sprockets-es6' +gem 'sprockets', '~> 3.7.0' +gem 'sprockets-es6', '~> 0.9.2' # Default values for AR models gem 'default_value_for', '~> 3.0.0' @@ -19,7 +17,7 @@ gem 'mysql2', '~> 0.3.16', group: :mysql gem 'pg', '~> 0.18.2', group: :postgres # Authentication libraries -gem 'devise', '~> 4.0' +gem 'devise', '~> 4.2' gem 'doorkeeper', '~> 4.2.0' gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' @@ -31,7 +29,7 @@ gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' gem 'omniauth-google-oauth2', '~> 0.4.1' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos -gem 'omniauth-saml', '~> 1.6.0' +gem 'omniauth-saml', '~> 1.7.0' gem 'omniauth-shibboleth', '~> 1.2.0' gem 'omniauth-twitter', '~> 1.2.0' gem 'omniauth_crowd', '~> 2.2.0' @@ -53,7 +51,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem 'gitlab_git', '~> 10.6.6' +gem 'gitlab_git', '~> 10.7.0' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes @@ -101,17 +99,18 @@ gem 'unf', '~> 0.1.4' gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing -gem 'html-pipeline', '~> 1.11.0' -gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' -gem 'gitlab-markup', '~> 1.5.0' -gem 'redcarpet', '~> 3.3.3' -gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~>3.6' -gem 'org-ruby', '~> 0.9.12' -gem 'creole', '~> 0.5.0' -gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 1.5.2' -gem 'rouge', '~> 2.0' +gem 'html-pipeline', '~> 1.11.0' +gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie' +gem 'gitlab-markup', '~> 1.5.0' +gem 'redcarpet', '~> 3.3.3' +gem 'RedCloth', '~> 4.3.2' +gem 'rdoc', '~>3.6' +gem 'org-ruby', '~> 0.9.12' +gem 'creole', '~> 0.5.0' +gem 'wikicloth', '0.8.1' +gem 'asciidoctor', '~> 1.5.2' +gem 'rouge', '~> 2.0' +gem 'truncato', '~> 0.7.8' # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM @@ -122,8 +121,8 @@ gem 'diffy', '~> 3.0.3' # Application server group :unicorn do - gem 'unicorn', '~> 4.9.0' - gem 'unicorn-worker-killer', '~> 0.4.2' + gem 'unicorn', '~> 5.1.0' + gem 'unicorn-worker-killer', '~> 0.4.4' end # State machine @@ -132,11 +131,10 @@ gem 'state_machines-activerecord', '~> 0.4.0' gem 'after_commit_queue', '~> 1.3.0' # Issue tags -gem 'acts-as-taggable-on', '~> 3.4' +gem 'acts-as-taggable-on', '~> 4.0' # Background jobs -gem 'sinatra', '~> 1.4.4', require: false -gem 'sidekiq', '~> 4.0' +gem 'sidekiq', '~> 4.2' gem 'sidekiq-cron', '~> 0.4.0' gem 'redis-namespace', '~> 1.5.2' @@ -213,7 +211,7 @@ gem 'oj', '~> 2.17.4' gem 'chronic', '~> 0.10.2' gem 'chronic_duration', '~> 0.10.6' -gem 'sass-rails', '~> 5.0.0' +gem 'sass-rails', '~> 5.0.6' gem 'coffee-rails', '~> 4.1.0' gem 'uglifier', '~> 2.7.2' gem 'turbolinks', '~> 2.5.0' @@ -227,7 +225,7 @@ gem 'gon', '~> 6.1.0' gem 'jquery-atwho-rails', '~> 1.3.2' gem 'jquery-rails', '~> 4.1.0' gem 'jquery-ui-rails', '~> 5.0.0' -gem 'request_store', '~> 1.3.0' +gem 'request_store', '~> 1.3' gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' gem 'net-ssh', '~> 3.0.1' @@ -298,12 +296,11 @@ group :development, :test do gem 'spring-commands-spinach', '~> 1.1.0' gem 'spring-commands-teaspoon', '~> 0.0.2' - gem 'rubocop', '~> 0.42.0', require: false + gem 'rubocop', '~> 0.43.0', require: false gem 'rubocop-rspec', '~> 1.5.0', require: false gem 'scss_lint', '~> 0.47.0', require: false gem 'haml_lint', '~> 0.18.2', require: false gem 'simplecov', '0.12.0', require: false - gem 'flog', '~> 4.3.2', require: false gem 'flay', '~> 2.6.1', require: false gem 'bundler-audit', '~> 0.5.0', require: false @@ -311,6 +308,8 @@ group :development, :test do gem 'license_finder', '~> 2.1.0', require: false gem 'knapsack', '~> 1.11.0' + + gem 'activerecord_sane_schema_dumper', '0.2' end group :test do @@ -323,10 +322,6 @@ group :test do gem 'timecop', '~> 0.8.0' end -group :production do - gem 'gitlab_meta', '7.0' -end - gem 'newrelic_rpm', '~> 3.16' gem 'octokit', '~> 4.3.0' @@ -335,7 +330,7 @@ gem 'mail_room', '~> 0.8.1' gem 'email_reply_parser', '~> 0.5.8' -gem 'ruby-prof', '~> 0.15.9' +gem 'ruby-prof', '~> 0.16.2' ## CI gem 'activerecord-session_store', '~> 1.0.0' @@ -348,7 +343,7 @@ gem 'oauth2', '~> 1.2.0' gem 'paranoia', '~> 2.0' # Health check -gem 'health_check', '~> 2.1.0' +gem 'health_check', '~> 2.2.0' # System information gem 'vmstat', '~> 2.2' diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 0dd9b47ff3e4..b9501e68aae8 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -40,14 +40,16 @@ GEM multi_json (~> 1.11, >= 1.11.2) rack (>= 1.5.2, < 3) railties (>= 4.0, < 5.1) + activerecord_sane_schema_dumper (0.2) + rails (>= 4, < 5) activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - acts-as-taggable-on (3.5.0) - activerecord (>= 3.2, < 5) + acts-as-taggable-on (4.0.0) + activerecord (>= 4.0) addressable (2.3.8) after_commit_queue (1.3.0) activerecord (>= 3.0) @@ -159,11 +161,15 @@ GEM database_cleaner (1.5.3) debug_inspector (0.0.2) debugger-ruby_core_source (1.3.8) + deckar01-task_list (1.0.5) + activesupport (~> 4.0) + html-pipeline + rack (~> 1.0) default_value_for (3.0.2) activerecord (>= 3.2.0, < 5.1) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.1.1) + devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -211,9 +217,6 @@ GEM flay (2.6.1) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flog (4.3.2) - ruby_parser (~> 3.1, > 3.1.0) - sexp_processor (~> 4.4) flowdock (0.7.1) httparty (~> 0.7) multi_json @@ -282,12 +285,11 @@ GEM mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) gitlab-markup (1.5.0) - gitlab_git (10.6.6) + gitlab_git (10.7.0) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) rugged (~> 0.24.0) - gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) omniauth (~> 1.0) @@ -337,7 +339,7 @@ GEM thor tilt hashie (3.4.4) - health_check (2.1.0) + health_check (2.2.1) rails (>= 4.0) hipchat (1.5.2) httparty @@ -473,9 +475,9 @@ GEM omniauth-oauth2 (1.3.1) oauth2 (~> 1.0) omniauth (~> 1.2) - omniauth-saml (1.6.0) + omniauth-saml (1.7.0) omniauth (~> 1.3) - ruby-saml (~> 1.3) + ruby-saml (~> 1.4) omniauth-shibboleth (1.2.1) omniauth (>= 1.0.0) omniauth-twitter (1.2.1) @@ -490,7 +492,7 @@ GEM orm_adapter (0.5.0) paranoia (2.1.4) activerecord (~> 4.0) - parser (2.3.1.2) + parser (2.3.1.4) ast (~> 2.2) pg (0.18.4) pkg-config (1.1.7) @@ -557,7 +559,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - raindrops (0.15.0) + raindrops (0.17.0) rake (10.5.0) rb-fsevent (0.9.6) rb-inotify (0.9.5) @@ -591,7 +593,7 @@ GEM request_store (1.3.1) rerun (0.11.0) listen (~> 3.0) - responders (2.1.1) + responders (2.3.0) railties (>= 4.2.0, < 5.1) rinku (2.0.0) rotp (2.1.2) @@ -623,7 +625,7 @@ GEM rspec-retry (0.4.5) rspec-core rspec-support (3.5.0) - rubocop (0.42.0) + rubocop (0.43.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) @@ -633,9 +635,9 @@ GEM rubocop (>= 0.40.0) ruby-fogbugz (0.2.1) crack (~> 0.4) - ruby-prof (0.15.9) + ruby-prof (0.16.2) ruby-progressbar (1.8.1) - ruby-saml (1.3.0) + ruby-saml (1.4.1) nokogiri (>= 1.5.10) ruby_parser (3.8.2) sexp_processor (~> 4.1) @@ -648,7 +650,7 @@ GEM sanitize (2.1.0) nokogiri (>= 1.4.4) sass (3.4.22) - sass-rails (5.0.5) + sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -676,11 +678,11 @@ GEM rack shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.1.4) + sidekiq (4.2.1) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) + rack-protection (~> 1.5) redis (~> 3.2, >= 3.2.1) - sinatra (>= 1.4.7) sidekiq-cron (0.4.0) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) @@ -690,10 +692,6 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - sinatra (1.4.7) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) slack-notifier (1.2.1) slop (3.6.0) spinach (0.8.10) @@ -713,10 +711,10 @@ GEM spring (>= 0.9.1) spring-commands-teaspoon (0.0.2) spring (>= 0.9.1) - sprockets (3.6.3) + sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-es6 (0.9.0) + sprockets-es6 (0.9.2) babel-source (>= 5.8.11) babel-transpiler sprockets (>= 3.0.0) @@ -736,8 +734,6 @@ GEM ffi sysexits (1.2.0) systemu (2.6.5) - task_list (1.0.2) - html-pipeline teaspoon (1.1.5) railties (>= 3.2.5, < 6) teaspoon-jasmine (2.2.0) @@ -754,6 +750,9 @@ GEM tilt (2.0.5) timecop (0.8.1) timfel-krb5-auth (0.8.3) + truncato (0.7.8) + htmlentities (~> 4.3.1) + nokogiri (~> 1.6.1) turbolinks (2.5.3) coffee-rails tzinfo (1.2.2) @@ -767,9 +766,8 @@ GEM unf_ext unf_ext (0.0.7.2) unicode-display_width (1.1.1) - unicorn (4.9.0) + unicorn (5.1.0) kgio (~> 2.6) - rack raindrops (~> 0.7) unicorn-worker-killer (0.4.4) get_process_mem (~> 0) @@ -813,7 +811,8 @@ DEPENDENCIES ace-rails-ap (~> 4.1.0) activerecord-nulldb-adapter activerecord-session_store (~> 1.0.0) - acts-as-taggable-on (~> 3.4) + activerecord_sane_schema_dumper (= 0.2) + acts-as-taggable-on (~> 4.0) addressable (~> 2.3.8) after_commit_queue (~> 1.3.0) akismet (~> 2.0) @@ -844,8 +843,9 @@ DEPENDENCIES creole (~> 0.5.0) d3_rails (~> 3.5.0) database_cleaner (~> 1.5.0) + deckar01-task_list (= 1.0.5) default_value_for (~> 3.0.0) - devise (~> 4.0) + devise (~> 4.2) devise-two-factor (~> 3.0.0) diffy (~> 3.0.3) doorkeeper (~> 4.2.0) @@ -855,7 +855,6 @@ DEPENDENCIES factory_girl_rails (~> 4.6.0) ffaker (~> 2.0.0) flay (~> 2.6.1) - flog (~> 4.3.2) fog-aws (~> 0.9) fog-azure (~> 0.0) fog-core (~> 1.40) @@ -870,9 +869,8 @@ DEPENDENCIES gemojione (~> 3.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) - github-markup (~> 1.5.0) - gitlab_git (~> 10.6.6) - gitlab_meta (= 7.0) + gitlab-markup (~> 1.5.0) + gitlab_git (~> 10.7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) @@ -881,7 +879,7 @@ DEPENDENCIES grape-entity (~> 0.4.2) haml_lint (~> 0.18.2) hamlit (~> 2.6.1) - health_check (~> 2.1.0) + health_check (~> 2.2.0) hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) httparty (~> 0.13.3) @@ -920,7 +918,7 @@ DEPENDENCIES omniauth-gitlab (~> 1.0.0) omniauth-google-oauth2 (~> 0.4.1) omniauth-kerberos (~> 0.3.0) - omniauth-saml (~> 1.6.0) + omniauth-saml (~> 1.7.0) omniauth-shibboleth (~> 1.2.0) omniauth-twitter (~> 1.2.0) omniauth_crowd (~> 2.2.0) @@ -943,19 +941,19 @@ DEPENDENCIES redis (~> 3.2) redis-namespace (~> 1.5.2) redis-rails (~> 4.0.0) - request_store (~> 1.3.0) + request_store (~> 1.3) rerun (~> 0.11.0) responders (~> 2.0) rouge (~> 2.0) rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.5.0) rspec-retry (~> 0.4.5) - rubocop (~> 0.42.0) + rubocop (~> 0.43.0) rubocop-rspec (~> 1.5.0) ruby-fogbugz (~> 0.2.1) - ruby-prof (~> 0.15.9) + ruby-prof (~> 0.16.2) sanitize (~> 2.0) - sass-rails (~> 5.0.0) + sass-rails (~> 5.0.6) scss_lint (~> 0.47.0) sdoc (~> 0.3.20) seed-fu (~> 2.3.5) @@ -964,10 +962,9 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 2.8.0) - sidekiq (~> 4.0) + sidekiq (~> 4.2) sidekiq-cron (~> 0.4.0) simplecov (= 0.12.0) - sinatra (~> 1.4.4) slack-notifier (~> 1.2.0) spinach-rails (~> 0.2.1) spinach-rerun-reporter (~> 0.0.2) @@ -975,23 +972,23 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) spring-commands-spinach (~> 1.1.0) spring-commands-teaspoon (~> 0.0.2) - sprockets (~> 3.6.0) - sprockets-es6 + sprockets (~> 3.7.0) + sprockets-es6 (~> 0.9.2) state_machines-activerecord (~> 0.4.0) sys-filesystem (~> 1.1.6) - task_list (~> 1.0.2) teaspoon (~> 1.1.0) teaspoon-jasmine (~> 2.2.0) test_after_commit (~> 0.4.2) thin (~> 1.7.0) timecop (~> 0.8.0) + truncato (~> 0.7.8) turbolinks (~> 2.5.0) u2f (~> 0.2.1) uglifier (~> 2.7.2) underscore-rails (~> 1.8.0) unf (~> 0.1.4) - unicorn (~> 4.9.0) - unicorn-worker-killer (~> 0.4.2) + unicorn (~> 5.1.0) + unicorn-worker-killer (~> 0.4.4) version_sorter (~> 2.1.0) virtus (~> 1.0.1) vmstat (~> 2.2) @@ -1000,4 +997,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.12.5 + 1.13.5 diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 92b5b552ec6e..9e03135e89cb 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.12.8"; + version = "8.13.5"; buildInputs = [ env ruby bundler tzdata git nodejs procps ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "1l2r3mjyra53wpq724d974zv9ax5hb1qrdsz4071b2p34s70gbl3"; + sha256 = "1ir52fdg81jawkfk03xj6c2j4lmw8sy4mwc25p024l0zpsg2gpz3"; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index a87d4f92c626..fc36db0d6038 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -71,6 +71,14 @@ }; version = "1.0.0"; }; + activerecord_sane_schema_dumper = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "122c7v7lvs0gwckvx2rar07waxnx1vv0lryz322nybb69d8vbhl6"; + type = "gem"; + }; + version = "0.2"; + }; activesupport = { source = { remotes = ["https://rubygems.org"]; @@ -80,13 +88,12 @@ version = "4.2.7.1"; }; acts-as-taggable-on = { - dependencies = ["activerecord"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bz0z8dlp3fjzah9y9b6rr9mkidsav9l4hdm51fnq1gd05yv3pr7"; + sha256 = "1h2y2zh4vrjf6bzdgvyq5a53a4gpr8xvq4a5rvq7fy1w43z4753s"; type = "gem"; }; - version = "3.5.0"; + version = "4.0.0"; }; addressable = { source = { @@ -97,7 +104,6 @@ version = "2.3.8"; }; after_commit_queue = { - dependencies = ["activerecord"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1jrhvj4335dsrj0xndbf7a7m2inbwbx1knc0bwgvmkk1w47l43s0"; @@ -130,7 +136,6 @@ version = "6.0.3"; }; asana = { - dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1560p13g57pl4xqkmhwn1vpqhm7mw9fwmmswk38k3i2r7g0b5y9z"; @@ -171,7 +176,6 @@ version = "1.0.0"; }; autoprefixer-rails = { - dependencies = ["execjs" "json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0m1w42ncz0p48r5hbyglayxkzrnplw18r99dc1ia2cb3nizkwllx"; @@ -188,7 +192,6 @@ version = "1.2.0"; }; axiom-types = { - dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; source = { remotes = ["https://rubygems.org"]; sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1"; @@ -261,7 +264,6 @@ version = "2.3.0"; }; better_errors = { - dependencies = ["coderay" "erubis"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0v0q8bdkqqlcsfqbk4wvc3qnz8an44mgz720v5f11a4nr413mjgf"; @@ -270,7 +272,6 @@ version = "1.0.1"; }; binding_of_caller = { - dependencies = ["debug_inspector"]; source = { remotes = ["https://rubygems.org"]; sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk"; @@ -279,7 +280,6 @@ version = "0.7.2"; }; bootstrap-sass = { - dependencies = ["autoprefixer-rails" "sass"]; source = { remotes = ["https://rubygems.org"]; sha256 = "12hhw42hk9clwfj6yz5v0c5p35wrn5yjnji7bnzsfs99vi2q00ld"; @@ -344,7 +344,6 @@ version = "2.6.2"; }; capybara-screenshot = { - dependencies = ["capybara" "launchy"]; source = { remotes = ["https://rubygems.org"]; sha256 = "17v1wihr3aqrxhrwswkdpdklj1xsfcaksblh1y8hixvm9bqfyz3y"; @@ -417,7 +416,6 @@ version = "1.1.0"; }; coercible = { - dependencies = ["descendants_tracker"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah"; @@ -434,7 +432,6 @@ version = "4.1.1"; }; coffee-script = { - dependencies = ["coffee-script-source" "execjs"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; @@ -475,7 +472,6 @@ version = "2.2.0"; }; crack = { - dependencies = ["safe_yaml"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; @@ -500,7 +496,6 @@ version = "1.4.1"; }; d3_rails = { - dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; sha256 = "12vxiiflnnkcxak2wmbajyf5wzmcv9wkl4drsp0am72azl8a6g9x"; @@ -540,6 +535,14 @@ }; version = "1.3.8"; }; + deckar01-task_list = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x2va9b7p2x82ind3cbk9dr4pk97c4g7vqccwzb20xdwdq0q4j91"; + type = "gem"; + }; + version = "1.0.5"; + }; default_value_for = { source = { remotes = ["https://rubygems.org"]; @@ -549,7 +552,6 @@ version = "3.0.2"; }; descendants_tracker = { - dependencies = ["thread_safe"]; source = { remotes = ["https://rubygems.org"]; sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79"; @@ -560,10 +562,10 @@ devise = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1i5glkxmn0ymj50pz05nh6xcffc9giqajgfg6qrcbs2n552hbr5k"; + sha256 = "045qw3186gkcm38wjbjhb7w2zycbqj85wfb1cdwvkqk8hf1a7dp0"; type = "gem"; }; - version = "4.1.1"; + version = "4.2.0"; }; devise-two-factor = { source = { @@ -606,7 +608,6 @@ version = "4.2.0"; }; dropzonejs-rails = { - dependencies = ["rails"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64"; @@ -623,7 +624,6 @@ version = "0.5.8"; }; email_spec = { - dependencies = ["launchy" "mail"]; source = { remotes = ["https://rubygems.org"]; sha256 = "00p1cc69ncrgg7m45va43pszip8anx5735w1lsb7p5ygkyw8nnpv"; @@ -712,7 +712,6 @@ version = "4.6.0"; }; faraday = { - dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6"; @@ -721,7 +720,6 @@ version = "0.9.2"; }; faraday_middleware = { - dependencies = ["faraday"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h"; @@ -730,7 +728,6 @@ version = "0.10.0"; }; faraday_middleware-multi_json = { - dependencies = ["faraday_middleware" "multi_json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0651sxhzbq9xfq3hbpmrp0nbybxnm9ja3m97k386m4bqgamlvz1q"; @@ -755,7 +752,6 @@ version = "1.9.10"; }; flay = { - dependencies = ["ruby_parser" "sexp_processor"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0zcp9nmnfqixdcqa2dzwwjy5np4n2n16bj25gw7bbzbjp9hqzhn6"; @@ -763,17 +759,7 @@ }; version = "2.6.1"; }; - flog = { - dependencies = ["ruby_parser" "sexp_processor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1asrcdj6gh5mxcimqak94jjyyi5cxnqn904lc8pmrljg1nv1bxpm"; - type = "gem"; - }; - version = "4.3.2"; - }; flowdock = { - dependencies = ["httparty" "multi_json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg"; @@ -814,7 +800,6 @@ version = "0.3.2"; }; fog-json = { - dependencies = ["fog-core" "multi_json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r"; @@ -847,7 +832,6 @@ version = "0.1.1"; }; fog-xml = { - dependencies = ["fog-core" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1576sbzza47z48p0k9h1wg3rhgcvcvdd1dfz3xx1cgahwr564fqa"; @@ -864,7 +848,6 @@ version = "4.6.1.0"; }; foreman = { - dependencies = ["thor"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq"; @@ -881,7 +864,6 @@ version = "0.2.5"; }; fuubar = { - dependencies = ["rspec" "ruby-progressbar"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0xwqs24y8s73aayh39si17kccsmr0bjgmi6jrjyfp7gkjb6iyhpv"; @@ -890,7 +872,6 @@ version = "2.0.0"; }; gemnasium-gitlab-service = { - dependencies = ["rugged"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1qv7fkahmqkah3770ycrxd0x2ais4z41hb43a0r8q8wcdklns3m3"; @@ -940,7 +921,6 @@ meta.priority = 10; # lower priority, exectuable conflicts with gitlab-markdown }; gitlab-flowdock-git-hook = { - dependencies = ["flowdock" "gitlab-grit" "multi_json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8"; @@ -967,21 +947,12 @@ gitlab_git = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1vg2k3nlws6ghbs80zy3v8yclsx61x36f17r0k8vwv1xwvfhyhgz"; + sha256 = "0nnr6dlqq30syab2g7yvffgzinj5c8n9q7fvr3d88ix8hsawjrjm"; type = "gem"; }; - version = "10.6.6"; - }; - gitlab_meta = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14vahv7gblcypbvip845sg3lvawf3kij61mkxz5vyfcv23niqvp9"; - type = "gem"; - }; - version = "7.0"; + version = "10.7.0"; }; gitlab_omniauth-ldap = { - dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1vbdyi57vvlrigyfhmqrnkw801x57fwa3gxvj1rj2bn9ig5186ri"; @@ -1038,7 +1009,6 @@ version = "0.15.0"; }; grape-entity = { - dependencies = ["activesupport" "multi_json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0hxghs2p9ncvdwhp6dwr1a74g552c49dd0jzy0szp4pg2xjbgjk8"; @@ -1081,13 +1051,12 @@ health_check = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jhm5342ngm2qfa1s6g0k09rszvb0h9jkxgda7dkwhg2v4cgj976"; + sha256 = "0y8nzhs7ccpvbmqrxw5vdyf5x4fv8356cb8r29h8m3rxd8r388r7"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.1"; }; hipchat = { - dependencies = ["httparty" "mimemagic"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k"; @@ -1096,7 +1065,6 @@ version = "1.5.2"; }; html-pipeline = { - dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1yckdlrn4v5d7bgl8mbffax16640pgg9ny693kqi4j7g17vx2q9l"; @@ -1113,7 +1081,6 @@ version = "4.3.4"; }; httparty = { - dependencies = ["json" "multi_xml"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2"; @@ -1146,7 +1113,6 @@ version = "0.11.1"; }; influxdb = { - dependencies = ["cause" "json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1vhg5nd88nwvfa76lqcczld916nljswwq6clsixrzi3js8ym9y1w"; @@ -1179,7 +1145,6 @@ version = "4.1.1"; }; jquery-turbolinks = { - dependencies = ["railties" "turbolinks"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1d23mnl3lgamk9ziw4yyv2ixck6d8s8xp4f9pmwimk0by0jq7xhc"; @@ -1188,7 +1153,6 @@ version = "2.1.0"; }; jquery-ui-rails = { - dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1gfygrv4bjpjd2c377lw7xzk1b77rxjyy3w6wl4bq1gkqvyrkx77"; @@ -1245,7 +1209,6 @@ version = "1.11.0"; }; launchy = { - dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; @@ -1286,7 +1249,6 @@ version = "8.0.0"; }; listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; source = { remotes = ["https://rubygems.org"]; sha256 = "182wd2pkf690ll19lx6zbk01a3rqkk5lwsyin6kwydl7lqxj5z3g"; @@ -1295,7 +1257,6 @@ version = "3.0.5"; }; loofah = { - dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8"; @@ -1304,7 +1265,6 @@ version = "2.0.3"; }; macaddr = { - dependencies = ["systemu"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b"; @@ -1505,7 +1465,6 @@ version = "1.4.1"; }; omniauth-azure-oauth2 = { - dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0qay454zvyas8xfnfkycqpjkafaq5pw4gaji176cdfw0blhviz0s"; @@ -1514,7 +1473,6 @@ version = "0.0.6"; }; omniauth-bitbucket = { - dependencies = ["multi_json" "omniauth" "omniauth-oauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1lals2z1yixffrc97zh7zn1jpz9l6vpb3alcp13im42dq9q0g845"; @@ -1523,7 +1481,6 @@ version = "0.0.2"; }; omniauth-cas3 = { - dependencies = ["addressable" "nokogiri" "omniauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "13swm2hi2z63nvb2bps6g41kki8kr9b5c7014rk8259bxlpflrk7"; @@ -1540,7 +1497,6 @@ version = "4.0.0"; }; omniauth-github = { - dependencies = ["omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1mbx3c8m1llhdxrqdciq8jh428bxj1nvf4yhziv2xqmqpjcqz617"; @@ -1549,7 +1505,6 @@ version = "1.1.2"; }; omniauth-gitlab = { - dependencies = ["omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; sha256 = "083yyc8612kq8ygd8y7s8lxg2d51jcsakbs4pa19aww67gcm72iz"; @@ -1566,7 +1521,6 @@ version = "0.4.1"; }; omniauth-kerberos = { - dependencies = ["omniauth-multipassword" "timfel-krb5-auth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "05xsv76qjxcxzrvabaar2bchv7435y8l2j0wk4zgchh3yv85kiq7"; @@ -1575,7 +1529,6 @@ version = "0.3.0"; }; omniauth-multipassword = { - dependencies = ["omniauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0qykp76hw80lkgb39hyzrv68hkbivc8cv0vbvrnycjh9fwfp1lv8"; @@ -1584,7 +1537,6 @@ version = "0.4.2"; }; omniauth-oauth = { - dependencies = ["oauth" "omniauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1n5vk4by7hkyc09d9blrw2argry5awpw4gbw1l4n2s9b3j4qz037"; @@ -1593,7 +1545,6 @@ version = "1.1.0"; }; omniauth-oauth2 = { - dependencies = ["oauth2" "omniauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0mskwlw5ibx9mz7ywqji6mm56ikf7mglbnfc02qhg6ry527jsxdm"; @@ -1604,13 +1555,12 @@ omniauth-saml = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xs7v08s34s2bpyd3i8i8kj73zqb6wgn51ix3pmcwsifns0c8npr"; + sha256 = "1garppa83v53yr9bwfx51v4hqwfr5h4aq3d39gn2fmysnfav7c1x"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; omniauth-shibboleth = { - dependencies = ["omniauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0a8pwy23aybxhn545357zdjy0hnpfgldwqk5snmz9kxingpq12jl"; @@ -1619,7 +1569,6 @@ version = "1.2.1"; }; omniauth-twitter = { - dependencies = ["json" "omniauth-oauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1hqjpb1zx0pp3s12c83pkpk4kkx41f001jc5n8qz0h3wll0ld833"; @@ -1628,7 +1577,6 @@ version = "1.2.1"; }; omniauth_crowd = { - dependencies = ["activesupport" "nokogiri" "omniauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7"; @@ -1637,7 +1585,6 @@ version = "2.2.3"; }; org-ruby = { - dependencies = ["rubypants"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk"; @@ -1654,7 +1601,6 @@ version = "0.5.0"; }; paranoia = { - dependencies = ["activerecord"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0z2smnnghjhcs4l5fkz9scs1kj0bvj2n8xmzcvw4rg9yprdnlxr0"; @@ -1665,10 +1611,10 @@ parser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0fxcs83z28wxn6bphbq5q40c1y5ab8zl8ww17jwkbi032wf6iik6"; + sha256 = "0l92rqcfy16y7kmnkil88c5mv3vj8pvhj0llbhv0avmhkaixhld1"; type = "gem"; }; - version = "2.3.1.2"; + version = "2.3.1.4"; }; pg = { source = { @@ -1727,7 +1673,6 @@ version = "1.9.2"; }; pry = { - dependencies = ["coderay" "method_source" "slop"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1x78rvp69ws37kwig18a8hr79qn36vh8g1fn75p485y3b3yiqszg"; @@ -1736,7 +1681,6 @@ version = "0.10.3"; }; pry-rails = { - dependencies = ["pry"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0a2iinvabis2xmv0z7z7jmh7bbkkngxj2qixfdg5m6qj9x8k1kx6"; @@ -1761,7 +1705,6 @@ version = "1.6.4"; }; rack-accept = { - dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936"; @@ -1770,7 +1713,6 @@ version = "0.4.5"; }; rack-attack = { - dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0ihic8ar2ddfv15p5gia8nqzsl3y7iayg5v4rmg72jlvikgsabls"; @@ -1787,7 +1729,6 @@ version = "0.4.0"; }; rack-mount = { - dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "09a1qfaxxsll1kbgz7z0q0nr48sfmfm7akzaviis5bjpa5r00ld2"; @@ -1804,7 +1745,6 @@ version = "1.2.3"; }; rack-protection = { - dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; @@ -1813,7 +1753,6 @@ version = "1.5.3"; }; rack-test = { - dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; @@ -1830,7 +1769,6 @@ version = "4.2.7.1"; }; rails-deprecated_sanitizer = { - dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj"; @@ -1839,7 +1777,6 @@ version = "1.0.3"; }; rails-dom-testing = { - dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1v8jl6803mbqpxh4hn0szj081q1a3ap0nb8ni0qswi7z4la844v8"; @@ -1848,7 +1785,6 @@ version = "1.0.7"; }; rails-html-sanitizer = { - dependencies = ["loofah"]; source = { remotes = ["https://rubygems.org"]; sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7"; @@ -1875,10 +1811,10 @@ raindrops = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1hv0xhr762axywr937czi92fs0x3zk7k22vg6f4i7rr8d05sp560"; + sha256 = "1syj5gdrgwzdqzc3p1bqg1wv6gn16s2iq8304mrglzhi7cyja73q"; type = "gem"; }; - version = "0.15.0"; + version = "0.17.0"; }; rake = { source = { @@ -1897,7 +1833,6 @@ version = "0.9.6"; }; rb-inotify = { - dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9"; @@ -1906,7 +1841,6 @@ version = "0.9.5"; }; rblineprof = { - dependencies = ["debugger-ruby_core_source"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0m58kdjgncwf0h1qry3qk5h4bg8sj0idykqqijqcrr09mxfd9yc6"; @@ -1915,7 +1849,6 @@ version = "0.3.6"; }; rdoc = { - dependencies = ["json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8"; @@ -1956,7 +1889,6 @@ version = "3.2.2"; }; redis-actionpack = { - dependencies = ["actionpack" "redis-rack" "redis-store"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1jjl6dhhpdapdaywq5iqz7z36mwbw0cn0m30wcc5wcbv7xmiiygw"; @@ -1965,7 +1897,6 @@ version = "4.0.1"; }; redis-activesupport = { - dependencies = ["activesupport" "redis-store"]; source = { remotes = ["https://rubygems.org"]; sha256 = "10y3kybz21n2z11478sf0cp4xzclvxf0b428787brmgpc6i7p7zg"; @@ -1974,7 +1905,6 @@ version = "4.1.5"; }; redis-namespace = { - dependencies = ["redis"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0rp8gfkznfxqzxk9s976k71jnljkh0clkrhnp6vgx46s5yhj9g25"; @@ -1983,7 +1913,6 @@ version = "1.5.2"; }; redis-rack = { - dependencies = ["rack" "redis-store"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1y1mxx8gn0krdrpwllv7fqsbvki1qjnb2dz8b4q9gwc326829gk8"; @@ -1992,7 +1921,6 @@ version = "1.5.0"; }; redis-rails = { - dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0igww7hb58aq74mh50dli3zjg78b54y8nhd0h1h9vz4vgjd4q8m7"; @@ -2001,7 +1929,6 @@ version = "4.0.0"; }; redis-store = { - dependencies = ["redis"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0gf462p0wx4hn7m1m8ghs701n6xx0ijzm5cff9xfagd2s6va145m"; @@ -2018,7 +1945,6 @@ version = "1.3.1"; }; rerun = { - dependencies = ["listen"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0av239bpmy55fdx4qaw9n71aapjy2myr51h5plzjxsyr0fdwn1xq"; @@ -2027,13 +1953,12 @@ version = "0.11.0"; }; responders = { - dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i00bxp8fa67rzl50wfiaw16w21j5d5gwjjkdiwr0sw9q6ixmpz1"; + sha256 = "16h343srb6msivc2mpm1dbihsmniwvyc9jk3g4ip08g9fpmxfc2i"; type = "gem"; }; - version = "2.1.1"; + version = "2.3.0"; }; rinku = { source = { @@ -2060,7 +1985,6 @@ version = "2.0.6"; }; rqrcode = { - dependencies = ["chunky_png"]; source = { remotes = ["https://rubygems.org"]; sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb"; @@ -2069,7 +1993,6 @@ version = "0.7.0"; }; rqrcode-rails3 = { - dependencies = ["rqrcode"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg"; @@ -2136,10 +2059,10 @@ rubocop = { source = { remotes = ["https://rubygems.org"]; - sha256 = "064rh2fhr05mjgsmi1viljn9arcm2ggfaxkpk92ns9kf3ym7dz8v"; + sha256 = "0r2p4v6w5w1zx4skj9i3g3pshg3rykhgswimydrswp6nb8nkaphj"; type = "gem"; }; - version = "0.42.0"; + version = "0.43.0"; }; rubocop-rspec = { source = { @@ -2150,7 +2073,6 @@ version = "1.5.0"; }; ruby-fogbugz = { - dependencies = ["crack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm"; @@ -2161,10 +2083,10 @@ ruby-prof = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qvz8yclvxch3bmwh7wmnb5h8jsbmb8jmqcf94jjrakpcs2sc072"; + sha256 = "0y13gdcdajfgrkx5rc9pvb7bwkyximwl5yrhq05gkmhflzdr7kag"; type = "gem"; }; - version = "0.15.9"; + version = "0.16.2"; }; ruby-progressbar = { source = { @@ -2177,10 +2099,10 @@ ruby-saml = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qhma3cdmi9acpsn6r3x5mjjgfqxkhzxgy2pd3bc6rddghpa3x5l"; + sha256 = "1abhf16vbyzck4pv06qd5c59780glaf682ssjzpjwd9h9d7nqvl5"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.1"; }; ruby_parser = { source = { @@ -2239,7 +2161,6 @@ version = "1.0.4"; }; sanitize = { - dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; @@ -2258,10 +2179,10 @@ sass-rails = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ag66qa1f4agghdmnmn199s4sp7x54msa3abs31vl89ncbdf933i"; + sha256 = "0iji20hb8crncz14piss1b29bfb6l89sz3ai5fny3iw39vnxkdcb"; type = "gem"; }; - version = "5.0.5"; + version = "5.0.6"; }; sawyer = { source = { @@ -2280,7 +2201,6 @@ version = "0.47.1"; }; sdoc = { - dependencies = ["json" "rdoc"]; source = { remotes = ["https://rubygems.org"]; sha256 = "17l8qk0ld47z4h5avcnylvds8nc6dp25zc64w23z8li2hs341xf2"; @@ -2297,7 +2217,6 @@ version = "2.3.6"; }; select2-rails = { - dependencies = ["thor"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj"; @@ -2330,7 +2249,6 @@ version = "4.7.0"; }; sham_rack = { - dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0zs6hpgg87x5jrykjxgfp2i7m5aja53s5kamdhxam16wki1hid3i"; @@ -2339,7 +2257,6 @@ version = "1.3.6"; }; shoulda-matchers = { - dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0d3ryqcsk1n9y35bx5wxnqbgw4m8b3c79isazdjnnbg8crdp72d0"; @@ -2350,13 +2267,12 @@ sidekiq = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0j0yz9fv79d7sasz7lsrb9fnymxg58jpykgr58r73nv2v8nsx1nm"; + sha256 = "1l9ji9lmgvgc9p45js3hrbpv6fj0kvrvx5lkrjd751g8r3h98z0l"; type = "gem"; }; - version = "4.1.4"; + version = "4.2.1"; }; sidekiq-cron = { - dependencies = ["redis-namespace" "rufus-scheduler" "sidekiq"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0xnbvh8kjv6954vsiwfcpp7bn8sgpwvnyapnq7b94w8h7kj3ykqy"; @@ -2380,14 +2296,6 @@ }; version = "0.10.0"; }; - sinatra = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp"; - type = "gem"; - }; - version = "1.4.7"; - }; slack-notifier = { source = { remotes = ["https://rubygems.org"]; @@ -2405,7 +2313,6 @@ version = "3.6.0"; }; spinach = { - dependencies = ["colorize" "gherkin-ruby" "json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0phfjs4iw2iqxdaljzwk6qxmi2x86pl3hirmpgw2pgfx76wfx688"; @@ -2414,7 +2321,6 @@ version = "0.8.10"; }; spinach-rails = { - dependencies = ["capybara" "railties" "spinach"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1nfacfylkncfgi59g2wga6m4nzdcjqb8s50cax4nbx362ap4bl70"; @@ -2439,7 +2345,6 @@ version = "1.7.2"; }; spring-commands-rspec = { - dependencies = ["spring"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2"; @@ -2456,7 +2361,6 @@ version = "1.1.0"; }; spring-commands-teaspoon = { - dependencies = ["spring"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1g7n4m2s9d0frh7y1xibzpphqajfnx4fvgfc66nh545dd91w2nqz"; @@ -2467,18 +2371,18 @@ sprockets = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0flynmaaxa53pv15x7kcxr7z6h1hn7ifrxk13dfhhvh6h38jnzkv"; + sha256 = "0jzsfiladswnzbrwqfiaj1xip68y58rwx0lpmj907vvq47k87gj1"; type = "gem"; }; - version = "3.6.3"; + version = "3.7.0"; }; sprockets-es6 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17hjwpzkdg5dsgzky7hmaly2jih8867ya35855p3lxqpd3gyfpny"; + sha256 = "0508h3vnjz08c64k11za6cqnbvvifka9pmdrycamzzjd4dmf10y3"; type = "gem"; }; - version = "0.9.0"; + version = "0.9.2"; }; sprockets-rails = { source = { @@ -2544,15 +2448,6 @@ }; version = "2.6.5"; }; - task_list = { - dependencies = ["html-pipeline"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1iv1fizb04463c4mp4gxd8v0414fhvmiwvwvjby5b9qq79d8zwab"; - type = "gem"; - }; - version = "1.0.2"; - }; teaspoon = { source = { remotes = ["https://rubygems.org"]; @@ -2562,7 +2457,6 @@ version = "1.1.5"; }; teaspoon-jasmine = { - dependencies = ["teaspoon"]; source = { remotes = ["https://rubygems.org"]; sha256 = "00wygrv1jm4aj15p1ab9d5fdrj6y83kv26xgp52mx4lp78h2ms9q"; @@ -2579,7 +2473,6 @@ version = "0.7.7"; }; test_after_commit = { - dependencies = ["activerecord"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1fzg8qan6f0n0ynr594bld2k0rwwxj99yzhiga2f3pkj9ina1abb"; @@ -2635,8 +2528,15 @@ }; version = "0.8.3"; }; + truncato = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09ngwz2mpfsi1ms94j7nmms4kbd5sgcqv5dshrbwaqf585ja7cm5"; + type = "gem"; + }; + version = "0.7.8"; + }; turbolinks = { - dependencies = ["coffee-rails"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1ddrx25vvvqxlz4h59lrmjhc2bfwxf4bpicvyhgbpjd48ckj81jn"; @@ -2645,7 +2545,6 @@ version = "2.5.3"; }; tzinfo = { - dependencies = ["thread_safe"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; @@ -2662,7 +2561,6 @@ version = "0.2.1"; }; uglifier = { - dependencies = ["execjs" "json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0mzs64z3m1b98rh6ssxpqfz9sc87f6ml6906b0m57vydzfgrh1cz"; @@ -2679,7 +2577,6 @@ version = "1.8.3"; }; unf = { - dependencies = ["unf_ext"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; @@ -2706,13 +2603,12 @@ unicorn = { source = { remotes = ["https://rubygems.org"]; - sha256 = "02xgk7gajnp8zqd2wvk1hbbwz7czlbpk29ahs9ph0jprsssnzzrv"; + sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v"; type = "gem"; }; - version = "4.9.0"; + version = "5.1.0"; }; unicorn-worker-killer = { - dependencies = ["get_process_mem" "unicorn"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0rrdxpwdsapx47axjin8ymxb4f685qlpx8a26bql4ay1559c3gva"; @@ -2729,7 +2625,6 @@ version = "1.10.0"; }; uuid = { - dependencies = ["macaddr"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0gr2mxg27l380wpiy66mgv9wq02myj6m4gmp6c4g1vsbzkh0213v"; @@ -2746,7 +2641,6 @@ version = "2.1.0"; }; virtus = { - dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"]; source = { remotes = ["https://rubygems.org"]; sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk"; @@ -2779,7 +2673,6 @@ version = "2.3.0"; }; webmock = { - dependencies = ["addressable" "crack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1p7hqdxk5359xwp59pcx841fhbnqx01ra98rnwhdyz61nrc6piv3"; @@ -2788,7 +2681,6 @@ version = "1.21.0"; }; websocket-driver = { - dependencies = ["websocket-extensions"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1v39w1ig6ps8g55xhz6x1w53apl17ii6kpy0jg9249akgpdvb0k9"; @@ -2805,7 +2697,6 @@ version = "0.1.2"; }; wikicloth = { - dependencies = ["builder" "expression_parser" "rinku"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s"; @@ -2822,7 +2713,6 @@ version = "1.1.5"; }; xpath = { - dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e51f081437f4..302bac55320a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1816,15 +1816,11 @@ in gitinspector = callPackage ../applications/version-management/gitinspector { }; - gitlab = callPackage ../applications/version-management/gitlab { - ruby = ruby_2_2; - }; + gitlab = callPackage ../applications/version-management/gitlab { }; gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; - gitlab-shell = callPackage ../applications/version-management/gitlab-shell { - ruby = ruby_2_2; - }; + gitlab-shell = callPackage ../applications/version-management/gitlab-shell { }; gitlab-workhorse = callPackage ../applications/version-management/gitlab-workhorse { }; From 3d768171e0e7d93324b18d28ab30ed40be6be4c4 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Thu, 10 Nov 2016 08:52:01 +0100 Subject: [PATCH 0133/1749] pythonPackages.tensorflow: update sha256 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9560205004b8..63b948d798d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30425,7 +30425,7 @@ in { "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; sha256 = if stdenv.isDarwin then "1gjybh3j3rn34bzhsxsfdbqgsr4jh50qyx2wqywvcb24fkvy40j9" else - "15v7iyry8bmp5wcc1rr4bkp80f3887rl99zqf8pys5bad4gldbkh"; + "0g05pa4z6kdy0giz7hjgjgwf4zzr5l8cf1zh247ymixlikn3fnpx"; }; propagatedBuildInputs = with self; [ numpy six protobuf3_0_0b2 pkgs.swig mock]; From 840f2987d181fb8e501ac7138b9d9e8fac605820 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 03:02:16 +0100 Subject: [PATCH 0134/1749] ocaml-uutf: 0.9.3 -> 0.9.4 This commit also refactors the expression --- .../ocaml-modules/uutf/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index fda630114ed6..a08e0ccbf74e 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,32 +1,36 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner}: let pname = "uutf"; webpage = "http://erratique.ch/software/${pname}"; in -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; +buildOcaml rec { + name = pname; + version = "0.9.4"; -stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; - version = "0.9.3"; + minimumSupportedOcamlVersion = "4.00.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0xvq20knmq25902ijpbk91ax92bkymsqkbfklj1537hpn64lydhz"; + sha256 = "1f71fyawxal42x6g82539bv0ava2smlar6rmxxz1cyq3l0i6fw0k"; }; - buildInputs = [ ocaml findlib ocamlbuild opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = "./pkg/build true"; + buildPhase = '' + ocaml pkg/build.ml \ + native=true \ + native-dynlink=true \ + cmdliner=true + ''; installPhase = '' - opam-installer --script --prefix=$out ${pname}.install > install.sh - sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ + opam-installer --prefix=$out --script ${pname}.install | sh + ln -s $out/lib/uutf $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { From 1414170edbab7b19a31d99b65545390e25977b53 Mon Sep 17 00:00:00 2001 From: Jaanus Torp Date: Thu, 10 Nov 2016 10:20:08 +0000 Subject: [PATCH 0135/1749] Fixed unavailable Spotify version --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 0cc0740eddbf..c9139a8c2276 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux"; let # Please update the stable branch! - version = "1.0.38.171.g5e1cd7b2-22"; + version = "1.0.42.151.g19de0aa6-74"; deps = [ alsaLib @@ -51,7 +51,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0mhrbcw92g11czwcclnbwz1pk1jgap4xlya7dqsrcyb50azmv450"; + sha256 = "905c0c87091855c9d5d354ebeca9fb3951ff60c08f0dfc1c1898bf66cc8acd15"; }; buildInputs = [ dpkg makeWrapper ]; From 0c726497a221b960c9b019708d6e05affa8165a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Thu, 10 Nov 2016 12:43:36 +0100 Subject: [PATCH 0136/1749] maintainers: added mguentner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b15f4542fb55..39f50d8433c3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -273,6 +273,7 @@ mdaiter = "Matthew S. Daiter "; meditans = "Carlo Nucera "; meisternu = "Matt Miemiec "; + mguentner = "Maximilian Güntner "; mic92 = "Jörg Thalheim "; michaelpj = "Michael Peyton Jones "; michalrus = "Michal Rus "; From ec99fb434f97ca52d285d02ca63d833766fabcab Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Thu, 10 Nov 2016 17:41:20 +0300 Subject: [PATCH 0137/1749] dtrx: add archivers to dependencies --- pkgs/tools/compression/dtrx/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index d412a4e433ef..4e3f7d3d0dbd 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -1,6 +1,17 @@ -{stdenv, fetchurl, pythonPackages}: +{stdenv, lib, fetchurl, pythonPackages +, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield +, bzip2, xz, lzip +# unzip is handled by p7zip +, unzipSupport ? false +, unrarSupport ? false }: -pythonPackages.buildPythonApplication rec { +let + archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip p7zip cabextract unshield ] + ++ lib.optional (unzipSupport) unzip + ++ lib.optional (unrarSupport) unrar + ++ [ bzip2 xz lzip ]); + +in pythonPackages.buildPythonApplication rec { name = "dtrx-${version}"; version = "7.1"; @@ -9,6 +20,10 @@ pythonPackages.buildPythonApplication rec { sha1 = "05cfe705a04a8b84571b0a5647cd2648720791a4"; }; + postInstall = '' + wrapProgram "$out/bin/dtrx" --prefix PATH : "${archivers}" + ''; + meta = with stdenv.lib; { description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives"; homepage = "http://brettcsmith.org/2007/dtrx/"; From db402312a32edd3b5ea39c4d2ef35a3a56d7e4e4 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 27 Oct 2016 23:35:55 +0200 Subject: [PATCH 0138/1749] emacs: fix segfaults in 25.1 --- pkgs/applications/editors/emacs/default.nix | 22 ++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 08223ef82ef0..57ecebc7565a 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -34,7 +34,27 @@ stdenv.mkDerivation rec { sha256 = "0cwgyiyymnx4xdg99dm2drfxcyhy2jmyf0rkr9fwj9mwwf77kwhr"; }; - patches = lib.optional stdenv.isDarwin ./at-fdcwd.patch; + patches = (lib.optional stdenv.isDarwin ./at-fdcwd.patch) ++ [ + ## Fixes a segfault in emacs 25.1 + ## http://lists.gnu.org/archive/html/emacs-devel/2016-10/msg00917.html + ## https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24358 + (fetchurl { + url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=9afea93ed536fb9110ac62b413604cf4c4302199; + sha256 = "1iifyfqh7qfdfsrpqgz2l7z0l7alvma57jlklyq258qyjg0pc8n4"; }) + (fetchurl { + url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=71ca4f6a43bad06192cbc4bb8c7a2d69c179b7b0; + sha256 = "0vadqvcigca0j891yis1mhjn18rg4l9qj621q6vzip46ka6qig0d"; }) + (fetchurl { + url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=1047496722a58ef5b736dae64d32adeb58c5055c; + sha256 = "01lfa89qw7y0spcy57hm1ymijb57i6kvhb9z9impcxwza60lbi7b"; }) + (fetchurl { + url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=96ac0c3ebce825e60595794f99e703ec8302e240; + sha256 = "0bmkrm356fbwc8wsiqh2w706mq5r9q4ic4m8vzdj099ihnf121nn"; }) + (fetchurl { + url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=43986d16fb6ad78a627250e14570ea70bdb1f23a; + sha256 = "0kp8dgs7fjgvidhm2y84jrxad78mxi0c47jhyszj5644qqxm47cr"; + }) + ]; nativeBuildInputs = [ pkgconfig ] ++ lib.optionals srcRepo [ autoconf automake texinfo ]; From d1dba6e08338e571acd17e7aa78ad7804ea03bb4 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 3 Nov 2016 10:52:59 +0100 Subject: [PATCH 0139/1749] emacs: add selinux capability --- pkgs/applications/editors/emacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 57ecebc7565a..4f62d0963c03 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif -, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls +, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK2 ? true, gtk2 ? null @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ++ lib.optionals srcRepo [ autoconf automake texinfo ]; buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] + [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext libselinux ] ++ lib.optional stdenv.isLinux dbus ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft From ba5f7673c6cb72e607b4b3673faa75911ef15beb Mon Sep 17 00:00:00 2001 From: Stefan Goetz Date: Thu, 10 Nov 2016 16:30:13 +0100 Subject: [PATCH 0140/1749] youtube-dl: 2016-11-04 -> 2016-11-08.1 (#20292) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index d1ba3ced99bc..a2dd91e83bc9 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.11.04"; + version = "2016.11.08.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "9622b29b81587278a00e39e4206e7c52555d240cbbb44242f237660169e8d531"; + sha256 = "95d45438254c949952127b269451da861682fb06a7ef62b5f5dc75bc40bfaeeb"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From d48846756f3eba1f0e8fd772e2ea06d51604a6ee Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 10 Nov 2016 05:19:51 +0100 Subject: [PATCH 0141/1749] chromium: fix nix syntax highlighting for emacs --- pkgs/applications/networking/browsers/chromium/update.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix index 23f06569fa95..3b9ea3966473 100644 --- a/pkgs/applications/networking/browsers/chromium/update.nix +++ b/pkgs/applications/networking/browsers/chromium/update.nix @@ -64,7 +64,7 @@ in rec { csv2nix = name: src: import (runCommand "${name}.nix" { src = builtins.fetchurl src; } '' - esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; } + esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; } # ohai emacs " IFS=, read -r -a headings <<< "$(head -n1 "$src")" echo "[" > "$out" tail -n +2 "$src" | while IFS=, read -r -a line; do From 5dee508acff13d3f54443565a0af8dde4d3217b1 Mon Sep 17 00:00:00 2001 From: James Cunningham Date: Thu, 10 Nov 2016 16:24:45 +0000 Subject: [PATCH 0142/1749] vim plugins: add dracula theme --- pkgs/misc/vim-plugins/default.nix | 10 ++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 11 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index f9ea101d3eb0..2cd10593aeb4 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -520,6 +520,16 @@ rec { }; + dracula = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "dracula-2016-09-21"; + src = fetchgit { + url = "git://github.com/dracula/vim"; + rev = "926dfbab01128322f6326bdd10de2856b1fa3232"; + sha256 = "1kqd367qa2dnz3qf10lyw7hacahylc94axc6f6f5nw4cklm1g8yv"; + }; + dependencies = []; + }; + vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-jade-2016-10-31"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 263970be386a..b7e33a71ff83 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -35,6 +35,7 @@ "github:ctrlpvim/ctrlp.vim" "github:derekelkins/agda-vim" "github:digitaltoad/vim-jade" +"github:dracula/vim" "github:eagletmt/neco-ghc" "github:eikenb/acp" "github:elmcast/elm-vim" From 674eb5ddf0771de511499504024c7e1d0717797d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Nov 2016 17:52:12 +0100 Subject: [PATCH 0143/1749] nlohmann_json: 2.0.3 -> 2.0.7 --- pkgs/development/libraries/nlohmann_json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index dcc0c781ee0e..15ddbdaedef4 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "2.0.3"; + version = "2.0.7"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "192mg2y93g9q0jdn3fdffydpxk19nsrcv92kfip6srkdkwja18ri"; + sha256 = "03jklvlcsms09p79qz9piqrdy2vhn4rkwidwfgq6cpxm6anqyqjh"; }; nativeBuildInputs = [ cmake ]; From b15dec170afa5f0e9e86caf938646d24a4407da5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Nov 2016 09:34:57 +0100 Subject: [PATCH 0144/1749] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/ea775f0608816e429b5e3c44060b66c6003c27a4. --- .../haskell-modules/hackage-packages.nix | 1212 ++++++++++++++--- 1 file changed, 1036 insertions(+), 176 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 45839074b79b..728684fd028b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9575,6 +9575,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "IPv6Addr_0_6_2_0" = callPackage + ({ mkDerivation, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "0.6.2.0"; + sha256 = "c0123cbacaba0266ea6eed1cf0ceb0cf323600e9eaa0ca855090edae0b085926"; + libraryHaskellDepends = [ + attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + homepage = "https://github.com/MichelBoucey/IPv6Addr"; + description = "Library to deal with IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "IcoGrid" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -15669,6 +15689,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Spintax_0_2_0_0" = callPackage + ({ mkDerivation, attoparsec, base, extra, mwc-random, text }: + mkDerivation { + pname = "Spintax"; + version = "0.2.0.0"; + sha256 = "33b5e8e7d3e41ef5a8b008e2a1084c23b57e26af147f5158dca59256b875336a"; + libraryHaskellDepends = [ attoparsec base extra mwc-random text ]; + homepage = "https://github.com/MichelBoucey/spintax"; + description = "Random text generation based on spintax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Spock" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, containers , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect @@ -17943,10 +17976,8 @@ self: { }: mkDerivation { pname = "XSaiga"; - version = "1.1.0.0"; - sha256 = "580f29b238c9195613f836eea693a937ba1ad00ea4591bbb7cb1a6a2032f02fd"; - revision = "4"; - editedCabalFile = "0cd366fd1401a0c35d4b127ef70b7c26447b6ab2c6c5cb4b0c8b4b4b654e27b2"; + version = "1.3.0.1"; + sha256 = "a913eac19f76759271bc331084773e04f4d6d16dd70190e10bd9403e51cdaad2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18377,7 +18408,7 @@ self: { description = "Bindings for ABC, A System for Sequential Synthesis and Verification"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) abc;}; + }) {abc = null;}; "abcnotation" = callPackage ({ mkDerivation, base, parsec, prettify, process, semigroups }: @@ -26709,6 +26740,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "asciidiagram_1_3_3" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative + , rasterific-svg, svg-tree, text, vector + }: + mkDerivation { + pname = "asciidiagram"; + version = "1.3.3"; + sha256 = "694948f5f408aa7dfcab17ffefb74e413f1d3dacf2c523bfbf9ecaf972645f18"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers FontyFruity JuicyPixels lens linear mtl + rasterific-svg svg-tree text vector + ]; + executableHaskellDepends = [ + base bytestring directory filepath FontyFruity JuicyPixels + optparse-applicative rasterific-svg svg-tree text + ]; + description = "Pretty rendering of Ascii diagram into svg or png"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "asic" = callPackage ({ mkDerivation, asil, base, bytestring, utf8-string }: mkDerivation { @@ -33533,6 +33588,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blosum_0_1_1_3" = callPackage + ({ mkDerivation, base, containers, fasta, lens + , optparse-applicative, pipes, pipes-text, split, text, text-show + }: + mkDerivation { + pname = "blosum"; + version = "0.1.1.3"; + sha256 = "bff68ec89bf8f7c70b18a8d13df8b9e464eea6168ec3df935f7d3391e6196de1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers fasta lens text text-show + ]; + executableHaskellDepends = [ + base containers fasta optparse-applicative pipes pipes-text split + text + ]; + homepage = "http://github.com/GregorySchwartz/blosum#readme"; + description = "BLOSUM generator"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bloxorz" = callPackage ({ mkDerivation, base, GLFW, OpenGL }: mkDerivation { @@ -37335,6 +37413,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "carte" = callPackage + ({ mkDerivation, base, filepath, mtl, network, optparse-applicative + , random, semigroups, time, transformers, tuple + }: + mkDerivation { + pname = "carte"; + version = "0.1.0.0"; + sha256 = "3a6a40c11fa4544082a752630e381b89e9a16b305f967fcf0ff6eb8f358b5136"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base filepath mtl network optparse-applicative random semigroups + time transformers tuple + ]; + homepage = "https://github.com/m1dnight/carte"; + description = "Carte: A commandline pastebin server"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "cartel" = callPackage ({ mkDerivation, base, directory, filepath, multiarg , optparse-applicative, pretty-show, process, QuickCheck, random @@ -38353,6 +38450,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cereal_0_5_4_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "cereal"; + version = "0.5.4.0"; + sha256 = "daca6c5aeff21ca233bebe006c158b0e4421b239c722768b568fca9b32cafee7"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim + ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + homepage = "https://github.com/GaloisInc/cereal"; + description = "A binary serialization library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cereal-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, HUnit, mtl , resourcet, transformers @@ -40619,6 +40737,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cli-builder" = callPackage + ({ mkDerivation, base, doctest, either, exceptions, filemanip + , hspec, optparse-applicative, QuickCheck, transformers + }: + mkDerivation { + pname = "cli-builder"; + version = "0.1.0"; + sha256 = "0a72dbaa461d913c4cb8e0315d00148e9106da9558281bf803b3fbad33ad24e5"; + libraryHaskellDepends = [ + base either exceptions optparse-applicative transformers + ]; + testHaskellDepends = [ base doctest filemanip hspec QuickCheck ]; + homepage = "https://github.com/uecmma/haskell-library-collections/tree/master/cli-builder"; + description = "Simple project template from stack"; + license = stdenv.lib.licenses.mit; + }) {}; + "click-clack" = callPackage ({ mkDerivation, base, containers, GLFW, Hipmunk, MonadRandom, mtl , OpenGL, random, StateVar, transformers @@ -41355,8 +41490,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "code-page"; - version = "0.1"; - sha256 = "543968422a3bbccdeddb1fe7258ef28ed7fb87c839da817c4d7935a9a2f20653"; + version = "0.1.1"; + sha256 = "16b8b802bca21b71dd782560978b7ac88866c129df83b760e9059a7da04d70f7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/RyanGlScott/code-page"; @@ -43317,6 +43452,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-extra_1_1_14" = callPackage + ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring + , bytestring-builder, conduit, directory, exceptions, filepath + , hspec, monad-control, network, primitive, process, QuickCheck + , resourcet, stm, streaming-commons, text, transformers + , transformers-base + }: + mkDerivation { + pname = "conduit-extra"; + version = "1.1.14"; + sha256 = "6f3abc94f28fb577fc03383ba477fe4f2635cb14fed2f90c7520e1331dc343c6"; + libraryHaskellDepends = [ + async attoparsec base blaze-builder bytestring conduit directory + exceptions filepath monad-control network primitive process + resourcet stm streaming-commons text transformers transformers-base + ]; + testHaskellDepends = [ + async attoparsec base blaze-builder bytestring bytestring-builder + conduit exceptions hspec process QuickCheck resourcet stm + streaming-commons text transformers transformers-base + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Batteries included conduit: adapters for common libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-find" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath @@ -44590,23 +44752,23 @@ self: { }) {}; "convert-annotation" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, containers, HTTP - , lens, lens-aeson, optparse-generic, pipes, pipes-bytestring - , pipes-csv, safe, text, wreq + ({ mkDerivation, aeson, base, bytestring, cassava, containers + , deepseq, HTTP, inline-r, lens, lens-aeson, optparse-generic + , pipes, pipes-bytestring, pipes-csv, safe, text, vector, wreq }: mkDerivation { pname = "convert-annotation"; - version = "0.2.0.1"; - sha256 = "93db09c63eed3c744673d89e20560c028f6e424396933d9a67fb49f78a764449"; + version = "0.5.0.0"; + sha256 = "946e3b0961a64fe7c3a8ffe28c8f87675a4f37000f3a4a7431f9b9c1af7dca67"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers HTTP lens lens-aeson safe text - wreq + aeson base bytestring containers deepseq HTTP inline-r lens + lens-aeson safe text wreq ]; executableHaskellDepends = [ - base bytestring cassava lens optparse-generic pipes - pipes-bytestring pipes-csv text + base bytestring cassava inline-r lens optparse-generic pipes + pipes-bytestring pipes-csv text vector ]; homepage = "http://github.com/GregorySchwartz/convert-annotation#readme"; description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases"; @@ -46051,6 +46213,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "criterion_1_1_4_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring + , cassava, code-page, containers, deepseq, directory, filepath + , Glob, hastache, HUnit, js-flot, js-jquery, mtl, mwc-random + , optparse-applicative, parsec, QuickCheck, statistics, tasty + , tasty-hunit, tasty-quickcheck, text, time, transformers + , transformers-compat, vector, vector-algorithms + }: + mkDerivation { + pname = "criterion"; + version = "1.1.4.0"; + sha256 = "53a243fc759ed3100e71f96a5f6649658d076d91d52ce2853a6f8587aa3cfa76"; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base binary bytestring cassava code-page + containers deepseq directory filepath Glob hastache js-flot + js-jquery mtl mwc-random optparse-applicative parsec statistics + text time transformers transformers-compat vector vector-algorithms + ]; + testHaskellDepends = [ + aeson base bytestring HUnit QuickCheck statistics tasty tasty-hunit + tasty-quickcheck vector + ]; + homepage = "http://www.serpentine.com/criterion"; + description = "Robust, reliable performance measurement and analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "criterion-plus" = callPackage ({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th , monad-control, mtl, optparse-applicative, placeholders @@ -47308,14 +47498,19 @@ self: { inherit (pkgs) st; util = null;}; "cufft" = callPackage - ({ mkDerivation, base, c2hs, cuda }: + ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath + , template-haskell + }: mkDerivation { pname = "cufft"; - version = "0.1.2.2"; - sha256 = "7ce52f10a05bd5064466dde644e0663abbc9eb3cfe0026531cfc04c1c8302bec"; + version = "0.7.5.0"; + sha256 = "09bd838815a521b21b971c43e1eb0b79dfe54d848a3cf9d0137f3cdb414e1171"; + setupHaskellDepends = [ + base Cabal directory filepath template-haskell + ]; libraryHaskellDepends = [ base cuda ]; libraryToolDepends = [ c2hs ]; - homepage = "http://github.com/robeverest/cufft"; + homepage = "https://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -50713,6 +50908,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "declarative_0_3_3" = callPackage + ({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types + , mighty-metropolis, mwc-probability, pipes, primitive + , speedy-slice, transformers + }: + mkDerivation { + pname = "declarative"; + version = "0.3.3"; + sha256 = "77d14c47453135ed727b0e8323244a68bb10b74a6c4bdaf5e24eb8a619683dee"; + libraryHaskellDepends = [ + base hasty-hamiltonian lens mcmc-types mighty-metropolis + mwc-probability pipes primitive speedy-slice transformers + ]; + testHaskellDepends = [ base mwc-probability ]; + homepage = "http://github.com/jtobin/declarative"; + description = "DIY Markov Chains"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "decode-utf8" = callPackage ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode }: @@ -52304,7 +52519,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-lib_1_4" = callPackage + "diagrams-lib_1_4_0_1" = callPackage ({ mkDerivation, active, adjunctions, array, base, cereal, colour , containers, data-default-class, deepseq, diagrams-core , diagrams-solve, directory, distributive, dual-tree, exceptions @@ -52316,8 +52531,8 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.4"; - sha256 = "5aed2074a86e6f6cc030ff062d8a3a743aaf8fa9d7d9cd14c6d7b0b1d32112ad"; + version = "1.4.0.1"; + sha256 = "5140b590c83047058d4253842ef1105b2ecf71d8dd72a280123c00b030a32dc6"; libraryHaskellDepends = [ active adjunctions array base cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -54453,6 +54668,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dns_2_0_9" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , bytestring-builder, conduit, conduit-extra, containers, doctest + , hspec, iproute, mtl, network, random, resourcet, safe, word8 + }: + mkDerivation { + pname = "dns"; + version = "2.0.9"; + sha256 = "b0d6c335dd9fdfa85e8389c67fc4a132d47ecb871c32332cb7858ceaa045fb8c"; + libraryHaskellDepends = [ + attoparsec base binary bytestring bytestring-builder conduit + conduit-extra containers iproute mtl network random resourcet safe + ]; + testHaskellDepends = [ + attoparsec base binary bytestring bytestring-builder conduit + conduit-extra containers doctest hspec iproute mtl network random + resourcet safe word8 + ]; + testTarget = "spec"; + description = "DNS library in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dnscache" = callPackage ({ mkDerivation, base, bytestring, containers, contstuff, dns , iproute, time @@ -54670,6 +54909,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "docopt_0_7_0_5" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers + , HUnit, parsec, split, template-haskell, text, th-lift + }: + mkDerivation { + pname = "docopt"; + version = "0.7.0.5"; + sha256 = "15790808a4896bbf0748c1c0f3ab63c07aea4621d95b93a39886813f829d05ee"; + libraryHaskellDepends = [ + base containers parsec template-haskell th-lift + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring containers HUnit parsec split + template-haskell text th-lift + ]; + homepage = "https://github.com/docopt/docopt.hs"; + description = "A command-line interface parser that will make you smile"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doctemplates" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, hspec, parsec, scientific, text, unordered-containers @@ -57478,8 +57738,8 @@ self: { }: mkDerivation { pname = "elm-export"; - version = "0.4.1.1"; - sha256 = "91e01639707349bf27a8aa9fffa8f30206fc1f50e269d6220403ec585a54e263"; + version = "0.5.0.2"; + sha256 = "13d1542351031f716508fdbe51876aa1cd10791b8b901cb8abdafb23981c14c4"; libraryHaskellDepends = [ base bytestring containers directory formatting mtl text time ]; @@ -69437,8 +69697,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.3.5.3"; - sha256 = "2999e909ccd45cee6ce517a74fa2ad8f3f06611ec9945c1c0b04f114ed6cbf26"; + version = "0.3.7.0"; + sha256 = "97918cba0952621a9bdb78718c824a6f43a0098f6e52335d35164a2f9c7d7afa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70062,8 +70322,8 @@ self: { }: mkDerivation { pname = "github-backup"; - version = "1.20160922"; - sha256 = "ea8036c3d9e40057bcf6c26fe925606bce8769277f0d2cfa394fd23a73df4242"; + version = "1.20161110"; + sha256 = "a6d0e48a3e6300f6633106ce28e8a7140856e924d78ef5330675410a10dcc245"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base hslogger MissingH ]; @@ -70214,8 +70474,8 @@ self: { }: mkDerivation { pname = "gitit"; - version = "0.12.1.1"; - sha256 = "c95f78a9d3060c6695c0d8f3f6e2cc01f64d0b535d8c6c3e591a9fd802d534a5"; + version = "0.12.2"; + sha256 = "160a928d992847823ab11982fa6465a4d80e59ce2a45e54e8a5e1838aba22b78"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70932,20 +71192,19 @@ self: { }) {}; "gloss-examples" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim - , GLFW-b, gloss, gloss-algorithms, gloss-raster, gloss-rendering - , random, repa, repa-algorithms, repa-io, vector + ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim, gloss + , gloss-algorithms, gloss-raster, random, repa, repa-algorithms + , repa-io, vector }: mkDerivation { pname = "gloss-examples"; - version = "1.10.2.3"; - sha256 = "0d25bd4a7ae5f69f68175476647d7d2dbfa987ebe33419166ff312b88c527df3"; + version = "1.10.2.4"; + sha256 = "ef1adf43066757d82adc16b4bde4f19a73653b837112ca41713ad16e230cac62"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bmp bytestring containers ghc-prim GLFW-b gloss - gloss-algorithms gloss-raster gloss-rendering random repa - repa-algorithms repa-io vector + base bmp bytestring containers ghc-prim gloss gloss-algorithms + gloss-raster random repa repa-algorithms repa-io vector ]; homepage = "http://gloss.ouroborus.net"; description = "Examples using the gloss library"; @@ -70990,8 +71249,8 @@ self: { }: mkDerivation { pname = "gloss-raster"; - version = "1.10.2.3"; - sha256 = "28485da7f90e37c778acba0232f3bba47a796dc62ed9cc02ebc43c7ddd7875b1"; + version = "1.10.2.4"; + sha256 = "f9875344822a1bbb4b937605e1b1483b25559c186db94033c97117f6148cdef5"; libraryHaskellDepends = [ base containers ghc-prim gloss gloss-rendering repa ]; @@ -71029,6 +71288,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-rendering_1_10_3_5" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: + mkDerivation { + pname = "gloss-rendering"; + version = "1.10.3.5"; + sha256 = "00c68518b2eb62f086257238034a18065faa7939369a5b2986c2f461e6a80d73"; + libraryHaskellDepends = [ + base bmp bytestring containers GLUT OpenGL + ]; + description = "Gloss picture data types and rendering functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-sodium" = callPackage ({ mkDerivation, base, gloss, sodium }: mkDerivation { @@ -75730,8 +76003,8 @@ self: { }: mkDerivation { pname = "gruff"; - version = "0.3.4"; - sha256 = "10ec0d3c842911815c204025a98642dc70e26d5dcb5c07c143277baad45d4947"; + version = "0.4"; + sha256 = "ae08f3b01988d5a7c3761ad43df355c5148b3511693eb86a83ab7879ccbcba0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ruff ]; @@ -75750,8 +76023,8 @@ self: { }: mkDerivation { pname = "gruff-examples"; - version = "0.3.1"; - sha256 = "e7fda6673da47266fcf7f37ecddc6b643e6bd5fbfefac4df2b6ec6fe115acf0b"; + version = "0.4"; + sha256 = "65c48c95c591f8fbda19e0dd19c74af1caaea979ecbdd5a4d8f793eba4d65482"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91038,6 +91311,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hquantlib_0_0_3_3" = callPackage + ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl + , hmatrix-special, HUnit, mersenne-random, parallel, QuickCheck + , statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, vector, vector-algorithms + }: + mkDerivation { + pname = "hquantlib"; + version = "0.0.3.3"; + sha256 = "208839f68a4af5f3b0e09214623c8e166f768a46b6cdc7369937ab73e8d78c28"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers hmatrix hmatrix-gsl hmatrix-special mersenne-random + parallel statistics time vector vector-algorithms + ]; + executableHaskellDepends = [ + base containers mersenne-random parallel + ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "http://github.com/paulrzcz/hquantlib.git"; + description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hquery" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, HUnit , parsec, test-framework, test-framework-hunit, text, xmlhtml @@ -91088,12 +91390,16 @@ self: { }) {}; "hreader-lens" = callPackage - ({ mkDerivation, base, hreader, hset, lens, profunctors }: + ({ mkDerivation, base, comonad, hreader, hset, lens, lens-action + , profunctors + }: mkDerivation { pname = "hreader-lens"; - version = "0.1.1.0"; - sha256 = "3b4cef769b0589e042c65876ebd343eb3a00d5ed449b8c6678604ac8b755d647"; - libraryHaskellDepends = [ base hreader hset lens profunctors ]; + version = "0.1.2.0"; + sha256 = "4d44e22ce21015f02007168bf07ae27d589e2e265a019b02410ba4b176d87728"; + libraryHaskellDepends = [ + base comonad hreader hset lens lens-action profunctors + ]; homepage = "http://github.com/dredozubov/hreader-lens"; description = "Optics for hreader package"; license = stdenv.lib.licenses.mit; @@ -95469,7 +95775,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_5_3_4" = callPackage + "http-client_0_5_4" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -95478,8 +95784,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.3.4"; - sha256 = "34e9fee9939668a056dc0f8193cfd1906209a51a31853e7ee57f5a7548dd2689"; + version = "0.5.4"; + sha256 = "f226b9dd4b7a6b5ef3becddd02baeabe3429b88584a42609ca3733c84bfe7300"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -95823,8 +96129,8 @@ self: { }: mkDerivation { pname = "http-dispatch"; - version = "0.5.0.2"; - sha256 = "1aee418e5b2a6798036a3b93272bbd577998274f1f00fc87012db80353f83b2f"; + version = "0.6.0.0"; + sha256 = "67a1cea38faec49d5e9708090e567b032e186e61fa391e15eb4b524ad14786e7"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive http-client http-client-tls http-types @@ -103208,6 +103514,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jason" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, text + , unordered-containers, vector + }: + mkDerivation { + pname = "jason"; + version = "0.1.0.1"; + sha256 = "a36a5f9cf93da0c03ede25407ce724c0b8f8e13285074f8bea57e50ea4e49d04"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers text unordered-containers vector + ]; + executableHaskellDepends = [ aeson base bytestring text ]; + testHaskellDepends = [ aeson base bytestring text ]; + homepage = "https://github.com/Lupino/jason#readme"; + description = "A fast JASONETTE-iOS JSON combinator library for haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "java-bridge" = callPackage ({ mkDerivation, base, bimap, containers, cpphs, directory , filepath, hinduce-missingh, hint, mtl, multimap, named-records @@ -105779,8 +106105,8 @@ self: { }: mkDerivation { pname = "keysafe"; - version = "0.20161022"; - sha256 = "2b6cc28f249b18dcdb0263ccb649598ddc8196f449e14130a20b0358711151a1"; + version = "0.20161107"; + sha256 = "ded1fd52ede4c574a4dd85ff60296f0e1bfe9b248857ee83025247790a03dfe7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -112517,19 +112843,25 @@ self: { "log" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , bloodhound, bytestring, cond, deepseq, exceptions, hpqtypes - , http-client, lifted-base, monad-control, monad-time, mtl - , old-locale, split, stm, text, text-show, time, transformers + , 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 , transformers-base, unordered-containers, vector }: mkDerivation { pname = "log"; - version = "0.5.3"; - sha256 = "2b948145b4c63f136fdac698e4c908d49029f0436ddceae3d7ae0a9544406143"; + version = "0.5.4"; + sha256 = "54dbe118a7bb4cc54b9a894859bb9b0e411f9b8f5f5205fe8bd2c0d079ef1962"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring cond deepseq exceptions hpqtypes http-client lifted-base - monad-control monad-time mtl old-locale split stm text text-show - time transformers transformers-base unordered-containers vector + 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 + process random tasty tasty-hunit text time transformers ]; homepage = "https://github.com/scrive/log"; description = "Structured logging solution with multiple backends"; @@ -112579,6 +112911,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "log-utils" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, data-default + , exceptions, hpqtypes, http-types, invariant, kontra-config + , lifted-base, log, monad-control, random, text, time, transformers + , transformers-base, unjson, vector, wai, warp + }: + mkDerivation { + pname = "log-utils"; + version = "0.2.2"; + sha256 = "7fe12350c66debb33f6bf348c34ee2d046931035cf93dac2c13d76294eed3688"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring cmdargs data-default exceptions hpqtypes + http-types invariant kontra-config lifted-base log monad-control + random text time transformers transformers-base unjson vector wai + warp + ]; + homepage = "https://github.com/scrive/log-utils"; + description = "Utils for working with logs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "log2json" = callPackage ({ mkDerivation, base, containers, json, parsec }: mkDerivation { @@ -113217,14 +113572,12 @@ self: { }) {}; "lowgl" = callPackage - ({ mkDerivation, base, data-default, gl, linear, vector }: + ({ mkDerivation, base, gl, linear, vector }: mkDerivation { pname = "lowgl"; - version = "0.3.1.1"; - sha256 = "85f5a954970634aa41bc77b6a2932ed935b1411be4ad7badab31dad45b2365b0"; - revision = "1"; - editedCabalFile = "d16861021ff55cbb15185537758b01c3bf1eddf910c2dfd57cb3e51d73f5e591"; - libraryHaskellDepends = [ base data-default gl linear vector ]; + version = "0.4.0.1"; + sha256 = "fceb0202bed4a3a3e0431ad32eac95fcc4aefef93b992a35797da0bfc8d39df7"; + libraryHaskellDepends = [ base gl linear vector ]; description = "Basic gl wrapper and reference"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; @@ -113562,6 +113915,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lucid_2_9_7" = callPackage + ({ mkDerivation, base, bifunctors, blaze-builder, bytestring + , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "lucid"; + version = "2.9.7"; + sha256 = "a087af27ad196e3a41ccb6b954a12d384589a14b2ac55614e6a27817f65e0608"; + libraryHaskellDepends = [ + base blaze-builder bytestring containers hashable mmorph mtl text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bifunctors hspec HUnit mtl parsec text + ]; + homepage = "https://github.com/chrisdone/lucid"; + description = "Clear to write, read and edit DSL for HTML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lucid-foundation" = callPackage ({ mkDerivation, base, hspec, lucid, QuickCheck , quickcheck-instances, text @@ -118044,8 +118419,8 @@ self: { ({ mkDerivation, base, bytestring, cereal, network, transformers }: mkDerivation { pname = "modbus-tcp"; - version = "0.2.1"; - sha256 = "b235be55c9efcb4796ba7bfd11e6592ecb0dbbbf814aff4ebe33314b0caf51b8"; + version = "0.2.1.1"; + sha256 = "60cf7f9956387abd5b24e760d281b7a3423432d271502745df59b398d499de86"; libraryHaskellDepends = [ base bytestring cereal network transformers ]; @@ -118097,6 +118472,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "modify-fasta_0_8_2_2" = callPackage + ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative + , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text + , text-show + }: + mkDerivation { + pname = "modify-fasta"; + version = "0.8.2.2"; + sha256 = "76d72306f18d23ef72ec8dada391483136689f3b0a2f074ec79506759908100f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers fasta regex-tdfa regex-tdfa-text split text + text-show + ]; + executableHaskellDepends = [ + base containers fasta mtl optparse-applicative pipes pipes-text + split text + ]; + homepage = "https://github.com/GregorySchwartz/modify-fasta"; + description = "Modify fasta (and CLIP) files in several optional ways"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "modsplit" = callPackage ({ mkDerivation, base, directory, filepath, haskell98, mtl , utf8-string @@ -118697,6 +119097,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_20_1" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, conduit + , conduit-extra, exceptions, fast-logger, lifted-base + , monad-control, monad-loops, mtl, resourcet, stm, stm-chans + , template-haskell, text, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.20.1"; + sha256 = "8e7cd3af6a28c6be29ec184d221c60d745d14142794efbd175077ee3e8c0baad"; + libraryHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra exceptions + fast-logger lifted-base monad-control monad-loops mtl resourcet stm + stm-chans template-haskell text transformers transformers-base + transformers-compat + ]; + homepage = "https://github.com/kazu-yamamoto/logger"; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -120835,6 +121258,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "multi-trie" = callPackage + ({ mkDerivation, base, composition, containers, HTF }: + mkDerivation { + pname = "multi-trie"; + version = "0.1"; + sha256 = "ffcaa510f0f7e379d62c63669f1a35607e49a9811a5d6e50fd2229d9ec967b44"; + libraryHaskellDepends = [ base composition containers ]; + testHaskellDepends = [ base containers HTF ]; + homepage = "https://github.com/vadimvinnik/multi-trie"; + description = "Trie of sets, as a model for compound names having multiple values"; + license = stdenv.lib.licenses.mit; + }) {}; + "multiaddr" = callPackage ({ mkDerivation, attoparsec, base, base58-bytestring, bytestring , cereal, errors, hashable, tasty, tasty-hunit, tasty-quickcheck @@ -121911,23 +122347,21 @@ self: { "mysql-haskell" = callPackage ({ mkDerivation, base, binary, binary-ieee754, binary-parsers , blaze-textual, bytestring, bytestring-lexing, cryptonite - , HsOpenSSL, io-streams, memory, monad-loops, network - , optparse-applicative, scientific, tasty, tasty-hunit, tcp-streams - , text, time, tls, vector, wire-streams, word24 + , io-streams, memory, monad-loops, network, scientific, tasty + , tasty-hunit, tcp-streams, text, time, tls, vector, wire-streams + , word24 }: mkDerivation { pname = "mysql-haskell"; - version = "0.6.0.0"; - sha256 = "c1d577ccf0f38a1e0c54409c6e2dfc55bc77c88a3a22537679c4a742d5674429"; + version = "0.7.0.0"; + sha256 = "c4ab3b07780ab7ba3df4ec5c9575d717456433ea7af5ab0af4aae346af22ceda"; libraryHaskellDepends = [ base binary binary-ieee754 binary-parsers blaze-textual bytestring - bytestring-lexing cryptonite HsOpenSSL io-streams memory - monad-loops network scientific tcp-streams text time tls vector - wire-streams word24 + bytestring-lexing cryptonite io-streams memory monad-loops network + scientific tcp-streams text time tls vector wire-streams word24 ]; testHaskellDepends = [ - base bytestring io-streams optparse-applicative tasty tasty-hunit - text time vector + base bytestring io-streams tasty tasty-hunit text time vector ]; homepage = "https://github.com/winterland1989/mysql-haskell"; description = "pure haskell MySQL driver"; @@ -121935,6 +122369,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mysql-haskell-openssl" = callPackage + ({ mkDerivation, base, HsOpenSSL, io-streams, mysql-haskell + , network, tcp-streams, tcp-streams-openssl, wire-streams + }: + mkDerivation { + pname = "mysql-haskell-openssl"; + version = "0.7.0.0"; + sha256 = "c960cc61a13f63df2cc776af9b876ff8e68f181237ec772d27c21684ed7e791b"; + libraryHaskellDepends = [ + base HsOpenSSL io-streams mysql-haskell network tcp-streams + tcp-streams-openssl wire-streams + ]; + homepage = "https://github.com/winterland1989/mysql-haskell"; + description = "TLS support for mysql-haskell package using openssl"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mysql-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light @@ -124433,8 +124884,8 @@ self: { ({ mkDerivation, async, base, bytestring, template-haskell, unix }: mkDerivation { pname = "ngx-export"; - version = "0.2.4.0"; - sha256 = "83423a70e9d066a02ea3931b96de18cfcdc9866a47bd7a00c5b82a96f436d99c"; + version = "0.2.4.2"; + sha256 = "547a786039d88cbb0aa6ba355c8930245232121a06b63bbf005f725bc8f93ffa"; libraryHaskellDepends = [ async base bytestring template-haskell unix ]; @@ -124990,10 +125441,8 @@ self: { }: mkDerivation { pname = "normalization-insensitive"; - version = "2.0"; - sha256 = "8f8ab5ae70a07a2d65fd0a46dbd8ed5cc3f3af5e95aa074e5a12b312a4dd4e29"; - revision = "1"; - editedCabalFile = "0f02d93794b029d48c4cd5564f7f357efba43bd13e33a51044994d487e274fc2"; + version = "2.0.0.1"; + sha256 = "17f922efd2b1a6ebdefb619c12d1581585f3bc0c2deec811ba124f8ae38d109d"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -125705,9 +126154,11 @@ self: { }: mkDerivation { pname = "nvvm"; - version = "0.7.5.0"; - sha256 = "ccd9efb4f1f97318e98d3ad363810d2fd4780992c37fc92d7e526b3af8f59c85"; - setupHaskellDepends = [ base Cabal directory filepath ]; + version = "0.7.5.1"; + sha256 = "73914a6a1816432b0cc687a6200b52a030a705b51276f8266a984c3617f69109"; + setupHaskellDepends = [ + base Cabal directory filepath template-haskell + ]; libraryHaskellDepends = [ base bytestring cuda template-haskell ]; libraryToolDepends = [ c2hs ]; homepage = "https://github.com/tmcdonell/nvvm"; @@ -126545,6 +126996,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_5_2_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, case-insensitive, containers, contravariant, multiset + , postgresql-simple, pretty, product-profunctors, profunctors + , QuickCheck, semigroups, text, time, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.5.2.1"; + sha256 = "ef175620163b6aaa5dc7aff6a49347b698134fb924869a789c097406ad746152"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors semigroups text time time-locale-compat transformers + uuid void + ]; + testHaskellDepends = [ + aeson base containers contravariant multiset postgresql-simple + product-profunctors profunctors QuickCheck semigroups text time + ]; + homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -127288,6 +127766,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "operate-do" = callPackage + ({ mkDerivation, base, charset, doctest, filemanip + , haskell-src-meta, hspec, QuickCheck, template-haskell + }: + mkDerivation { + pname = "operate-do"; + version = "0.1.0"; + sha256 = "c1daa940cd97336eecba200f8201f591ed1395390feeb3c9376fea86b7901764"; + libraryHaskellDepends = [ + base charset haskell-src-meta template-haskell + ]; + testHaskellDepends = [ base doctest filemanip hspec QuickCheck ]; + homepage = "https://github.com/uecmma/haskell-library-collections/tree/master/operate-do"; + description = "Simple project template from stack"; + license = stdenv.lib.licenses.mit; + }) {}; + "operational" = callPackage ({ mkDerivation, base, mtl, random }: mkDerivation { @@ -128843,6 +129338,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pandoc-stylefrommeta" = callPackage + ({ mkDerivation, base, containers, HaTeX, MissingH, pandoc + , pandoc-types + }: + mkDerivation { + pname = "pandoc-stylefrommeta"; + version = "0.1.0.1"; + sha256 = "8118b1f301b9a77ea855b217db98f3bc205bb04e673100a652460bea888af2d3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers HaTeX MissingH pandoc pandoc-types + ]; + homepage = "http://github.com/lyokha/styleFromMeta"; + description = "Pandoc filter to customize links, images and paragraphs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pandoc-types" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , ghc-prim, syb @@ -132421,20 +132934,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pinboard_0_9_10" = callPackage + "pinboard_0_9_11" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, either, hspec - , http-client, http-client-tls, http-types, mtl, network - , profunctors, QuickCheck, random, safe-exceptions, semigroups - , text, time, transformers, unordered-containers, vector + , http-client, http-client-tls, http-types, monad-logger, mtl + , network, profunctors, QuickCheck, random, safe-exceptions + , semigroups, text, time, transformers, unordered-containers + , vector }: mkDerivation { pname = "pinboard"; - version = "0.9.10"; - sha256 = "841e1a70daecec66d53fb3fdeb1c89fa5c2de0e5bd701129a9596492216a5249"; + version = "0.9.11"; + sha256 = "2fc06cd5f9afb134802d9777cb53052066eb7ee9b3fa6f24b7eb12907146f774"; libraryHaskellDepends = [ aeson base bytestring containers either http-client http-client-tls - http-types mtl network profunctors random safe-exceptions text time - transformers unordered-containers vector + http-types monad-logger mtl network profunctors random + safe-exceptions text time transformers unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring containers hspec mtl QuickCheck @@ -138493,42 +139007,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "purescript_0_10_1" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal - , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring - , clock, containers, data-ordlist, directory, dlist, edit-distance - , file-embed, filepath, fsnotify, Glob, haskeline, hspec - , hspec-discover, http-client, http-types, HUnit - , language-javascript, lifted-base, monad-control, monad-logger - , mtl, network, optparse-applicative, parallel, parsec - , pattern-arrows, pipes, pipes-http, process, protolude, regex-tdfa - , safe, semigroups, silently, sourcemap, spdx, split, stm, syb - , text, time, transformers, transformers-base, transformers-compat + "purescript_0_10_2" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty + , ansi-terminal, ansi-wl-pprint, base, base-compat, bower-json + , boxes, bytestring, clock, containers, data-ordlist, directory + , dlist, edit-distance, file-embed, filepath, foldl, fsnotify, Glob + , haskeline, hspec, hspec-discover, http-client, http-types, HUnit + , language-javascript, lens, lifted-base, monad-control + , monad-logger, mtl, network, optparse-applicative, parallel + , parsec, pattern-arrows, pipes, pipes-http, process, protolude + , regex-tdfa, safe, semigroups, silently, sourcemap, spdx, split + , stm, syb, system-filepath, text, time, transformers + , transformers-base, transformers-compat, turtle , unordered-containers, utf8-string, vector, wai, wai-websockets , warp, websockets }: mkDerivation { pname = "purescript"; - version = "0.10.1"; - sha256 = "954e333a0f7c860941384289de241b683cbdd606c5c71ab300fe7ac7b3573df0"; + version = "0.10.2"; + sha256 = "45e60466575afed67fbc5244c4e0d3c7184c5aa009ebe7b81aa92a673d212e14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-better-errors ansi-terminal base base-compat bower-json boxes bytestring clock containers data-ordlist directory dlist edit-distance filepath fsnotify Glob haskeline http-client - http-types language-javascript lifted-base monad-control + http-types language-javascript lens lifted-base monad-control monad-logger mtl parallel parsec pattern-arrows pipes pipes-http process protolude regex-tdfa safe semigroups sourcemap spdx split stm syb text time transformers transformers-base transformers-compat unordered-containers utf8-string vector ]; executableHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base-compat boxes - bytestring containers directory file-embed filepath Glob haskeline - http-types monad-logger mtl network optparse-applicative parsec - process protolude split stm text time transformers - transformers-compat utf8-string wai wai-websockets warp websockets + aeson aeson-pretty ansi-terminal ansi-wl-pprint base base-compat + boxes bytestring containers directory file-embed filepath foldl + Glob haskeline http-types monad-logger mtl network + optparse-applicative parsec process protolude split stm + system-filepath text time transformers transformers-compat turtle + utf8-string wai wai-websockets warp websockets ]; testHaskellDepends = [ aeson aeson-better-errors base base-compat boxes bytestring @@ -141825,6 +142341,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rebase_1_0_3" = callPackage + ({ mkDerivation, base, base-prelude, bifunctors, bytestring + , containers, contravariant, contravariant-extras, deepseq, dlist + , either, fail, hashable, mtl, profunctors, scientific + , semigroupoids, semigroups, stm, text, time, transformers + , unordered-containers, uuid, vector, void + }: + mkDerivation { + pname = "rebase"; + version = "1.0.3"; + sha256 = "366a0d4224d4f80da4e6bcd80ed0027a2895e0b4504e11448cad9e03c1a9f82d"; + libraryHaskellDepends = [ + base base-prelude bifunctors bytestring containers contravariant + contravariant-extras deepseq dlist either fail hashable mtl + profunctors scientific semigroupoids semigroups stm text time + transformers unordered-containers uuid vector void + ]; + homepage = "https://github.com/nikita-volkov/rebase"; + description = "A more progressive alternative to the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "recaptcha" = callPackage ({ mkDerivation, base, HTTP, network, network-uri, xhtml }: mkDerivation { @@ -142812,10 +143351,8 @@ self: { }: mkDerivation { pname = "regex-do"; - version = "1.1"; - sha256 = "655a035f10fdb6a9db733d28a63b4f8a943224c14c3811779539112796689edc"; - revision = "1"; - editedCabalFile = "407ea11d3fe9a9307983b11124fab217db7d02bf36498b4953b1cf8e25323f77"; + version = "2.2"; + sha256 = "3da54464f6cac1c8410b04ddeb6152908377adc9b9f94fc2190c69988e5d1f7b"; libraryHaskellDepends = [ array base bytestring regex-base regex-pcre stringsearch text ]; @@ -142824,7 +143361,7 @@ self: { stringsearch text ]; homepage = "https://github.com/ciez/regex-do"; - description = "PCRE regex wrapper functions"; + description = "PCRE wrapper"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -144350,6 +144887,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "req" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, connection, data-default-class, hspec + , hspec-core, http-api-data, http-client, http-client-tls + , http-types, mtl, QuickCheck, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "req"; + version = "0.1.0"; + sha256 = "c93bae94d0b640f0d459a3da79c6021f7d8403099e9f08c35a2cddf64eea2269"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive connection + data-default-class http-api-data http-client http-client-tls + http-types mtl text time transformers + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive + data-default-class hspec hspec-core http-client http-types mtl + QuickCheck text time unordered-containers + ]; + homepage = "https://github.com/mrkkrp/req"; + description = "Easy-to-use, type-safe, expandable, high-level HTTP library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reqcatcher" = callPackage ({ mkDerivation, base, http-client, http-types, HUnit, lens , network, tasty, tasty-hunit, text, wai, warp, wreq @@ -144582,6 +145145,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "resourcet_1_1_8_1" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, lifted-base + , mmorph, monad-control, mtl, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "resourcet"; + version = "1.1.8.1"; + sha256 = "833a3104a554bda7c434c38a8a63992e8b456f057fa8ec6d039e6abe28715527"; + libraryHaskellDepends = [ + base containers exceptions lifted-base mmorph monad-control mtl + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ base hspec lifted-base transformers ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "respond" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-default-class, exceptions, fast-logger, formatting, HList @@ -146426,8 +147009,8 @@ self: { }: mkDerivation { pname = "rss"; - version = "3000.2.0.5"; - sha256 = "6155b9c686b026f0cb7be13f99d2555db06c8c57cf2563d798cb30553137b979"; + version = "3000.2.0.6"; + sha256 = "8de46fea948323030528367dfa2e5a81640d656a1c00d674377c809462fd990d"; libraryHaskellDepends = [ base HaXml network network-uri old-locale time ]; @@ -146693,10 +147276,10 @@ self: { ({ mkDerivation, array, base, mtl, parsec, safe, strict, Vec }: mkDerivation { pname = "ruff"; - version = "0.4"; - sha256 = "d4effe4cfe26b2ebfb486e7d68f1027aaa3b11d04277d18eb64d2e566e18f225"; + version = "0.4.0.1"; + sha256 = "e557e74593e1ab0fc35447f4f8d5cddc2af7c151655cc2c5ae1672fcddcda3c5"; libraryHaskellDepends = [ array base mtl parsec safe strict Vec ]; - homepage = "https://gitorious.org/ruff"; + homepage = "http://code.mathr.co.uk/ruff"; description = "relatively useful fractal functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -146894,6 +147477,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "safe_0_3_10" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "safe"; + version = "0.3.10"; + sha256 = "da724ad9cf4b424c4881a50439c3b13777f477e3301c068ce7d54e9031e14b9a"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/ndmitchell/safe#readme"; + description = "Library of safe (exception free) functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safe-access" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -149435,8 +150031,8 @@ self: { }: mkDerivation { pname = "semdoc"; - version = "0.1.1"; - sha256 = "05a2a838a25125bf8d8cf9f696f3745486e5d1d2c8a778b16c54a746b970882a"; + version = "0.1.2"; + sha256 = "b9a2c73fa5bd0346ae9b21e5ee158460689bf521f97996418b0d426c334b3dc8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150710,18 +151306,20 @@ self: { }) {}; "servant-elm" = callPackage - ({ mkDerivation, aeson, base, data-default, elm-export, hspec, lens - , servant, servant-foreign, text + ({ mkDerivation, aeson, base, data-default, directory, elm-export + , formatting, hspec, interpolate, lens, mockery, process, servant + , servant-foreign, text }: mkDerivation { pname = "servant-elm"; - version = "0.1.0.2"; - sha256 = "ee5de357b7c835eb68115de8cfcacb81dd83944916afec87c52ff92606c8dbda"; + version = "0.2.0.0"; + sha256 = "0a120bc909b14390ef43db690f050b6afd1b9ac72a25586c5734e007c2ea4fda"; libraryHaskellDepends = [ - base elm-export lens servant servant-foreign text + base elm-export formatting lens servant servant-foreign text ]; testHaskellDepends = [ - aeson base data-default elm-export hspec servant + aeson base data-default directory elm-export formatting hspec + interpolate mockery process servant text ]; homepage = "http://github.com/mattjbray/servant-elm#readme"; description = "Automatically derive Elm functions to query servant webservices"; @@ -152983,8 +153581,8 @@ self: { }: mkDerivation { pname = "sibe"; - version = "0.2.0.1"; - sha256 = "964a03b7ba59444dcd0a776da94164840e402d6ca737ca2619a678080571046c"; + version = "0.2.0.3"; + sha256 = "324abe72b361aaef1286bbe8e76dda18e431010db60aa1ea018f95e045fe91ea"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152996,7 +153594,6 @@ self: { base Chart Chart-cairo containers data-default-class directory hmatrix JuicyPixels random random-shuffle split vector ]; - testHaskellDepends = [ base hmatrix ]; homepage = "https://github.com/mdibaiee/sibe"; description = "Machine Learning algorithms"; license = stdenv.lib.licenses.gpl3; @@ -153363,17 +153960,18 @@ self: { }) {}; "simple-effects" = callPackage - ({ mkDerivation, base, interlude-l, lens, list-t, monad-control - , mtl, transformers, transformers-base + ({ mkDerivation, base, ghc-prim, interlude-l, lens, list-t + , monad-control, mtl, transformers, transformers-base }: mkDerivation { pname = "simple-effects"; - version = "0.3.0.1"; - sha256 = "16796c57b5acea501c3b03c1306813a2488c1021ba5db51d168c2bc0c2f32c7b"; + version = "0.6.0.0"; + sha256 = "f448eb1750229b71894a9f482981de64439093ddd72abe5a8672fbaaae135189"; libraryHaskellDepends = [ - base interlude-l lens list-t monad-control mtl transformers - transformers-base + base ghc-prim interlude-l lens list-t monad-control mtl + transformers transformers-base ]; + testHaskellDepends = [ base interlude-l ]; homepage = "https://gitlab.com/LukaHorvat/simple-effects"; description = "A simple effect system that integrates with MTL"; license = stdenv.lib.licenses.bsd3; @@ -155495,6 +156093,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "snap-server_1_0_1_1" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , bytestring, bytestring-builder, case-insensitive, clock + , containers, deepseq, directory, filepath, HsOpenSSL, http-common + , http-streams, HUnit, io-streams, io-streams-haproxy, lifted-base + , monad-control, mtl, network, old-locale, openssl-streams + , parallel, QuickCheck, random, snap-core, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, threads + , time, transformers, unix, unix-compat, vector + }: + mkDerivation { + pname = "snap-server"; + version = "1.0.1.1"; + sha256 = "878d83a815b9cc8f3d282ef6fafc441528b5f7819147f17f0c1b1f9904146c70"; + configureFlags = [ "-fopenssl" ]; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + case-insensitive clock containers filepath HsOpenSSL io-streams + io-streams-haproxy lifted-base mtl network old-locale + openssl-streams snap-core text time unix unix-compat vector + ]; + testHaskellDepends = [ + attoparsec base base16-bytestring blaze-builder bytestring + bytestring-builder case-insensitive clock containers deepseq + directory filepath HsOpenSSL http-common http-streams HUnit + io-streams io-streams-haproxy lifted-base monad-control mtl network + old-locale openssl-streams parallel QuickCheck random snap-core + test-framework test-framework-hunit test-framework-quickcheck2 text + threads time transformers unix unix-compat vector + ]; + homepage = "http://snapframework.com/"; + description = "A web server for the Snap Framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snap-templates" = callPackage ({ mkDerivation, base, bytestring, containers, directory , directory-tree, filepath, hashable, old-time, template-haskell @@ -156225,15 +156859,15 @@ self: { "snaplet-sqlite-simple" = callPackage ({ mkDerivation, aeson, base, bytestring, clientsession , configurator, containers, direct-sqlite, directory, errors - , exceptions, HUnit, lens, lifted-base, monad-control, mtl, snap - , snap-core, sqlite-simple, stm, test-framework - , test-framework-hunit, text, time, transformers, transformers-base - , unordered-containers + , exceptions, HUnit, lens, lifted-base, monad-control, mtl + , SafeSemaphore, snap, snap-core, sqlite-simple, stm + , test-framework, test-framework-hunit, text, time, transformers + , transformers-base, unordered-containers }: mkDerivation { pname = "snaplet-sqlite-simple"; - version = "1.0.0.0"; - sha256 = "d787e7cadbabb380ac4a889d9d21ca1e94ead91ef0864788471d1a62f7189f38"; + version = "1.0.0.2"; + sha256 = "2d12f405b1a796d587a43646aa136c4a0e9e5761212cbdb84014e226bed360d7"; libraryHaskellDepends = [ aeson base bytestring clientsession configurator direct-sqlite lens lifted-base monad-control mtl snap sqlite-simple text transformers @@ -156241,9 +156875,9 @@ self: { ]; testHaskellDepends = [ aeson base bytestring clientsession configurator containers - directory errors exceptions HUnit lens mtl snap snap-core - sqlite-simple stm test-framework test-framework-hunit text time - transformers unordered-containers + directory errors exceptions HUnit lens mtl SafeSemaphore snap + snap-core sqlite-simple stm test-framework test-framework-hunit + text time transformers unordered-containers ]; homepage = "https://github.com/nurpax/snaplet-sqlite-simple"; description = "sqlite-simple snaplet for the Snap Framework"; @@ -156898,6 +157532,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "solga_0_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hashable + , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck + , resourcet, safe-exceptions, scientific, text + , unordered-containers, vector, wai, wai-extra + }: + mkDerivation { + pname = "solga"; + version = "0.1.0.2"; + sha256 = "fdb4825ebac855d411c6841e015fe7dd1ac0a56a3bcc78aef7a91a1d8444b06a"; + libraryHaskellDepends = [ + aeson base bytestring containers http-types resourcet + safe-exceptions text wai wai-extra + ]; + testHaskellDepends = [ + aeson base bytestring hashable hspec hspec-wai hspec-wai-json + http-types QuickCheck scientific text unordered-containers vector + wai wai-extra + ]; + homepage = "https://github.com/chpatrick/solga"; + description = "Simple typesafe web routing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "solga-swagger" = callPackage ({ mkDerivation, base, bytestring, dlist, http-types , insert-ordered-containers, lens, mtl, solga, swagger2, text @@ -156917,6 +157576,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "solga-swagger_0_1_0_2" = callPackage + ({ mkDerivation, base, bytestring, dlist, http-types + , insert-ordered-containers, lens, mtl, solga, swagger2, text + , unordered-containers + }: + mkDerivation { + pname = "solga-swagger"; + version = "0.1.0.2"; + sha256 = "dcb77313090c82ce9f35843ecec2ce59741fffa5f7a337d77b5d545a8e2136d4"; + libraryHaskellDepends = [ + base bytestring dlist http-types insert-ordered-containers lens mtl + solga swagger2 text unordered-containers + ]; + homepage = "https://github.com/chpatrick/solga"; + description = "Swagger generation for Solga"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "solr" = callPackage ({ mkDerivation, base, base-prelude, bytestring , bytestring-tree-builder, case-insensitive, contravariant @@ -159552,8 +160230,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.1.1.0"; - sha256 = "1c44ee900e27ef1988a4875c39b2ceb32d116ad45dc1c95a8adecfa39e0e3857"; + version = "0.1.2.0"; + sha256 = "43db7f70ca360b0d858572afaf012ba10cda7f0ea19511c4e036bdfbb832e917"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164010,19 +164688,18 @@ self: { }) {}; "takusen-oracle" = callPackage - ({ mkDerivation, base, clntsh, mtl, old-time, sqlplus, time }: + ({ mkDerivation, base, clntsh, mtl, old-time, time }: mkDerivation { pname = "takusen-oracle"; - version = "0.9.3"; - sha256 = "4d290f84c6f35cc447df478c6afddb38633ed2442c58f4b1e1a3254036fba7b4"; + version = "0.9.4.1"; + sha256 = "492159551e80b58cff2318546f3649dd1c2b08eb4ff4f94d855d713df4ec868b"; libraryHaskellDepends = [ base mtl old-time time ]; librarySystemDepends = [ clntsh ]; - libraryToolDepends = [ sqlplus ]; homepage = "https://github.com/paulrzcz/takusen-oracle.git"; description = "Database library with left-fold interface for Oracle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {clntsh = null; sqlplus = null;}; + }) {clntsh = null;}; "tal" = callPackage ({ mkDerivation, base, containers, mtl, pretty, transformers @@ -164852,29 +165529,53 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; - "tcp-streams_0_5_0_0" = callPackage + "tcp-streams_0_6_0_0" = callPackage ({ mkDerivation, base, bytestring, data-default-class, directory - , HsOpenSSL, HsOpenSSL-x509-system, HUnit, io-streams, network - , openssl, pem, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, tls, x509, x509-store, x509-system + , HUnit, io-streams, network, pem, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, tls, x509 + , x509-store, x509-system }: mkDerivation { pname = "tcp-streams"; - version = "0.5.0.0"; - sha256 = "a963c6ad88b4feb4012c39bb6ebe1237b3e6263a3b1b0b14fb3b10f729df3be0"; + version = "0.6.0.0"; + sha256 = "cfd94893d4b4c177e600186ae8e369bd728c26ed7e626653b29ace274c4e0fbc"; libraryHaskellDepends = [ - base bytestring data-default-class HsOpenSSL HsOpenSSL-x509-system - io-streams network pem tls x509 x509-store x509-system + base bytestring data-default-class io-streams network pem tls x509 + x509-store x509-system ]; - librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring directory HUnit io-streams network QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + homepage = "https://github.com/winterland1989/tcp-streams"; description = "One stop solution for tcp client and server with tls support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) openssl;}; + }) {}; + + "tcp-streams-openssl" = callPackage + ({ mkDerivation, base, bytestring, directory, HsOpenSSL + , HsOpenSSL-x509-system, HUnit, io-streams, network, QuickCheck + , tcp-streams, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "tcp-streams-openssl"; + version = "0.6.0.0"; + sha256 = "4c4c18ed031fe372507ef2361a79ffbfea9c2cda134eecf017aa48ac00bf8d94"; + libraryHaskellDepends = [ + base bytestring HsOpenSSL HsOpenSSL-x509-system io-streams network + tcp-streams + ]; + testHaskellDepends = [ + base bytestring directory HUnit io-streams network QuickCheck + tcp-streams test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/winterland1989/tcp-streams"; + description = "Tcp streams using openssl for tls support"; + license = stdenv.lib.licenses.bsd3; + }) {}; "tdd-util" = callPackage ({ mkDerivation, base, bytestring, HUnit, lens @@ -166670,7 +167371,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-show_3_4_1" = callPackage + "text-show_3_4_1_1" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, contravariant , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec @@ -166680,8 +167381,8 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.4.1"; - sha256 = "1a1ac1c88004b3c060d09d011f645e6fbcf59147b109ee4192cbe7724732558b"; + version = "3.4.1.1"; + sha256 = "f0ba04cb7389decad861b668764f7d7e58a6371269f2ac5809f842d2844f9921"; libraryHaskellDepends = [ array base base-compat bifunctors bytestring bytestring-builder containers contravariant generic-deriving ghc-boot-th ghc-prim @@ -166831,8 +167532,8 @@ self: { }: mkDerivation { pname = "text1"; - version = "0.0.3"; - sha256 = "4ca7215f67aa347fbc26b266c1b8455d0e4eae8533523acc8a8ef7b221827d50"; + version = "0.0.4"; + sha256 = "17b1175bae397eb48ddeb750820d44d2ac819f79efc5f4d023a1bb00c9737bec"; libraryHaskellDepends = [ base binary lens semigroups text ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -167282,6 +167983,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-orphans_0_13_3" = callPackage + ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift + , th-lift-instances, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.3"; + sha256 = "7380d5b66d0c754e383e7b16e982b5d9ddf5f45f5a33118a20023ec8af78c46d"; + libraryHaskellDepends = [ + base mtl template-haskell th-lift th-lift-instances th-reify-many + ]; + testHaskellDepends = [ base hspec template-haskell ]; + description = "Orphan instances for TH datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-printf" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec, HUnit , QuickCheck, template-haskell, text, transformers @@ -167342,6 +168060,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "th-to-exp" = callPackage + ({ mkDerivation, base, hspec, template-haskell }: + mkDerivation { + pname = "th-to-exp"; + version = "0.0.1.0"; + sha256 = "30283dcba984a48a048f77a5405be78df338050ad97da9df21fcfe49e519bf56"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec template-haskell ]; + homepage = "https://github.com/lexi-lambda/th-to-exp#readme"; + description = "Provides a way to persist data from compile-time to runtime"; + license = stdenv.lib.licenses.isc; + }) {}; + "th-traced" = callPackage ({ mkDerivation, base, containers, mtl, template-haskell }: mkDerivation { @@ -167916,8 +168647,8 @@ self: { }: mkDerivation { pname = "tianbar"; - version = "1.2.0.0"; - sha256 = "f822b063d0c213ee931b75d13ec39a23f135fa08172bd6aeac3222db5cec9456"; + version = "1.2.1.0"; + sha256 = "0ac03b869479eb576caa20bcfd76e2cf61a2cf9fbec61bc2cccbd4f4507e6c61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168463,6 +169194,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "time-warp" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , data-default, data-msgpack, exceptions, formatting, hslogger + , hspec, lens, lifted-base, monad-control, monad-loops, MonadRandom + , mtl, network-msgpack-rpc, pqueue, QuickCheck + , quickcheck-instances, random, safe, serokell-util, stm + , template-haskell, text, text-format, time, time-units + , transformers, transformers-base + }: + mkDerivation { + pname = "time-warp"; + version = "0.1.1.1"; + sha256 = "52bdeb1608ee7a5688ffec46fda64437a8bbb8d9648ce4f0a523a15405c9ea18"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring containers data-default data-msgpack + exceptions formatting hslogger lens lifted-base monad-control + monad-loops MonadRandom mtl network-msgpack-rpc pqueue QuickCheck + quickcheck-instances random safe serokell-util stm template-haskell + text text-format time time-units transformers transformers-base + ]; + executableHaskellDepends = [ + async base data-default data-msgpack exceptions formatting hspec + lens MonadRandom mtl network-msgpack-rpc QuickCheck random + serokell-util stm text text-format time-units transformers + ]; + testHaskellDepends = [ + async base data-default data-msgpack exceptions hspec lens mtl + network-msgpack-rpc QuickCheck random serokell-util stm text + text-format time-units transformers + ]; + homepage = "https://github.com/serokell/time-warp"; + description = "Distributed systems execution emulation"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "timecalc" = callPackage ({ mkDerivation, base, haskeline, uu-parsinglib }: mkDerivation { @@ -170004,6 +170772,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "transient_0_4_4_1" = callPackage + ({ mkDerivation, base, containers, directory, mtl, random, stm + , time, transformers + }: + mkDerivation { + pname = "transient"; + version = "0.4.4.1"; + sha256 = "f1ad34b6c3d4044d294abf4b37f35efb764b710851eab6e58e1b9abb8a68d0ed"; + libraryHaskellDepends = [ + base containers directory mtl random stm time transformers + ]; + homepage = "http://www.fpcomplete.com/user/agocorona"; + description = "Making composable programs with multithreading, events and distributed computing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transient-universe" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, filepath, hashable, HTTP, iproute, mtl, network @@ -173286,6 +174071,8 @@ self: { pname = "unicode-transforms"; version = "0.2.0"; sha256 = "3b27ca1ae8f0a906fbbefe1de819a80a01933610a4657ef6383db2590fdecb0e"; + revision = "1"; + editedCabalFile = "33480d6bb76758c9016397d10769d6ebf2db4004391961ad6dff05610a67d380"; libraryHaskellDepends = [ base bitarray bytestring text ]; testHaskellDepends = [ base deepseq getopt-generics QuickCheck split text @@ -178613,6 +179400,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_2_9" = callPackage + ({ mkDerivation, array, async, auto-update, base, blaze-builder + , bytestring, bytestring-builder, case-insensitive, containers + , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date + , http-types, http2, HUnit, iproute, lifted-base, network, process + , QuickCheck, silently, simple-sendfile, stm, streaming-commons + , text, time, transformers, unix, unix-compat, vault, wai, word8 + }: + mkDerivation { + pname = "warp"; + version = "3.2.9"; + sha256 = "e2789a51b302dde7ab4145b5a0be745e1bdaae108761f9664718fbccbd55ebca"; + libraryHaskellDepends = [ + array async auto-update base blaze-builder bytestring + bytestring-builder case-insensitive containers ghc-prim hashable + http-date http-types http2 iproute network simple-sendfile stm + streaming-commons text unix unix-compat vault wai word8 + ]; + testHaskellDepends = [ + array async auto-update base blaze-builder bytestring + bytestring-builder case-insensitive containers directory doctest + ghc-prim hashable hspec HTTP http-date http-types http2 HUnit + iproute lifted-base network process QuickCheck silently + simple-sendfile stm streaming-commons text time transformers unix + unix-compat vault wai word8 + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -184422,6 +185241,47 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_4_26" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , blaze-html, blaze-markup, byteable, bytestring, case-insensitive + , cereal, clientsession, conduit, conduit-extra, containers, cookie + , data-default, deepseq, deepseq-generics, directory, exceptions + , fast-logger, hspec, hspec-expectations, http-types, HUnit + , lifted-base, monad-control, monad-logger, mtl, mwc-random + , network, old-locale, parsec, path-pieces, primitive, QuickCheck + , random, resourcet, safe, semigroups, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.4.26"; + sha256 = "2441476cd66d5e615ce33d7d378f121e6f05875fa92a0e8afd3ab47c3d50dd6d"; + libraryHaskellDepends = [ + aeson auto-update base blaze-builder blaze-html blaze-markup + byteable bytestring case-insensitive cereal clientsession conduit + conduit-extra containers cookie data-default deepseq + deepseq-generics directory exceptions fast-logger http-types + lifted-base monad-control monad-logger mtl mwc-random old-locale + parsec path-pieces primitive random resourcet safe semigroups + shakespeare template-haskell text time transformers + transformers-base unix-compat unordered-containers vector wai + wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base blaze-builder bytestring clientsession conduit + conduit-extra containers cookie hspec hspec-expectations http-types + HUnit lifted-base mwc-random network path-pieces QuickCheck random + resourcet shakespeare streaming-commons template-haskell text + transformers wai wai-extra + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core From 6a53da63b3650f154b5afe391b71cb7118f53c42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Nov 2016 13:51:48 +0100 Subject: [PATCH 0145/1749] haskell-http-client: update reference in configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e618059a7d44..20aa50282c24 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -974,7 +974,7 @@ self: super: { # https://github.com/commercialhaskell/stack/issues/2263 stack = super.stack.overrideScope (self: super: { - http-client = self.http-client_0_5_3_4; + http-client = self.http-client_0_5_4; http-client-tls = self.http-client-tls_0_3_3; http-conduit = self.http-conduit_2_2_3; optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0; From cb07aea0bd980a11d599bcbf35f094e8db911119 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Nov 2016 20:45:52 +0100 Subject: [PATCH 0146/1749] haskell-STMonadTrans: disable failing test suite to fix the build Closes https://github.com/NixOS/nixpkgs/issues/20309. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 20aa50282c24..e4ceff8e7819 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1074,4 +1074,7 @@ self: super: { # https://github.com/mulby/diff-parse/issues/9 diff-parse = doJailbreak super.diff-parse; + # https://github.com/josefs/STMonadTrans/issues/4 + STMonadTrans = dontCheck super.STMonadTrans; + } From a2a0fa6657d813528f61f4ea109428ff792d83ca Mon Sep 17 00:00:00 2001 From: Martijn Vermaat Date: Thu, 10 Nov 2016 14:00:40 -0400 Subject: [PATCH 0147/1749] python27Packages.consul: Disable tests to unbreak --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63b948d798d2..43266c0b1b85 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4091,12 +4091,14 @@ in { buildInputs = with self; [ requests2 six pytest ]; + # No tests distributed. https://github.com/cablehead/python-consul/issues/133 + doCheck = false; + meta = { description = "Python client for Consul (http://www.consul.io/)"; homepage = https://github.com/cablehead/python-consul; license = licenses.mit; maintainers = with maintainers; [ desiderius ]; - broken = true; }; }); From 63d45ecd65f2d7b22c712475bdfd4c560b1666a3 Mon Sep 17 00:00:00 2001 From: Igor Sharonov Date: Fri, 4 Nov 2016 15:03:43 +0300 Subject: [PATCH 0148/1749] pythonPackages.mezzanine: mark as broken, fixes #19989 --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 035939574817..ca0cd5f3af22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14070,6 +14070,7 @@ in { license = licenses.free; maintainers = with maintainers; [ prikhi ]; platforms = platforms.linux; + broken = true; # broken dependency of django within filebrowser_safe }; }; From 663007d607657e569cb681cc77c54b5787454bb7 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 10 Nov 2016 23:31:16 +0100 Subject: [PATCH 0149/1749] chromium: 54.0.2840.90 -> 54.0.2840.100 fixes CVE-2016-5199 CVE-2016-5200 CVE-2016-5201 CVE-2016-5202 --- .../networking/browsers/chromium/upstream-info.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 5fa9bb86c51d..1c71e7419a15 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,9 +1,9 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "11a98nknz7lh5jmjslznccg11nr0wla4c9l40fvxqxjm2gs6qags"; - sha256bin64 = "0qdydj0i9ll72f5m9r48gc3dyc22q6qas5nq8h0mbnrxrwd9dnyj"; - version = "55.0.2883.35"; + sha256 = "1dw5difl42jch8pppk9z7ivvw0ah7azjx81allfm85ys075h0ppm"; + sha256bin64 = "1vd3ia7s7k8dkcc9sg1wmbi6x54wf7jmiavixnqb5swglczxfmxz"; + version = "55.0.2883.44"; }; dev = { sha256 = "1pfgb5dnygyxiwfq6ini5s159c178zz7235npaag7k8gcc10ybnz"; @@ -11,8 +11,8 @@ version = "56.0.2906.0"; }; stable = { - sha256 = "01h1qkdw5dpwz61dybpf4bhag198j082lzwpkdx2nj55k2j3lawl"; - sha256bin64 = "18mxgzi79qhi07wgyyx6bb0lqm9pzkw85ypg6vmqv8gh0abn7dn1"; - version = "54.0.2840.90"; + sha256 = "1pw91kqqvm9nkz9i6wmm83wnqzl34q8rxw1sjcpfr4qcg15gbrz2"; + sha256bin64 = "05w9yadn7kwn0aiqd2mrg67lpk413zp6xkgwxnwni7z13j3zrw49"; + version = "54.0.2840.100"; }; } From cb93b34999d36b7f6ecd4c94f84b7c3776bba505 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 7 Nov 2016 15:43:34 +0800 Subject: [PATCH 0150/1749] SMB2 support for CIFS [tuomas: removed unneeded kernel version check] Signed-off-by: Tuomas Tynkkynen --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4d5fac82d93c..1fe6278d0a7a 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -258,6 +258,7 @@ with stdenv.lib; CIFS_XATTR y CIFS_POSIX y CIFS_FSCACHE y + CIFS_SMB2 y ${optionalString (versionAtLeast version "3.12") '' CEPH_FSCACHE y ''} From 74ecbbe4e3243988267987e80906bd19c1f5eb96 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 10 Nov 2016 01:14:35 +0200 Subject: [PATCH 0151/1749] kernel config: Ensure SECCOMP_FILTER is enabled As noted in a97db109a206, SECCOMP_FILTER must be enabled or systemd gets very unhappy. --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1fe6278d0a7a..e650b7abc1c7 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -342,6 +342,7 @@ with stdenv.lib; CGROUPS y # used by systemd FHANDLE y # used by systemd SECCOMP y # used by systemd >= 231 + SECCOMP_FILTER y # ditto POSIX_MQUEUE y FRONTSWAP y FUSION y # Fusion MPT device support From 9028442fcbd03794af8bf5b3e606280aa91fa0c9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:05:27 -0500 Subject: [PATCH 0152/1749] ammonite-repl: 0.7.9 -> 0.8.0 --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index c2cf9506c786..f9d3b3bfb200 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ammonite-repl-${version}"; - version = "0.7.9"; + version = "0.8.0"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${version}"; - sha256 = "1jfb5rmab45j0bizfmjhygsjzijv3zcrygws3cr5awjd6js6jg27"; + sha256 = "1427p90nyizds8799nih527vixnw8qrwdih60bnd1aywz703yr7v"; }; propagatedBuildInputs = [ jre ] ; From 0b91aa42d2d9cb02d368f41ff48a908b82a496f6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:05:55 -0500 Subject: [PATCH 0153/1749] atom: 1.12.0 -> 1.12.1 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index ae571debe769..03483db3adf6 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0grl5lw05gjw9381pr8asgqp9f912li28v0bvl8j6i0ynfy67jmk"; + sha256 = "0v7qlqkpq5zymn0ww35ywkh0vzm2mfpah18nqrc0rx0kvxr0xzqj"; name = "${name}.deb"; }; From ecd1a53df649709e4a528c8539d9f0f925fe83ae Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:06:20 -0500 Subject: [PATCH 0154/1749] rkt: 1.18.0 -> 1.19.0 --- pkgs/applications/virtualization/rkt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index e22e8468e9f4..a1c6927043ed 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.19.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "0vvkwdpl9y0g5m00m1h7q8f95hj5qxigpxrb5zwfqrcv3clzn5a6"; + sha256 = "0s3x27m16jl7nw63zg8g522km1zkwwgafrs8l8sc7pfryhnpmvag"; }; stage1BaseImage = fetchurl { From cc62ecc2d96e2aec3731de547c83bcf3c9e2a87c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:06:54 -0500 Subject: [PATCH 0155/1749] linux: 3.12.66 -> 3.12.67 --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 48f12307bd15..afdc8b82fbdc 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.66"; + version = "3.12.67"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "02nac7sr0c1h10mxp5azlsmz0gsr7qllsn2hibjknhk7jg8ry8cc"; + sha256 = "18laiqnqfabrqc6dw2pkimcg30hs865kgaflflav6zz9lb3ls1d5"; }; kernelPatches = args.kernelPatches; From 579f5fd9dd644092dff29638e7d456af7607562d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:07:24 -0500 Subject: [PATCH 0156/1749] linux: 4.4.30 -> 4.4.31 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 2930ebdfc7b9..e2d184c2c673 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.30"; + version = "4.4.31"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0p4r779fyhjp9fxc00qqfanjxm1xlajabd2b8d7y1p8jplrr294x"; + sha256 = "03fzi08xs9xp7r7bla6n3ykr81a365n8c5br1x7vwpgpacm63rk6"; }; kernelPatches = args.kernelPatches; From 0a1f39eb9125e09eba863fc4cebe6f1d105933ad Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:07:56 -0500 Subject: [PATCH 0157/1749] linux: 4.8.6 -> 4.8.7 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index b3a5e97e5d56..a1f5230ac002 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.6"; + version = "4.8.7"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0szk5m4wj6w0avpri9168acid8apbsjv78wz0k4cymh88804wx3l"; + sha256 = "03qgqqy1kxdqpb844g2yfyq45xy77110hrz8ddqy0rlkia8kzx8m"; }; kernelPatches = args.kernelPatches; From ad19b9bde532841c727618eeb3d3457fd7b98c6d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:08:28 -0500 Subject: [PATCH 0158/1749] linux: 4.9-rc3 -> 4.9-rc4 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 39bfbe76e6c7..bb79494e171e 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9-rc3"; - modDirVersion = "4.9.0-rc3"; + version = "4.9-rc4"; + modDirVersion = "4.9.0-rc4"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "16dvjxh1i0s18mzm2bcj1v1drv7n2id39jgy71n7i5pyvzc5ffhj"; + sha256 = "09w3milw95916g1mc19phw6w51kma7f1i3dfjar2ijnrcri3hvmx"; }; features.iwlwifi = true; From 7fedbe7c981e1ca421873fa59b419384ac4bc1ff Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:40:38 -0500 Subject: [PATCH 0159/1749] opencv3: Move IPP to use sha256 --- pkgs/development/libraries/opencv/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 0167011ed49a..9d5fc0a2e661 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { let ippicvVersion = "20151201"; ippicvPlatform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux" else throw "ICV is not available for this platform (or not yet supported by this package)"; - ippicvHash = if ippicvPlatform == "linux" then "808b791a6eac9ed78d32a7666804320e" + ippicvHash = if ippicvPlatform == "linux" then "1nph0w0pdcxwhdb5lxkb8whpwd9ylvwl97hn0k425amg80z86cs3" else throw "ippicvHash: impossible"; ippicvName = "ippicv_${ippicvPlatform}_${ippicvVersion}.tgz"; ippicvArchive = "3rdparty/ippicv/downloads/linux-${ippicvHash}/${ippicvName}"; ippicv = fetchurl { url = "https://github.com/Itseez/opencv_3rdparty/raw/ippicv/master_${ippicvVersion}/ippicv/${ippicvName}"; - md5 = ippicvHash; + sha256 = ippicvHash; }; in lib.optionalString enableIpp '' From 77591541eaf9054afb37596d110c809502ed8c5c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:58:14 -0500 Subject: [PATCH 0160/1749] sharedobjects: Remove --- .../libraries/java/shared-objects/default.nix | 14 -------------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 18 deletions(-) delete mode 100644 pkgs/development/libraries/java/shared-objects/default.nix diff --git a/pkgs/development/libraries/java/shared-objects/default.nix b/pkgs/development/libraries/java/shared-objects/default.nix deleted file mode 100644 index 9453aa0635c7..000000000000 --- a/pkgs/development/libraries/java/shared-objects/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, jdk}: - -stdenv.mkDerivation { - name = "shared-objects-1.4"; - src = fetchurl { - url = http://www.cwi.nl/projects/MetaEnv/shared-objects/shared-objects-1.4.tar.gz; - md5 = "c1f2c58bd1a07be32da8a6b89354a11f"; - }; - buildInputs = [stdenv jdk]; - - meta = { - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6a3f16f569..4ae6eb7294d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9714,10 +9714,6 @@ in saxonb = callPackage ../development/libraries/java/saxon/default8.nix { }; - sharedobjects = callPackage ../development/libraries/java/shared-objects { - stdenv = overrideInStdenv stdenv [gnumake380]; - }; - smack = callPackage ../development/libraries/java/smack { }; swt = callPackage ../development/libraries/java/swt { From ca9ab3bfe1acb8177e1084008c4d92c0f9494e3d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 03:03:04 +0100 Subject: [PATCH 0161/1749] ocaml-uuseg: 0.8.0 -> 0.9.0 This commit also refactors the expression. --- pkgs/development/ocaml-modules/uuseg/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 3c7a4ff5c58b..92777129ca03 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,18 +1,16 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: +{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: let - inherit (stdenv.lib) getVersion versionAtLeast; - pname = "uuseg"; - version = "0.8.0"; webpage = "http://erratique.ch/software/${pname}"; in -assert versionAtLeast (getVersion ocaml) "4.01"; +buildOcaml rec { -stdenv.mkDerivation { + minimumSupportedOcamlVersion = "4.01"; - name = "ocaml-${pname}-${version}"; + name = pname; + version = "0.9.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; @@ -34,7 +32,7 @@ stdenv.mkDerivation { installPhase = '' opam-installer --script --prefix=$out ${pname}.install | sh - ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/${pname} ''; meta = with stdenv.lib; { From 4402a3c599c6da6abd7619614fe58d658d246998 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS)" Date: Fri, 11 Nov 2016 08:27:37 +0000 Subject: [PATCH 0162/1749] python-plover: 3.0.0 -> 3.1.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 a51ea9dca528..b7e904a83124 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14839,7 +14839,7 @@ in { plover = buildPythonPackage rec { name = "plover-${version}"; - version = "3.0.0"; + version = "3.1.0"; disabled = !isPy27; meta = { @@ -14850,7 +14850,7 @@ in { src = pkgs.fetchurl { url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1jja37nhiypdx1z6cazp8ffsf0z3yqmpdbprpdzf668lcb422rl0"; + sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4"; }; # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 From babbe0e14dfcfde06a57aa8f1e951fedcc0e9612 Mon Sep 17 00:00:00 2001 From: Tim Digel Date: Fri, 11 Nov 2016 10:03:18 +0100 Subject: [PATCH 0163/1749] vim: 8.0.0005 -> 8.0.0075 --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index c91df72f18c7..39975c3dc69d 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.0.0005"; + version = "8.0.0075"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0"; + sha256 = "1imhvrd90f797jlbzvx8sc08h53s55ns6jxy1kl5kh8lz1qq455w"; }; enableParallelBuilding = true; From 53c3cf3fb9038fe564d6544b73a5719e009d46b1 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 11 Nov 2016 08:04:59 -0200 Subject: [PATCH 0164/1749] lxqt: it is capable of setting a background --- nixos/modules/services/x11/desktop-managers/lxqt.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index d13b7352c95e..c385e74dbb2f 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -25,6 +25,7 @@ in services.xserver.desktopManager.session = singleton { name = "lxqt"; + bgSupport = true; start = '' exec ${pkgs.lxqt.lxqt-common}/bin/startlxqt ''; From e15fdbe9fca506d62fd6a725fbf11f38c73b1811 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Fri, 11 Nov 2016 11:22:36 +0100 Subject: [PATCH 0165/1749] hipchat: 4.27.0.1658 -> 4.28.0.1659 --- .../networking/instant-messengers/hipchat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index e2f99f20e7cc..e4cc2700c03f 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -4,7 +4,7 @@ let - version = "4.27.0.1658"; + version = "4.28.0.1659"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -44,7 +44,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "1f0rgy5p9xcxfll6prir49vb7hjlnqx6xjaxlimhca4l30jvdsvn"; + sha256 = "091njvbihn0l7j5ymnl8ynz51pcy9varbvvny880r8szldash90y"; } else throw "HipChat is not supported on ${stdenv.system}"; From 13fbc6ccd12113d2789bb445eb76a7cfd8d276ee Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Fri, 11 Nov 2016 11:25:16 +0100 Subject: [PATCH 0166/1749] numix-icon-theme-circle: 2016-09-27 -> 2016-11-10 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 5c7464098adb..33734e15c9ce 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, numix-icon-theme }: stdenv.mkDerivation rec { - version = "2016-09-27"; + version = "2016-11-10"; package-name = "numix-icon-theme-circle"; - + name = "${package-name}-${version}"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "481bc1100f01e25e92deb7facf61436b27f9ca8a"; - sha256 = "0fkr7w6z6sz5yblgshr3qr2bszia6dsjszv3gmcbi2xqvjjd8wij"; + rev = "ba72743b0ee78cf56585bb498eb59e83d0de17a2"; + sha256 = "0zyvcpa8d8jc7r08chhv0chp7z29w6ir9hkgm9aq23aa80i6pdgv"; }; buildInputs = [ numix-icon-theme ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { install -dm 755 $out/share/icons cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/ ''; - + meta = with stdenv.lib; { description = "Numix icon theme (circle version)"; homepage = https://numixproject.org; From 857405442715e9f93d25605a2f283ecd060834ec Mon Sep 17 00:00:00 2001 From: = Date: Fri, 11 Nov 2016 12:21:40 +0100 Subject: [PATCH 0167/1749] josm: 10966 -> 11223 --- pkgs/applications/misc/josm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index dde6b151c8b7..30398747d437 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "10966"; + version = "11223"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0ggiilqfr7n4b2qik1ddlx9h0dwzglfk10y1zmzw9ij0gfbxn791"; + sha256 = "0fv1hlp98f178jy7lxnvq2rk6rq1zj62q6dv0vn02fvm00ia53s8"; }; phases = [ "installPhase" ]; From bb2a67d226d2fc8b268655132fee33a720046613 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 11 Nov 2016 07:11:29 -0500 Subject: [PATCH 0168/1749] openssl_1_1_0: 1.1.0b -> 1.1.0c --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index efb9a9e1d4ee..cd4a696b1d98 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -120,8 +120,8 @@ in { }; openssl_1_1_0 = common { - version = "1.1.0b"; - sha256 = "1xznrqvb1dbngv2k2nb6da6fdw00c01sy2i36yjdxr4vpxrf0pd4"; + version = "1.1.0c"; + sha256 = "1xfn5ydl14myd9wgxm4nxy5a42cpp1g12ijf3g9m4mz0l90n8hzw"; }; openssl_1_0_2-steam = common { From acbd916119eb7240345a1138dee5f701242765ea Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 11 Nov 2016 12:27:08 +0200 Subject: [PATCH 0169/1749] gimp-lensfun: 0.1.1 -> 0.2.4 --- .../graphics/gimp/plugins/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 9fd669551dec..fa6db4e7f02f 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -233,21 +233,20 @@ rec { }; gimplensfun = pluginDerivation rec { - name = "gimplensfun-0.1.1"; + version = "0.2.4"; + name = "gimplensfun-${version}"; - src = fetchurl { - url = "http://lensfun.sebastiankraft.net/${name}.tar.gz"; - sha256 = "0kr296n4k7gsjqg1abmvpysxi88iq5wrzdpcg7vm7l1ifvbs972q"; + src = fetchFromGitHub { + owner = "seebk"; + repo = "GIMP-Lensfun"; + rev = version; + sha256 = "0zlmp9v732qmzj083mnk5z421s57mnckmpjhiw890wmmwzj2lhxz"; }; - patchPhase = '' sed -i Makefile -e's|/usr/bin/g++|g++|' ''; - buildInputs = [ gimp pkgconfig glib gimp.gtk pkgs.lensfun pkgs.exiv2 ]; installPhase = " - installPlugins gimplensfun - mkdir -p $out/bin - cp gimplensfun $out/bin + installPlugins gimp-lensfun "; meta = { From 092d7e9705e5dae05be0b59c7df02f1b460ff8ab Mon Sep 17 00:00:00 2001 From: Franz Thoma Date: Wed, 9 Nov 2016 13:47:20 +0100 Subject: [PATCH 0170/1749] i3-gaps: 4.12 -> 4.13 --- pkgs/applications/window-managers/i3/gaps.nix | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index fa03bc47d9ed..3d8067f18825 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -1,26 +1,20 @@ -{ fetchurl, stdenv, i3 }: +{ fetchurl, stdenv, i3, autoreconfHook }: i3.overrideDerivation (super : rec { name = "i3-gaps-${version}"; - version = "4.12"; - releaseDate = "2016-03-06"; + version = "4.13"; + releaseDate = "2016-11-08"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "1i9l993cak85fcw12zgrb5cpspmjixr3yf8naa4zb8589mg4rb8s"; + sha256 = "0w959nx2crn00fckqwb5y78vcr1j9mvq5lh25wyjszx04pjhf378"; }; - postUnpack = '' - echo -n "${version} (${releaseDate}, branch \\\"gaps-next\\\")" > ./i3-${version}/I3_VERSION - echo -n "${version}" > ./i3-${version}/VERSION - ''; + nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ]; - postInstall = '' - wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" - for program in $out/bin/i3-sensible-*; do - sed -i 's/which/command -v/' $program - done + postUnpack = '' + echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION ''; }) // { From 54199414e38081e016e7a525c90bcdbcd392621a Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 10 Nov 2016 22:40:09 +0100 Subject: [PATCH 0171/1749] nsd service: fix typo Closes #20343. --- nixos/modules/services/networking/nsd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 6af1dd736431..ccfd219620cf 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -118,8 +118,8 @@ let ''; yesOrNo = b: if b then "yes" else "no"; - maybeString = prefix: x: if x == null then "" else ''${prefix} "${s}"''; - maybeToString = prefix: x: if x == null then "" else ''${prefix} ${toString s}''; + maybeString = prefix: x: if x == null then "" else ''${prefix} "${x}"''; + maybeToString = prefix: x: if x == null then "" else ''${prefix} ${toString x}''; forEach = pre: l: concatMapStrings (x: pre + x + "\n") l; From cf57b79fb1b4d1c261a1b27eaed75aefe99bd498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Fri, 11 Nov 2016 16:34:11 +0100 Subject: [PATCH 0172/1749] homebank: 5.1 -> 5.1.1 --- pkgs/applications/office/homebank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 20ab6ce6f60e..5ee14c81e948 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -3,7 +3,7 @@ let download_root = "http://homebank.free.fr/public/"; - name = "homebank-5.1"; + name = "homebank-5.1.1"; lastrelease = download_root + name + ".tar.gz"; oldrelease = download_root + "old/" + name + ".tar.gz"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ lastrelease oldrelease ]; - sha256 = "1v6za6md5sjb1r3f5lc9k03v2q68cbx6g64vcn69666c42za2aq0"; + sha256 = "1gd4b8fsq89w486mfrclw4r1nrgh7lxp4sncbgprbz9id7f6vlww"; }; buildInputs = [ pkgconfig gtk libofx intltool hicolor_icon_theme From 1810f50e0e87721529623ad5b7579d6e53e74769 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 22:03:51 -0500 Subject: [PATCH 0173/1749] saxonb: Use sha256 --- pkgs/development/libraries/java/saxon/default8.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/java/saxon/default8.nix b/pkgs/development/libraries/java/saxon/default8.nix index 7f1f0e260c0a..7728737977c2 100644 --- a/pkgs/development/libraries/java/saxon/default8.nix +++ b/pkgs/development/libraries/java/saxon/default8.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "saxonb-8.8"; src = fetchurl { url = mirror://sourceforge/saxon/saxonb8-8j.zip; - md5 = "35c4c376174cfe340f179d2e44dd84f0"; + sha256 = "15bzrfyd2f1045rsp9dp4znyhmizh1pm97q8ji2bc0b43q23xsb8"; }; buildInputs = [unzip]; From 7d4ffab20206a7571a1605e3cbf142c5c1c164cd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 22:06:31 -0500 Subject: [PATCH 0174/1749] saxon: use sha256 --- pkgs/development/libraries/java/saxon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 1677376230b4..fcd884f0a419 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./unzip-builder.sh; src = fetchurl { url = mirror://sourceforge/saxon/saxon6_5_3.zip; - md5 = "7b8c7c187473c04d2abdb40d8ddab5c6"; + sha256 = "0l5y3y2z4wqgh80f26dwwxwncs8v3nkz3nidv14z024lmk730vs3"; }; nativeBuildInputs = [ unzip ]; From 7897a6613e7440343b7743fef28bafcd75812015 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:54:37 -0500 Subject: [PATCH 0175/1749] libLAS: 1.8.0 -> 1.8.1 --- pkgs/development/libraries/libLAS/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index c67b3701ec91..20531adcd1c7 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip }: stdenv.mkDerivation rec { - name = "libLAS-1.8.0"; + name = "libLAS-1.8.1"; src = fetchurl { url = "http://download.osgeo.org/liblas/${name}.tar.bz2"; - md5 = "599881281d45db4ce9adb2d75458391e"; + sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip]; + buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ]; meta = { From b43a43d7a1fcb046e4ac39f521712e6afd84c745 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:35:07 -0500 Subject: [PATCH 0176/1749] pangoxsl: Use sha256 --- pkgs/development/libraries/pangoxsl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index 4a98704559b7..38f1496062e6 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pangoxsl-1.6.0.3"; src = fetchurl { url = mirror://sourceforge/pangopdf/pangoxsl-1.6.0.3.tar.gz; - md5 = "c98bad47ffa7de2e946a8e35d45e071c"; + sha256 = "1wcd553nf4nwkrfrh765cyzwj9bsg7zpkndg2hjs8mhwgx04lm8n"; }; buildInputs = [ From dc3f9cd566a5ff0a8ac06f8b96d51cca4951c96c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 11 Nov 2016 15:36:47 -0500 Subject: [PATCH 0177/1749] jdom: use sha256 --- pkgs/development/libraries/java/jdom/builder.sh | 2 +- pkgs/development/libraries/java/jdom/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/jdom/builder.sh b/pkgs/development/libraries/java/jdom/builder.sh index d95feb5eeb44..dbec4b6f3e0e 100755 --- a/pkgs/development/libraries/java/jdom/builder.sh +++ b/pkgs/development/libraries/java/jdom/builder.sh @@ -3,4 +3,4 @@ source $stdenv/setup tar zxvf $src mkdir -p $out -mv $name/* $out +mv * $out diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix index 9f0440f03049..99d213a01dac 100644 --- a/pkgs/development/libraries/java/jdom/default.nix +++ b/pkgs/development/libraries/java/jdom/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www.jdom.org/dist/binary/jdom-1.0.tar.gz; - md5 = "ce29ecc05d63fdb419737fd00c04c281"; + sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf"; }; meta = { From 1b5ab63bd2f67f86d0798cc4d0c5ae84a4c55070 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 12 Aug 2016 14:27:50 +0300 Subject: [PATCH 0178/1749] go-bindata-assetfs: init at 20160814 --- .../tools/go-bindata-assetfs/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/go-bindata-assetfs/default.nix diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix new file mode 100644 index 000000000000..249fc21cdfe4 --- /dev/null +++ b/pkgs/development/tools/go-bindata-assetfs/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "go-bindata-assetfs-${version}"; + version = "20160814-${rev}"; + rev = "e1a2a7e"; + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + + src = fetchFromGitHub { + inherit rev; + owner = "elazarl"; + repo = "go-bindata-assetfs"; + sha256 = "0b6q8h9fwpgpkvml1j87wq9174g7px1dmskhm884drpvswda2djk"; + }; + + meta = with stdenv.lib; { + description = "Serve embedded files from jteeuwen/go-bindata"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ avnik ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6a3f16f569..9f6f634235d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11232,6 +11232,8 @@ in go-bindata = callPackage ../development/tools/go-bindata { }; + go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; + gocode = callPackage ../development/tools/gocode { }; kgocode = callPackage ../applications/misc/kgocode { From 9bd197fc975e78a21183f7616ab90d449329ecf7 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 13 Aug 2016 07:58:05 +0300 Subject: [PATCH 0179/1749] drone: init at 0.5-20160813 --- .../continuous-integration/drone/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/tools/continuous-integration/drone/default.nix diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix new file mode 100644 index 000000000000..3569f8215dac --- /dev/null +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, buildGoPackage, go-bindata, go-bindata-assetfs }: + +buildGoPackage rec { + name = "drone.io-${version}"; + version = "0.5-20160813-${stdenv.lib.strings.substring 0 7 revision}"; + revision = "e82ddd002276deb1741eca5345260ff1c2059abb"; + goPackagePath = "github.com/drone/drone"; + + extraSrcs = [ + { + goPackagePath = "github.com/drone/drone-ui"; + src = fetchFromGitHub { + owner = "drone"; + repo = "drone-ui"; + rev = "43bdae89a59c4d26e24f80f65748b9f78f1df0a9"; + sha256 = "0k0kg07nkk595yk10n1fym3x8wlgn34n3f4mb237gqp8hhlnp5ra"; + }; + } + ]; + nativeBuildInputs = [ go-bindata go-bindata-assetfs ]; + + preBuild = '' + go generate github.com/drone/drone/server/template + go generate github.com/drone/drone/store/datastore/ddl + ''; + + src = fetchFromGitHub { + owner = "drone"; + repo = "drone"; + rev = revision; + sha256 = "11ld8dzjn4g7wbfm4xqr3ih2dqaqqa8rdnw7m7d3sd78w7r7s3gs"; + }; + + meta = with stdenv.lib; { + maintainer = with maintainers; [ avnik ]; + license = licenses.asl20; + description = "Continuous Integration platform built on container technology"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f6f634235d8..342b4e50d96f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1443,6 +1443,8 @@ in driftnet = callPackage ../tools/networking/driftnet {}; + drone = callPackage ../development/tools/continuous-integration/drone { }; + dropbear = callPackage ../tools/networking/dropbear { }; dtach = callPackage ../tools/misc/dtach { }; From 9743c0e623ec0b62230241a4fa69b3cdc7ccaca1 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 4 Nov 2016 06:48:54 +0200 Subject: [PATCH 0180/1749] drone: fix build issue on OSX also update all hashes to recent snapshots --- .../continuous-integration/drone/default.nix | 43 ++++++++++++++++--- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 3569f8215dac..0d9d19c8b939 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -2,18 +2,47 @@ buildGoPackage rec { name = "drone.io-${version}"; - version = "0.5-20160813-${stdenv.lib.strings.substring 0 7 revision}"; - revision = "e82ddd002276deb1741eca5345260ff1c2059abb"; + version = "0.5-20161104-${stdenv.lib.strings.substring 0 7 revision}"; + revision = "232df356afeeb4aec5e2959fa54b084dcadb267f"; goPackagePath = "github.com/drone/drone"; + # These dependencies pulled (in `drone` buildprocess) via Makefile, + # so I extracted them here, all revisions pinned by same date, as ${version} extraSrcs = [ { goPackagePath = "github.com/drone/drone-ui"; src = fetchFromGitHub { owner = "drone"; repo = "drone-ui"; - rev = "43bdae89a59c4d26e24f80f65748b9f78f1df0a9"; - sha256 = "0k0kg07nkk595yk10n1fym3x8wlgn34n3f4mb237gqp8hhlnp5ra"; + rev = "e66df33b4620917a2e7b59760887cc3eed543664"; + sha256 = "0d50xdzkh9akpf5c0sqgcgy11v2vz858l36jp5snr94zkrdkv0n1"; + }; + } + { + goPackagePath = "github.com/drone/mq"; + src = fetchFromGitHub { + owner = "drone"; + repo = "mq"; + rev = "0f296601feeed952dabd038793864acdbefe6dbe"; + sha256 = "1k7439c90l4w29g7wyixfmpbkap7bn8yh8zynbjyjf9qjzwsnw97"; + }; + } + { + goPackagePath = "github.com/tidwall/redlog"; + src = fetchFromGitHub { + owner = "tidwall"; + repo = "redlog"; + rev = "54086c8553cd23aba652513a87d2b085ea961541"; + sha256 = "12a7mk6r8figjinzkbisxcaly6sasggy62m8zs4cf35lpq2lhffq"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + src = fetchFromGitHub { + owner = "golang"; + repo = "crypto"; + rev = "9477e0b78b9ac3d0b03822fd95422e2fe07627cd"; + sha256 = "1qcqai6nf1q50z9ga7r4ljnrh1qz49kwlcqpri4bknx732lqq0v5"; }; } ]; @@ -24,11 +53,15 @@ buildGoPackage rec { go generate github.com/drone/drone/store/datastore/ddl ''; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/drone + ''; + src = fetchFromGitHub { owner = "drone"; repo = "drone"; rev = revision; - sha256 = "11ld8dzjn4g7wbfm4xqr3ih2dqaqqa8rdnw7m7d3sd78w7r7s3gs"; + sha256 = "0xrijcrlv3ag9n2kywkrhdkxyhxc8fs6zqn0hyav6a6jpqnsahg3"; }; meta = with stdenv.lib; { From c1dca9e40b7f357460f69e08e568b242c6e1bdfa Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 11 Nov 2016 23:11:54 +0100 Subject: [PATCH 0181/1749] etcd: make all service using etc go to 127.0.0.1:2379 by default The old etcd port 4001 is no longer enabled by default in etcd 3. The new port is 2379 and is officially assigned by IANA. There were still some services left that expect etcd on port 4001 by default. This changes the default to 2379 everywhere. It should not cause problems for users as the etcd by nix does listen on the new port only by default anyway. --- nixos/modules/services/cluster/fleet.nix | 2 +- nixos/modules/services/cluster/kubernetes.nix | 2 +- nixos/modules/services/cluster/panamax.nix | 2 +- nixos/modules/services/networking/skydns.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/cluster/fleet.nix b/nixos/modules/services/cluster/fleet.nix index 78d4ea93c491..ec03be395948 100644 --- a/nixos/modules/services/cluster/fleet.nix +++ b/nixos/modules/services/cluster/fleet.nix @@ -28,7 +28,7 @@ in { etcdServers = mkOption { type = types.listOf types.str; - default = [ "http://127.0.0.1:4001" ]; + default = [ "http://127.0.0.1:2379" ]; description = '' Fleet list of etcd endpoints to use. ''; diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 4bdd7f95f774..19303e97a706 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -23,7 +23,7 @@ in { etcdServers = mkOption { description = "Kubernetes list of etcd servers to watch."; - default = [ "127.0.0.1:4001" ]; + default = [ "127.0.0.1:2379" ]; type = types.listOf types.str; }; diff --git a/nixos/modules/services/cluster/panamax.nix b/nixos/modules/services/cluster/panamax.nix index b47ff744fc27..4475e8d8c24b 100644 --- a/nixos/modules/services/cluster/panamax.nix +++ b/nixos/modules/services/cluster/panamax.nix @@ -46,7 +46,7 @@ in { fleetctlEndpoint = mkOption { type = types.str; - default = "http://127.0.0.1:4001"; + default = "http://127.0.0.1:2379"; description = '' Panamax fleetctl endpoint. ''; diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix index ba913482e3cb..6ad18bb22403 100644 --- a/nixos/modules/services/networking/skydns.nix +++ b/nixos/modules/services/networking/skydns.nix @@ -11,7 +11,7 @@ in { etcd = { machines = mkOption { - default = [ "http://localhost:4001" ]; + default = [ "http://127.0.0.1:2379" ]; type = types.listOf types.str; description = "Skydns list of etcd endpoints to connect to."; }; From fa180d0d6357efb175c8e0c7543875375f5c8602 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Sat, 12 Nov 2016 12:54:47 +1000 Subject: [PATCH 0182/1749] grsec: 4.8.6 -> 4.8.7 --- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 98f89508fc1f..3d4ba5d2b58d 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.6"; - grrev = "201611091800"; - sha256 = "09kz4mjsrjixwvr8hf4q1lwk1miqb3mq6i6adzrha7c5s6c940x0"; + { kver = "4.8.7"; + grrev = "201611102210"; + sha256 = "1n7avhvzy4njf9wky38l99i18v1rr05bgspivnp440j8d6nh60nh"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 2350c543f61259469af0594fe7800c067b258484 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Wed, 9 Nov 2016 21:51:43 +0100 Subject: [PATCH 0183/1749] protobuf: refactoring Versions 3.x use a common derivation such as 2.x versions. --- .../libraries/protobuf/3.0.0-beta-2.nix | 43 ++--------------- pkgs/development/libraries/protobuf/3.0.nix | 43 ++--------------- .../libraries/protobuf/generic-v3.nix | 47 +++++++++++++++++++ 3 files changed, 53 insertions(+), 80 deletions(-) create mode 100644 pkgs/development/libraries/protobuf/generic-v3.nix diff --git a/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix b/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix index a06d4cef968a..26b829669b8e 100644 --- a/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix +++ b/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix @@ -1,43 +1,6 @@ -{ stdenv, fetchFromGitHub , autoreconfHook, zlib, gmock }: - -stdenv.mkDerivation rec { - name = "protobuf-${version}"; +{ callPackage, ... }: +callPackage ./generic-v3.nix { version = "3.0.0-beta-2"; - # make sure you test also -A pythonPackages.protobuf - src = fetchFromGitHub { - owner = "google"; - repo = "protobuf"; - rev = "v${version}"; - sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1"; - }; - - postPatch = '' - rm -rf gmock - cp -r ${gmock.source} gmock - chmod -R a+w gmock - '' + stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' - ''; - - buildInputs = [ autoreconfHook zlib ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = { - description = "Google's data interchange format"; - longDescription = - ''Protocol Buffers are a way of encoding structured data in an efficient - yet extensible format. Google uses Protocol Buffers for almost all of - its internal RPC protocols and file formats. - ''; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - homepage = https://developers.google.com/protocol-buffers/; - }; - - passthru.version = version; + sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1"; } diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix index 16a39daf7907..f80acf462b85 100644 --- a/pkgs/development/libraries/protobuf/3.0.nix +++ b/pkgs/development/libraries/protobuf/3.0.nix @@ -1,43 +1,6 @@ -{ stdenv, fetchFromGitHub , autoreconfHook, zlib, gmock }: - -stdenv.mkDerivation rec { - name = "protobuf-${version}"; +{ callPackage, ... }: +callPackage ./generic-v3.nix { version = "3.0.0"; - # make sure you test also -A pythonPackages.protobuf - src = fetchFromGitHub { - owner = "google"; - repo = "protobuf"; - rev = "v${version}"; - sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7"; - }; - - postPatch = '' - rm -rf gmock - cp -r ${gmock.source} gmock - chmod -R a+w gmock - '' + stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' - ''; - - buildInputs = [ autoreconfHook zlib ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = { - description = "Google's data interchange format"; - longDescription = - ''Protocol Buffers are a way of encoding structured data in an efficient - yet extensible format. Google uses Protocol Buffers for almost all of - its internal RPC protocols and file formats. - ''; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - homepage = https://developers.google.com/protocol-buffers/; - }; - - passthru.version = version; + sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7"; } diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix new file mode 100644 index 000000000000..5a3738564d7a --- /dev/null +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook, zlib, gmock +, version, sha256 +, ... +}: + +stdenv.mkDerivation rec { + name = "protobuf-${version}"; + + # make sure you test also -A pythonPackages.protobuf + src = fetchFromGitHub { + owner = "google"; + repo = "protobuf"; + rev = "v${version}"; + inherit sha256; + }; + + postPatch = '' + rm -rf gmock + cp -r ${gmock.source} gmock + chmod -R a+w gmock + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/google/protobuf/testing/googletest.cc \ + --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' + ''; + + buildInputs = [ autoreconfHook zlib ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = { + description = "Google's data interchange format"; + longDescription = + ''Protocol Buffers are a way of encoding structured data in an efficient + yet extensible format. Google uses Protocol Buffers for almost all of + its internal RPC protocols and file formats. + ''; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; + homepage = https://developers.google.com/protocol-buffers/; + }; + + passthru.version = version; +} From 96042412d16fb297722b1f84308f50df13aa8545 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Wed, 9 Nov 2016 22:01:00 +0100 Subject: [PATCH 0184/1749] protobuf3_1: init at 3.1.0 --- pkgs/development/libraries/protobuf/3.1.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+) create mode 100644 pkgs/development/libraries/protobuf/3.1.nix diff --git a/pkgs/development/libraries/protobuf/3.1.nix b/pkgs/development/libraries/protobuf/3.1.nix new file mode 100644 index 000000000000..91ef87512c84 --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.1.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.1.0"; + sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6a3f16f569..7a678219d7ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8821,6 +8821,7 @@ in protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { }); # 3.0.0-beta-2 is only introduced for tensorflow. remove this version when tensorflow is moved to 3.0. protobuf3_0_0b2 = lowPrio (callPackage ../development/libraries/protobuf/3.0.0-beta-2.nix { }); + protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { }; protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; From 6be676014444e7f73d48edd00c7a46f62a74c5fb Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sat, 12 Nov 2016 11:04:56 +0300 Subject: [PATCH 0185/1749] yandex-disk: 0.1.5.948 -> 0.1.5.978 --- pkgs/tools/filesystems/yandex-disk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 1658a4289201..77302f3d4a2b 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -6,18 +6,18 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; - sha256 = "0k05ybvnv0zx4vfx55jyhia38qqysaj68mapq0gwgf74k3a943g2"; + sha256 = "1skbzmrcjbw00a3jnbl2llqwz3ahsgvq74mjav68s2hw1wjidvk6"; } else { arch = "i386"; gcclib = "${stdenv.cc.cc.lib}/lib"; - sha256 = "09z9idmp7idcq0alwkla9kal9h82dx11jqh678lc4rviqggxzxhp"; + sha256 = "09h71i3k9d24ki81jdwhnav63fqbc44glbx228s9g3cr4ap41jcx"; }; in stdenv.mkDerivation rec { name = "yandex-disk-${version}"; - version = "0.1.5.948"; + version = "0.1.5.978"; src = fetchurl { url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; From 5f8aa15e846e14bdf034caaee908c321277aad22 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sat, 12 Nov 2016 11:34:35 +0300 Subject: [PATCH 0186/1749] yandex-disk service: correct permissions --- nixos/modules/services/network-filesystems/yandex-disk.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix index 982b6ca5ea7b..d9e35e3953f2 100644 --- a/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -86,7 +86,7 @@ in chown ${u} ${dir} if ! test -d "${cfg.directory}" ; then - mkdir -p -m 755 ${cfg.directory} || + (mkdir -p -m 755 ${cfg.directory} && chown ${u} ${cfg.directory}) || exit 1 fi From ccf8566bdd5784d771ebf46b0a4be514b0204ae5 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sat, 12 Nov 2016 12:36:33 +0300 Subject: [PATCH 0187/1749] yandex-disk service: add exclude-dirs option --- .../services/network-filesystems/yandex-disk.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix index d9e35e3953f2..4de206641331 100644 --- a/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -55,6 +55,15 @@ in description = "The directory to use for Yandex.Disk storage"; }; + excludes = mkOption { + default = ""; + type = types.string; + example = "data,backup"; + description = '' + Comma-separated list of directories which are excluded from synchronization. + ''; + }; + }; }; @@ -94,7 +103,7 @@ in -c '${pkgs.yandex-disk}/bin/yandex-disk token -p ${cfg.password} ${cfg.username} ${dir}/token' ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \ - -c '${pkgs.yandex-disk}/bin/yandex-disk start --no-daemon -a ${dir}/token -d ${cfg.directory}' + -c '${pkgs.yandex-disk}/bin/yandex-disk start --no-daemon -a ${dir}/token -d ${cfg.directory} --exclude-dirs=${cfg.excludes}' ''; }; From 22e129060dffd143c4342c3bc104bdc7c3233479 Mon Sep 17 00:00:00 2001 From: ft Date: Sat, 12 Nov 2016 01:52:43 -0800 Subject: [PATCH 0188/1749] powerline: 2.1.4 -> 2.4 --- 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 59dfde790ae0..1bac52117431 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18839,12 +18839,12 @@ in { }; powerline = buildPythonPackage rec { - rev = "2.1.4"; + rev = "2.4"; name = "powerline-${rev}"; src = pkgs.fetchurl { url = "https://github.com/powerline/powerline/archive/${rev}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "0gnh5yyackmqcphiympan48dm5lc834yzspss1lp4g1wq3vpyraf"; + sha256 = "12fp3cpwgpkxcj4mfjdpsmf1h0b8pqy1icb07jdivz9kw18h0184"; }; propagatedBuildInputs = with self; [ pkgs.git pkgs.mercurial pkgs.bazaar self.psutil self.pygit2 ]; From 52ccc27c1e8c41e6a59dc186eef2adafba1963c7 Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Sat, 12 Nov 2016 14:32:04 +0300 Subject: [PATCH 0189/1749] fix autobuild compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently autobuild failed to build in both master and release-16.03. The error message is mv: cannot stat '/nix/store/a4jzlkrhd4b4nr5760caj3rrjxhyg4z3-autobuild-5.3/bin/abput-sourceforge': No such file or directory builder for ‘/nix/store/l19vywq8zvbarswby5h7vl4iq1c1pvq7-autobuild-5.3.drv’ failed with exit code 1 It happens in post install script postInstall = '' wrapProgram $out/bin/ab{put,build}-sourceforge \ --prefix PATH ":" "${stdenv.lib.makeBinPath [ openssh rsync ]}" ''; The problem is that in autobuild 5.0 the ab{put,build}-sourceforge were removed * Version 5.0 (released 2008-11-25) ... ** abput, abput-sourceforge, abput-testdrive: Remove. ** abbuild, abbuild-sourceforge: Remove. Both the SourceForge and TestDrive systems have been shutdown. The scripts were of questionable value anyway. Possibly the bug was introduced in commit 8c4fcc87f8320004e924f53bbaee29ae3b7b4692: autobuild: 3.5 -> 5.3. As the package doesn't contain these programs there is no need in wrapping them. This commit just remove the postInstall section of corresponding package. --- pkgs/development/tools/misc/autobuild/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index a7d6c42e6af2..6919b03d47c1 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -12,11 +12,6 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = '' - wrapProgram $out/bin/ab{put,build}-sourceforge \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ openssh rsync ]}" - ''; - meta = { description = "Continuous integration tool"; From 24df641deba37fb6f9bed238f028052178721ac6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 12 Nov 2016 09:39:16 +0100 Subject: [PATCH 0190/1749] ocamlPackages.conduit: refactor --- pkgs/development/ocaml-modules/conduit/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 26accd99db67..afe44ea0a7f6 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,5 +1,7 @@ -{stdenv, buildOcaml, fetchurl, sexplib_p4, stringext, uri, cstruct, ipaddr, - async ? null, async_ssl ? null, lwt ? null}: +{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri, cstruct, ipaddr +, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" +, async_p4 ? null, async_ssl_p4 ? null, lwt ? null +}: buildOcaml rec { name = "conduit"; @@ -10,10 +12,10 @@ buildOcaml rec { sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1"; }; - propagatedBuildInputs = ([ sexplib_p4 stringext uri cstruct ipaddr ] - ++ stdenv.lib.optional (lwt != null) lwt - ++ stdenv.lib.optional (async != null) async - ++ stdenv.lib.optional (async_ssl != null) async_ssl); + propagatedBuildInputs = [ sexplib_p4 stringext uri cstruct ipaddr ]; + buildInputs = stdenv.lib.optional (lwt != null) lwt + ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4 + ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4; meta = with stdenv.lib; { homepage = https://github.com/mirage/ocaml-conduit; From 72c1a6f0f46cf4e35986b49f957f690922ba7a02 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 12 Nov 2016 09:55:42 +0100 Subject: [PATCH 0191/1749] ocamlPackages.cohttp: refactor --- .../ocaml-modules/cohttp/default.nix | 17 +++++++++-------- pkgs/development/tools/misc/trv/default.nix | 5 +++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index dcf3c8c13d79..5a22e37d8213 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,22 +1,23 @@ -{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib_p4, sexplib_p4, conduit, - stringext, base64, magic-mime, ounit, alcotest, lwt ? null, - async ? null, async_ssl ? null}: +{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri, fieldslib_p4 +, sexplib_p4, conduit , stringext, base64, magic-mime, ounit, alcotest +, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" +, lwt ? null, async_p4 ? null, async_ssl_p4 ? null +}: buildOcaml rec { name = "cohttp"; version = "0.19.3"; - minimumSupportedOcamlVersion = "4.02"; + minimumSupportedOcamlVersion = "4.01"; src = fetchurl { url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz"; sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv"; }; - buildInputs = [ alcotest ]; - propagatedBuildInputs = [ cmdliner re uri fieldslib_p4 sexplib_p4 sexplib_p4 - conduit stringext base64 magic-mime ounit async - async_ssl lwt ]; + buildInputs = [ alcotest cmdliner conduit magic-mime ounit lwt ] + ++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ]; + propagatedBuildInputs = [ re stringext uri fieldslib_p4 sexplib_p4 base64 ]; buildFlags = "PREFIX=$(out)"; diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index 4b83c12bed77..4b00e92b4c3c 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -1,6 +1,7 @@ {stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4 , re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find -, cohttp, uri, tzdata}: +, cohttp, conduit, magic-mime, uri, tzdata +}: assert stdenv.lib.versionOlder "4.02" ocaml.version; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { }; - buildInputs = [ ocaml findlib camlp4 ]; + buildInputs = [ ocaml findlib camlp4 conduit magic-mime ]; propagatedBuildInputs = [ core_p4 async_p4 async_unix_p4 async_extra_p4 sexplib_p4 async_shell core_extended_p4 async_find cohttp uri re2_p4 ]; From 2d136204c47985c9518105e1af9e14810c8319ec Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 12 Nov 2016 10:17:30 +0100 Subject: [PATCH 0192/1749] ocamlPackages.cstruct: 1.6.0 -> 1.9.0, 2.3.0 --- .../ocaml-modules/cstruct/default.nix | 33 ++++++++++++------- .../ocaml-modules/nocrypto/default.nix | 4 +-- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index c9f04918d172..dd6cffb979c5 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,20 +1,31 @@ -{stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib_p4, findlib, - async_p4 ? null, lwt ? null, camlp4}: +{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib_p4, findlib, ppx_tools +, async_p4 ? null, lwt ? null, camlp4 +}: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; +assert stdenv.lib.versionAtLeast ocaml.version "4.01"; + +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" + then { version = "2.3.0"; sha256 = "19spsgkry41dhsbm6ij71kws90bqp7wiggc6lsqdl43xxvbgdmys"; } + else { version = "1.9.0"; sha256 = "1c1j21zgmxi9spq23imy7byn50qr7hlds1cfpzxlsx9dp309jngy"; }; +in + +let opt = b: "--${if b != null then "en" else "dis"}able"; in stdenv.mkDerivation { - name = "ocaml-cstruct-1.6.0"; + name = "ocaml${ocaml.version}-cstruct-${param.version}"; - src = fetchurl { - url = https://github.com/mirage/ocaml-cstruct/archive/v1.6.0.tar.gz; - sha256 = "0f90a1b7a03091cf22a3ccb11a0cce03b6500f064ad3766b5ed81418ac008ece"; + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-cstruct"; + rev = "v${param.version}"; + inherit (param) sha256; }; - configureFlags = stdenv.lib.strings.concatStringsSep " " ((if lwt != null then ["--enable-lwt"] else []) ++ - (if async_p4 != null then ["--enable-async"] else [])); - buildInputs = [ocaml findlib camlp4]; - propagatedBuildInputs = [ocplib-endian sexplib_p4 lwt async_p4]; + configureFlags = [ "${opt lwt}-lwt" "${opt async_p4}-async" "${opt ppx_tools}-ppx" ]; + + buildInputs = [ ocaml findlib ppx_tools camlp4 lwt async_p4 ]; + propagatedBuildInputs = [ ocplib-endian sexplib_p4 ]; createFindlibDestdir = true; dontStrip = true; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index f8db935b6122..fab048a9a9f8 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ounit }: +{ stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ocaml_lwt, ounit }: assert stdenv.lib.versionAtLeast ocaml.version "4.01"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "15gffvixk12ghsfra9amfszd473c8h188zfj03ngvblbdm0d80m0"; }; - buildInputs = [ ocaml findlib type_conv ounit ]; + buildInputs = [ ocaml findlib type_conv ocaml_lwt ounit ]; propagatedBuildInputs = [ cstruct zarith ]; configureFlags = "--enable-tests"; From f059c7f7541bda789833d5c93cb6ea3c2b346820 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 12 Nov 2016 12:43:10 +0100 Subject: [PATCH 0193/1749] Revert "cjdns test: exercise host builder logic" This reverts commit daf3ba426b2558e73ef2742fab1a73c782ef62a6. This is an alternative to 0ba3d429a758cec15545fc11c9d3fd1424c5c5f8, which disables the test outright. Briefly, exercising builders which rely on import-from-derivation can cause Hydra jobsets to time out. --- nixos/tests/cjdns.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index 1cedf168dcb3..f61c82b916ad 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -57,7 +57,6 @@ import ./make-test.nix ({ pkgs, ...} : { connectTo."192.168.0.1:1024}" = { password = carolPassword; publicKey = carolPubKey; - hostname = "carol"; }; }; }; From 852b365928bf0e54b5823a0e80aa071e7a57ed43 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 12 Nov 2016 12:47:43 +0100 Subject: [PATCH 0194/1749] Revert "cjdns: Disable tests" This reverts commit 0ba3d429a758cec15545fc11c9d3fd1424c5c5f8. --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index 5687d5b0e6e6..639ee45b38d6 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -221,7 +221,7 @@ in rec { tests.boot-stage1 = callTest tests/boot-stage1.nix {}; tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable; - #tests.cjdns = callTest tests/cjdns.nix {}; + tests.cjdns = callTest tests/cjdns.nix {}; tests.containers-ipv4 = callTest tests/containers-ipv4.nix {}; tests.containers-ipv6 = callTest tests/containers-ipv6.nix {}; tests.containers-bridge = callTest tests/containers-bridge.nix {}; From 081a871771276e6a93f50977c1ad90d066b2eb56 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 12 Nov 2016 13:56:45 +0100 Subject: [PATCH 0195/1749] Revert "Merge pull request #20302 from spacekitteh/patch-10" This reverts commit e02173c70cd18dee1972713031c412eee35d73ef, reversing changes made to c2b4a0d2668fda88430e7067245fc63d977ea28c. Breaks all grsec packages; Not having binary substitutes for no good reason is disruptive to my workflow, so I'll just revert this for now. --- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 3d4ba5d2b58d..6bba248374ba 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.7"; - grrev = "201611102210"; - sha256 = "1n7avhvzy4njf9wky38l99i18v1rr05bgspivnp440j8d6nh60nh"; + { kver = "4.7.10"; + grrev = "201611011946"; + sha256 = "0nva1007r4shlcxzflbxvd88yzvb98si2kjlgnhdqphyz1c0qhql"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 51b04c1bf518cfb5053557491e99dc6ff64cc416 Mon Sep 17 00:00:00 2001 From: Jesse Haber-Kucharsky Date: Sat, 12 Nov 2016 07:26:30 -0500 Subject: [PATCH 0196/1749] Revert opam solver dependency changes - Reverts the change to the monolithic `clingo` package in favor of the previous split between `clasp` and `gringo` since `opam` works with the latter but not (for some reason) with the former. - Adds explicit non-support for Python in `gringo`. This is not necessary for opam. - Forces usage of the `std::to_string` functions in the C++ standard library instead of the incomplete alternative implementations inside of the `gringo` sources. --- pkgs/tools/misc/aspcud/default.nix | 6 +-- pkgs/tools/misc/clingo/default.nix | 37 ----------------- pkgs/tools/misc/gringo/default.nix | 40 +++++++++++++++++++ .../misc/gringo/gringo-4.5.4-cmath.patch | 11 +++++ .../misc/gringo/gringo-4.5.4-to_string.patch | 11 +++++ pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 66 insertions(+), 41 deletions(-) delete mode 100644 pkgs/tools/misc/clingo/default.nix create mode 100644 pkgs/tools/misc/gringo/default.nix create mode 100644 pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch create mode 100644 pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 0bdcfa76fec1..577c0a33b3ee 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, - boost, clasp, cmake, clingo, re2c + boost, clasp, cmake, gringo, re2c }: let @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373"; }; - buildInputs = [ boost clasp cmake clingo re2c ]; + buildInputs = [ boost clasp cmake gringo re2c ]; buildPhase = '' cmake -DCMAKE_BUILD_TYPE=Release \ - -DGRINGO_LOC=${clingo}/bin/gringo \ + -DGRINGO_LOC=${gringo}/bin/gringo \ -DCLASP_LOC=${clasp}/bin/clasp \ -DENCODING_LOC=$out/share/aspcud/specification.lp \ . diff --git a/pkgs/tools/misc/clingo/default.nix b/pkgs/tools/misc/clingo/default.nix deleted file mode 100644 index 6ab0a68920f7..000000000000 --- a/pkgs/tools/misc/clingo/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, - bison, re2c, scons -}: - -let - version = "5.1.0"; -in - -stdenv.mkDerivation rec { - name = "clingo-${version}"; - - src = fetchFromGitHub { - owner = "potassco"; - repo = "clingo"; - rev = "v${version}"; - sha256 = "1rvaqqa8xfagsqxk45lax3l29sksijd3zvl662vpvdi1sy0d71xv"; - }; - - buildInputs = [ bison re2c scons ]; - - buildPhase = '' - scons --build-dir=release - ''; - - installPhase = '' - mkdir -p $out/bin - cp build/release/{gringo,clingo,reify,lpconvert} $out/bin/ - ''; - - meta = with stdenv.lib; { - description = "A grounder and solver for logic programs."; - homepage = http://potassco.org; - platforms = platforms.linux; - maintainers = [ maintainers.hakuch ]; - license = licenses.gpl3Plus; - }; -} diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix new file mode 100644 index 000000000000..00879d9505b8 --- /dev/null +++ b/pkgs/tools/misc/gringo/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, + bison, re2c, scons +}: + +let + version = "4.5.4"; +in + +stdenv.mkDerivation rec { + name = "gringo-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; + sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41"; + }; + + buildInputs = [ bison re2c scons ]; + + patches = [ + ./gringo-4.5.4-cmath.patch + ./gringo-4.5.4-to_string.patch + ]; + + buildPhase = '' + scons WITH_PYTHON= --build-dir=release + ''; + + installPhase = '' + mkdir -p $out/bin + cp build/release/gringo $out/bin/gringo + ''; + + meta = with stdenv.lib; { + description = "Converts input programs with first-order variables to equivalent ground programs"; + homepage = http://potassco.sourceforge.net/; + platforms = platforms.linux; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch new file mode 100644 index 000000000000..7b5510e2344b --- /dev/null +++ b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch @@ -0,0 +1,11 @@ +--- gringo/libgringo/src/term.cc~ 2016-07-12 23:56:10.593577749 -0400 ++++ gringo/libgringo/src/term.cc 2016-07-12 23:52:35.169968338 -0400 +@@ -22,6 +22,8 @@ + #include "gringo/logger.hh" + #include "gringo/graph.hh" + ++#include ++ + namespace Gringo { + + // {{{ definition of Defines diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch new file mode 100644 index 000000000000..b81eab4cd678 --- /dev/null +++ b/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch @@ -0,0 +1,11 @@ +--- gringo/libgringo/gringo/bug.hh~ 2014-03-10 12:19:26.000000000 -0400 ++++ gringo/libgringo/gringo/bug.hh 2016-11-12 07:51:55.288563663 -0500 +@@ -32,7 +32,7 @@ + #define _GLIBCXX_MAKE_MOVE_ITERATOR(_Iter) std::make_move_iterator(_Iter) + #define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) std::make_move_iterator(_Iter) + +-#ifdef MISSING_STD_TO_STRING ++#if 0 + + #include + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 342b4e50d96f..0cfed41dceb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -876,7 +876,7 @@ in goa = callPackage ../development/tools/goa { }; - clingo = callPackage ../tools/misc/clingo { }; + gringo = callPackage ../tools/misc/gringo { }; gti = callPackage ../tools/misc/gti { }; From b51f165334dcc30db4d6dd2a1c0c20d036c0fa6e Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sat, 12 Nov 2016 15:35:32 +0100 Subject: [PATCH 0197/1749] apache-httpd * Introduce listen = [ { ip = "*"; port = 443; } ]; configuartion. * deprecated port = 443 option which is no longer needed --- .../web-servers/apache-httpd/default.nix | 43 +++++++++++++------ .../apache-httpd/per-server-options.nix | 25 ++++++++++- 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 397857ea0858..2d71bcc0c79a 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -16,7 +16,17 @@ let phpMajorVersion = head (splitString "." php.version); - getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80; + defaultListen = cfg: if cfg.enableSSL + then [{ip = "*"; port = 443;}] + else [{ip = "*"; port = 80;}]; + + getListen = cfg: + let list = (lib.optional (cfg.port != 0) {ip = "*"; port = cfg.port;}) ++ cfg.listen; + in if list == [] + then defaultListen cfg + else list; + + listenToString = l: "${l.ip}:${toString l.port}"; extraModules = attrByPath ["extraModules"] [] mainCfg; extraForeignModules = filter isAttrs extraModules; @@ -25,10 +35,13 @@ let makeServerInfo = cfg: { # Canonical name must not include a trailing slash. - canonicalName = - (if cfg.enableSSL then "https" else "http") + "://" + - cfg.hostName + - (if getPort cfg != (if cfg.enableSSL then 443 else 80) then ":${toString (getPort cfg)}" else ""); + canonicalNames = + let defaultPort = (head (defaultListen cfg)).port; in + map (port: + (if cfg.enableSSL then "https" else "http") + "://" + + cfg.hostName + + (if port != defaultPort then ":${toString port}" else "") + ) (map (x: x.port) (getListen cfg)); # Admin address: inherit from the main server if not specified for # a virtual host. @@ -224,7 +237,7 @@ let ++ (map (svc: svc.robotsEntries) subservices))); in '' - ServerName ${serverInfo.canonicalName} + ${concatStringsSep "\n" (map (n: "ServerName ${n}") serverInfo.canonicalNames)} ${concatMapStrings (alias: "ServerAlias ${alias}\n") cfg.serverAliases} @@ -326,9 +339,10 @@ let ${let - ports = map getPort allHosts; - uniquePorts = uniqList {inputList = ports;}; - in concatMapStrings (port: "Listen ${toString port}\n") uniquePorts + listen = concatMap getListen allHosts; + toStr = listen: "Listen ${listenToString listen}\n"; + uniqueListen = uniqList {inputList = map toStr listen;}; + in concatStrings uniqueListen } User ${mainCfg.user} @@ -382,15 +396,15 @@ let # Always enable virtual hosts; it doesn't seem to hurt. ${let - ports = map getPort allHosts; - uniquePorts = uniqList {inputList = ports;}; - directives = concatMapStrings (port: "NameVirtualHost *:${toString port}\n") uniquePorts; + listen = concatMap getListen allHosts; + uniqueListen = uniqList {inputList = listen;}; + directives = concatMapStrings (listen: "NameVirtualHost ${listenToString listen}\n") uniqueListen; in optionalString (!version24) directives } ${let makeVirtualHost = vhost: '' - + ${perServerConf false vhost} ''; @@ -628,6 +642,8 @@ in message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; } ]; + warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port}";}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts); + users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton { name = "wwwrun"; group = mainCfg.group; @@ -712,5 +728,4 @@ in }; }; - } diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix index 5abcc5e74900..1d53ce659005 100644 --- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix @@ -28,9 +28,30 @@ with lib; type = types.int; default = 0; description = '' - Port for the server. 0 means use the default port: 80 for http - and 443 for https (i.e. when enableSSL is set). + Port for the server. Option will be removed, use instead. + ''; + }; + + listen = mkOption { + type = types.listOf (types.submodule ( + { + options = { + port = mkOption { + type = types.int; + description = "port to listen on"; + }; + ip = mkOption { + type = types.string; + default = "*"; + description = "Ip to listen on. 0.0.0.0 for ipv4 only, * for all."; + }; + }; + } )); + description = '' + List of { /* ip: "*"; */ port = 80;} to listen on ''; + + default = []; }; enableSSL = mkOption { From 2079c92fa9275dccdd8ae9e69916c4aa1e6ffc64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20G=C3=B6tz?= Date: Sat, 12 Nov 2016 15:39:45 +0100 Subject: [PATCH 0198/1749] qutebrowser: 0.8.2 -> 0.8.4 --- 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 af1256d3442b..0d9c1a113f8d 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -24,12 +24,12 @@ let in buildPythonApplication rec { name = "qutebrowser-${version}"; - version = "0.8.2"; + version = "0.8.4"; namePrefix = ""; src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1kfxjdn1dqla8d8gcggp55zcgf4zb77knkfshd213my0iw2yzgcf"; + sha256 = "0wc6iq7rw89625v595bs4y8spzhid6nnz2gq67f2kbjppk2rikpm"; }; # Needs tox From 38c6a88274572d161368b840a7a4b957bca9efa8 Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 12 Nov 2016 15:33:07 +0000 Subject: [PATCH 0199/1749] citrix-receiver: 13.3.0 -> 13.4.0 --- .../networking/remote/citrix-receiver/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index f8ec7ec01d91..57d04e528452 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -24,17 +24,17 @@ stdenv.mkDerivation rec { name = "citrix-receiver-${version}"; - version = "13.3.0"; + version = "13.4.0"; homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; src = requireFile rec { - name = "${prefixWithBitness}-${version}.344519.tar.gz"; + name = "${prefixWithBitness}-${version}.10109380.tar.gz"; sha256 = if stdenv.is64bit - then "11l0s4f1si43qlxai053ps4nks7v4bahipsmcdpnrdzq0vps17ls" - else "0sbgkb9a3ss2n08lal7qk8pmxyqbvkm7jj7l995ddjaa6jbkr3fz"; + then "133brs0sq6d0mgr19rc6ig1n9ahm3ryi23v5nrgqfh0hgxqcrrjb" + else "0r7jfl5yqv1s2npy8l9gsn0gbb82f6raa092ppkc8xy5pni5sh7l"; message = '' In order to use Citrix Receiver, you need to comply with the Citrix EULA and download the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: From b83c0783d3f6c624342a3e57b9511f0794ddfc40 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sat, 12 Nov 2016 18:12:10 +0100 Subject: [PATCH 0200/1749] bluez: 5.40 -> 5.43 --- pkgs/os-specific/linux/bluez/bluez5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index de318a9474a0..b54298124415 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.40"; + name = "bluez-5.43"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "09ywk3lvgis0nbi0d5z8d4qp5r33lzwnd6bdakacmbsm420qpnns"; + sha256 = "05cdnpz0w2lwq2x5ba87q1h2wgb4lfnpbnbh6p7499hx59fw1j8n"; }; pythonPath = with pythonPackages; From f68e16f0235989f11ad7394edf656649c652bef4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 11 Nov 2016 06:34:24 -0800 Subject: [PATCH 0201/1749] top-level: Make cross compiling slightly saner Removes the weird stdenv cycle used to match the old infrastructure. It turns out that matching it so precisely is not needed. --- pkgs/stdenv/cross/default.nix | 20 +++++++++----------- pkgs/top-level/all-packages.nix | 11 +++++++---- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 93c5a21d9d5a..575692ca0126 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -8,24 +8,22 @@ rec { }; vanillaStdenv = (import ../. (args // argClobber // { allPackages = args: allPackages (argClobber // args); - })).stdenv; + })).stdenv // { + # Needed elsewhere as a hacky way to pass the target + cross = crossSystem; + }; - # Yeah this isn't so cleanly just build-time packages yet. Notice the - # buildPackages <-> stdenvCross cycle. Yup, it's very weird. - # - # This works because the derivation used to build `stdenvCross` are in - # fact using `forceNativeDrv` to use the `nativeDrv` attribute of the resulting - # derivation built with `vanillaStdenv` (second argument of `makeStdenvCross`). - # - # Eventually, `forceNativeDrv` should be removed and the cycle broken. + # For now, this is just used to build the native stdenv. Eventually, it should + # be used to build compilers and other such tools targeting the cross + # platform. Then, `forceNativeDrv` can be removed. buildPackages = allPackages { # It's OK to change the built-time dependencies allowCustomOverrides = true; - bootStdenv = stdenvCross; + bootStdenv = vanillaStdenv; inherit system platform crossSystem config; }; stdenvCross = buildPackages.makeStdenvCross - vanillaStdenv crossSystem + buildPackages.stdenv crossSystem buildPackages.binutilsCross buildPackages.gccCrossStageFinal; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 342b4e50d96f..1cee25320760 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -46,10 +46,13 @@ in callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg); - forceNativeDrv = drv : if crossSystem == null then drv else - (drv // { crossDrv = drv.nativeDrv; }); - - stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal); + forceNativeDrv = drv: + # Even when cross compiling, some packages come from the stdenv's + # bootstrapping package set. Those packages are only built for the native + # platform. + if crossSystem != null && drv ? crossDrv + then drv // { crossDrv = drv.nativeDrv; } + else drv; # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's From 62f9196e35a2eb3eafb92628256450a88c5a530e Mon Sep 17 00:00:00 2001 From: Corbin Date: Sat, 12 Nov 2016 11:52:04 -0800 Subject: [PATCH 0202/1749] pythonPackages.stripe: init at 1.41.1 --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59dfde790ae0..23934589cccb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31258,4 +31258,28 @@ in { maintainers = with maintainers; [ mikefaille ]; }; }; + + stripe = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "stripe"; + version = "1.41.1"; + + # Tests require network connectivity and there's no easy way to disable + # them. ~ C. + doCheck = false; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/${pname}/${name}.tar.gz"; + sha256 = "0zvffvq933ia5w5ll6xhx2zgvppgc6zc2mxhc6f0kypw5g2fxvz5"; + }; + + buildInputs = with self; [ unittest2 mock ]; + propagatedBuildInputs = with self; [ requests ]; + + meta = { + homepage = "https://github.com/stripe/stripe-python"; + description = "Stripe Python bindings"; + license = licenses.mit; + }; + }; } From fcfe3c0909c7703bf5cfe6a7c2402e7e1b08b1d6 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Sat, 12 Nov 2016 12:48:42 +0300 Subject: [PATCH 0203/1749] jemalloc: 4.1.1 -> 4.3.1 Fixes #18466. --- pkgs/development/libraries/jemalloc/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index a332487d4edf..84638bc01ea6 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "jemalloc-4.1.1"; + name = "jemalloc-${version}"; + version = "4.3.1"; src = fetchurl { - url = "http://www.canonware.com/download/jemalloc/${name}.tar.bz2"; - sha256 = "1bmdr51wxiir595k2r6z9a7rcgm42kkgnr586xir7vdcndr3pwf8"; + url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2"; + sha256 = "12r71i8nm3vwz21fc16rwbb0pwcg5s05n1qg3rwl2s85v0x1ifzp"; }; # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix="; meta = with stdenv.lib; { - homepage = http://www.canonware.com/jemalloc/index.html; + homepage = http://jemalloc.net; description = "General purpose malloc(3) implementation"; longDescription = '' malloc(3)-compatible memory allocator that emphasizes fragmentation From dcb76cda796a2f0a34da90a855146bb7e7c41eac Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 12 Nov 2016 16:37:20 -0500 Subject: [PATCH 0204/1749] atom: 1.12.1 -> 1.12.2 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 03483db3adf6..96b26e6bee1b 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.12.1"; + version = "1.12.2"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0v7qlqkpq5zymn0ww35ywkh0vzm2mfpah18nqrc0rx0kvxr0xzqj"; + sha256 = "03kznbxfxyjq9fqq1jvq3gvvy50dz3wqvn098n9k9gv8x3595mw4"; name = "${name}.deb"; }; From 7e933af17344c049cdb13bffeafdb82f0927f3bc Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 12 Nov 2016 17:14:20 +0100 Subject: [PATCH 0205/1749] db: fix build with libc++-3.8 --- pkgs/development/libraries/db/clang-4.8.patch | 22 --- pkgs/development/libraries/db/clang-5.3.patch | 154 ------------------ .../development/libraries/db/cygwin-4.4.patch | 21 --- .../development/libraries/db/cygwin-4.5.patch | 22 --- pkgs/development/libraries/db/db-4.8.nix | 20 ++- pkgs/development/libraries/db/db-5.3.nix | 4 - pkgs/development/libraries/db/generic.nix | 18 ++ .../libraries/db/register-race-fix.patch | 47 ------ 8 files changed, 37 insertions(+), 271 deletions(-) delete mode 100644 pkgs/development/libraries/db/clang-4.8.patch delete mode 100644 pkgs/development/libraries/db/clang-5.3.patch delete mode 100644 pkgs/development/libraries/db/cygwin-4.4.patch delete mode 100644 pkgs/development/libraries/db/cygwin-4.5.patch delete mode 100644 pkgs/development/libraries/db/register-race-fix.patch diff --git a/pkgs/development/libraries/db/clang-4.8.patch b/pkgs/development/libraries/db/clang-4.8.patch deleted file mode 100644 index c53160a82970..000000000000 --- a/pkgs/development/libraries/db/clang-4.8.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/dbinc/atomic.h b/dbinc/atomic.h -index 0034dcc..fa7ba93 100644 ---- a/dbinc/atomic.h -+++ b/dbinc/atomic.h -@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; - #define atomic_inc(env, p) __atomic_inc(p) - #define atomic_dec(env, p) __atomic_dec(p) - #define atomic_compare_exchange(env, p, o, n) \ -- __atomic_compare_exchange((p), (o), (n)) -+ __db_atomic_compare_exchange((p), (o), (n)) - static inline int __atomic_inc(db_atomic_t *p) - { - int temp; -@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p) - * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html - * which configure could be changed to use. - */ --static inline int __atomic_compare_exchange( -+static inline int __db_atomic_compare_exchange( - db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) - { - atomic_value_t was; diff --git a/pkgs/development/libraries/db/clang-5.3.patch b/pkgs/development/libraries/db/clang-5.3.patch deleted file mode 100644 index 0a0993da13e1..000000000000 --- a/pkgs/development/libraries/db/clang-5.3.patch +++ /dev/null @@ -1,154 +0,0 @@ -diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h -index 6a858f7..9f338dc 100644 ---- a/src/dbinc/atomic.h -+++ b/src/dbinc/atomic.h -@@ -70,7 +70,7 @@ typedef struct { - * These have no memory barriers; the caller must include them when necessary. - */ - #define atomic_read(p) ((p)->value) --#define atomic_init(p, val) ((p)->value = (val)) -+#define atomic_init_db(p, val) ((p)->value = (val)) - - #ifdef HAVE_ATOMIC_SUPPORT - -@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; - #define atomic_inc(env, p) __atomic_inc(p) - #define atomic_dec(env, p) __atomic_dec(p) - #define atomic_compare_exchange(env, p, o, n) \ -- __atomic_compare_exchange((p), (o), (n)) -+ __atomic_compare_exchange_db((p), (o), (n)) - static inline int __atomic_inc(db_atomic_t *p) - { - int temp; -@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p) - * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html - * which configure could be changed to use. - */ --static inline int __atomic_compare_exchange( -+static inline int __atomic_compare_exchange_db( - db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) - { - atomic_value_t was; -@@ -206,7 +206,7 @@ static inline int __atomic_compare_exchange( - #define atomic_dec(env, p) (--(p)->value) - #define atomic_compare_exchange(env, p, oldval, newval) \ - (DB_ASSERT(env, atomic_read(p) == (oldval)), \ -- atomic_init(p, (newval)), 1) -+ atomic_init_db(p, (newval)), 1) - #else - #define atomic_inc(env, p) __atomic_inc(env, p) - #define atomic_dec(env, p) __atomic_dec(env, p) -diff --git a/src/dbinc/db.in b/src/dbinc/db.in -index 92ac822..f80428e 100644 ---- a/src/dbinc/db.in -+++ b/src/dbinc/db.in -@@ -2782,7 +2782,7 @@ typedef struct { - #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) - #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ - #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) --#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) -+#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) - - /******************************************************* - * Hsearch historic interface. -diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c -index 16de695..d0dcc29 100644 ---- a/src/mp/mp_fget.c -+++ b/src/mp/mp_fget.c -@@ -649,7 +649,7 @@ alloc: /* Allocate a new buffer header and data space. */ - - /* Initialize enough so we can call __memp_bhfree. */ - alloc_bhp->flags = 0; -- atomic_init(&alloc_bhp->ref, 1); -+ atomic_init_db(&alloc_bhp->ref, 1); - #ifdef DIAGNOSTIC - if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) { - __db_errx(env, DB_STR("3025", -@@ -955,7 +955,7 @@ alloc: /* Allocate a new buffer header and data space. */ - MVCC_MPROTECT(bhp->buf, mfp->pagesize, - PROT_READ); - -- atomic_init(&alloc_bhp->ref, 1); -+ atomic_init_db(&alloc_bhp->ref, 1); - MUTEX_LOCK(env, alloc_bhp->mtx_buf); - alloc_bhp->priority = bhp->priority; - alloc_bhp->pgno = bhp->pgno; -diff --git a/src/mp/mp_mvcc.c b/src/mp/mp_mvcc.c -index 770bad8..e28cce0 100644 ---- a/src/mp/mp_mvcc.c -+++ b/src/mp/mp_mvcc.c -@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp) - #else - memcpy(frozen_bhp, bhp, SSZA(BH, buf)); - #endif -- atomic_init(&frozen_bhp->ref, 0); -+ atomic_init_db(&frozen_bhp->ref, 0); - if (mutex != MUTEX_INVALID) - frozen_bhp->mtx_buf = mutex; - else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH, -@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp) - #endif - alloc_bhp->mtx_buf = mutex; - MUTEX_LOCK(env, alloc_bhp->mtx_buf); -- atomic_init(&alloc_bhp->ref, 1); -+ atomic_init_db(&alloc_bhp->ref, 1); - F_CLR(alloc_bhp, BH_FROZEN); - } - -diff --git a/src/mp/mp_region.c b/src/mp/mp_region.c -index 4952030..47645f8 100644 ---- a/src/mp/mp_region.c -+++ b/src/mp/mp_region.c -@@ -245,7 +245,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg) - MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0) - return (ret); - SH_TAILQ_INIT(&htab[i].hash_bucket); -- atomic_init(&htab[i].hash_page_dirty, 0); -+ atomic_init_db(&htab[i].hash_page_dirty, 0); - } - - /* -@@ -302,7 +302,7 @@ no_prealloc: - } else - hp->mtx_hash = mtx_base + (i % dbenv->mp_mtxcount); - SH_TAILQ_INIT(&hp->hash_bucket); -- atomic_init(&hp->hash_page_dirty, 0); -+ atomic_init_db(&hp->hash_page_dirty, 0); - #ifdef HAVE_STATISTICS - hp->hash_io_wait = 0; - hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0; -diff --git a/src/mutex/mut_method.c b/src/mutex/mut_method.c -index 09353b0..177353c 100644 ---- a/src/mutex/mut_method.c -+++ b/src/mutex/mut_method.c -@@ -474,7 +474,7 @@ atomic_compare_exchange(env, v, oldval, newval) - MUTEX_LOCK(env, mtx); - ret = atomic_read(v) == oldval; - if (ret) -- atomic_init(v, newval); -+ atomic_init_db(v, newval); - MUTEX_UNLOCK(env, mtx); - - return (ret); -diff --git a/src/mutex/mut_tas.c b/src/mutex/mut_tas.c -index 106b161..fc4de9d 100644 ---- a/src/mutex/mut_tas.c -+++ b/src/mutex/mut_tas.c -@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags) - - #ifdef HAVE_SHARED_LATCHES - if (F_ISSET(mutexp, DB_MUTEX_SHARED)) -- atomic_init(&mutexp->sharecount, 0); -+ atomic_init_db(&mutexp->sharecount, 0); - else - #endif - if (MUTEX_INIT(&mutexp->tas)) { -@@ -536,7 +536,7 @@ __db_tas_mutex_unlock(env, mutex) - F_CLR(mutexp, DB_MUTEX_LOCKED); - /* Flush flag update before zeroing count */ - MEMBAR_EXIT(); -- atomic_init(&mutexp->sharecount, 0); -+ atomic_init_db(&mutexp->sharecount, 0); - } else { - DB_ASSERT(env, sharecount > 0); - MEMBAR_EXIT(); diff --git a/pkgs/development/libraries/db/cygwin-4.4.patch b/pkgs/development/libraries/db/cygwin-4.4.patch deleted file mode 100644 index 3f9d658b5dac..000000000000 --- a/pkgs/development/libraries/db/cygwin-4.4.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rc db-4.4.20.NC-old/os/os_flock.c db-4.4.20.NC/os/os_flock.c -*** db-4.4.20.NC-old/os/os_flock.c Mon Jun 20 16:59:01 2005 ---- db-4.4.20.NC/os/os_flock.c Wed Jun 7 17:01:49 2006 -*************** -*** 36,41 **** ---- 36,50 ---- - - DB_ASSERT(F_ISSET(fhp, DB_FH_OPENED) && fhp->fd != -1); - -+ #ifdef __CYGWIN__ -+ /* -+ * Windows file locking interferes with read/write operations, so we -+ * map the ranges to an area past the end of the file. -+ */ -+ DB_ASSERT(offset < (off_t) 1 << 62); -+ offset += (off_t) 1 << 62; -+ #endif -+ - #ifdef HAVE_FCNTL - fl.l_start = offset; - fl.l_len = 1; diff --git a/pkgs/development/libraries/db/cygwin-4.5.patch b/pkgs/development/libraries/db/cygwin-4.5.patch deleted file mode 100644 index 3f0ee78a7085..000000000000 --- a/pkgs/development/libraries/db/cygwin-4.5.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -rc db-4.5.20-orig/os/os_flock.c db-4.5.20/os/os_flock.c -*** db-4.5.20-orig/os/os_flock.c 2006-10-13 12:36:12.000000000 +0200 ---- db-4.5.20/os/os_flock.c 2006-10-13 12:40:11.000000000 +0200 -*************** -*** 30,35 **** ---- 30,44 ---- - - DB_ASSERT(dbenv, F_ISSET(fhp, DB_FH_OPENED) && fhp->fd != -1); - -+ #ifdef __CYGWIN__ -+ /* -+ * Windows file locking interferes with read/write operations, so we -+ * map the ranges to an area past the end of the file. -+ */ -+ DB_ASSERT(dbenv, offset < (off_t) 1 << 62); -+ offset += (off_t) 1 << 62; -+ #endif -+ - fl.l_start = offset; - fl.l_len = 1; - fl.l_type = acquire ? F_WRLCK : F_UNLCK; -Only in db-4.5.20/os: os_flock.c~ diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index 40869a865ae5..f631a032102e 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -5,5 +5,23 @@ import ./generic.nix (args // rec { extraPatches = [ ./clang-4.8.patch ]; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; branch = "4.8"; - drvArgs = { hardeningDisable = [ "format" ]; }; + drvArgs.hardeningDisable = [ "format" ]; + + # https://community.oracle.com/thread/3952592 + # this patch renames some sybols that conflict with libc++-3.8 + # symbols: atomic_compare_exchange, atomic_init, store + drvArgs.prePatch = '' + substituteInPlace dbinc/db.in \ + --replace '#define store' '#define store_db' + + substituteInPlace dbinc/atomic.h \ + --replace atomic_compare_exchange atomic_compare_exchange_db \ + --replace atomic_init atomic_init_db + substituteInPlace mp/*.c \ + --replace atomic_compare_exchange atomic_compare_exchange_db \ + --replace atomic_init atomic_init_db + substituteInPlace mutex/*.c \ + --replace atomic_compare_exchange atomic_compare_exchange_db \ + --replace atomic_init atomic_init_db + ''; }) diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 91adfa24b58d..e22532594438 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -4,8 +4,4 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; branch = "5.3"; - # https://community.oracle.com/thread/3952592 - # this patch renames some sybols that conflict with libc++-3.8 - # symbols: atomic_compare_exchange, atomic_init, store - extraPatches = [ ./clang-5.3.patch ]; }) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index fdc828effdfb..8e3eb5248e9e 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -20,6 +20,24 @@ stdenv.mkDerivation (rec { patches = extraPatches; + # https://community.oracle.com/thread/3952592 + # this patch renames some sybols that conflict with libc++-3.8 + # symbols: atomic_compare_exchange, atomic_init, store + prePatch = '' + substituteInPlace src/dbinc/db.in \ + --replace '#define store' '#define store_db' + + substituteInPlace src/dbinc/atomic.h \ + --replace atomic_compare_exchange atomic_compare_exchange_db \ + --replace atomic_init atomic_init_db + substituteInPlace src/mp/*.c \ + --replace atomic_compare_exchange atomic_compare_exchange_db \ + --replace atomic_init atomic_init_db + substituteInPlace src/mutex/*.c \ + --replace atomic_compare_exchange atomic_compare_exchange_db \ + --replace atomic_init atomic_init_db + ''; + configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") diff --git a/pkgs/development/libraries/db/register-race-fix.patch b/pkgs/development/libraries/db/register-race-fix.patch deleted file mode 100644 index bb05c966e5bd..000000000000 --- a/pkgs/development/libraries/db/register-race-fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -rc db-4.5.20-orig/env/env_register.c db-4.5.20/env/env_register.c -*** db-4.5.20-orig/env/env_register.c 2006-09-09 16:29:04.000000000 +0200 ---- db-4.5.20/env/env_register.c 2007-05-16 21:13:27.000000000 +0200 -*************** -*** 255,260 **** ---- 255,262 ---- - buf[nr - 1] = '\0'; - } - -+ //sleep(3); -+ - pos = (off_t)lcnt * PID_LEN; - if (REGISTRY_LOCK(dbenv, pos, 1) == 0) { - if ((ret = REGISTRY_UNLOCK(dbenv, pos)) != 0) -*************** -*** 361,366 **** ---- 363,392 ---- - if (recovery_failed) - goto err; - -+ //sleep(5); -+ -+ /* -+ * Acquire an exclusive lock to prevent a race like this: -+ * -+ * 1) Process X is about to exit and process Y is just -+ * starting. -+ * 2) Process Y reads X's slot. -+ * 3) Process X clears its slot. -+ * 4) Process Y sees that X's slot isn't cleared yet (since it -+ * just read the old value). -+ * 5) Process X closes the registry, releases the lock on its -+ * slot. -+ * 6) Process Y tries to acquire X's slot and succeeds, so it -+ * concludes that X died and recovery is needed. -+ * -+ * A more efficient solution to this problem would be to let -+ * __envreg_add acquire the lock on a slot first, and *then* -+ * read the slot (instead of the other way around). Then we -+ * wouldn't need the exclusive lock here. -+ */ -+ if ((ret = REGISTRY_EXCL_LOCK(dbenv, 0)) != 0) -+ goto err; -+ - /* - * Why isn't an exclusive lock necessary to discard a DB_ENV handle? - * From c7d1925b6eb805acbeba9e9324969bf67965d350 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 13 Nov 2016 00:42:17 +0100 Subject: [PATCH 0206/1749] Revert "db: fix build with libc++-3.8" This reverts commit 7e933af17344c049cdb13bffeafdb82f0927f3bc. --- pkgs/development/libraries/db/clang-4.8.patch | 22 +++ pkgs/development/libraries/db/clang-5.3.patch | 154 ++++++++++++++++++ .../development/libraries/db/cygwin-4.4.patch | 21 +++ .../development/libraries/db/cygwin-4.5.patch | 22 +++ pkgs/development/libraries/db/db-4.8.nix | 20 +-- pkgs/development/libraries/db/db-5.3.nix | 4 + pkgs/development/libraries/db/generic.nix | 18 -- .../libraries/db/register-race-fix.patch | 47 ++++++ 8 files changed, 271 insertions(+), 37 deletions(-) create mode 100644 pkgs/development/libraries/db/clang-4.8.patch create mode 100644 pkgs/development/libraries/db/clang-5.3.patch create mode 100644 pkgs/development/libraries/db/cygwin-4.4.patch create mode 100644 pkgs/development/libraries/db/cygwin-4.5.patch create mode 100644 pkgs/development/libraries/db/register-race-fix.patch diff --git a/pkgs/development/libraries/db/clang-4.8.patch b/pkgs/development/libraries/db/clang-4.8.patch new file mode 100644 index 000000000000..c53160a82970 --- /dev/null +++ b/pkgs/development/libraries/db/clang-4.8.patch @@ -0,0 +1,22 @@ +diff --git a/dbinc/atomic.h b/dbinc/atomic.h +index 0034dcc..fa7ba93 100644 +--- a/dbinc/atomic.h ++++ b/dbinc/atomic.h +@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; + #define atomic_inc(env, p) __atomic_inc(p) + #define atomic_dec(env, p) __atomic_dec(p) + #define atomic_compare_exchange(env, p, o, n) \ +- __atomic_compare_exchange((p), (o), (n)) ++ __db_atomic_compare_exchange((p), (o), (n)) + static inline int __atomic_inc(db_atomic_t *p) + { + int temp; +@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p) + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + * which configure could be changed to use. + */ +-static inline int __atomic_compare_exchange( ++static inline int __db_atomic_compare_exchange( + db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) + { + atomic_value_t was; diff --git a/pkgs/development/libraries/db/clang-5.3.patch b/pkgs/development/libraries/db/clang-5.3.patch new file mode 100644 index 000000000000..0a0993da13e1 --- /dev/null +++ b/pkgs/development/libraries/db/clang-5.3.patch @@ -0,0 +1,154 @@ +diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h +index 6a858f7..9f338dc 100644 +--- a/src/dbinc/atomic.h ++++ b/src/dbinc/atomic.h +@@ -70,7 +70,7 @@ typedef struct { + * These have no memory barriers; the caller must include them when necessary. + */ + #define atomic_read(p) ((p)->value) +-#define atomic_init(p, val) ((p)->value = (val)) ++#define atomic_init_db(p, val) ((p)->value = (val)) + + #ifdef HAVE_ATOMIC_SUPPORT + +@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; + #define atomic_inc(env, p) __atomic_inc(p) + #define atomic_dec(env, p) __atomic_dec(p) + #define atomic_compare_exchange(env, p, o, n) \ +- __atomic_compare_exchange((p), (o), (n)) ++ __atomic_compare_exchange_db((p), (o), (n)) + static inline int __atomic_inc(db_atomic_t *p) + { + int temp; +@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p) + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + * which configure could be changed to use. + */ +-static inline int __atomic_compare_exchange( ++static inline int __atomic_compare_exchange_db( + db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) + { + atomic_value_t was; +@@ -206,7 +206,7 @@ static inline int __atomic_compare_exchange( + #define atomic_dec(env, p) (--(p)->value) + #define atomic_compare_exchange(env, p, oldval, newval) \ + (DB_ASSERT(env, atomic_read(p) == (oldval)), \ +- atomic_init(p, (newval)), 1) ++ atomic_init_db(p, (newval)), 1) + #else + #define atomic_inc(env, p) __atomic_inc(env, p) + #define atomic_dec(env, p) __atomic_dec(env, p) +diff --git a/src/dbinc/db.in b/src/dbinc/db.in +index 92ac822..f80428e 100644 +--- a/src/dbinc/db.in ++++ b/src/dbinc/db.in +@@ -2782,7 +2782,7 @@ typedef struct { + #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) + #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ + #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) +-#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) ++#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) + + /******************************************************* + * Hsearch historic interface. +diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c +index 16de695..d0dcc29 100644 +--- a/src/mp/mp_fget.c ++++ b/src/mp/mp_fget.c +@@ -649,7 +649,7 @@ alloc: /* Allocate a new buffer header and data space. */ + + /* Initialize enough so we can call __memp_bhfree. */ + alloc_bhp->flags = 0; +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + #ifdef DIAGNOSTIC + if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) { + __db_errx(env, DB_STR("3025", +@@ -955,7 +955,7 @@ alloc: /* Allocate a new buffer header and data space. */ + MVCC_MPROTECT(bhp->buf, mfp->pagesize, + PROT_READ); + +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + MUTEX_LOCK(env, alloc_bhp->mtx_buf); + alloc_bhp->priority = bhp->priority; + alloc_bhp->pgno = bhp->pgno; +diff --git a/src/mp/mp_mvcc.c b/src/mp/mp_mvcc.c +index 770bad8..e28cce0 100644 +--- a/src/mp/mp_mvcc.c ++++ b/src/mp/mp_mvcc.c +@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp) + #else + memcpy(frozen_bhp, bhp, SSZA(BH, buf)); + #endif +- atomic_init(&frozen_bhp->ref, 0); ++ atomic_init_db(&frozen_bhp->ref, 0); + if (mutex != MUTEX_INVALID) + frozen_bhp->mtx_buf = mutex; + else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH, +@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp) + #endif + alloc_bhp->mtx_buf = mutex; + MUTEX_LOCK(env, alloc_bhp->mtx_buf); +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + F_CLR(alloc_bhp, BH_FROZEN); + } + +diff --git a/src/mp/mp_region.c b/src/mp/mp_region.c +index 4952030..47645f8 100644 +--- a/src/mp/mp_region.c ++++ b/src/mp/mp_region.c +@@ -245,7 +245,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg) + MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0) + return (ret); + SH_TAILQ_INIT(&htab[i].hash_bucket); +- atomic_init(&htab[i].hash_page_dirty, 0); ++ atomic_init_db(&htab[i].hash_page_dirty, 0); + } + + /* +@@ -302,7 +302,7 @@ no_prealloc: + } else + hp->mtx_hash = mtx_base + (i % dbenv->mp_mtxcount); + SH_TAILQ_INIT(&hp->hash_bucket); +- atomic_init(&hp->hash_page_dirty, 0); ++ atomic_init_db(&hp->hash_page_dirty, 0); + #ifdef HAVE_STATISTICS + hp->hash_io_wait = 0; + hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0; +diff --git a/src/mutex/mut_method.c b/src/mutex/mut_method.c +index 09353b0..177353c 100644 +--- a/src/mutex/mut_method.c ++++ b/src/mutex/mut_method.c +@@ -474,7 +474,7 @@ atomic_compare_exchange(env, v, oldval, newval) + MUTEX_LOCK(env, mtx); + ret = atomic_read(v) == oldval; + if (ret) +- atomic_init(v, newval); ++ atomic_init_db(v, newval); + MUTEX_UNLOCK(env, mtx); + + return (ret); +diff --git a/src/mutex/mut_tas.c b/src/mutex/mut_tas.c +index 106b161..fc4de9d 100644 +--- a/src/mutex/mut_tas.c ++++ b/src/mutex/mut_tas.c +@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags) + + #ifdef HAVE_SHARED_LATCHES + if (F_ISSET(mutexp, DB_MUTEX_SHARED)) +- atomic_init(&mutexp->sharecount, 0); ++ atomic_init_db(&mutexp->sharecount, 0); + else + #endif + if (MUTEX_INIT(&mutexp->tas)) { +@@ -536,7 +536,7 @@ __db_tas_mutex_unlock(env, mutex) + F_CLR(mutexp, DB_MUTEX_LOCKED); + /* Flush flag update before zeroing count */ + MEMBAR_EXIT(); +- atomic_init(&mutexp->sharecount, 0); ++ atomic_init_db(&mutexp->sharecount, 0); + } else { + DB_ASSERT(env, sharecount > 0); + MEMBAR_EXIT(); diff --git a/pkgs/development/libraries/db/cygwin-4.4.patch b/pkgs/development/libraries/db/cygwin-4.4.patch new file mode 100644 index 000000000000..3f9d658b5dac --- /dev/null +++ b/pkgs/development/libraries/db/cygwin-4.4.patch @@ -0,0 +1,21 @@ +diff -rc db-4.4.20.NC-old/os/os_flock.c db-4.4.20.NC/os/os_flock.c +*** db-4.4.20.NC-old/os/os_flock.c Mon Jun 20 16:59:01 2005 +--- db-4.4.20.NC/os/os_flock.c Wed Jun 7 17:01:49 2006 +*************** +*** 36,41 **** +--- 36,50 ---- + + DB_ASSERT(F_ISSET(fhp, DB_FH_OPENED) && fhp->fd != -1); + ++ #ifdef __CYGWIN__ ++ /* ++ * Windows file locking interferes with read/write operations, so we ++ * map the ranges to an area past the end of the file. ++ */ ++ DB_ASSERT(offset < (off_t) 1 << 62); ++ offset += (off_t) 1 << 62; ++ #endif ++ + #ifdef HAVE_FCNTL + fl.l_start = offset; + fl.l_len = 1; diff --git a/pkgs/development/libraries/db/cygwin-4.5.patch b/pkgs/development/libraries/db/cygwin-4.5.patch new file mode 100644 index 000000000000..3f0ee78a7085 --- /dev/null +++ b/pkgs/development/libraries/db/cygwin-4.5.patch @@ -0,0 +1,22 @@ +diff -rc db-4.5.20-orig/os/os_flock.c db-4.5.20/os/os_flock.c +*** db-4.5.20-orig/os/os_flock.c 2006-10-13 12:36:12.000000000 +0200 +--- db-4.5.20/os/os_flock.c 2006-10-13 12:40:11.000000000 +0200 +*************** +*** 30,35 **** +--- 30,44 ---- + + DB_ASSERT(dbenv, F_ISSET(fhp, DB_FH_OPENED) && fhp->fd != -1); + ++ #ifdef __CYGWIN__ ++ /* ++ * Windows file locking interferes with read/write operations, so we ++ * map the ranges to an area past the end of the file. ++ */ ++ DB_ASSERT(dbenv, offset < (off_t) 1 << 62); ++ offset += (off_t) 1 << 62; ++ #endif ++ + fl.l_start = offset; + fl.l_len = 1; + fl.l_type = acquire ? F_WRLCK : F_UNLCK; +Only in db-4.5.20/os: os_flock.c~ diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index f631a032102e..40869a865ae5 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -5,23 +5,5 @@ import ./generic.nix (args // rec { extraPatches = [ ./clang-4.8.patch ]; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; branch = "4.8"; - drvArgs.hardeningDisable = [ "format" ]; - - # https://community.oracle.com/thread/3952592 - # this patch renames some sybols that conflict with libc++-3.8 - # symbols: atomic_compare_exchange, atomic_init, store - drvArgs.prePatch = '' - substituteInPlace dbinc/db.in \ - --replace '#define store' '#define store_db' - - substituteInPlace dbinc/atomic.h \ - --replace atomic_compare_exchange atomic_compare_exchange_db \ - --replace atomic_init atomic_init_db - substituteInPlace mp/*.c \ - --replace atomic_compare_exchange atomic_compare_exchange_db \ - --replace atomic_init atomic_init_db - substituteInPlace mutex/*.c \ - --replace atomic_compare_exchange atomic_compare_exchange_db \ - --replace atomic_init atomic_init_db - ''; + drvArgs = { hardeningDisable = [ "format" ]; }; }) diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index e22532594438..91adfa24b58d 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -4,4 +4,8 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; branch = "5.3"; + # https://community.oracle.com/thread/3952592 + # this patch renames some sybols that conflict with libc++-3.8 + # symbols: atomic_compare_exchange, atomic_init, store + extraPatches = [ ./clang-5.3.patch ]; }) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index 8e3eb5248e9e..fdc828effdfb 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -20,24 +20,6 @@ stdenv.mkDerivation (rec { patches = extraPatches; - # https://community.oracle.com/thread/3952592 - # this patch renames some sybols that conflict with libc++-3.8 - # symbols: atomic_compare_exchange, atomic_init, store - prePatch = '' - substituteInPlace src/dbinc/db.in \ - --replace '#define store' '#define store_db' - - substituteInPlace src/dbinc/atomic.h \ - --replace atomic_compare_exchange atomic_compare_exchange_db \ - --replace atomic_init atomic_init_db - substituteInPlace src/mp/*.c \ - --replace atomic_compare_exchange atomic_compare_exchange_db \ - --replace atomic_init atomic_init_db - substituteInPlace src/mutex/*.c \ - --replace atomic_compare_exchange atomic_compare_exchange_db \ - --replace atomic_init atomic_init_db - ''; - configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") diff --git a/pkgs/development/libraries/db/register-race-fix.patch b/pkgs/development/libraries/db/register-race-fix.patch new file mode 100644 index 000000000000..bb05c966e5bd --- /dev/null +++ b/pkgs/development/libraries/db/register-race-fix.patch @@ -0,0 +1,47 @@ +diff -rc db-4.5.20-orig/env/env_register.c db-4.5.20/env/env_register.c +*** db-4.5.20-orig/env/env_register.c 2006-09-09 16:29:04.000000000 +0200 +--- db-4.5.20/env/env_register.c 2007-05-16 21:13:27.000000000 +0200 +*************** +*** 255,260 **** +--- 255,262 ---- + buf[nr - 1] = '\0'; + } + ++ //sleep(3); ++ + pos = (off_t)lcnt * PID_LEN; + if (REGISTRY_LOCK(dbenv, pos, 1) == 0) { + if ((ret = REGISTRY_UNLOCK(dbenv, pos)) != 0) +*************** +*** 361,366 **** +--- 363,392 ---- + if (recovery_failed) + goto err; + ++ //sleep(5); ++ ++ /* ++ * Acquire an exclusive lock to prevent a race like this: ++ * ++ * 1) Process X is about to exit and process Y is just ++ * starting. ++ * 2) Process Y reads X's slot. ++ * 3) Process X clears its slot. ++ * 4) Process Y sees that X's slot isn't cleared yet (since it ++ * just read the old value). ++ * 5) Process X closes the registry, releases the lock on its ++ * slot. ++ * 6) Process Y tries to acquire X's slot and succeeds, so it ++ * concludes that X died and recovery is needed. ++ * ++ * A more efficient solution to this problem would be to let ++ * __envreg_add acquire the lock on a slot first, and *then* ++ * read the slot (instead of the other way around). Then we ++ * wouldn't need the exclusive lock here. ++ */ ++ if ((ret = REGISTRY_EXCL_LOCK(dbenv, 0)) != 0) ++ goto err; ++ + /* + * Why isn't an exclusive lock necessary to discard a DB_ENV handle? + * From ed9b1c673b0a19fbddc5f8e757e94846ea174ec3 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 13 Nov 2016 11:38:35 +0100 Subject: [PATCH 0207/1749] google-cloud-sdk: 122.0.0 -> 134.0.0 --- pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 27ca19178a04..49c8bf14f05a 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -4,18 +4,18 @@ with python27Packages; stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "122.0.0"; + version = "134.0.0"; src = if stdenv.system == "i686-linux" then fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; - sha256 = "0nx348yx1avbb34bpj316fb7jzyzkylscyx8kv183rg4s1q2f798"; + sha256 = "0pv2whqqcjvz3x02rn08vyssvbqxsncqvx9916v2ycdpiymffdz0"; } else fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; - sha256 = "0jhw8yv2kv0fs64rzvddx3szzpn74nqnd3rbd9wx2vi6nmffkrwv"; + sha256 = "1kji861ii4ig73scg64lijcqdg2p0d2i2af1fdbkils0imwa3m5l"; }; buildInputs = [python27 makeWrapper]; From d65368ad28b93a0442e37dd8703fa2b3192ce95a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 13 Nov 2016 11:42:42 +0100 Subject: [PATCH 0208/1749] ocaml-asn1-combinators: 0.1.2 -> 0.1.3 This update relicenses the project to ISC and fixes the test bug, which broke the package on 32-bit platforms --- .../asn1-combinators/default.nix | 37 +++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 544db9e0d78b..feeb94a5c462 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -1,32 +1,39 @@ -{ stdenv, fetchzip, ocaml, findlib, cstruct, zarith, ounit }: +{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, cstruct, zarith, ounit, result, topkg, opam }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; +let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in -let version = "0.1.2"; in +buildOcaml rec { + name = "asn1-combinators"; + version = "0.1.3"; -stdenv.mkDerivation { - name = "ocaml-asn1-combinators-${version}"; + minimumSupportedOcamlVersion = "4.01"; - src = fetchzip { - url = "https://github.com/mirleft/ocaml-asn1-combinators/archive/${version}.tar.gz"; - sha256 = "13vpdgcyph4vq3gcp8b16756s4nz3crpxhxfhcqgc1ffz61gc0h5"; + src = fetchFromGitHub { + owner = "mirleft"; + repo = "ocaml-asn1-combinators"; + rev = "v${version}"; + sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj"; }; - buildInputs = [ ocaml findlib ounit ]; - propagatedBuildInputs = [ cstruct zarith ]; + buildInputs = [ ocaml findlib ounit topkg opam ]; + propagatedBuildInputs = [ result cstruct zarith ]; createFindlibDestdir = true; - configureFlags = "--enable-tests"; + buildPhase = "ocaml ${ocamlFlags} pkg/pkg.ml build --tests true"; + + installPhase = '' + opam-installer --script --prefix=$out | sh + ln -s $out/lib/asn1-combinators $out/lib/ocaml/${ocaml.version}/site-lib + ''; + doCheck = true; - checkTarget = "test"; + checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test"; meta = { homepage = https://github.com/mirleft/ocaml-asn1-combinators; description = "Combinators for expressing ASN.1 grammars in OCaml"; - platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.bsd2; + license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - broken = stdenv.isi686; # https://github.com/mirleft/ocaml-asn1-combinators/issues/13 }; } From 8600e38bcaadef0d4b13e710d9c41b30abf0a9d7 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 13 Nov 2016 11:56:25 +0100 Subject: [PATCH 0209/1749] google-cloud-sdk: add assertion for x86/x86-64 Linux --- pkgs/tools/admin/google-cloud-sdk/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 49c8bf14f05a..90bfd97ab593 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -2,6 +2,9 @@ with python27Packages; +# other systems not supported yet +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; + stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; version = "134.0.0"; From d6a3aaef89e9d640a3ba27afff06dcb432853730 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sun, 13 Nov 2016 12:07:10 +0000 Subject: [PATCH 0210/1749] vim-utils: fix typo --- pkgs/misc/vim-plugins/vim-utils.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index acb5b4fcbe1e..5110897e32aa 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -30,7 +30,7 @@ vim-with-plugins in PATH: # provide plugin which can be loaded manually: { name = "phpCompletion"; tag = "lazy"; } - # full ducomentation at github.com/MarcWeber/vim-addon-manager + # full documentation at github.com/MarcWeber/vim-addon-manager ]; # there is a pathogen implementation as well, but its startup is slower and [VAM] has more feature From 293da497c3dc6c6e595f81076ec6dd5a2fa06f52 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 14 Nov 2016 00:21:06 +0900 Subject: [PATCH 0211/1749] bspwm module: refactor --- nixos/modules/module-list.nix | 1 - .../x11/window-managers/bspwm-unstable.nix | 48 ----------- .../services/x11/window-managers/bspwm.nix | 83 +++++++++++++------ .../services/x11/window-managers/default.nix | 1 - 4 files changed, 56 insertions(+), 77 deletions(-) delete mode 100644 nixos/modules/services/x11/window-managers/bspwm-unstable.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8254ada3ddf7..0c930eb2eb0c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -539,7 +539,6 @@ ./services/x11/window-managers/fluxbox.nix ./services/x11/window-managers/icewm.nix ./services/x11/window-managers/bspwm.nix - ./services/x11/window-managers/bspwm-unstable.nix ./services/x11/window-managers/metacity.nix ./services/x11/window-managers/none.nix ./services/x11/window-managers/twm.nix diff --git a/nixos/modules/services/x11/window-managers/bspwm-unstable.nix b/nixos/modules/services/x11/window-managers/bspwm-unstable.nix deleted file mode 100644 index 3282e0d0851f..000000000000 --- a/nixos/modules/services/x11/window-managers/bspwm-unstable.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.xserver.windowManager.bspwm-unstable; -in - -{ - options = { - services.xserver.windowManager.bspwm-unstable = { - enable = mkEnableOption "bspwm-unstable"; - startThroughSession = mkOption { - type = with types; bool; - default = false; - description = " - Start the window manager through the script defined in - sessionScript. Defaults to the the bspwm-session script - provided by bspwm - "; - }; - sessionScript = mkOption { - default = "${pkgs.bspwm-unstable}/bin/bspwm-session"; - defaultText = "(pkgs.bspwm-unstable)/bin/bspwm-session"; - description = " - The start-session script to use. Defaults to the - provided bspwm-session script from the bspwm package. - - Does nothing unless `bspwm.startThroughSession` is enabled - "; - }; - }; - }; - - config = mkIf cfg.enable { - services.xserver.windowManager.session = singleton { - name = "bspwm-unstable"; - start = if cfg.startThroughSession - then cfg.sessionScript - else '' - export _JAVA_AWT_WM_NONREPARENTING=1 - SXHKD_SHELL=/bin/sh ${pkgs.sxhkd-unstable}/bin/sxhkd -f 100 & - ${pkgs.bspwm-unstable}/bin/bspwm - ''; - }; - environment.systemPackages = [ pkgs.bspwm-unstable ]; - }; -} diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix index 03a1b7a72e88..6783ac3479e6 100644 --- a/nixos/modules/services/x11/window-managers/bspwm.nix +++ b/nixos/modules/services/x11/window-managers/bspwm.nix @@ -9,40 +9,69 @@ in { options = { services.xserver.windowManager.bspwm = { - enable = mkEnableOption "bspwm"; - startThroughSession = mkOption { - type = with types; bool; - default = false; - description = " - Start the window manager through the script defined in - sessionScript. Defaults to the the bspwm-session script - provided by bspwm - "; - }; - sessionScript = mkOption { - default = "${pkgs.bspwm}/bin/bspwm-session"; - defaultText = "(pkgs.bspwm)/bin/bspwm-session"; - description = " - The start-session script to use. Defaults to the - provided bspwm-session script from the bspwm package. + enable = mkEnableOption "bspwm"; - Does nothing unless `bspwm.startThroughSession` is enabled - "; + package = mkOption { + type = types.package; + default = pkgs.bspwm; + defaultText = "pkgs.bspwm"; + example = "pkgs.bspwm-unstable"; + description = '' + bspwm package to use. + ''; + }; + configFile = mkOption { + type = with types; nullOr path; + example = "${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"; + default = null; + description = '' + Path to the bspwm configuration file. + If null, $HOME/.config/bspwm/bspwmrc will be used. + ''; + }; + + sxhkd = { + package = mkOption { + type = types.package; + default = pkgs.sxhkd; + defaultText = "pkgs.sxhkd"; + example = "pkgs.sxhkd-unstable"; + description = '' + sxhkd package to use. + ''; }; + configFile = mkOption { + type = with types; nullOr path; + example = "${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"; + default = null; + description = '' + Path to the sxhkd configuration file. + If null, $HOME/.config/sxhkd/sxhkdrc will be used. + ''; + }; + }; }; }; config = mkIf cfg.enable { services.xserver.windowManager.session = singleton { - name = "bspwm"; - start = if cfg.startThroughSession - then cfg.sessionScript - else '' - export _JAVA_AWT_WM_NONREPARENTING=1 - SXHKD_SHELL=/bin/sh ${pkgs.sxhkd}/bin/sxhkd -f 100 & - ${pkgs.bspwm}/bin/bspwm - ''; + name = "bspwm"; + start = '' + export _JAVA_AWT_WM_NONREPARENTING=1 + SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""} & + ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} + waitPID=$! + ''; }; - environment.systemPackages = [ pkgs.bspwm ]; + environment.systemPackages = [ cfg.package ]; }; + + imports = [ + (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ] + "Use services.xserver.windowManager.bspwm.enable and set services.xserver.windowManager.bspwm.package to pkgs.bspwm-unstable to use the unstable version of bspwm.") + (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm" "startThroughSession" ] + "bspwm package does not provide bspwm-session anymore.") + (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm" "sessionScript" ] + "bspwm package does not provide bspwm-session anymore.") + ]; } diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index dabe2c26a72f..f005decfa33c 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -10,7 +10,6 @@ in imports = [ ./afterstep.nix ./bspwm.nix - ./bspwm-unstable.nix ./compiz.nix ./dwm.nix ./exwm.nix From 8ea1e9353702748efdae1baa9f457dd86612a79e Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 14 Nov 2016 00:23:25 +0900 Subject: [PATCH 0212/1749] 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 84c87dce2a7efda5d6823a775ef3746734abadfa Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sat, 24 Sep 2016 09:42:18 -0700 Subject: [PATCH 0213/1749] vulkan-loader: fix evaluation without source --- pkgs/development/libraries/vulkan-loader/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 4c00bb861425..8b986798517d 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -11,7 +11,6 @@ let rev = "sdk-${version}"; sha256 = "157m746hc76xrxd3qq0f44f5dy7pjbz8cx74ykqrlbc7rmpjpk58"; }; - getRev = name: builtins.substring 0 40 (builtins.readFile "${src}/${name}_revision"); in stdenv.mkDerivation rec { @@ -37,6 +36,15 @@ stdenv.mkDerivation rec { "-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default ]; + preConfigure = '' + checkRev() { + [ "$2" = $(cat "$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "$1_revision") && exit 1) + } + checkRev spirv-tools "${spirv-tools.src.rev}" + checkRev spirv-headers "${spirv-tools.headers.rev}" + checkRev glslang "${glslang.src.rev}" + ''; + installPhase = '' mkdir -p $out/lib mkdir -p $out/bin From 8fe96a1926e4eb96b69fe99f187b378d7cac461e Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 25 Sep 2016 17:33:09 -0300 Subject: [PATCH 0214/1749] vulkan-loader: package headers, layers and demos --- .../libraries/vulkan-loader/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 8b986798517d..334489cb22db 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { "-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default ]; + outputs = [ "out" "dev" "demos" ]; + preConfigure = '' checkRev() { [ "$2" = $(cat "$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "$1_revision") && exit 1) @@ -46,11 +48,18 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/lib - mkdir -p $out/bin - cp loader/libvulkan.so* $out/lib + mkdir -p $out/lib $out/bin + cp -d loader/libvulkan.so* $out/lib cp demos/vulkaninfo $out/bin - ''; + mkdir -p $out/lib $out/etc/explicit_layer.d + cp -d layers/*.so $out/lib/ + cp -d layers/*.json $out/etc/explicit_layer.d/ + sed -i "s:\\./lib:$out/lib/lib:g" "$out/etc/"**/*.json + mkdir -p $dev/include + cp -rv ../include $dev/ + mkdir -p $demos/bin + cp demos/smoketest demos/tri demos/cube demos/*.spv demos/*.ppm $demos/bin + ''; meta = with stdenv.lib; { description = "LunarG Vulkan loader"; From 1624507eaf379f31cc133dd86fbbe90a5b2c8944 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 26 Sep 2016 19:53:08 -0300 Subject: [PATCH 0215/1749] vulkan-loader: allow 32-bit builds --- pkgs/development/libraries/vulkan-loader/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 334489cb22db..612ba2381137 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, python3Packages, glslang, spirv-tools, x11, libxcb, wayland }: -assert stdenv.system == "x86_64-linux"; - let version = "1.0.26.0"; src = fetchFromGitHub { From e783cc90a092768d631559c9ee389269c1daad5e Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sat, 12 Nov 2016 11:29:13 -0400 Subject: [PATCH 0216/1749] opengl: add driver paths to XDG_DATA_DIRS --- nixos/modules/hardware/opengl.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index bef500e30c0b..c4fad9a66725 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -135,6 +135,12 @@ in environment.sessionVariables.LD_LIBRARY_PATH = [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]; + environment.extraInit = '' + export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/opengl-driver/share + '' + optionalString cfg.driSupport32Bit '' + export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/opengl-driver-32/share + ''; + hardware.opengl.package = mkDefault (makePackage pkgs); hardware.opengl.package32 = mkDefault (makePackage pkgs_i686); From 6bf27c2caeb621472151c63fc33c4951ce0188d1 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 11 Oct 2016 13:50:52 -0300 Subject: [PATCH 0217/1749] vulkan-loader: allow validation layers to be enabled The loader now uses XDK_DATA_DIRS to find drivers and layers. --- nixos/modules/config/system-path.nix | 1 + nixos/modules/hardware/video/amdgpu-pro.nix | 2 - .../libraries/vulkan-loader/default.nix | 8 +- .../vulkan-loader/use-xdg-paths.patch | 142 ++++++++++++++++++ pkgs/os-specific/linux/amdgpu-pro/default.nix | 5 +- 5 files changed, 151 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 775d0c39c4fa..3ac5f634c7a6 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -118,6 +118,7 @@ in "/share/terminfo" "/share/themes" "/share/vim-plugins" + "/share/vulkan" ]; system.path = pkgs.buildEnv { diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix index 3723d7690dc6..979810abf90a 100644 --- a/nixos/modules/hardware/video/amdgpu-pro.nix +++ b/nixos/modules/hardware/video/amdgpu-pro.nix @@ -45,10 +45,8 @@ in "amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb"; "gbm/gbm.conf".source = package + "/etc/gbm/gbm.conf"; "OpenCL/vendors/amdocl64.icd".source = package + "/etc/OpenCL/vendors/amdocl64.icd"; - "vulkan/icd.d/amd_icd64.json".source = package + "/etc/vulkan/icd.d/amd_icd64.json"; } // optionalAttrs opengl.driSupport32Bit { "OpenCL/vendors/amdocl32.icd".source = package32 + "/etc/OpenCL/vendors/amdocl32.icd"; - "vulkan/icd.d/amd_icd32.json".source = package32 + "/etc/vulkan/icd.d/amd_icd32.json"; }; }; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 612ba2381137..622d027c60bc 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { "-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default ]; + patches = [ ./use-xdg-paths.patch ]; + outputs = [ "out" "dev" "demos" ]; preConfigure = '' @@ -49,10 +51,10 @@ stdenv.mkDerivation rec { mkdir -p $out/lib $out/bin cp -d loader/libvulkan.so* $out/lib cp demos/vulkaninfo $out/bin - mkdir -p $out/lib $out/etc/explicit_layer.d + mkdir -p $out/lib $out/share/vulkan/explicit_layer.d cp -d layers/*.so $out/lib/ - cp -d layers/*.json $out/etc/explicit_layer.d/ - sed -i "s:\\./lib:$out/lib/lib:g" "$out/etc/"**/*.json + cp -d layers/*.json $out/share/vulkan/explicit_layer.d/ + sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json mkdir -p $dev/include cp -rv ../include $dev/ mkdir -p $demos/bin diff --git a/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch new file mode 100644 index 000000000000..1ae0f20889fc --- /dev/null +++ b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch @@ -0,0 +1,142 @@ +diff --git a/loader/loader.c b/loader/loader.c +index a950ea1..9462d05 100644 +--- a/loader/loader.c ++++ b/loader/loader.c +@@ -2671,6 +2671,94 @@ static VkResult loader_get_manifest_files( + } + } + ++#if !defined(_WIN32) ++ if (home_location && override == NULL) { ++ char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS"); ++ char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS"); ++ char *cur, *src = loc; ++ size_t src_size = strlen(src), rel_size = strlen(home_location); ++ size_t size = 0; ++ ++ if (src_size > 0) ++ size += src_size + 1; ++ ++ if (xdgconfdirs == NULL) ++ xdgconfdirs = "/etc/xdg"; ++ if (xdgdatadirs == NULL) ++ xdgdatadirs = "/usr/local/share:/usr/share"; ++ ++ for (char *x = xdgconfdirs; *x; ++x) ++ if (*x == PATH_SEPERATOR) size += rel_size; ++ size += strlen(xdgconfdirs) + rel_size + 1; ++ for (char *x = xdgdatadirs; *x; ++x) ++ if (*x == PATH_SEPERATOR) size += rel_size; ++ size += strlen(xdgdatadirs) + rel_size + 1; ++ ++#if defined(LOCALPREFIX) ++ size += strlen(LOCALPREFIX "/" SYSCONFDIR) + rel_size + 1; ++ size += strlen(LOCALPREFIX "/" DATADIR) + rel_size + 1; ++#endif ++ ++ loc = cur = loader_stack_alloc(size); ++ if (cur == NULL) { ++ loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, ++ "Out of memory can't get manifest files"); ++ res = VK_ERROR_OUT_OF_HOST_MEMORY; ++ goto out; ++ } ++ ++ if (src_size > 0) { ++ memcpy(cur, src, src_size); ++ cur += src_size; ++ *cur++ = PATH_SEPERATOR; ++ } ++ ++ src = xdgconfdirs; ++ for (char *x = src;; ++x) { ++ if (*x == PATH_SEPERATOR || *x == 0) { ++ size_t s = x - src; ++ memcpy(cur, src, s); cur += s; ++ memcpy(cur, home_location, rel_size); cur += rel_size; ++ *cur++ = PATH_SEPERATOR; ++ if (*x == 0) ++ break; ++ src = ++x; ++ } ++ } ++ ++#if defined(LOCALPREFIX) ++ strcpy(cur, LOCALPREFIX "/" SYSCONFDIR); ++ cur += strlen(cur); ++ memcpy(cur, home_location, rel_size); cur += rel_size; ++ *cur++ = PATH_SEPERATOR; ++#endif ++ ++ src = xdgdatadirs; ++ for (char *x = src;; ++x) { ++ if (*x == PATH_SEPERATOR || *x == 0) { ++ size_t s = x - src; ++ memcpy(cur, src, s); cur += s; ++ memcpy(cur, home_location, rel_size); cur += rel_size; ++ *cur++ = PATH_SEPERATOR; ++ if (*x == 0) ++ break; ++ src = ++x; ++ } ++ } ++ ++#if defined(LOCALPREFIX) ++ strcpy(cur, LOCALPREFIX "/" DATADIR); ++ cur += strlen(cur); ++ memcpy(cur, home_location, rel_size); cur += rel_size; ++ *cur++ = PATH_SEPERATOR; ++#endif ++ ++ loc[size - 1] = 0; ++ assert(cur == loc + size); ++ list_is_dirs = true; ++ } ++#endif ++ + // Print out the paths being searched if debugging is enabled + loader_log(inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, + "Searching the following paths for manifest files: %s\n", loc); +diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h +index 3a02640..70a2652 100644 +--- a/loader/vk_loader_platform.h ++++ b/loader/vk_loader_platform.h +@@ -57,35 +57,10 @@ + #define VULKAN_ILAYERCONF_DIR "implicit_layer.d" + #define VULKAN_LAYER_DIR "layer" + +-#if defined(LOCALPREFIX) +-#define LOCAL_DRIVERS_INFO \ +- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" \ +- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" +-#define LOCAL_ELAYERS_INFO \ +- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" \ +- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" +-#define LOCAL_ILAYERS_INFO \ +- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" \ +- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" +-#else +-#define LOCAL_DRIVERS_INFO +-#define LOCAL_ELAYERS_INFO +-#define LOCAL_ILAYERS_INFO +-#endif +- +-#define DEFAULT_VK_DRIVERS_INFO \ +- LOCAL_DRIVERS_INFO \ +- "/" SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" \ +- "/usr/" DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR ++#define DEFAULT_VK_DRIVERS_INFO "" + #define DEFAULT_VK_DRIVERS_PATH "" +-#define DEFAULT_VK_ELAYERS_INFO \ +- LOCAL_ELAYERS_INFO \ +- "/" SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" \ +- "/usr/" DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR +-#define DEFAULT_VK_ILAYERS_INFO \ +- LOCAL_ILAYERS_INFO \ +- "/" SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" \ +- "/usr/" DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ++#define DEFAULT_VK_ELAYERS_INFO "" ++#define DEFAULT_VK_ILAYERS_INFO "" + #define DEFAULT_VK_LAYERS_PATH "" + #if !defined(LAYERS_SOURCE_PATH) + #define LAYERS_SOURCE_PATH NULL diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 17a066640410..856989381ef1 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -92,12 +92,13 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -r usr/bin $out/bin + cp -r usr/share $out/share cp -r etc $out/etc + mv $out/etc/vulkan $out/share cp -r usr/include $out/include cp -r usr/lib/${libArch} $out/lib mv $out/lib/amdgpu-pro/* $out/lib/ rmdir $out/lib/amdgpu-pro - cp -r usr/share $out/share '' + optionalString (!libsOnly) '' if [ -d $out/lib/xorg ]; then rm $out/lib/xorg @@ -133,7 +134,7 @@ in stdenv.mkDerivation rec { perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib" fi done - substituteInPlace "$out/etc/vulkan/icd.d/amd_icd${bitness}.json" --replace "/usr/lib/${libArch}" "$out/lib" + substituteInPlace "$out/share/vulkan/icd.d/amd_icd${bitness}.json" --replace "/usr/lib/${libArch}" "$out/lib" ''; buildInputs = [ From e1a25aeb656d7f458936a83d1c2937a8778714a1 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 26 Oct 2016 22:50:56 -0300 Subject: [PATCH 0218/1749] amdgpu-pro: fix kernel module for linux-4.8 --- pkgs/os-specific/linux/amdgpu-pro/default.nix | 27 ++- ...-vga-switcheroo-handler-flag-for-4.8.patch | 27 +++ .../0001-add-OS-detection-for-arch.patch | 26 --- ...002-Remove-dependency-on-System.map.patch} | 20 +- ...ate-kcl_ttm_bo_reserve-for-linux-4.7.patch | 25 --- .../0003-add-kcl_drm_gem_object_lookup.patch | 204 ------------------ ...atch => 0003-disable-dal-by-default.patch} | 0 .../0004-paging-changes-for-linux-4.6.patch | 42 ---- ...RU-stuff-isn-t-available-until-4.7.x.patch | 48 ----- ...blank_disable_allowed-to-vblank_disa.patch | 29 --- ...-parameter-from-__drm_atomic_helper_.patch | 29 --- ...o-in-bandwidth_calcs-causing-array-e.patch | 25 --- 12 files changed, 53 insertions(+), 449 deletions(-) create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch rename pkgs/os-specific/linux/amdgpu-pro/patches/{0010-remove-dependency-on-System.map.patch => 0002-Remove-dependency-on-System.map.patch} (85%) delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch rename pkgs/os-specific/linux/amdgpu-pro/patches/{0009-disable-dal-by-default.patch => 0003-disable-dal-by-default.patch} (100%) delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 856989381ef1..5c11fad35970 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, elfutils, mesa_noglu , xorg, patchelf, openssl, libdrm, libudev , libxcb, libxshmfence, epoxy, perl, zlib +, fetchFromGitHub , libsOnly ? false, kernel ? null }: @@ -42,6 +43,13 @@ in stdenv.mkDerivation rec { curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx"; }; + vulkanOverlay = fetchFromGitHub { + owner = "Lucretia"; + repo = "vulkan-overlay"; + rev = "70558192e7ac16103e1ec6100c1bebd6f162c818"; + sha256 = "1ycl55m3wc72q0a6pkyhhzji7llliw8076aiynr60jyv6cnmcgdz"; + }; + hardeningDisable = [ "pic" "format" ]; inherit libsOnly; @@ -55,21 +63,18 @@ in stdenv.mkDerivation rec { ''; modulePatches = [ - ./patches/0001-add-OS-detection-for-arch.patch - ./patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch - ./patches/0003-add-kcl_drm_gem_object_lookup.patch - ./patches/0004-paging-changes-for-linux-4.6.patch - ./patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch - ./patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch - ./patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch - ./patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch - ./patches/0009-disable-dal-by-default.patch - ./patches/0010-remove-dependency-on-System.map.patch + ./patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch + ./patches/0002-Remove-dependency-on-System.map.patch + ./patches/0003-disable-dal-by-default.patch ]; patchPhase = optionalString (!libsOnly) '' pushd usr/src/amdgpu-pro-${build} - for patch in $modulePatches; do echo $patch; patch -p1 < $patch; done + for patch in $vulkanOverlay/sys-kernel/amdgpu-pro-dkms/files/${build}/*.patch $modulePatches + do + echo $patch + patch -f -p1 < $patch || true + done popd ''; diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch new file mode 100644 index 000000000000..eba98965e679 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch @@ -0,0 +1,27 @@ +From c41b07cad36b1019e8d8debc8d46a7f2673982b7 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Wed, 26 Oct 2016 22:19:05 -0300 +Subject: [PATCH 1/2] Add vga switcheroo handler flag for 4.8 + +--- + amd/amdgpu/amdgpu_atpx_handler.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/amd/amdgpu/amdgpu_atpx_handler.c b/amd/amdgpu/amdgpu_atpx_handler.c +index cc9b998..e48d935 100644 +--- a/amd/amdgpu/amdgpu_atpx_handler.c ++++ b/amd/amdgpu/amdgpu_atpx_handler.c +@@ -565,7 +565,9 @@ void amdgpu_register_atpx_handler(void) + if (!r) + return; + +- vga_switcheroo_register_handler(&amdgpu_atpx_handler); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ vga_switcheroo_register_handler(&amdgpu_atpx_handler, 0); ++#endif + } + + /** +-- +2.10.0 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch deleted file mode 100644 index 46302ae0ea89..000000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e78ede724fff53fc0220999f6381242142ce8c33 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Sun, 21 Aug 2016 16:30:25 -0300 -Subject: [PATCH 1/8] add OS detection for arch - ---- - amd/backport/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/amd/backport/Makefile b/amd/backport/Makefile -index 0c285ef..6447a15 100644 ---- a/amd/backport/Makefile -+++ b/amd/backport/Makefile -@@ -17,6 +17,9 @@ else ifeq ("ubuntu",$(OS_NAME)) - ccflags-y += -DOS_NAME_UBUNTU - else ifeq ("steamos",$(OS_NAME)) - ccflags-y += -DOS_NAME_STEAMOS -+else ifeq ("arch",$(OS_NAME)) -+ccflags-y += -DOS_NAME_ARCH -+OS_VERSION = "0.0" - else - ccflags-y += -DOS_NAME_UNKNOWN - endif --- -2.9.3 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Remove-dependency-on-System.map.patch similarity index 85% rename from pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch rename to pkgs/os-specific/linux/amdgpu-pro/patches/0002-Remove-dependency-on-System.map.patch index ec8f2c5a5999..3e36e9166bb3 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Remove-dependency-on-System.map.patch @@ -1,7 +1,7 @@ -From fbc0d704f47526ca38f518b60237962cc6b08305 Mon Sep 17 00:00:00 2001 +From e03fd9f392af963a534dd3c40df06e81976766e6 Mon Sep 17 00:00:00 2001 From: David McFarland -Date: Thu, 25 Aug 2016 23:08:02 -0300 -Subject: [PATCH] remove dependency on System.map +Date: Wed, 26 Oct 2016 22:26:39 -0300 +Subject: [PATCH 2/2] Remove dependency on System.map --- amd/backport/Makefile | 3 +-- @@ -14,10 +14,10 @@ Subject: [PATCH] remove dependency on System.map delete mode 100755 pre-build.sh diff --git a/amd/backport/Makefile b/amd/backport/Makefile -index 6447a15..4682e0f 100644 +index dcc94d5..ef27e94 100644 --- a/amd/backport/Makefile +++ b/amd/backport/Makefile -@@ -53,10 +53,9 @@ ccflags-y += -DOS_NAME_RHEL_7 +@@ -55,10 +55,9 @@ ccflags-y += -DOS_NAME_RHEL_7 endif endif @@ -60,18 +60,18 @@ index 2d3f2ee..0000000 - -SYMS+="fence_default_wait_cb" diff --git a/dkms.conf b/dkms.conf -index 9ca148e..36be480 100644 +index f553501..e50ec3d 100644 --- a/dkms.conf +++ b/dkms.conf @@ -4,4 +4,3 @@ BUILT_MODULE_NAME[0]="amdgpu" BUILT_MODULE_LOCATION[0]="amd/amdgpu" - DEST_MODULE_LOCATION[0]="/extra" + DEST_MODULE_LOCATION[0]="/kernel/drivers/gpu/drm/amd/amdgpu" AUTOINSTALL="yes" -PRE_BUILD="pre-build.sh $kernelver" \ No newline at end of file diff --git a/pre-build.sh b/pre-build.sh deleted file mode 100755 -index 88ec680..0000000 +index 6f45523..0000000 --- a/pre-build.sh +++ /dev/null @@ -1,32 +0,0 @@ @@ -104,9 +104,9 @@ index 88ec680..0000000 - -echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c -for sym in $SYMS; do -- addr=$(grep $sym /boot/System.map-$KERNELVER | awk -F' ' '{print $1}') +- addr=$(grep $sym /boot/System.map*-$KERNELVER | awk -F' ' '{print $1}') - echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c -done -- -2.9.3 +2.10.0 diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch deleted file mode 100644 index 4101662a4ebe..000000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d84bd62a10308efb6a414e8f6582a7b1e9860638 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Sun, 21 Aug 2016 16:31:12 -0300 -Subject: [PATCH 2/8] update kcl_ttm_bo_reserve for linux-4.7 - ---- - amd/backport/include/kcl/kcl_ttm.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h -index 3575004..0d1560d 100644 ---- a/amd/backport/include/kcl/kcl_ttm.h -+++ b/amd/backport/include/kcl/kcl_ttm.h -@@ -84,7 +84,7 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo, - bool interruptible, bool no_wait, - struct ww_acquire_ctx *ticket) - { --#if defined(BUILD_AS_DKMS) -+#if defined(BUILD_AS_DKMS) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) - return ttm_bo_reserve(bo, interruptible, no_wait, false, ticket); - #else - return ttm_bo_reserve(bo, interruptible, no_wait, ticket); --- -2.9.3 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch deleted file mode 100644 index 214b8effd9d3..000000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch +++ /dev/null @@ -1,204 +0,0 @@ -From 2637dfe990e4c277bc724f6ba48e6661506805ec Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Sun, 21 Aug 2016 16:37:34 -0300 -Subject: [PATCH 3/8] add kcl_drm_gem_object_lookup - ---- - amd/amdgpu/amdgpu_atpx_handler.c | 4 ++++ - amd/amdgpu/amdgpu_bo_list.c | 2 +- - amd/amdgpu/amdgpu_cs.c | 2 +- - amd/amdgpu/amdgpu_display.c | 2 +- - amd/amdgpu/amdgpu_gem.c | 10 +++++----- - amd/amdgpu/dce_v10_0.c | 2 +- - amd/amdgpu/dce_v11_0.c | 2 +- - amd/amdgpu/dce_v8_0.c | 2 +- - amd/backport/include/kcl/kcl_drm.h | 11 +++++++++++ - amd/dal/amdgpu_dm/amdgpu_dm_types.c | 2 +- - 10 files changed, 27 insertions(+), 12 deletions(-) - -diff --git a/amd/amdgpu/amdgpu_atpx_handler.c b/amd/amdgpu/amdgpu_atpx_handler.c -index cc9b998..7e47478 100644 ---- a/amd/amdgpu/amdgpu_atpx_handler.c -+++ b/amd/amdgpu/amdgpu_atpx_handler.c -@@ -565,7 +565,11 @@ void amdgpu_register_atpx_handler(void) - if (!r) - return; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+ vga_switcheroo_register_handler(&amdgpu_atpx_handler, 0); -+#else - vga_switcheroo_register_handler(&amdgpu_atpx_handler); -+#endif - } - - /** -diff --git a/amd/amdgpu/amdgpu_bo_list.c b/amd/amdgpu/amdgpu_bo_list.c -index 35d0856..1d163ec 100644 ---- a/amd/amdgpu/amdgpu_bo_list.c -+++ b/amd/amdgpu/amdgpu_bo_list.c -@@ -106,7 +106,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, - struct amdgpu_bo *bo; - struct mm_struct *usermm; - -- gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle); -+ gobj = kcl_drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle); - if (!gobj) { - r = -ENOENT; - goto error_free; -diff --git a/amd/amdgpu/amdgpu_cs.c b/amd/amdgpu/amdgpu_cs.c -index d16ed26..b0390b5 100644 ---- a/amd/amdgpu/amdgpu_cs.c -+++ b/amd/amdgpu/amdgpu_cs.c -@@ -92,7 +92,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, - { - struct drm_gem_object *gobj; - -- gobj = drm_gem_object_lookup(p->adev->ddev, p->filp, -+ gobj = kcl_drm_gem_object_lookup(p->adev->ddev, p->filp, - data->handle); - if (gobj == NULL) - return -EINVAL; -diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c -index 46326b3..9b5441f 100644 ---- a/amd/amdgpu/amdgpu_display.c -+++ b/amd/amdgpu/amdgpu_display.c -@@ -594,7 +594,7 @@ amdgpu_user_framebuffer_create(struct drm_device *dev, - struct amdgpu_framebuffer *amdgpu_fb; - int ret; - -- obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); -+ obj = kcl_drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); - if (obj == NULL) { - dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, " - "can't create framebuffer\n", mode_cmd->handles[0]); -diff --git a/amd/amdgpu/amdgpu_gem.c b/amd/amdgpu/amdgpu_gem.c -index 0069aec..d10c282 100644 ---- a/amd/amdgpu/amdgpu_gem.c -+++ b/amd/amdgpu/amdgpu_gem.c -@@ -397,7 +397,7 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp, - struct drm_gem_object *gobj; - struct amdgpu_bo *robj; - -- gobj = drm_gem_object_lookup(dev, filp, handle); -+ gobj = kcl_drm_gem_object_lookup(dev, filp, handle); - if (gobj == NULL) { - return -ENOENT; - } -@@ -461,7 +461,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data, - int r = 0; - long ret; - -- gobj = drm_gem_object_lookup(dev, filp, handle); -+ gobj = kcl_drm_gem_object_lookup(dev, filp, handle); - if (gobj == NULL) { - return -ENOENT; - } -@@ -495,7 +495,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data, - int r = -1; - - DRM_DEBUG("%d \n", args->handle); -- gobj = drm_gem_object_lookup(dev, filp, args->handle); -+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); - if (gobj == NULL) - return -ENOENT; - robj = gem_to_amdgpu_bo(gobj); -@@ -643,7 +643,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, - return -EINVAL; - } - -- gobj = drm_gem_object_lookup(dev, filp, args->handle); -+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); - if (gobj == NULL) - return -ENOENT; - rbo = gem_to_amdgpu_bo(gobj); -@@ -705,7 +705,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, - struct amdgpu_bo *robj; - int r; - -- gobj = drm_gem_object_lookup(dev, filp, args->handle); -+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); - if (gobj == NULL) { - return -ENOENT; - } -diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c -index 7554dd7..6d38754 100644 ---- a/amd/amdgpu/dce_v10_0.c -+++ b/amd/amdgpu/dce_v10_0.c -@@ -2594,7 +2594,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc, - return -EINVAL; - } - -- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); -+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); - if (!obj) { - DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); - return -ENOENT; -diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c -index d9c9b88..93dbc1a 100644 ---- a/amd/amdgpu/dce_v11_0.c -+++ b/amd/amdgpu/dce_v11_0.c -@@ -2604,7 +2604,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc, - return -EINVAL; - } - -- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); -+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); - if (!obj) { - DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); - return -ENOENT; -diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c -index 7a027ce..c56a298 100644 ---- a/amd/amdgpu/dce_v8_0.c -+++ b/amd/amdgpu/dce_v8_0.c -@@ -2501,7 +2501,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, - return -EINVAL; - } - -- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); -+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); - if (!obj) { - DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); - return -ENOENT; -diff --git a/amd/backport/include/kcl/kcl_drm.h b/amd/backport/include/kcl/kcl_drm.h -index a65ee25..5a8a7b3 100644 ---- a/amd/backport/include/kcl/kcl_drm.h -+++ b/amd/backport/include/kcl/kcl_drm.h -@@ -3,6 +3,7 @@ - - #include - #include -+#include - - #if defined(BUILD_AS_DKMS) - extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw); -@@ -123,4 +124,14 @@ static inline int kcl_drm_universal_plane_init(struct drm_device *dev, struct dr - #endif - } - -+static inline struct drm_gem_object *kcl_drm_gem_object_lookup(struct drm_device *dev, -+ struct drm_file *filp, -+ u32 handle) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) -+ return drm_gem_object_lookup(filp, handle); -+#else -+ return drm_gem_object_lookup(dev, filp, handle); -+#endif -+} -+ - #endif /* AMDGPU_BACKPORT_KCL_DRM_H */ -diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c -index 3f357a5..2e2d2e6 100644 ---- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c -+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c -@@ -152,7 +152,7 @@ static int dm_crtc_pin_cursor_bo_new( - - amdgpu_crtc = to_amdgpu_crtc(crtc); - -- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); -+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); - - if (!obj) { - DRM_ERROR( --- -2.9.3 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-dal-by-default.patch similarity index 100% rename from pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch rename to pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-dal-by-default.patch diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch deleted file mode 100644 index 54394b7879be..000000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2bd83488ccea22bb9e399986c171cccc3b6beb93 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Sun, 21 Aug 2016 16:40:32 -0300 -Subject: [PATCH 4/8] paging changes for linux-4.6 - ---- - amd/amdgpu/amdgpu_ttm.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c -index 7bdebde..8b676c2 100644 ---- a/amd/amdgpu/amdgpu_ttm.c -+++ b/amd/amdgpu/amdgpu_ttm.c -@@ -548,8 +548,12 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages) - list_add(&guptask.list, >t->guptasks); - spin_unlock(>t->guptasklock); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+ r = get_user_pages(userptr, num_pages, write, 0, p, NULL); -+#else - r = get_user_pages(current, current->mm, userptr, num_pages, -- write, 0, p, NULL); -+ write, 0, p, NULL); -+#endif - - spin_lock(>t->guptasklock); - list_del(&guptask.list); -@@ -625,7 +629,11 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm) - set_page_dirty(page); - - mark_page_accessed(page); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+ put_page(page); -+#else - page_cache_release(page); -+#endif - } - - sg_free_table(ttm->sg); --- -2.9.3 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch deleted file mode 100644 index 6da3e46a3ee6..000000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c41c15fa04e363c41272e7b5d767710170691347 Mon Sep 17 00:00:00 2001 -From: "Luke A. Guest" -Date: Mon, 4 Jul 2016 19:19:45 +0100 -Subject: [PATCH 5/8] LRU stuff isn't available until >= 4.7.x - ---- - amd/amdgpu/amdgpu_ttm.c | 4 ++-- - amd/backport/kcl_ttm.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c -index 8b676c2..752d065 100644 ---- a/amd/amdgpu/amdgpu_ttm.c -+++ b/amd/amdgpu/amdgpu_ttm.c -@@ -907,7 +907,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, - return flags; - } - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) - - static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo) - { -@@ -969,7 +969,7 @@ static struct ttm_bo_driver amdgpu_bo_driver = { - .fault_reserve_notify = &amdgpu_bo_fault_reserve_notify, - .io_mem_reserve = &amdgpu_ttm_io_mem_reserve, - .io_mem_free = &amdgpu_ttm_io_mem_free, --#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) - .lru_removal = &amdgpu_ttm_lru_removal, - .lru_tail = &amdgpu_ttm_lru_tail, - .swap_lru_tail = &amdgpu_ttm_swap_lru_tail, -diff --git a/amd/backport/kcl_ttm.c b/amd/backport/kcl_ttm.c -index 24f7a83..1a2cb7b 100644 ---- a/amd/backport/kcl_ttm.c -+++ b/amd/backport/kcl_ttm.c -@@ -7,7 +7,7 @@ static int _kcl_ttm_bo_del_from_lru(struct ttm_buffer_object *bo) - { - int put_count = 0; - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) - struct ttm_bo_device *bdev = bo->bdev; - - if (bdev->driver->lru_removal) --- -2.9.3 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch deleted file mode 100644 index 5be5acad00d6..000000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5b90b8d8ab44637c707623b25ee98aa4ebded308 Mon Sep 17 00:00:00 2001 -From: "Luke A. Guest" -Date: Mon, 4 Jul 2016 19:30:08 +0100 -Subject: [PATCH 6/8] Change name of vblank_disable_allowed to - vblank_disable_immediate under 4.7.x. - ---- - amd/amdgpu/amdgpu_irq.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/amd/amdgpu/amdgpu_irq.c b/amd/amdgpu/amdgpu_irq.c -index d13865a..5cfa69f 100644 ---- a/amd/amdgpu/amdgpu_irq.c -+++ b/amd/amdgpu/amdgpu_irq.c -@@ -240,7 +240,11 @@ int amdgpu_irq_init(struct amdgpu_device *adev) - INIT_WORK(&adev->hotplug_work, - amdgpu_hotplug_work_func); - } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) -+ adev->ddev->vblank_disable_immediate = true; -+#else - adev->ddev->vblank_disable_allowed = true; -+#endif - - INIT_WORK(&adev->reset_work, amdgpu_irq_reset_work_func); - --- -2.9.3 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch deleted file mode 100644 index 13d4a282ac82..000000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 27ef2ce0d4d8eeb3bca32ddeae503f0a334832aa Mon Sep 17 00:00:00 2001 -From: "Luke A. Guest" -Date: Mon, 4 Jul 2016 19:41:08 +0100 -Subject: [PATCH 7/8] Remove connector parameter from - __drm_atomic_helper_connector_destroy_state for 4.7.x kernels. - ---- - amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c -index 2e2d2e6..cd34607 100644 ---- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c -+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c -@@ -1205,7 +1205,11 @@ void amdgpu_dm_connector_atomic_destroy_state( - struct dm_connector_state *dm_state = - to_dm_connector_state(state); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) -+ __drm_atomic_helper_connector_destroy_state(state); -+#else - __drm_atomic_helper_connector_destroy_state(connector, state); -+#endif - - kfree(dm_state); - } --- -2.9.3 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch deleted file mode 100644 index 693ad8b2f40d..000000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c9f2501131da0d9173e21f7e8ff5741a7fcfedb6 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Sun, 21 Aug 2016 16:58:45 -0300 -Subject: [PATCH 8/8] fix apparent typo in bandwidth_calcs causing array error - ---- - amd/dal/dc/calcs/bandwidth_calcs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amd/dal/dc/calcs/bandwidth_calcs.c b/amd/dal/dc/calcs/bandwidth_calcs.c -index 8a19139..c4ededd 100644 ---- a/amd/dal/dc/calcs/bandwidth_calcs.c -+++ b/amd/dal/dc/calcs/bandwidth_calcs.c -@@ -3181,7 +3181,7 @@ static void calculate_bandwidth( - bw_int_to_fixed( - 2), - vbios->mcifwrmc_urgent_latency), -- results->dmif_burst_time[i][j]), -+ results->dmif_burst_time[results->y_clk_level][results->sclk_level]), - results->mcifwr_burst_time[results->y_clk_level][results->sclk_level])), - results->dispclk), - bw_int_to_fixed( --- -2.9.3 - From 3d4a280c354bb21b711055ca7e02ee3e7999292b Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 27 Oct 2016 23:10:44 -0300 Subject: [PATCH 0219/1749] amdgpu-pro: 16.30.3-315407 -> 16.40-348864 --- pkgs/os-specific/linux/amdgpu-pro/default.nix | 107 +++++----- ...-vga-switcheroo-handler-flag-for-4.8.patch | 27 --- .../0001-Find-correct-System.map.patch | 25 +++ ...2-Fix-kernel-module-install-location.patch | 25 +++ ...0002-Remove-dependency-on-System.map.patch | 112 ---------- .../0003-Add-Gentoo-as-build-option.patch | 30 +++ ...ameter-from-ttm_bo_reserve-for-4.7.0.patch | 28 +++ ...rst-param-from-drm_gem_object_lookup.patch | 196 ++++++++++++++++++ ...ve-vblank_disable_allowed-assignment.patch | 26 +++ ..._helper_connector_destroy_state-call.patch | 28 +++ ...seq_printf-format-for-64-bit-context.patch | 30 +++ .../patches/0009-Fix-vblank-calls.patch | 135 ++++++++++++ ...0-Fix-crtc_gamma-functions-for-4.8.0.patch | 163 +++++++++++++++ ...m_atomic_helper_swap_state-for-4.8.0.patch | 28 +++ ...lag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch | 40 ++++ ...0013-Remove-dependency-on-System.map.patch | 61 ++++++ ...atch => 0014-disable-dal-by-default.patch} | 8 +- 17 files changed, 878 insertions(+), 191 deletions(-) delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0001-Find-correct-System.map.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0002-Fix-kernel-module-install-location.patch delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0002-Remove-dependency-on-System.map.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0003-Add-Gentoo-as-build-option.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0009-Fix-vblank-calls.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0013-Remove-dependency-on-System.map.patch rename pkgs/os-specific/linux/amdgpu-pro/patches/{0003-disable-dal-by-default.patch => 0014-disable-dal-by-default.patch} (79%) diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 5c11fad35970..4a0527242c7f 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, elfutils, mesa_noglu , xorg, patchelf, openssl, libdrm, libudev , libxcb, libxshmfence, epoxy, perl, zlib -, fetchFromGitHub +, fetchFromGitHub, ncurses , libsOnly ? false, kernel ? null }: @@ -26,11 +26,13 @@ let libReplaceDir = "/usr/lib/${libArch}"; + ncurses5 = ncurses.override { abiVersion = "5"; }; + in stdenv.mkDerivation rec { - version = "16.30"; + version = "16.40"; pname = "amdgpu-pro"; - build = "16.30.3-315407"; + build = "16.40-348864"; libCompatDir = "/run/lib/${libArch}"; @@ -38,16 +40,9 @@ in stdenv.mkDerivation rec { src = fetchurl { url = - "https://www2.ati.com/drivers/linux/amdgpu-pro_${build}.tar.xz"; - sha256 = "97d6fb64617cf2cefe780e5fb83b29d8ee4e3e7886b71fe3d92b0113847b2354"; - curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx"; - }; - - vulkanOverlay = fetchFromGitHub { - owner = "Lucretia"; - repo = "vulkan-overlay"; - rev = "70558192e7ac16103e1ec6100c1bebd6f162c818"; - sha256 = "1ycl55m3wc72q0a6pkyhhzji7llliw8076aiynr60jyv6cnmcgdz"; + "https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-${build}.tar.xz"; + sha256 = "1c06lx07irmlpmbmgb3qcgpzj6q6rimszrbbdrgz8kqnfpcv3mjr"; + curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMD-Radeon-GPU-PRO-Linux-Beta-Driver%e2%80%93Release-Notes.aspx"; }; hardeningDisable = [ "pic" "format" ]; @@ -58,19 +53,30 @@ in stdenv.mkDerivation rec { cd $sourceRoot mkdir root cd root - for deb in ../*.deb; do echo $deb; ar p $deb data.tar.xz | tar -xJ; done + for deb in ../*_all.deb ../*_i386.deb '' + optionalString stdenv.is64bit "../*_amd64.deb" + ''; do echo $deb; ar p $deb data.tar.xz | tar -xJ; done sourceRoot=. ''; modulePatches = [ - ./patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch - ./patches/0002-Remove-dependency-on-System.map.patch - ./patches/0003-disable-dal-by-default.patch + ./patches/0001-Find-correct-System.map.patch + ./patches/0002-Fix-kernel-module-install-location.patch + ./patches/0003-Add-Gentoo-as-build-option.patch + ./patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch + ./patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch + ./patches/0006-Remove-vblank_disable_allowed-assignment.patch + ./patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch + ./patches/0008-Change-seq_printf-format-for-64-bit-context.patch + ./patches/0009-Fix-vblank-calls.patch + ./patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch + ./patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch + ./patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch + ./patches/0013-Remove-dependency-on-System.map.patch + ./patches/0014-disable-dal-by-default.patch ]; patchPhase = optionalString (!libsOnly) '' pushd usr/src/amdgpu-pro-${build} - for patch in $vulkanOverlay/sys-kernel/amdgpu-pro-dkms/files/${build}/*.patch $modulePatches + for patch in $modulePatches do echo $patch patch -f -p1 < $patch || true @@ -91,55 +97,60 @@ in stdenv.mkDerivation rec { depLibPath = makeLibraryPath [ stdenv.cc.cc.lib xorg.libXext xorg.libX11 xorg.libXdamage xorg.libXfixes zlib - xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils libudev + xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils libudev ncurses5 ]; installPhase = '' mkdir -p $out - cp -r usr/bin $out/bin - cp -r usr/share $out/share + cp -r etc $out/etc - mv $out/etc/vulkan $out/share - cp -r usr/include $out/include - cp -r usr/lib/${libArch} $out/lib - mv $out/lib/amdgpu-pro/* $out/lib/ - rmdir $out/lib/amdgpu-pro + cp -r lib $out/lib + + pushd usr + cp -r lib/${libArch}/* $out/lib + '' + optionalString (!libsOnly) '' + cp -r src/amdgpu-pro-${build}/firmware $out/lib/firmware + '' + '' + cp -r share $out/share + popd + + pushd opt/amdgpu-pro + '' + optionalString (!stdenv.is64bit) '' + cp -r bin $out/bin + '' + '' + cp -r include $out/include + cp -r lib/${libArch}/* $out/lib + '' + optionalString (!libsOnly) '' + mv lib/xorg $out/lib/xorg + '' + '' + popd + '' + optionalString (!libsOnly) '' - if [ -d $out/lib/xorg ]; then - rm $out/lib/xorg - mv $out/lib/1.18 $out/lib/xorg - rm -r $out/lib/1.* - fi - cp -r lib/firmware $out/lib/firmware mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz cp usr/src/amdgpu-pro-${build}/amd/amdgpu/amdgpu.ko.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz '' + '' + mv $out/etc/vulkan $out/share interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" libPath="$out/lib:$out/lib/gbm:$depLibPath" - echo patching with $interpreter $libPath - for prog in "$out"/bin/*; do - echo patching program $prog - patchelf --interpreter "$interpreter" --set-rpath "$libPath" "$prog" - done - for lib in `find "$out/lib/" -name '*.so*'`; do - echo patching library $lib - patchelf --set-rpath "$libPath" "$lib" + '' + optionalString (!stdenv.is64bit) '' + for prog in clinfo modetest vbltest kms-universal-planes kms-steal-crtc modeprint amdgpu_test kmstest proptest; do + patchelf --interpreter "$interpreter" --set-rpath "$libPath" "$out/bin/$prog" done + '' + '' + ln -s libgbm.so.1.0.0 $out/lib/libgbm.so.1 + ln -s ${makeLibraryPath [ncurses5]}/libncursesw.so.5 $out/lib/libtinfo.so.5 ''; + # we'll just set the full rpath on everything to avoid having to track down dlopen problems postFixup = assert (stringLength libReplaceDir == stringLength libCompatDir); '' libPath="$out/lib:$out/lib/gbm:$depLibPath" - for lib in libgbm.so.1.0.0 ${optionalString (!libsOnly) "xorg/modules/drivers/amdgpu_drv.so"} amdvlk${bitness}.so vdpau/libvdpau_amdgpu.so; do - if [ -e "$out/lib/$lib" ]; then - patchelf --set-rpath "$libPath" "$out/lib/$lib" - fi + for lib in `find "$out/lib/" -name '*.so*' -type f`; do + patchelf --set-rpath "$libPath" "$lib" done for lib in libEGL.so.1 libGL.so.1.2 ${optionalString (!libsOnly) "xorg/modules/extensions/libglx.so"} dri/amdgpu_dri.so; do - if [ -e "$out/lib/$lib" ]; then - perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib" - fi + perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib" done - substituteInPlace "$out/share/vulkan/icd.d/amd_icd${bitness}.json" --replace "/usr/lib/${libArch}" "$out/lib" + substituteInPlace "$out/share/vulkan/icd.d/amd_icd${bitness}.json" --replace "/opt/amdgpu-pro/lib/${libArch}" "$out/lib" ''; buildInputs = [ diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch deleted file mode 100644 index eba98965e679..000000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c41b07cad36b1019e8d8debc8d46a7f2673982b7 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Wed, 26 Oct 2016 22:19:05 -0300 -Subject: [PATCH 1/2] Add vga switcheroo handler flag for 4.8 - ---- - amd/amdgpu/amdgpu_atpx_handler.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/amd/amdgpu/amdgpu_atpx_handler.c b/amd/amdgpu/amdgpu_atpx_handler.c -index cc9b998..e48d935 100644 ---- a/amd/amdgpu/amdgpu_atpx_handler.c -+++ b/amd/amdgpu/amdgpu_atpx_handler.c -@@ -565,7 +565,9 @@ void amdgpu_register_atpx_handler(void) - if (!r) - return; - -- vga_switcheroo_register_handler(&amdgpu_atpx_handler); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+ vga_switcheroo_register_handler(&amdgpu_atpx_handler, 0); -+#endif - } - - /** --- -2.10.0 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Find-correct-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Find-correct-System.map.patch new file mode 100644 index 000000000000..2a086cf37bc9 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Find-correct-System.map.patch @@ -0,0 +1,25 @@ +From 4243cf67bcdf8c3865efbfe19dc8841c88ab2daa Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 15:30:26 +0100 +Subject: [PATCH 01/14] Find correct System.map + +--- + pre-build.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pre-build.sh b/pre-build.sh +index 95457bd..169ccf0 100755 +--- a/pre-build.sh ++++ b/pre-build.sh +@@ -27,7 +27,7 @@ source amd/backport/symbols + + echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c + for sym in $SYMS; do +- addr=$(grep $sym /boot/System.map-$KERNELVER | awk -F' ' '{print $1}') ++ addr=$(grep $sym /boot/System.map*-$KERNELVER | awk -F' ' '{print $1}') + echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c + done + +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Fix-kernel-module-install-location.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Fix-kernel-module-install-location.patch new file mode 100644 index 000000000000..be8868835563 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Fix-kernel-module-install-location.patch @@ -0,0 +1,25 @@ +From c1860b4e8c2ebb784a07d6ba067c510950e67d24 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 15:31:13 +0100 +Subject: [PATCH 02/14] Fix kernel module install location + +--- + dkms.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dkms.conf b/dkms.conf +index d1a5e1d..0e03f08 100644 +--- a/dkms.conf ++++ b/dkms.conf +@@ -2,7 +2,7 @@ PACKAGE_NAME="amdgpu-pro" + PACKAGE_VERSION="16.40-348864" + BUILT_MODULE_NAME[0]="amdgpu" + BUILT_MODULE_LOCATION[0]="amd/amdgpu" +-DEST_MODULE_LOCATION[0]="/extra" ++DEST_MODULE_LOCATION[0]="/kernel/drivers/gpu/drm/amd/amdgpu" + AUTOINSTALL="yes" + PRE_BUILD="pre-build.sh $kernelver" + REMAKE_INITRD="yes" +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Remove-dependency-on-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Remove-dependency-on-System.map.patch deleted file mode 100644 index 3e36e9166bb3..000000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Remove-dependency-on-System.map.patch +++ /dev/null @@ -1,112 +0,0 @@ -From e03fd9f392af963a534dd3c40df06e81976766e6 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Wed, 26 Oct 2016 22:26:39 -0300 -Subject: [PATCH 2/2] Remove dependency on System.map - ---- - amd/backport/Makefile | 3 +-- - amd/backport/kcl_fence.c | 10 ++++++++-- - amd/backport/symbols | 3 --- - dkms.conf | 1 - - pre-build.sh | 32 -------------------------------- - 5 files changed, 9 insertions(+), 40 deletions(-) - delete mode 100644 amd/backport/symbols - delete mode 100755 pre-build.sh - -diff --git a/amd/backport/Makefile b/amd/backport/Makefile -index dcc94d5..ef27e94 100644 ---- a/amd/backport/Makefile -+++ b/amd/backport/Makefile -@@ -55,10 +55,9 @@ ccflags-y += -DOS_NAME_RHEL_7 - endif - endif - --BACKPORT_OBJS = symbols.o - endif - --BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o -+BACKPORT_OBJS = kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o - - amdgpu-y += $(addprefix ../backport/,$(BACKPORT_OBJS)) - -diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c -index 2141eef..ceef1fe 100644 ---- a/amd/backport/kcl_fence.c -+++ b/amd/backport/kcl_fence.c -@@ -22,8 +22,14 @@ struct default_wait_cb { - struct task_struct *task; - }; - --extern void --(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb); -+static void -+fence_default_wait_cb(struct fence *fence, struct fence_cb *cb) -+{ -+ struct default_wait_cb *wait = -+ container_of(cb, struct default_wait_cb, base); -+ -+ wake_up_process(wait->task); -+} - - signed long - _kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count, -diff --git a/amd/backport/symbols b/amd/backport/symbols -deleted file mode 100644 -index 2d3f2ee..0000000 ---- a/amd/backport/symbols -+++ /dev/null -@@ -1,3 +0,0 @@ --SYMS="" -- --SYMS+="fence_default_wait_cb" -diff --git a/dkms.conf b/dkms.conf -index f553501..e50ec3d 100644 ---- a/dkms.conf -+++ b/dkms.conf -@@ -4,4 +4,3 @@ BUILT_MODULE_NAME[0]="amdgpu" - BUILT_MODULE_LOCATION[0]="amd/amdgpu" - DEST_MODULE_LOCATION[0]="/kernel/drivers/gpu/drm/amd/amdgpu" - AUTOINSTALL="yes" --PRE_BUILD="pre-build.sh $kernelver" -\ No newline at end of file -diff --git a/pre-build.sh b/pre-build.sh -deleted file mode 100755 -index 6f45523..0000000 ---- a/pre-build.sh -+++ /dev/null -@@ -1,32 +0,0 @@ --#!/bin/bash -- --KERNELVER=$1 --KERNELVER_BASE=${KERNELVER%%-*} -- --version_lt () { -- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1) -- [ "$1" != "$newest" ] --} -- --version_ge () { -- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1) -- [ "$1" = "$newest" ] --} -- --version_gt () { -- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1) -- [ "$1" != "$oldest" ] --} -- --version_le () { -- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1) -- [ "$1" = "$oldest" ] --} -- --source amd/backport/symbols -- --echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c --for sym in $SYMS; do -- addr=$(grep $sym /boot/System.map*-$KERNELVER | awk -F' ' '{print $1}') -- echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c --done --- -2.10.0 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Add-Gentoo-as-build-option.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Add-Gentoo-as-build-option.patch new file mode 100644 index 000000000000..d8b0f289d849 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Add-Gentoo-as-build-option.patch @@ -0,0 +1,30 @@ +From c26c7670869e02c39c0d0f6dee9094a621f42252 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 15:31:49 +0100 +Subject: [PATCH 03/14] Add Gentoo as build option + +--- + amd/backport/Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/amd/backport/Makefile b/amd/backport/Makefile +index 0c285ef..dcc94d5 100644 +--- a/amd/backport/Makefile ++++ b/amd/backport/Makefile +@@ -17,8 +17,13 @@ else ifeq ("ubuntu",$(OS_NAME)) + ccflags-y += -DOS_NAME_UBUNTU + else ifeq ("steamos",$(OS_NAME)) + ccflags-y += -DOS_NAME_STEAMOS ++else ifeq ("gentoo",$(OS_NAME)) ++ccflags-y += -DOS_NAME_GENTOO ++# We don't have a version inside /etc/os-release. ++OS_VERSION = "0.0" + else + ccflags-y += -DOS_NAME_UNKNOWN ++OS_VERSION = "0.0" + endif + + ccflags-y += \ +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch new file mode 100644 index 000000000000..794da9b5fb71 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch @@ -0,0 +1,28 @@ +From d21e811c6f26674a0e1c2398dce6d247a1dd4918 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 15:46:58 +0100 +Subject: [PATCH 04/14] Remove extra parameter from ttm_bo_reserve for 4.7.0 + +--- + amd/backport/include/kcl/kcl_ttm.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h +index 05c444b..c5a602c 100644 +--- a/amd/backport/include/kcl/kcl_ttm.h ++++ b/amd/backport/include/kcl/kcl_ttm.h +@@ -106,7 +106,11 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo, + struct ww_acquire_ctx *ticket) + { + #if defined(BUILD_AS_DKMS) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ return ttm_bo_reserve(bo, interruptible, no_wait, ticket); ++#else + return ttm_bo_reserve(bo, interruptible, no_wait, false, ticket); ++#endif + #else + return ttm_bo_reserve(bo, interruptible, no_wait, ticket); + #endif +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch new file mode 100644 index 000000000000..94cb3e72ed56 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch @@ -0,0 +1,196 @@ +From 4ac701dce0a4139e89c80237fc4eaa65f48c6f07 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 15:53:50 +0100 +Subject: [PATCH 05/14] Remove first param from drm_gem_object_lookup + +--- + amd/amdgpu/amdgpu_bo_list.c | 4 ++++ + amd/amdgpu/amdgpu_cs.c | 4 ++++ + amd/amdgpu/amdgpu_display.c | 4 ++++ + amd/amdgpu/amdgpu_gem.c | 20 ++++++++++++++++++++ + amd/amdgpu/dce_v10_0.c | 4 ++++ + amd/amdgpu/dce_v11_0.c | 4 ++++ + amd/amdgpu/dce_v8_0.c | 4 ++++ + amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++ + 8 files changed, 48 insertions(+) + +diff --git a/amd/amdgpu/amdgpu_bo_list.c b/amd/amdgpu/amdgpu_bo_list.c +index 844214d..7ae09cf 100644 +--- a/amd/amdgpu/amdgpu_bo_list.c ++++ b/amd/amdgpu/amdgpu_bo_list.c +@@ -107,7 +107,11 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, + struct amdgpu_bo *bo; + struct mm_struct *usermm; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ gobj = drm_gem_object_lookup(filp, info[i].bo_handle); ++#else + gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle); ++#endif + if (!gobj) { + r = -ENOENT; + goto error_free; +diff --git a/amd/amdgpu/amdgpu_cs.c b/amd/amdgpu/amdgpu_cs.c +index 20f6ab2..22363ab 100644 +--- a/amd/amdgpu/amdgpu_cs.c ++++ b/amd/amdgpu/amdgpu_cs.c +@@ -92,8 +92,12 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, + { + struct drm_gem_object *gobj; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ gobj = drm_gem_object_lookup(p->filp, data->handle); ++#else + gobj = drm_gem_object_lookup(p->adev->ddev, p->filp, + data->handle); ++#endif + if (gobj == NULL) + return -EINVAL; + +diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c +index 96c4fa5..862611c 100644 +--- a/amd/amdgpu/amdgpu_display.c ++++ b/amd/amdgpu/amdgpu_display.c +@@ -601,7 +601,11 @@ amdgpu_user_framebuffer_create(struct drm_device *dev, + struct amdgpu_framebuffer *amdgpu_fb; + int ret; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]); ++#else + obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); ++#endif + if (obj == NULL) { + dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, " + "can't create framebuffer\n", mode_cmd->handles[0]); +diff --git a/amd/amdgpu/amdgpu_gem.c b/amd/amdgpu/amdgpu_gem.c +index 0069aec..6da025b 100644 +--- a/amd/amdgpu/amdgpu_gem.c ++++ b/amd/amdgpu/amdgpu_gem.c +@@ -397,7 +397,11 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp, + struct drm_gem_object *gobj; + struct amdgpu_bo *robj; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ gobj = drm_gem_object_lookup(filp, handle); ++#else + gobj = drm_gem_object_lookup(dev, filp, handle); ++#endif + if (gobj == NULL) { + return -ENOENT; + } +@@ -461,7 +465,11 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data, + int r = 0; + long ret; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ gobj = drm_gem_object_lookup(filp, handle); ++#else + gobj = drm_gem_object_lookup(dev, filp, handle); ++#endif + if (gobj == NULL) { + return -ENOENT; + } +@@ -495,7 +503,11 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data, + int r = -1; + + DRM_DEBUG("%d \n", args->handle); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ gobj = drm_gem_object_lookup(filp, args->handle); ++#else + gobj = drm_gem_object_lookup(dev, filp, args->handle); ++#endif + if (gobj == NULL) + return -ENOENT; + robj = gem_to_amdgpu_bo(gobj); +@@ -643,7 +655,11 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, + return -EINVAL; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ gobj = drm_gem_object_lookup(filp, args->handle); ++#else + gobj = drm_gem_object_lookup(dev, filp, args->handle); ++#endif + if (gobj == NULL) + return -ENOENT; + rbo = gem_to_amdgpu_bo(gobj); +@@ -705,7 +721,11 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, + struct amdgpu_bo *robj; + int r; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ gobj = drm_gem_object_lookup(filp, args->handle); ++#else + gobj = drm_gem_object_lookup(dev, filp, args->handle); ++#endif + if (gobj == NULL) { + return -ENOENT; + } +diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c +index 3fae88d..0fd1e4f 100644 +--- a/amd/amdgpu/dce_v10_0.c ++++ b/amd/amdgpu/dce_v10_0.c +@@ -2594,7 +2594,11 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ obj = drm_gem_object_lookup(file_priv, handle); ++#else + obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++#endif + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c +index fe87795..a85eb5f 100644 +--- a/amd/amdgpu/dce_v11_0.c ++++ b/amd/amdgpu/dce_v11_0.c +@@ -2604,7 +2604,11 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ obj = drm_gem_object_lookup(file_priv, handle); ++#else + obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++#endif + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c +index 1f5959b..308f5e4 100644 +--- a/amd/amdgpu/dce_v8_0.c ++++ b/amd/amdgpu/dce_v8_0.c +@@ -2448,7 +2448,11 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ obj = drm_gem_object_lookup(file_priv, handle); ++#else + obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++#endif + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +index d14c96f..a9de2e5 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +@@ -156,7 +156,11 @@ static int dm_crtc_pin_cursor_bo_new( + + amdgpu_crtc = to_amdgpu_crtc(crtc); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ obj = drm_gem_object_lookup(file_priv, handle); ++#else + obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++#endif + + if (!obj) { + DRM_ERROR( +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch new file mode 100644 index 000000000000..dc35fe4c96af --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch @@ -0,0 +1,26 @@ +From d4a070e6d68ff7ce8ac49c6135acc759c9a1cf6e Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 16:01:43 +0100 +Subject: [PATCH 06/14] Remove vblank_disable_allowed assignment + +--- + amd/amdgpu/amdgpu_irq.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/amd/amdgpu/amdgpu_irq.c b/amd/amdgpu/amdgpu_irq.c +index 6e85e69..71358c9 100644 +--- a/amd/amdgpu/amdgpu_irq.c ++++ b/amd/amdgpu/amdgpu_irq.c +@@ -240,7 +240,9 @@ int amdgpu_irq_init(struct amdgpu_device *adev) + INIT_WORK(&adev->hotplug_work, + amdgpu_hotplug_work_func); + } ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) + adev->ddev->vblank_disable_allowed = true; ++#endif + + INIT_WORK(&adev->reset_work, amdgpu_irq_reset_work_func); + +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch new file mode 100644 index 000000000000..9e8749a31ca6 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch @@ -0,0 +1,28 @@ +From 406bb3a83b51b2bcf61a972721aa116e69c0a771 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 16:10:27 +0100 +Subject: [PATCH 07/14] Fix __drm_atomic_helper_connector_destroy_state call + +--- + amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +index a9de2e5..fedf490 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +@@ -1224,7 +1224,11 @@ void amdgpu_dm_connector_atomic_destroy_state( + struct dm_connector_state *dm_state = + to_dm_connector_state(state); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ __drm_atomic_helper_connector_destroy_state(connector->state); ++#else + __drm_atomic_helper_connector_destroy_state(connector, state); ++#endif + + kfree(dm_state); + } +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch new file mode 100644 index 000000000000..827237a5f9ad --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch @@ -0,0 +1,30 @@ +From f268e7fa537fd8e12f4023803df795b2e29747e7 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 16:46:39 +0100 +Subject: [PATCH 08/14] Change seq_printf format for 64 bit context + +--- + amd/amdgpu/amdgpu_sa.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c +index 768a265..51d118e 100644 +--- a/amd/amdgpu/amdgpu_sa.c ++++ b/amd/amdgpu/amdgpu_sa.c +@@ -428,8 +428,13 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager, + soffset, eoffset, eoffset - soffset); + + if (i->fence) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ seq_printf(m, " protected by 0x%08x on context %llu", ++ i->fence->seqno, i->fence->context); ++#else + seq_printf(m, " protected by 0x%08x on context %d", + i->fence->seqno, i->fence->context); ++#endif + + seq_printf(m, "\n"); + } +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Fix-vblank-calls.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Fix-vblank-calls.patch new file mode 100644 index 000000000000..82db5905a459 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Fix-vblank-calls.patch @@ -0,0 +1,135 @@ +From 9da98ec93816277a2d4e93d3205da044bace08bc Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 16:49:09 +0100 +Subject: [PATCH 09/14] Fix vblank calls + +--- + amd/amdgpu/amdgpu_display.c | 8 ++++++++ + amd/amdgpu/dce_v10_0.c | 8 ++++++++ + amd/amdgpu/dce_v11_0.c | 8 ++++++++ + amd/amdgpu/dce_v8_0.c | 8 ++++++++ + amd/dal/amdgpu_dm/amdgpu_dm.c | 4 ++++ + 5 files changed, 36 insertions(+) + +diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c +index 862611c..267c65f 100644 +--- a/amd/amdgpu/amdgpu_display.c ++++ b/amd/amdgpu/amdgpu_display.c +@@ -268,7 +268,11 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc, + + work->base = base; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ r = drm_crtc_vblank_get(crtc); ++#else + r = drm_vblank_get(crtc->dev, amdgpu_crtc->crtc_id); ++#endif + if (r) { + DRM_ERROR("failed to get vblank before flip\n"); + goto pflip_cleanup; +@@ -296,7 +300,11 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc, + return 0; + + vblank_cleanup: ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_vblank_put(&amdgpu_crtc->base); ++#else + drm_vblank_put(crtc->dev, amdgpu_crtc->crtc_id); ++#endif + + pflip_cleanup: + if (unlikely(amdgpu_bo_reserve(new_rbo, false) != 0)) { +diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c +index 0fd1e4f..5f0044c 100644 +--- a/amd/amdgpu/dce_v10_0.c ++++ b/amd/amdgpu/dce_v10_0.c +@@ -3372,11 +3372,19 @@ static int dce_v10_0_pageflip_irq(struct amdgpu_device *adev, + + /* wakeup usersapce */ + if (works->event) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event); ++#else + drm_send_vblank_event(adev->ddev, crtc_id, works->event); ++#endif + + spin_unlock_irqrestore(&adev->ddev->event_lock, flags); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_vblank_put(&amdgpu_crtc->base); ++#else + drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id); ++#endif + schedule_work(&works->unpin_work); + + return 0; +diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c +index a85eb5f..8edc670 100644 +--- a/amd/amdgpu/dce_v11_0.c ++++ b/amd/amdgpu/dce_v11_0.c +@@ -3432,11 +3432,19 @@ static int dce_v11_0_pageflip_irq(struct amdgpu_device *adev, + + /* wakeup usersapce */ + if(works->event) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event); ++#else + drm_send_vblank_event(adev->ddev, crtc_id, works->event); ++#endif + + spin_unlock_irqrestore(&adev->ddev->event_lock, flags); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_vblank_put(&amdgpu_crtc->base); ++#else + drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id); ++#endif + schedule_work(&works->unpin_work); + + return 0; +diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c +index 308f5e4..57e8014 100644 +--- a/amd/amdgpu/dce_v8_0.c ++++ b/amd/amdgpu/dce_v8_0.c +@@ -3323,11 +3323,19 @@ static int dce_v8_0_pageflip_irq(struct amdgpu_device *adev, + + /* wakeup usersapce */ + if (works->event) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event); ++#else + drm_send_vblank_event(adev->ddev, crtc_id, works->event); ++#endif + + spin_unlock_irqrestore(&adev->ddev->event_lock, flags); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_vblank_put(&amdgpu_crtc->base); ++#else + drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id); ++#endif + schedule_work(&works->unpin_work); + + return 0; +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm.c b/amd/dal/amdgpu_dm/amdgpu_dm.c +index 30865ec..f49999b 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm.c +@@ -196,10 +196,14 @@ static void dm_pflip_high_irq(void *interrupt_params) + + /* wakeup usersapce */ + if(works->event) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event); ++#else + drm_send_vblank_event( + adev->ddev, + amdgpu_crtc->crtc_id, + works->event); ++#endif + + spin_unlock_irqrestore(&adev->ddev->event_lock, flags); + +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch new file mode 100644 index 000000000000..b11ab3e557e2 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch @@ -0,0 +1,163 @@ +From b41eafa282a003cde9729e2ff486f55dc54f12c6 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 16:56:47 +0100 +Subject: [PATCH 10/14] Fix crtc_gamma functions for 4.8.0 + +--- + amd/amdgpu/dce_v10_0.c | 19 +++++++++++++++++++ + amd/amdgpu/dce_v11_0.c | 19 +++++++++++++++++++ + amd/amdgpu/dce_v8_0.c | 19 +++++++++++++++++++ + amd/dal/amdgpu_dm/amdgpu_dm_types.c | 12 ++++++++++++ + 4 files changed, 69 insertions(+) + +diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c +index 5f0044c..85378aa 100644 +--- a/amd/amdgpu/dce_v10_0.c ++++ b/amd/amdgpu/dce_v10_0.c +@@ -2671,6 +2671,24 @@ static void dce_v10_0_cursor_reset(struct drm_crtc *crtc) + } + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++static int dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, ++ u16 *blue, uint32_t size) ++{ ++ struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc); ++ int i; ++ ++ /* userspace palettes are always correct as is */ ++ for (i = 0; i < size; i++) { ++ amdgpu_crtc->lut_r[i] = red[i] >> 6; ++ amdgpu_crtc->lut_g[i] = green[i] >> 6; ++ amdgpu_crtc->lut_b[i] = blue[i] >> 6; ++ } ++ dce_v10_0_crtc_load_lut(crtc); ++ ++ return 0; ++} ++#else + static void dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, + u16 *blue, uint32_t start, uint32_t size) + { +@@ -2685,6 +2703,7 @@ static void dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green + } + dce_v10_0_crtc_load_lut(crtc); + } ++#endif + + static void dce_v10_0_crtc_destroy(struct drm_crtc *crtc) + { +diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c +index 8edc670..0129543 100644 +--- a/amd/amdgpu/dce_v11_0.c ++++ b/amd/amdgpu/dce_v11_0.c +@@ -2681,6 +2681,24 @@ static void dce_v11_0_cursor_reset(struct drm_crtc *crtc) + } + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++static int dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, ++ u16 *blue, uint32_t size) ++{ ++ struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc); ++ int i; ++ ++ /* userspace palettes are always correct as is */ ++ for (i = 0; i < size; i++) { ++ amdgpu_crtc->lut_r[i] = red[i] >> 6; ++ amdgpu_crtc->lut_g[i] = green[i] >> 6; ++ amdgpu_crtc->lut_b[i] = blue[i] >> 6; ++ } ++ dce_v11_0_crtc_load_lut(crtc); ++ ++ return 0; ++} ++#else + static void dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, + u16 *blue, uint32_t start, uint32_t size) + { +@@ -2695,6 +2713,7 @@ static void dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green + } + dce_v11_0_crtc_load_lut(crtc); + } ++#endif + + static void dce_v11_0_crtc_destroy(struct drm_crtc *crtc) + { +diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c +index 57e8014..d0d9267 100644 +--- a/amd/amdgpu/dce_v8_0.c ++++ b/amd/amdgpu/dce_v8_0.c +@@ -2525,6 +2525,24 @@ static void dce_v8_0_cursor_reset(struct drm_crtc *crtc) + } + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++static int dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, ++ u16 *blue, uint32_t size) ++{ ++ struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc); ++ int i; ++ ++ /* userspace palettes are always correct as is */ ++ for (i = 0; i < size; i++) { ++ amdgpu_crtc->lut_r[i] = red[i] >> 6; ++ amdgpu_crtc->lut_g[i] = green[i] >> 6; ++ amdgpu_crtc->lut_b[i] = blue[i] >> 6; ++ } ++ dce_v8_0_crtc_load_lut(crtc); ++ ++ return 0; ++} ++#else + static void dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, + u16 *blue, uint32_t start, uint32_t size) + { +@@ -2539,6 +2557,7 @@ static void dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, + } + dce_v8_0_crtc_load_lut(crtc); + } ++#endif + + static void dce_v8_0_crtc_destroy(struct drm_crtc *crtc) + { +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +index fedf490..c1f3c27 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +@@ -995,6 +995,13 @@ void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc) + kfree(crtc); + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++static int amdgpu_dm_atomic_crtc_gamma_set(struct drm_crtc *crtc, ++ u16 *red, ++ u16 *green, ++ u16 *blue, ++ uint32_t size) ++#else + static void amdgpu_dm_atomic_crtc_gamma_set( + struct drm_crtc *crtc, + u16 *red, +@@ -1002,6 +1009,7 @@ static void amdgpu_dm_atomic_crtc_gamma_set( + u16 *blue, + uint32_t start, + uint32_t size) ++#endif + { + struct drm_device *dev = crtc->dev; + struct drm_property *prop = dev->mode_config.prop_crtc_id; +@@ -1009,6 +1017,10 @@ static void amdgpu_dm_atomic_crtc_gamma_set( + crtc->state->mode.private_flags |= AMDGPU_CRTC_MODE_PRIVATE_FLAGS_GAMMASET; + + drm_atomic_helper_crtc_set_property(crtc, prop, 0); ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ return 0; ++#endif + } + + static int dm_crtc_funcs_atomic_set_property( +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch new file mode 100644 index 000000000000..d205fc3189ce --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch @@ -0,0 +1,28 @@ +From 32422de1ddaf539d284b32de5fe43d07b7553499 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 17:00:32 +0100 +Subject: [PATCH 11/14] Fix drm_atomic_helper_swap_state for 4.8.0 + +--- + amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +index c1f3c27..60cba1a 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +@@ -2331,7 +2331,11 @@ int amdgpu_dm_atomic_commit( + * the software side now. + */ + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_atomic_helper_swap_state(state, true); ++#else + drm_atomic_helper_swap_state(dev, state); ++#endif + + /* + * From this point state become old state really. New state is +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch new file mode 100644 index 000000000000..77b0cf796401 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch @@ -0,0 +1,40 @@ +From 69207f061e13e6f02418d5706d230135abcc1a72 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 19:19:45 +0100 +Subject: [PATCH 12/14] Add extra flag to ttm_bo_move_ttm for >=4.8.0-rc2 + +--- + amd/amdgpu/amdgpu_ttm.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c +index 145732a..dd691fa 100644 +--- a/amd/amdgpu/amdgpu_ttm.c ++++ b/amd/amdgpu/amdgpu_ttm.c +@@ -344,7 +344,11 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, + if (unlikely(r)) { + goto out_cleanup; + } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ r = ttm_bo_move_ttm(bo, true, interruptible, no_wait_gpu, new_mem); ++#else + r = ttm_bo_move_ttm(bo, true, no_wait_gpu, new_mem); ++#endif + out_cleanup: + ttm_bo_mem_put(bo, &tmp_mem); + return r; +@@ -377,7 +381,11 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, + if (unlikely(r)) { + return r; + } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ r = ttm_bo_move_ttm(bo, true, interruptible, no_wait_gpu, &tmp_mem); ++#else + r = ttm_bo_move_ttm(bo, true, no_wait_gpu, &tmp_mem); ++#endif + if (unlikely(r)) { + goto out_cleanup; + } +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0013-Remove-dependency-on-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0013-Remove-dependency-on-System.map.patch new file mode 100644 index 000000000000..23a648e0d522 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0013-Remove-dependency-on-System.map.patch @@ -0,0 +1,61 @@ +From 115cdb5a06b112674d9652ef44d7f19583ff0136 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Wed, 26 Oct 2016 22:26:39 -0300 +Subject: [PATCH 13/14] Remove dependency on System.map + +--- + amd/backport/Makefile | 3 +-- + amd/backport/kcl_fence.c | 10 ++++++++-- + amd/backport/symbols | 3 --- + 3 files changed, 9 insertions(+), 7 deletions(-) + delete mode 100644 amd/backport/symbols + +diff --git a/amd/backport/Makefile b/amd/backport/Makefile +index dcc94d5..ef27e94 100644 +--- a/amd/backport/Makefile ++++ b/amd/backport/Makefile +@@ -55,10 +55,9 @@ ccflags-y += -DOS_NAME_RHEL_7 + endif + endif + +-BACKPORT_OBJS = symbols.o + endif + +-BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o ++BACKPORT_OBJS = kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o + + amdgpu-y += $(addprefix ../backport/,$(BACKPORT_OBJS)) + +diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c +index 8c697aa..85d96d3 100644 +--- a/amd/backport/kcl_fence.c ++++ b/amd/backport/kcl_fence.c +@@ -25,8 +25,14 @@ struct default_wait_cb { + struct task_struct *task; + }; + +-extern void +-(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb); ++static void ++fence_default_wait_cb(struct fence *fence, struct fence_cb *cb) ++{ ++ struct default_wait_cb *wait = ++ container_of(cb, struct default_wait_cb, base); ++ ++ wake_up_process(wait->task); ++} + + signed long + _kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count, +diff --git a/amd/backport/symbols b/amd/backport/symbols +deleted file mode 100644 +index 2d3f2ee..0000000 +--- a/amd/backport/symbols ++++ /dev/null +@@ -1,3 +0,0 @@ +-SYMS="" +- +-SYMS+="fence_default_wait_cb" +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-dal-by-default.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0014-disable-dal-by-default.patch similarity index 79% rename from pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-dal-by-default.patch rename to pkgs/os-specific/linux/amdgpu-pro/patches/0014-disable-dal-by-default.patch index 05bcbf8bd061..693985ec2a2d 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-dal-by-default.patch +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0014-disable-dal-by-default.patch @@ -1,14 +1,14 @@ -From 49d45957ddaafe13a9cc7bacd1b9665fe9c517ac Mon Sep 17 00:00:00 2001 +From 942064886eae63ed7aa0a63c07e9f175898dddf7 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 25 Aug 2016 22:17:06 -0300 -Subject: [PATCH] disable dal by default +Subject: [PATCH 14/14] disable dal by default --- amd/amdgpu/amdgpu_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amd/amdgpu/amdgpu_drv.c b/amd/amdgpu/amdgpu_drv.c -index 793528b..9a4dfcc 100644 +index 66f3242..df62815 100644 --- a/amd/amdgpu/amdgpu_drv.c +++ b/amd/amdgpu/amdgpu_drv.c @@ -79,7 +79,7 @@ int amdgpu_vm_block_size = -1; @@ -21,5 +21,5 @@ index 793528b..9a4dfcc 100644 int amdgpu_sched_hw_submission = 2; int amdgpu_powerplay = -1; -- -2.9.3 +2.10.1 From d4da4fa5f971e8afc543cc9ba6bcf66f945e464b Mon Sep 17 00:00:00 2001 From: Frank Lanitz Date: Sun, 13 Nov 2016 17:51:11 +0100 Subject: [PATCH 0220/1749] Geany: 1.28 -> 1.29 --- pkgs/applications/editors/geany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 961c7ba04619..c0370229580b 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }: let - version = "1.28"; + version = "1.29"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.geany.org/${name}.tar.bz2"; - sha256 = "0nha21rbdhl10vdpaq8d5v5fszvggl1xar555pvrnvm2y443ffpp"; + sha256 = "394307596bc908419617e4c33e93eae8b5b733dfc8d01161677b8cbd3a4fb20f"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; From feb8a692a17184124308409f89d4309073a63204 Mon Sep 17 00:00:00 2001 From: obadz Date: Sun, 13 Nov 2016 17:12:04 +0000 Subject: [PATCH 0221/1749] getxbook: init at 1.2 --- pkgs/applications/misc/getxbook/default.nix | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/misc/getxbook/default.nix diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix new file mode 100644 index 000000000000..a77f87f6f1f1 --- /dev/null +++ b/pkgs/applications/misc/getxbook/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, openssl }: + +stdenv.mkDerivation rec { + name = "getxbook-${version}"; + version = "1.2"; + + src = fetchurl { + url = "https://njw.me.uk/getxbook/${name}.tar.xz"; + sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; + }; + + buildInputs = [ openssl ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "A collection of tools to download books from Google Books"; + homepage = https://njw.me.uk/getxbook/; + license = licenses.isc; + maintainers = with maintainers; [ obadz ]; + platforms = platforms.all; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cee25320760..b3a881fc9ad2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12994,6 +12994,8 @@ in get_iplayer = callPackage ../applications/misc/get_iplayer {}; + getxbook = callPackage ../applications/misc/getxbook {}; + gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { inherit (gnome2) libart_lgpl; webkit = null; From 2ded9f3f7b2222b8aea5e779416f8a6ed3528009 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 13 Nov 2016 14:01:01 -0500 Subject: [PATCH 0222/1749] coq: Improve emacs buffer handling --- pkgs/applications/science/logic/coq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 6c4211178077..f162fe4a86ea 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -72,9 +72,9 @@ stdenv.mkDerivation { (when (fboundp 'get-coq-library-directory) (inherit-local-permanent coq-library-directory (get-coq-library-directory)) (coq-prog-args)) - ; Pass proof-general's coq flags to flycheck command (pretty ugly, should probably be part of PG) - (inherit-local-permanent flycheck-command-wrapper-function (lambda (cmd) - (append (funcall (default-value 'flycheck-command-wrapper-function) cmd) (coq-coqtop-prog-args coq-load-path)))) + (mapc (lambda (arg) + (when (file-directory-p (concat arg "/lib/coq/${coq-version}/user-contrib")) + (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${stdenv.lib.concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) ''; }; From ee6dfa1e9eafdc21a4ab43b8e18f06c24ef0f670 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sun, 13 Nov 2016 14:04:43 -0500 Subject: [PATCH 0223/1749] crashplan: 4.7.0r2 -> 4.8.0r1 --- nixos/modules/services/backup/crashplan.nix | 2 +- pkgs/applications/backup/crashplan/default.nix | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix index 38cf8eb72fb8..d0af2e416b63 100644 --- a/nixos/modules/services/backup/crashplan.nix +++ b/nixos/modules/services/backup/crashplan.nix @@ -49,7 +49,7 @@ with lib; ensureDir ${crashplan.vardir}/backupArchives 700 ensureDir ${crashplan.vardir}/log 777 cp -avn ${crashplan}/conf.template/* ${crashplan.vardir}/conf - for x in app.asar bin EULA.txt install.vars lang lib libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libmd564.so libmd5.so share skin upgrade; do + for x in app.asar bin install.vars lang lib libc42archive64.so libc52archive.so libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libleveldb64.so libleveldb.so libmd564.so libmd5.so share skin upgrade; do rm -f ${crashplan.vardir}/$x; ln -sf ${crashplan}/$x ${crashplan.vardir}/$x; done diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index b6c658636bb2..94893a01c74f 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }: let - version = "4.7.0"; - rev = "2"; #tracks unversioned changes that occur on download.code42.com from time to time + version = "4.8.0"; + rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time in stdenv.mkDerivation rec { name = "crashplan-${version}-r${rev}"; crashPlanArchive = fetchurl { url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz"; - sha256 = "1vi6dqf8kc90axrgdcf6rwnhynxgxkc0qn6pbdp2gvkxdqxrprn8"; + sha256 = "117k9yx10n4lc0hkx0j48f19km0jrdgfq6xmbmhv3v73zbx21axs"; }; srcs = [ crashPlanArchive ]; @@ -43,7 +43,6 @@ in stdenv.mkDerivation rec { install -d -m 755 unpacked $out - install -D -m 644 EULA.txt $out/EULA.txt install -D -m 644 run.conf $out/bin/run.conf install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine From 008399e9de050842f67361fdc911d6b526fca287 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sun, 13 Nov 2016 14:41:57 -0500 Subject: [PATCH 0224/1749] add self to crashplan maintainers --- lib/maintainers.nix | 1 + pkgs/applications/backup/crashplan/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 735fc427c3c7..dbe45ee010a8 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -198,6 +198,7 @@ jb55 = "William Casarin "; jcumming = "Jack Cummings "; jefdaj = "Jeffrey David Johnson "; + jerith666 = "Matt McHenry "; jfb = "James Felix Black "; jgeerds = "Jascha Geerds "; jgillich = "Jakob Gillich "; diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index 94893a01c74f..1a125de0a872 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { description = "An online/offline backup solution"; homepage = "http://www.crashplan.org"; license = licenses.unfree; - maintainers = with maintainers; [ sztupi domenkozar ]; + maintainers = with maintainers; [ sztupi domenkozar jerith666 ]; }; buildInputs = [ makeWrapper cpio ]; From 181ed4c82bc85ec818db07047c1da522c63a31d0 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 13 Nov 2016 21:50:11 +0100 Subject: [PATCH 0225/1749] bmon: 3.8 -> 3.9 --- pkgs/tools/misc/bmon/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index 1bbabcf5523f..30412016e507 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -3,16 +3,18 @@ stdenv.mkDerivation rec { name = "bmon-${version}"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "tgraf"; repo = "bmon"; rev = "v${version}"; - sha256 = "19jv14r9j9n54bqhidw3z11z3wys1v2cagqpsxn0kjga1gkg87xs"; + sha256 = "1a4sj8pf02392zghr9wa1dc8x38fj093d4hg1fcakzrdjvrg1p2h"; }; - buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ]; + nativeBuildInputs = [ autoconf automake pkgconfig ]; + + buildInputs = [ ncurses confuse libnl ]; preConfigure = "sh ./autogen.sh"; From 83fe4fa0bfed7d402732a6c31817daefaaed8e64 Mon Sep 17 00:00:00 2001 From: obadz Date: Sun, 13 Nov 2016 20:58:50 +0000 Subject: [PATCH 0226/1749] e2fsprogs: 1.42.13 -> 1.43.3 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index f00a80603f97..8ff100394494 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.13"; + name = "e2fsprogs-1.43.3"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; + sha256 = "09wrn60rlqdgjkmm09yv32zxdjba2pd4ya3704bhywyln2xz33nf"; }; outputs = [ "bin" "dev" "out" "man" ]; From cbe8c3f62f8a7dde0898e112dffaf2e59c3578cd Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 13 Nov 2016 22:15:44 +0100 Subject: [PATCH 0227/1749] zile: 2.4.11 -> 2.4.13 --- pkgs/applications/editors/zile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 7282dc0ba202..58971b3199bf 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, ncurses, boehmgc, perl, help2man }: stdenv.mkDerivation rec { - name = "zile-2.4.11"; + name = "zile-2.4.13"; src = fetchurl { url = "mirror://gnu/zile/${name}.tar.gz"; - sha256 = "1k593y1xzvlj52q0gyhcx2lllws4sg84b8r9pcginjb1vjypplhz"; + sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7"; }; buildInputs = [ pkgconfig ncurses boehmgc ]; From b82ad1ba7695e92421e168c26d1915c00f4374ce Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 13 Nov 2016 22:48:52 +0100 Subject: [PATCH 0228/1749] db: fix all versions with libc++3.8 --- pkgs/development/libraries/db/clang-4.8.patch | 138 +++++++++++++++++- pkgs/development/libraries/db/clang-5.3.patch | 4 +- pkgs/development/libraries/db/clang-6.0.patch | 136 +++++++++++++++++ .../development/libraries/db/cygwin-4.4.patch | 21 --- .../development/libraries/db/cygwin-4.5.patch | 22 --- pkgs/development/libraries/db/db-4.8.nix | 7 +- pkgs/development/libraries/db/db-5.3.nix | 5 +- pkgs/development/libraries/db/db-6.0.nix | 2 +- pkgs/development/libraries/db/generic.nix | 10 +- .../libraries/db/register-race-fix.patch | 47 ------ 10 files changed, 286 insertions(+), 106 deletions(-) create mode 100644 pkgs/development/libraries/db/clang-6.0.patch delete mode 100644 pkgs/development/libraries/db/cygwin-4.4.patch delete mode 100644 pkgs/development/libraries/db/cygwin-4.5.patch delete mode 100644 pkgs/development/libraries/db/register-race-fix.patch diff --git a/pkgs/development/libraries/db/clang-4.8.patch b/pkgs/development/libraries/db/clang-4.8.patch index c53160a82970..bbb778914977 100644 --- a/pkgs/development/libraries/db/clang-4.8.patch +++ b/pkgs/development/libraries/db/clang-4.8.patch @@ -1,13 +1,22 @@ diff --git a/dbinc/atomic.h b/dbinc/atomic.h -index 0034dcc..fa7ba93 100644 +index 0034dcc..160c8ea 100644 --- a/dbinc/atomic.h +++ b/dbinc/atomic.h +@@ -70,7 +70,7 @@ typedef struct { + * These have no memory barriers; the caller must include them when necessary. + */ + #define atomic_read(p) ((p)->value) +-#define atomic_init(p, val) ((p)->value = (val)) ++#define atomic_init_db(p, val) ((p)->value = (val)) + + #ifdef HAVE_ATOMIC_SUPPORT + @@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; #define atomic_inc(env, p) __atomic_inc(p) #define atomic_dec(env, p) __atomic_dec(p) #define atomic_compare_exchange(env, p, o, n) \ - __atomic_compare_exchange((p), (o), (n)) -+ __db_atomic_compare_exchange((p), (o), (n)) ++ __atomic_compare_exchange_int((p), (o), (n)) static inline int __atomic_inc(db_atomic_t *p) { int temp; @@ -16,7 +25,130 @@ index 0034dcc..fa7ba93 100644 * which configure could be changed to use. */ -static inline int __atomic_compare_exchange( -+static inline int __db_atomic_compare_exchange( ++static inline int __atomic_compare_exchange_int( db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) { atomic_value_t was; +@@ -206,7 +206,7 @@ static inline int __atomic_compare_exchange( + #define atomic_dec(env, p) (--(p)->value) + #define atomic_compare_exchange(env, p, oldval, newval) \ + (DB_ASSERT(env, atomic_read(p) == (oldval)), \ +- atomic_init(p, (newval)), 1) ++ atomic_init_db(p, (newval)), 1) + #else + #define atomic_inc(env, p) __atomic_inc(env, p) + #define atomic_dec(env, p) __atomic_dec(env, p) +diff --git a/dbinc/db.in b/dbinc/db.in +index 9fc6712..7428e0a 100644 +--- a/dbinc/db.in ++++ b/dbinc/db.in +@@ -2413,7 +2413,7 @@ typedef struct { + #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) + #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ + #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) +-#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) ++#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) + + /******************************************************* + * Hsearch historic interface. +diff --git a/mp/mp_fget.c b/mp/mp_fget.c +index 5fdee5a..0b75f57 100644 +--- a/mp/mp_fget.c ++++ b/mp/mp_fget.c +@@ -617,7 +617,7 @@ alloc: /* Allocate a new buffer header and data space. */ + + /* Initialize enough so we can call __memp_bhfree. */ + alloc_bhp->flags = 0; +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + #ifdef DIAGNOSTIC + if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) { + __db_errx(env, +@@ -911,7 +911,7 @@ alloc: /* Allocate a new buffer header and data space. */ + MVCC_MPROTECT(bhp->buf, mfp->stat.st_pagesize, + PROT_READ); + +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + MUTEX_LOCK(env, alloc_bhp->mtx_buf); + alloc_bhp->priority = bhp->priority; + alloc_bhp->pgno = bhp->pgno; +diff --git a/mp/mp_mvcc.c b/mp/mp_mvcc.c +index 34467d2..f05aa0c 100644 +--- a/mp/mp_mvcc.c ++++ b/mp/mp_mvcc.c +@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp) + #else + memcpy(frozen_bhp, bhp, SSZA(BH, buf)); + #endif +- atomic_init(&frozen_bhp->ref, 0); ++ atomic_init_db(&frozen_bhp->ref, 0); + if (mutex != MUTEX_INVALID) + frozen_bhp->mtx_buf = mutex; + else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH, +@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp) + #endif + alloc_bhp->mtx_buf = mutex; + MUTEX_LOCK(env, alloc_bhp->mtx_buf); +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + F_CLR(alloc_bhp, BH_FROZEN); + } + +diff --git a/mp/mp_region.c b/mp/mp_region.c +index e6cece9..ddbe906 100644 +--- a/mp/mp_region.c ++++ b/mp/mp_region.c +@@ -224,7 +224,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg) + MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0) + return (ret); + SH_TAILQ_INIT(&htab[i].hash_bucket); +- atomic_init(&htab[i].hash_page_dirty, 0); ++ atomic_init_db(&htab[i].hash_page_dirty, 0); + } + + /* +@@ -269,7 +269,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg) + hp->mtx_hash = (mtx_base == MUTEX_INVALID) ? MUTEX_INVALID : + mtx_base + i; + SH_TAILQ_INIT(&hp->hash_bucket); +- atomic_init(&hp->hash_page_dirty, 0); ++ atomic_init_db(&hp->hash_page_dirty, 0); + #ifdef HAVE_STATISTICS + hp->hash_io_wait = 0; + hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0; +diff --git a/mutex/mut_method.c b/mutex/mut_method.c +index 2588763..5c6d516 100644 +--- a/mutex/mut_method.c ++++ b/mutex/mut_method.c +@@ -426,7 +426,7 @@ atomic_compare_exchange(env, v, oldval, newval) + MUTEX_LOCK(env, mtx); + ret = atomic_read(v) == oldval; + if (ret) +- atomic_init(v, newval); ++ atomic_init_db(v, newval); + MUTEX_UNLOCK(env, mtx); + + return (ret); +diff --git a/mutex/mut_tas.c b/mutex/mut_tas.c +index f3922e0..e40fcdf 100644 +--- a/mutex/mut_tas.c ++++ b/mutex/mut_tas.c +@@ -46,7 +46,7 @@ __db_tas_mutex_init(env, mutex, flags) + + #ifdef HAVE_SHARED_LATCHES + if (F_ISSET(mutexp, DB_MUTEX_SHARED)) +- atomic_init(&mutexp->sharecount, 0); ++ atomic_init_db(&mutexp->sharecount, 0); + else + #endif + if (MUTEX_INIT(&mutexp->tas)) { +@@ -486,7 +486,7 @@ __db_tas_mutex_unlock(env, mutex) + F_CLR(mutexp, DB_MUTEX_LOCKED); + /* Flush flag update before zeroing count */ + MEMBAR_EXIT(); +- atomic_init(&mutexp->sharecount, 0); ++ atomic_init_db(&mutexp->sharecount, 0); + } else { + DB_ASSERT(env, sharecount > 0); + MEMBAR_EXIT(); diff --git a/pkgs/development/libraries/db/clang-5.3.patch b/pkgs/development/libraries/db/clang-5.3.patch index 0a0993da13e1..1cfb13ca8e68 100644 --- a/pkgs/development/libraries/db/clang-5.3.patch +++ b/pkgs/development/libraries/db/clang-5.3.patch @@ -16,7 +16,7 @@ index 6a858f7..9f338dc 100644 #define atomic_dec(env, p) __atomic_dec(p) #define atomic_compare_exchange(env, p, o, n) \ - __atomic_compare_exchange((p), (o), (n)) -+ __atomic_compare_exchange_db((p), (o), (n)) ++ __atomic_compare_exchange_int((p), (o), (n)) static inline int __atomic_inc(db_atomic_t *p) { int temp; @@ -25,7 +25,7 @@ index 6a858f7..9f338dc 100644 * which configure could be changed to use. */ -static inline int __atomic_compare_exchange( -+static inline int __atomic_compare_exchange_db( ++static inline int __atomic_compare_exchange_int( db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) { atomic_value_t was; diff --git a/pkgs/development/libraries/db/clang-6.0.patch b/pkgs/development/libraries/db/clang-6.0.patch new file mode 100644 index 000000000000..5c1e8f506c4e --- /dev/null +++ b/pkgs/development/libraries/db/clang-6.0.patch @@ -0,0 +1,136 @@ +diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h +index e4420aa..4799b5f 100644 +--- a/src/dbinc/atomic.h ++++ b/src/dbinc/atomic.h +@@ -70,7 +70,7 @@ typedef struct { + * These have no memory barriers; the caller must include them when necessary. + */ + #define atomic_read(p) ((p)->value) +-#define atomic_init(p, val) ((p)->value = (val)) ++#define atomic_init_db(p, val) ((p)->value = (val)) + + #ifdef HAVE_ATOMIC_SUPPORT + +@@ -225,7 +225,7 @@ static inline int __atomic_compare_exchange_int( + #define atomic_dec(env, p) (--(p)->value) + #define atomic_compare_exchange(env, p, oldval, newval) \ + (DB_ASSERT(env, atomic_read(p) == (oldval)), \ +- atomic_init(p, (newval)), 1) ++ atomic_init_db(p, (newval)), 1) + #else + #define atomic_inc(env, p) __atomic_inc_int(env, p) + #define atomic_dec(env, p) __atomic_dec_int(env, p) +diff --git a/src/dbinc/db.in b/src/dbinc/db.in +index 3c2ad9b..3e46f02 100644 +--- a/src/dbinc/db.in ++++ b/src/dbinc/db.in +@@ -2999,7 +2999,7 @@ typedef struct { + #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) + #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ + #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) +-#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) ++#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) + + /******************************************************* + * Hsearch historic interface. +diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c +index 59fe9fe..fa4ced7 100644 +--- a/src/mp/mp_fget.c ++++ b/src/mp/mp_fget.c +@@ -654,7 +654,7 @@ alloc: /* Allocate a new buffer header and data space. */ + + /* Initialize enough so we can call __memp_bhfree. */ + alloc_bhp->flags = 0; +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + #ifdef DIAGNOSTIC + if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) { + __db_errx(env, DB_STR("3025", +@@ -969,7 +969,7 @@ alloc: /* Allocate a new buffer header and data space. */ + MVCC_MPROTECT(bhp->buf, mfp->pagesize, + PROT_READ); + +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + MUTEX_LOCK(env, alloc_bhp->mtx_buf); + alloc_bhp->priority = bhp->priority; + alloc_bhp->pgno = bhp->pgno; +diff --git a/src/mp/mp_mvcc.c b/src/mp/mp_mvcc.c +index 83c4d72..0a47202 100644 +--- a/src/mp/mp_mvcc.c ++++ b/src/mp/mp_mvcc.c +@@ -281,7 +281,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp) + #else + memcpy(frozen_bhp, bhp, SSZA(BH, buf)); + #endif +- atomic_init(&frozen_bhp->ref, 0); ++ atomic_init_db(&frozen_bhp->ref, 0); + if (mutex != MUTEX_INVALID) + frozen_bhp->mtx_buf = mutex; + else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH, +@@ -440,7 +440,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp) + #endif + alloc_bhp->mtx_buf = mutex; + MUTEX_LOCK(env, alloc_bhp->mtx_buf); +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + F_CLR(alloc_bhp, BH_FROZEN); + } + +diff --git a/src/mp/mp_region.c b/src/mp/mp_region.c +index 4d95e4f..e97459c 100644 +--- a/src/mp/mp_region.c ++++ b/src/mp/mp_region.c +@@ -278,7 +278,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg) + MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0) + return (ret); + SH_TAILQ_INIT(&htab[i].hash_bucket); +- atomic_init(&htab[i].hash_page_dirty, 0); ++ atomic_init_db(&htab[i].hash_page_dirty, 0); + } + + mtx_base = mtx_prev = MUTEX_INVALID; +@@ -332,7 +332,7 @@ no_prealloc: + DB_MUTEX_SHARED, &hp->mtx_hash)) != 0) + return (ret); + SH_TAILQ_INIT(&hp->hash_bucket); +- atomic_init(&hp->hash_page_dirty, 0); ++ atomic_init_db(&hp->hash_page_dirty, 0); + #ifdef HAVE_STATISTICS + hp->hash_io_wait = 0; + hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0; +diff --git a/src/mutex/mut_method.c b/src/mutex/mut_method.c +index 72b34de..a9f9868 100644 +--- a/src/mutex/mut_method.c ++++ b/src/mutex/mut_method.c +@@ -501,7 +501,7 @@ __atomic_compare_exchange_int(env, v, oldval, newval) + MUTEX_LOCK(env, mtx); + ret = atomic_read(v) == oldval; + if (ret) +- atomic_init(v, newval); ++ atomic_init_db(v, newval); + MUTEX_UNLOCK(env, mtx); + + return (ret); +diff --git a/src/mutex/mut_tas.c b/src/mutex/mut_tas.c +index 7899c4b..d9420fa 100644 +--- a/src/mutex/mut_tas.c ++++ b/src/mutex/mut_tas.c +@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags) + + #ifdef HAVE_SHARED_LATCHES + if (F_ISSET(mutexp, DB_MUTEX_SHARED)) +- atomic_init(&mutexp->sharecount, 0); ++ atomic_init_db(&mutexp->sharecount, 0); + else + #endif + if (MUTEX_INIT(&mutexp->tas)) { +@@ -643,7 +643,7 @@ was_not_locked: + F_CLR(mutexp, DB_MUTEX_LOCKED); + /* Flush flag update before zeroing count */ + MEMBAR_EXIT(); +- atomic_init(&mutexp->sharecount, 0); ++ atomic_init_db(&mutexp->sharecount, 0); + } else { + DB_ASSERT(env, sharecount > 0); + MEMBAR_EXIT(); diff --git a/pkgs/development/libraries/db/cygwin-4.4.patch b/pkgs/development/libraries/db/cygwin-4.4.patch deleted file mode 100644 index 3f9d658b5dac..000000000000 --- a/pkgs/development/libraries/db/cygwin-4.4.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rc db-4.4.20.NC-old/os/os_flock.c db-4.4.20.NC/os/os_flock.c -*** db-4.4.20.NC-old/os/os_flock.c Mon Jun 20 16:59:01 2005 ---- db-4.4.20.NC/os/os_flock.c Wed Jun 7 17:01:49 2006 -*************** -*** 36,41 **** ---- 36,50 ---- - - DB_ASSERT(F_ISSET(fhp, DB_FH_OPENED) && fhp->fd != -1); - -+ #ifdef __CYGWIN__ -+ /* -+ * Windows file locking interferes with read/write operations, so we -+ * map the ranges to an area past the end of the file. -+ */ -+ DB_ASSERT(offset < (off_t) 1 << 62); -+ offset += (off_t) 1 << 62; -+ #endif -+ - #ifdef HAVE_FCNTL - fl.l_start = offset; - fl.l_len = 1; diff --git a/pkgs/development/libraries/db/cygwin-4.5.patch b/pkgs/development/libraries/db/cygwin-4.5.patch deleted file mode 100644 index 3f0ee78a7085..000000000000 --- a/pkgs/development/libraries/db/cygwin-4.5.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -rc db-4.5.20-orig/os/os_flock.c db-4.5.20/os/os_flock.c -*** db-4.5.20-orig/os/os_flock.c 2006-10-13 12:36:12.000000000 +0200 ---- db-4.5.20/os/os_flock.c 2006-10-13 12:40:11.000000000 +0200 -*************** -*** 30,35 **** ---- 30,44 ---- - - DB_ASSERT(dbenv, F_ISSET(fhp, DB_FH_OPENED) && fhp->fd != -1); - -+ #ifdef __CYGWIN__ -+ /* -+ * Windows file locking interferes with read/write operations, so we -+ * map the ranges to an area past the end of the file. -+ */ -+ DB_ASSERT(dbenv, offset < (off_t) 1 << 62); -+ offset += (off_t) 1 << 62; -+ #endif -+ - fl.l_start = offset; - fl.l_len = 1; - fl.l_type = acquire ? F_WRLCK : F_UNLCK; -Only in db-4.5.20/os: os_flock.c~ diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index 40869a865ae5..bce91e5a9401 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -2,8 +2,9 @@ import ./generic.nix (args // rec { version = "4.8.30"; - extraPatches = [ ./clang-4.8.patch ]; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; - branch = "4.8"; - drvArgs = { hardeningDisable = [ "format" ]; }; + extraPatches = [ ./clang-4.8.patch ]; + + drvArgs.hardeningDisable = [ "format" ]; + drvArgs.doCheck = false; }) diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 91adfa24b58d..d1d3c953fc9f 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -3,9 +3,6 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - branch = "5.3"; - # https://community.oracle.com/thread/3952592 - # this patch renames some sybols that conflict with libc++-3.8 - # symbols: atomic_compare_exchange, atomic_init, store + license = stdenv.lib.licenses.agpl3; extraPatches = [ ./clang-5.3.patch ]; }) diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index 716cad9ab074..b7c5667b883e 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -4,5 +4,5 @@ import ./generic.nix (args // rec { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; license = stdenv.lib.licenses.agpl3; - branch = "6.0"; + extraPatches = [ ./clang-6.0.patch ]; }) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index fdc828effdfb..a6f9c676bba0 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -4,9 +4,8 @@ # Options from inherited versions , version, sha256 -, extraPatches ? [ ] +, patchSrc ? "src", extraPatches ? [ ] , license ? stdenv.lib.licenses.sleepycat -, branch ? null , drvArgs ? {} }: @@ -36,11 +35,16 @@ stdenv.mkDerivation (rec { rm -rf $out/docs ''; + doCheck = true; + + checkPhase = '' + make examples_c examples_cxx + ''; + meta = with stdenv.lib; { homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html"; description = "Berkeley DB"; license = license; platforms = platforms.unix; - branch = branch; }; } // drvArgs) diff --git a/pkgs/development/libraries/db/register-race-fix.patch b/pkgs/development/libraries/db/register-race-fix.patch deleted file mode 100644 index bb05c966e5bd..000000000000 --- a/pkgs/development/libraries/db/register-race-fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -rc db-4.5.20-orig/env/env_register.c db-4.5.20/env/env_register.c -*** db-4.5.20-orig/env/env_register.c 2006-09-09 16:29:04.000000000 +0200 ---- db-4.5.20/env/env_register.c 2007-05-16 21:13:27.000000000 +0200 -*************** -*** 255,260 **** ---- 255,262 ---- - buf[nr - 1] = '\0'; - } - -+ //sleep(3); -+ - pos = (off_t)lcnt * PID_LEN; - if (REGISTRY_LOCK(dbenv, pos, 1) == 0) { - if ((ret = REGISTRY_UNLOCK(dbenv, pos)) != 0) -*************** -*** 361,366 **** ---- 363,392 ---- - if (recovery_failed) - goto err; - -+ //sleep(5); -+ -+ /* -+ * Acquire an exclusive lock to prevent a race like this: -+ * -+ * 1) Process X is about to exit and process Y is just -+ * starting. -+ * 2) Process Y reads X's slot. -+ * 3) Process X clears its slot. -+ * 4) Process Y sees that X's slot isn't cleared yet (since it -+ * just read the old value). -+ * 5) Process X closes the registry, releases the lock on its -+ * slot. -+ * 6) Process Y tries to acquire X's slot and succeeds, so it -+ * concludes that X died and recovery is needed. -+ * -+ * A more efficient solution to this problem would be to let -+ * __envreg_add acquire the lock on a slot first, and *then* -+ * read the slot (instead of the other way around). Then we -+ * wouldn't need the exclusive lock here. -+ */ -+ if ((ret = REGISTRY_EXCL_LOCK(dbenv, 0)) != 0) -+ goto err; -+ - /* - * Why isn't an exclusive lock necessary to discard a DB_ENV handle? - * From cad9212813603cf3339dc56be974177941a8b3a7 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 12 Nov 2016 16:22:32 +0100 Subject: [PATCH 0229/1749] grsecurity: 4.7.10-201611011946 -> 4.8.7-201611102210 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 6 +++--- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index eda2dd26163e..a1f5230ac002 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.7.10"; - extraMeta.branch = "4.7"; + version = "4.8.7"; + extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1p2r5d0jcrak9gxp0339g9z198x9laf09h08ck4jllhhaajrnicj"; + sha256 = "03qgqqy1kxdqpb844g2yfyq45xy77110hrz8ddqy0rlkia8kzx8m"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 6bba248374ba..3d4ba5d2b58d 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.7.10"; - grrev = "201611011946"; - sha256 = "0nva1007r4shlcxzflbxvd88yzvb98si2kjlgnhdqphyz1c0qhql"; + { kver = "4.8.7"; + grrev = "201611102210"; + sha256 = "1n7avhvzy4njf9wky38l99i18v1rr05bgspivnp440j8d6nh60nh"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From f7e1da5fd1d7f4256ae9b1005ba4945af96cd7c9 Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Mon, 14 Nov 2016 00:27:40 +0100 Subject: [PATCH 0230/1749] nodejs: 4.6.0 -> 4.6.2; 6.8.0 -> 6.9.1 --- pkgs/development/web/nodejs/v4.nix | 4 ++-- pkgs/development/web/nodejs/v6.nix | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index 04ea7086f74c..9a142a89677f 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "4.6.0"; + version = "4.6.2"; name = "${baseName}-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "1566q1kkv8j30fgqx8sm2h8323f38wwpa1hfb10gr6z46jyhv4a2"; + sha256 = "17ick2r2biyxs5zf83i8q8844fbcphm0d5g1z70mcrb86yrmi545"; }; }) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 50bd2cb672e3..b91ec8df6873 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -10,19 +10,12 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "6.8.0"; + version = "6.9.1"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "13arzwki13688hr1lh871y06lrk019g4hkasmg11arm8j1dcwcpq"; + sha256 = "0a87vzb33xdg8w0xi3c605hfav3c9m4ylab1436whz3p0l9qvp8b"; }; - patches = nodejs.patches ++ [ - (fetchpatch { - url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch"; - sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i"; - }) - ]; - }) From 4fd9a608747d05896ecfd4519ebaa96355b96fea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 12 Nov 2016 18:11:56 +0100 Subject: [PATCH 0231/1749] pythonPackages.prompt_toolkit: 1.0.3 -> 1.0.9 --- 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 23934589cccb..b4537e1222a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18963,10 +18963,10 @@ in { prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "1.0.3"; + version = "1.0.9"; src = pkgs.fetchurl { - sha256 = "18lbmmkyjf509klc3217lq0x863pfzix779zx5kp9lms1iph4pl0"; + sha256 = "172r15k9kwdw2lnajvpz1632dd16nqz1kcal1p0lq5ywdarj6rfd"; url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz"; }; checkPhase = '' From 7f71b89454ebfb0699ca441329f8cb36466d74ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Nov 2016 18:00:34 +0100 Subject: [PATCH 0232/1749] dpkg: 1.18.10 -> 1.18.14 --- pkgs/tools/package-management/dpkg/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index ce7208982555..b940c574d609 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.18.10"; + version = "1.18.14"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1ibdidmc8nfiigadfpl3xrccrxw6hvmqiqqizy1v265s87d28m82"; + sha256 = "0njd8pdq1vx70sjlgymi79lijg05fmd8vxnqndzhjjb0a8cf920p"; }; - postPatch = '' - # dpkg tries to force some dependents like debian-devscripts to use - # -fstack-protector-strong - not (yet?) a good idea. Disable for now: - substituteInPlace scripts/Dpkg/Vendor/Debian.pm \ - --replace "stackprotectorstrong => 1" "stackprotectorstrong => 0" - ''; +# postPatch = '' +# # dpkg tries to force some dependents like debian-devscripts to use +# # -fstack-protector-strong - not (yet?) a good idea. Disable for now: +# substituteInPlace scripts/Dpkg/Vendor/Debian.pm \ +# --replace "stackprotectorstrong => 1" "stackprotectorstrong => 0" +# ''; configureFlags = [ "--disable-dselect" From 2548fd6908d38cee7a80d99b0dd68e26935e8df5 Mon Sep 17 00:00:00 2001 From: Corbin Date: Fri, 28 Oct 2016 22:23:53 -0700 Subject: [PATCH 0233/1749] services/tahoe: SFTP support. --- .../services/network-filesystems/tahoe.nix | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index f1846b963252..f91827c379de 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -138,6 +138,45 @@ in ''; }; helper.enable = mkEnableOption "helper service"; + sftpd.enable = mkEnableOption "SFTP service"; + sftpd.port = mkOption { + default = null; + type = types.nullOr types.int; + description = '' + The port on which the SFTP server will listen. + + This is the correct setting to tweak if you want Tahoe's SFTP + daemon to listen on a different port. + ''; + }; + sftpd.hostPublicKeyFile = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Path to the SSH host public key. + ''; + }; + sftpd.hostPrivateKeyFile = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Path to the SSH host private key. + ''; + }; + sftpd.accounts.file = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Path to the accounts file. + ''; + }; + sftpd.accounts.url = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + URL of the accounts server. + ''; + }; package = mkOption { default = pkgs.tahoelafs; defaultText = "pkgs.tahoelafs"; @@ -256,6 +295,19 @@ in [helper] enabled = ${if settings.helper.enable then "true" else "false"} + + [sftpd] + enabled = ${if settings.sftpd.enable then "true" else "false"} + ${optionalString (settings.sftpd.port != null) + "port = ${toString settings.sftpd.port}"} + ${optionalString (settings.sftpd.hostPublicKeyFile != null) + "host_pubkey_file = ${settings.sftpd.hostPublicKeyFile}"} + ${optionalString (settings.sftpd.hostPrivateKeyFile != null) + "host_privkey_file = ${settings.sftpd.hostPrivateKeyFile}"} + ${optionalString (settings.sftpd.accounts.file != null) + "accounts.file = ${settings.sftpd.accounts.file}"} + ${optionalString (settings.sftpd.accounts.url != null) + "accounts.url = ${settings.sftpd.accounts.url}"} ''; }); # Actually require Tahoe, so that we will have it installed. From e82c325bff0295ed4bbbd308fd4f99cdfd9ab515 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 14 Nov 2016 05:28:22 +0100 Subject: [PATCH 0234/1749] btrfs-progs: 4.8.2 -> 4.8.3 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 525aa2fec28a..0e7e6fbcdec2 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.8.2"; in +let version = "4.8.3"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41"; + sha256 = "1wlflrygnpndppil9g12pk184f75g9qx1lkr0x1gijigglqhr9n1"; }; buildInputs = [ From 8ef3eaeb4e531929ec29a880cb4c67f790e5eb70 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 14 Nov 2016 05:32:22 +0100 Subject: [PATCH 0235/1749] dpkg: remove commented old postPatch This was supposed to be removed in 7f71b89454ebfb0699ca441329f8cb36466d74ee since it doesn't appear to be needed any longer. --- pkgs/tools/package-management/dpkg/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index b940c574d609..c1d4cd319b8f 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -9,13 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0njd8pdq1vx70sjlgymi79lijg05fmd8vxnqndzhjjb0a8cf920p"; }; -# postPatch = '' -# # dpkg tries to force some dependents like debian-devscripts to use -# # -fstack-protector-strong - not (yet?) a good idea. Disable for now: -# substituteInPlace scripts/Dpkg/Vendor/Debian.pm \ -# --replace "stackprotectorstrong => 1" "stackprotectorstrong => 0" -# ''; - configureFlags = [ "--disable-dselect" "--with-admindir=/var/lib/dpkg" From 3a3706c07f42685309865393cda23886cabd3ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Faille?= Date: Mon, 14 Nov 2016 00:15:57 -0500 Subject: [PATCH 0236/1749] vagrant: 1.8.6 -> 1.8.7 I upgrade vagrant mainly for this bug : https://github.com/mitchellh/vagrant/issues/7844 --- pkgs/development/tools/vagrant/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 062873f0ccd4..40e42d478612 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -2,7 +2,7 @@ , libxml2, libxslt, makeWrapper, p7zip, xar, gzip, cpio }: let - version = "1.8.6"; + version = "1.8.7"; rake = buildRubyGem { inherit ruby; gemName = "rake"; @@ -17,9 +17,9 @@ let else "system ${stdenv.system} not supported"; sha256 = { - "x86_64-linux" = "1nkhf160hcl02yvafj6hq53j204qqxyvxjngnmf4f5md8dmkpn76"; - "i686-linux" = "0mr4pn7nggjdsqyxh1z2mflvvmpzhbxh5gax501d2hi8xr0y68df"; - "x86_64-darwin" = "1nd2adxwhs2vwmi5vw2z720ny4q9rpj8i4dlcdxzbyli7h8cs5mr"; + "x86_64-linux" = "10c77b643b73dd3ad7a45a89d8ab95b58b79dc10e0cf6e760fe24abc436b2fdb"; + "i686-linux" = "9d2a70f34ab65d8d2cb013917f221835432aa63cd4ef781c9fd1404cfcfe7898"; + "x86_64-darwin" = "14d68f599a620cf421838ed037f0a1c4467e1b67475deeff62330a21fda4937b"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = builtins.replaceStrings ["-linux"] [""] stdenv.system; From 86f63755f5cc2635a428c21a2f633a0f0bb32292 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 13 Nov 2016 17:50:29 +0100 Subject: [PATCH 0237/1749] ocamlPackages.batteries: 2.5.2 -> 2.5.3 --- pkgs/development/ocaml-modules/batteries/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 904a214c34f5..d24c61745104 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }: -let version = "2.5.2"; in +let version = "2.5.3"; in stdenv.mkDerivation { name = "ocaml-batteries-${version}"; src = fetchzip { url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; - sha256 = "01v7sp8vsqlfrmpji5pkrsjl43r3q8hk1a4z4lmyy9y2i0fqwl07"; + sha256 = "047v05qy0526ad52hzhfa0giczhyzbmw9fwsn6l319icq77ms6jh"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ]; From 328ad178588c8a2bc690f937ef60acef41162ec8 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 14 Nov 2016 08:15:37 +0000 Subject: [PATCH 0238/1749] Update hash for xnu 3248.60.10, the tarball changed upstream, it seems. (cherry picked from commit 5ddaca179c15154efae4e5b7efea843d2c67cff8) --- pkgs/os-specific/darwin/apple-source-releases/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 8625ac72c104..c66096c2fedc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -213,7 +213,7 @@ let ppp = applePackage "ppp" "osx-10.11.6" "1dql6r1v0vbcs04958nn2i6p31yfsxyy51jca63bm5mf0gxalk3f" {}; removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; - xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; + xnu = applePackage "xnu" "osx-10.11.6" "1vij2q5bpvp1sd2maf154mjk9g5z5hxyzcg5wcd4z7i8j5h36xnv" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; From c0f9bc9b4eca7c4d58235d62dc886dc04f5abded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 10 Nov 2016 23:56:50 +0100 Subject: [PATCH 0239/1749] wireguard: 2016-10-25 -> 0.0.20161110 --- pkgs/os-specific/linux/wireguard/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 14974f6d43fc..54f49bba32b3 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -2,17 +2,15 @@ # module requires Linux >= 4.1 https://www.wireguard.io/install/#kernel-requirements assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1"; -# module is incompatible with the PaX constification plugin -assert kernel != null -> !(kernel.features.grsecurity or false); let - name = "wireguard-unstable-${version}"; + name = "wireguard-experimental-${version}"; - version = "2016-10-25"; + version = "0.0.20161110"; src = fetchurl { - url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-0.0.20161025.tar.xz"; - sha256 = "09rhap3dzb8rcq1a1af9inf1qz7161yghafbgpbnd9dg016vhgs3"; + url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-${version}.tar.xz"; + sha256 = "13z416k64gnkp9248h846h40ph83ms7l9mm9b9xpki17j5q7hm10"; }; meta = with stdenv.lib; { From 2ef41c34f82c646bc659af7b7043b8c0619a962b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 14 Nov 2016 09:47:31 +0100 Subject: [PATCH 0240/1749] pythonPackages.asgiref: 0.14.0 -> 1.0.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 b4537e1222a8..6f0f30342712 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -645,11 +645,11 @@ in { asgiref = buildPythonPackage rec { name = "asgiref-${version}"; - version = "0.14.0"; + version = "1.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/asgiref/${name}.tar.gz"; - sha256 = "1ww4z14pd7g2mwz5nyvxm4rif0rsm9h8i0lwk78v58b2j45r43lc"; + sha256 = "1jg4nxjsn7nc4vd3170xd60m6syn57m6xwyyna6r68vniq8nhg7i"; }; propagatedBuildInputs = with self ; [ six ]; From 710ae1b5b3fd24679b22050c251fe81f494945a7 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 14 Nov 2016 09:48:01 +0100 Subject: [PATCH 0241/1749] pythonPackages.asgi_ipc: 1.1.0 -> 1.2.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 6f0f30342712..ecf9c6075414 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -663,11 +663,11 @@ in { asgi_ipc = buildPythonPackage rec { name = "asgi_ipc-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz"; - sha256 = "16q5x2cvx3rpnikmqv8l4clkfib8baqy7diy18rsmzj6hqqli3xy"; + sha256 = "03phyfj30s4sgaqfbmv38nfvx3kdmjwsh3558d2lxrf2gdrimmf9"; }; propagatedBuildInputs = with self ; [ asgiref msgpack posix_ipc ]; From 2f48d75b8dffd09135332510516c300bc4e659de Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 14 Nov 2016 09:48:23 +0100 Subject: [PATCH 0242/1749] pythonPackages.asgi_redis: 0.14.1 -> 1.0.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 ecf9c6075414..4212b0aa56c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -681,11 +681,11 @@ in { asgi_redis = buildPythonPackage rec { name = "asgi_redis-${version}"; - version = "0.14.1"; + version = "1.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/asgi_redis/${name}.tar.gz"; - sha256 = "13ixh1nwgla7wm2xa42inwrd3g5lri89gd31xl62zhs8m6jmg122"; + sha256 = "1pdzxannmgb0as2x6xy0rk4xi8ygnsggpsa0z31pzpwbk6jsgwxd"; }; # Requires a redis server available From 92df69fb22d34d1387ebe2821e77e9202c777f23 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 10 Nov 2016 18:34:52 +0100 Subject: [PATCH 0243/1749] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/5e084e904a16887236499910167127c7cd79a861. --- .../haskell-modules/hackage-packages.nix | 962 +++++++++++++++--- 1 file changed, 802 insertions(+), 160 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 728684fd028b..c835d85b97e4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1668,6 +1668,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "BlastHTTP_1_2_1" = callPackage + ({ mkDerivation, base, biocore, biofasta, blastxml, bytestring + , conduit, HTTP, http-conduit, hxt, mtl, network, transformers + }: + mkDerivation { + pname = "BlastHTTP"; + version = "1.2.1"; + sha256 = "cee85e0fba0530aff57209b3d91a800db52b63c3f7e4a431a04e7a9cbd355bd5"; + libraryHaskellDepends = [ + base biocore biofasta blastxml bytestring conduit HTTP http-conduit + hxt mtl network transformers + ]; + homepage = "https://github.com/eggzilla/BlastHTTP"; + description = "Libary to interface with the NCBI blast REST interface"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Blobs" = callPackage ({ mkDerivation, base, containers, directory, HaXml, polyparse , pretty, wx, wxcore @@ -4504,8 +4522,8 @@ self: { }: mkDerivation { pname = "EntrezHTTP"; - version = "1.0.2"; - sha256 = "547f087fcc10e85550775bb02c56b9eea6d2cd32d419cdbe0ab33ad28c0335e9"; + version = "1.0.3"; + sha256 = "395c438c8b5b68fc0826e1946483d252a8936d5a91a25bf928eef113b4f9a89b"; libraryHaskellDepends = [ base biocore bytestring conduit HTTP http-conduit hxt mtl network Taxonomy text transformers @@ -5751,12 +5769,19 @@ self: { }) {}; "GPipe-GLFW" = callPackage - ({ mkDerivation, base, GLFW-b, GPipe, transformers }: + ({ mkDerivation, base, exception-transformers, GLFW-b, GPipe + , transformers + }: mkDerivation { pname = "GPipe-GLFW"; - version = "1.2.2"; - sha256 = "b2c2764511504225550b7e03badba80ba6e264eb86bee3fcc2f7d54e2e11d652"; + version = "1.2.3"; + sha256 = "a6854b9e0a2790db5205d22035cfa6e68c8e2341918a875e851f22264a9b5c40"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base GLFW-b GPipe transformers ]; + executableHaskellDepends = [ + base exception-transformers GPipe transformers + ]; homepage = "https://github.com/plredmond/GPipe-GLFW"; description = "GLFW OpenGL context creation for GPipe"; license = stdenv.lib.licenses.mit; @@ -13686,10 +13711,10 @@ self: { ({ mkDerivation, base, containers, mtl, old-time, random }: mkDerivation { pname = "QIO"; - version = "1.2"; - sha256 = "a6c35c08c698137e2923a1e5d5877d0349f75711d6119fcb68eb395b72b1a0f2"; + version = "1.3"; + sha256 = "e81da8f965cc031009fd9005f5cc253b83466bc0a14a2857d73c2c902ab6aba7"; libraryHaskellDepends = [ base containers mtl old-time random ]; - homepage = "http://www.cs.nott.ac.uk/~asg/QIO/"; + homepage = "https://github.com/alexandersgreen/qio-haskell"; description = "The Quantum IO Monad is a library for defining quantum computations in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -14136,8 +14161,8 @@ self: { }: mkDerivation { pname = "RNAlien"; - version = "1.2.5"; - sha256 = "ab604c7e96b0801d9dc4fa7f30335e918b485dc433efdfb1e56f4c4dc38be6cd"; + version = "1.2.6"; + sha256 = "a3a0de2cde3813f9e7f87f27f8ebf306bcb6da8da6b818624a335c329e051874"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -17976,8 +18001,8 @@ self: { }: mkDerivation { pname = "XSaiga"; - version = "1.3.0.1"; - sha256 = "a913eac19f76759271bc331084773e04f4d6d16dd70190e10bd9403e51cdaad2"; + version = "1.4.0.1"; + sha256 = "f9eae0f1298cf4ab340b9a2761a1b4f80cffdf25a73ef8679c750008ba4316d2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32797,6 +32822,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bitx-bitcoin_0_11_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, directory + , doctest, exceptions, hspec, http-client, http-client-tls + , http-types, microlens, microlens-th, network, QuickCheck, safe + , scientific, split, text, time + }: + mkDerivation { + pname = "bitx-bitcoin"; + version = "0.11.0.0"; + sha256 = "9f46782f5a9688b7c1681789d7165c9a21247dc5fc67807cf847bf526414ce20"; + libraryHaskellDepends = [ + aeson base bytestring deepseq exceptions http-client + http-client-tls http-types microlens microlens-th network + QuickCheck scientific split text time + ]; + testHaskellDepends = [ + aeson base bytestring directory doctest hspec http-client + http-types microlens safe text time + ]; + homepage = "https://github.com/tebello-thejane/bitx.hs"; + description = "A Haskell library for working with the BitX bitcoin exchange"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bk-tree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -34410,8 +34460,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.13"; - sha256 = "5e5687cdb05065e564140d1970d737f8c8a73f57b321fb522cc7b32c96765ee7"; + version = "0.14"; + sha256 = "5cccff3f432593ad50288e66a78a115c5e030bbb3aca37c332a914d6743bcc81"; libraryHaskellDepends = [ base containers contravariant data-default deepseq microlens microlens-mtl microlens-th template-haskell text text-zipper @@ -34632,6 +34682,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "btrfs_0_1_2_1" = callPackage + ({ mkDerivation, base, bytestring, time, unix }: + mkDerivation { + pname = "btrfs"; + version = "0.1.2.1"; + sha256 = "85b28c30a369958cd86ab2d822aa874846950e2720d0b9cda5ef8cd225cf3ee0"; + libraryHaskellDepends = [ base bytestring time unix ]; + homepage = "https://github.com/redneb/hs-btrfs"; + description = "Bindings to the btrfs API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "buffer-builder" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, HTF, mtl, quickcheck-instances, text @@ -37951,6 +38014,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cassava_0_4_5_1" = callPackage + ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring + , containers, deepseq, hashable, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , unordered-containers, vector + }: + mkDerivation { + pname = "cassava"; + version = "0.4.5.1"; + sha256 = "7c622ae9dc647508662a1cda3fe3f6d7032786e4e3d15f8488de9e9330cf9d9f"; + libraryHaskellDepends = [ + array attoparsec base blaze-builder bytestring containers deepseq + hashable text unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring hashable HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text + unordered-containers vector + ]; + homepage = "https://github.com/hvr/cassava"; + description = "A CSV parsing and encoding library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cassava-conduit" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava , conduit, conduit-extra, containers, mtl, QuickCheck, text @@ -40387,6 +40475,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "classyplate" = callPackage + ({ mkDerivation, base, template-haskell, type-list }: + mkDerivation { + pname = "classyplate"; + version = "0.1.0.0"; + sha256 = "b10d14b679f41e41755013b18b11158310bf80ff415cb369444a8f82388f6fbc"; + libraryHaskellDepends = [ base template-haskell type-list ]; + description = "Fuseable type-class based generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "clay" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: mkDerivation { @@ -41149,6 +41248,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clustering_0_3_1" = callPackage + ({ mkDerivation, base, binary, containers, hierarchical-clustering + , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty + , tasty-hunit, tasty-quickcheck, unordered-containers, vector + }: + mkDerivation { + pname = "clustering"; + version = "0.3.1"; + sha256 = "bc69248083d4c7f7ed32b1f0971d18a52414fd0ee8bc1f05fea8e4538fe87f86"; + libraryHaskellDepends = [ + base binary containers matrices mwc-random parallel primitive + unordered-containers vector + ]; + testHaskellDepends = [ + base binary hierarchical-clustering matrices mwc-random Rlang-QQ + split tasty tasty-hunit tasty-quickcheck vector + ]; + description = "High performance clustering algorithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clustertools" = callPackage ({ mkDerivation, base, bio, bytestring, containers, QuickCheck , regex-compat, simpleargs @@ -43452,7 +43573,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "conduit-extra_1_1_14" = callPackage + "conduit-extra_1_1_15" = callPackage ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring , bytestring-builder, conduit, directory, exceptions, filepath , hspec, monad-control, network, primitive, process, QuickCheck @@ -43461,8 +43582,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.14"; - sha256 = "6f3abc94f28fb577fc03383ba477fe4f2635cb14fed2f90c7520e1331dc343c6"; + version = "1.1.15"; + sha256 = "7bef29eb0db59c236519b0c5cac82183ed7741a535a57e0772aac1158e90bb8d"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring conduit directory exceptions filepath monad-control network primitive process @@ -43470,7 +43591,7 @@ self: { ]; testHaskellDepends = [ async attoparsec base blaze-builder bytestring bytestring-builder - conduit exceptions hspec process QuickCheck resourcet stm + conduit directory exceptions hspec process QuickCheck resourcet stm streaming-commons text transformers transformers-base ]; homepage = "http://github.com/snoyberg/conduit"; @@ -45923,8 +46044,8 @@ self: { }: mkDerivation { pname = "crawlchain"; - version = "0.1.0.9"; - sha256 = "12bd2f1f2f9dbe5abb67a77a85db087669917381f2ddcc2b28fb5d3aa1248238"; + version = "0.1.1.4"; + sha256 = "0754ba3c874648e6c6e84c17d2d729cc3427f3cad2f1d0f37fbbcb4841020917"; libraryHaskellDepends = [ base bytestring directory HTTP network-uri split tagsoup time ]; @@ -47404,8 +47525,8 @@ self: { }: mkDerivation { pname = "cubicbezier"; - version = "0.4.0.2"; - sha256 = "b3e87a3fa4000f44121b6278d1a0b258acc2c71425fe7bf9d565fa7c36581a17"; + version = "0.5.0.0"; + sha256 = "96c2792707bc80a45a428886af97c1b4c7524a2e9ba0be13fa60d7bac879e508"; libraryHaskellDepends = [ base containers integration matrices microlens microlens-mtl microlens-th mtl vector @@ -50786,8 +50907,8 @@ self: { }: mkDerivation { pname = "debian"; - version = "3.91.1"; - sha256 = "0624b718aec8e1d28fdf4d471c1236a66099555ac22858dbe49a7ee00f9b25e6"; + version = "3.91.2"; + sha256 = "16b14ad562ef5895462b59790f42d591d977e1433c4c2763a3a6a34e052e0d56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52294,7 +52415,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-contrib_1_4" = callPackage + "diagrams-contrib_1_4_0_1" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , cubicbezier, data-default, data-default-class, diagrams-core , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens @@ -52304,8 +52425,8 @@ self: { }: mkDerivation { pname = "diagrams-contrib"; - version = "1.4"; - sha256 = "1b06f7d5fb4ae77a851ef2c6e6f7193418e679198b757bbd75b81798c6f8dceb"; + version = "1.4.0.1"; + sha256 = "1194be9ab13c8660ef1c56c35b3a6578953db51e173de96eb8d49603e855750c"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -55761,11 +55882,11 @@ self: { ({ mkDerivation, base, drmaa, inline-c, shelly, text }: mkDerivation { pname = "drmaa"; - version = "0.1.0.1"; - sha256 = "5cb530e4c7f8cde9e8b4520ef116a44e9c5cde8191ad7f91964ca270c69ae1e7"; + version = "0.1.1"; + sha256 = "66b095d3b94ed531e2a704fba319002e8d3b7b6f9b3f68102a4b4d0f7a048567"; libraryHaskellDepends = [ base inline-c shelly text ]; librarySystemDepends = [ drmaa ]; - description = "A simple Haskell bindings to DRMAA C library"; + description = "A minimal Haskell bindings to DRMAA C library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {drmaa = null;}; @@ -58136,6 +58257,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "emailaddress_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, doctest + , email-validate, Glob, http-api-data, opaleye, path-pieces + , persistent, postgresql-simple, product-profunctors, profunctors + , text + }: + mkDerivation { + pname = "emailaddress"; + version = "0.2.0.0"; + sha256 = "390b0aaf8fa2d3a694b812ad83fc0f26ed5c7172cc318a7d46c1fc3456d9c15c"; + libraryHaskellDepends = [ + aeson base bifunctors bytestring email-validate http-api-data + opaleye path-pieces persistent postgresql-simple + product-profunctors profunctors text + ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/cdepillabout/emailaddress#readme"; + description = "Wrapper around email-validate library adding instances for common type classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "emailparse" = callPackage ({ mkDerivation, attoparsec, base, bytestring, either , either-unwrap, HUnit, mime, MissingH, mtl, QuickCheck, strptime @@ -61463,8 +61606,8 @@ self: { }: mkDerivation { pname = "fbmessenger-api"; - version = "0.1.2.0"; - sha256 = "94bba7cff0abeb451ca841d30ef8237c9803331e1e988a9a5f6303eb4797ab2c"; + version = "0.1.2.1"; + sha256 = "9df807a7c6ecf9dc374a17cbda52433b2567aa60753797497c7e043ef6837237"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68584,6 +68727,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcid_0_6_6" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time, unix + }: + mkDerivation { + pname = "ghcid"; + version = "0.6.6"; + sha256 = "62f567852111da733b6feedbfb37ff561889e27af63d16df048f37a4bfeb6ab0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cmdargs directory extra filepath process terminal-size time + unix + ]; + executableHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time unix + ]; + testHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time unix + ]; + homepage = "https://github.com/ndmitchell/ghcid#readme"; + description = "GHCi based bare bones IDE"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -68612,8 +68784,8 @@ self: { ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.5.0.2"; - sha256 = "78b95464b0101d3ffe9d23452c738bdb924c7a3737121e2a938fde863627bd8e"; + version = "0.6.0.0"; + sha256 = "35b859e5a09dd12ada9cea7c343dae75500f50cd7d5ff247d5a5868d419049d6"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; @@ -68642,8 +68814,8 @@ self: { ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.5.0.0"; - sha256 = "8886b7ee0f737b23139845d5dd5c56b79e891df15f632378a064f26d404bbda8"; + version = "0.6.0.0"; + sha256 = "92dea9556a700d8473b0657f80228868194984dd9edb3405cd11f58939d81e5a"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; @@ -68655,8 +68827,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.5.0.2"; - sha256 = "4e7042c09170af65a486a87a134d40519c1cecf663956349f26729490063d878"; + version = "0.6.0.0"; + sha256 = "cf65462c0b94e3d2b21efc78dd60e90e147767a0b9719a7542f4a040dc00e60d"; isLibrary = false; isExecutable = false; description = "DOM library using JSFFI and GHCJS"; @@ -68706,6 +68878,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ghcjs-promise" = callPackage + ({ mkDerivation, base, ghcjs-base, protolude }: + mkDerivation { + pname = "ghcjs-promise"; + version = "0.1.0.3"; + sha256 = "2395a17260e27ac252df2a5968de8ee5f0cf55d970c2fbe6fb27b2ccf01af81b"; + libraryHaskellDepends = [ base ghcjs-base protolude ]; + homepage = "https://github.com/vwwv/ghcjs-promise"; + description = "Bidirectional bidings to javascript's promise"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {ghcjs-base = null;}; + "ghcjs-websockets" = callPackage ({ mkDerivation, base, base64-bytestring, binary, bytestring, text }: @@ -69697,8 +69882,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.3.7.0"; - sha256 = "97918cba0952621a9bdb78718c824a6f43a0098f6e52335d35164a2f9c7d7afa"; + version = "0.3.7.1"; + sha256 = "6e30c1fff6bd5ebc5bea71307e3cc6e726d96487d1b66894e754dc90afe76831"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69920,8 +70105,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20161031"; - sha256 = "6de3751f361d730e4a69106443b747a45e27aaeabf51ea999c41bd92fd2c71ce"; + version = "6.20161111"; + sha256 = "d6ea2566b5883fce8cdbd498d5b6fc22c4ed042de6514622b8b4a59ea4564f45"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -70147,17 +70332,22 @@ self: { }) {}; "git-repair" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , exceptions, filepath, hslogger, IfElse, MissingH, mtl, network - , network-uri, optparse-applicative, process, QuickCheck, text - , time, transformers, unix, unix-compat, utf8-string + ({ mkDerivation, async, base, bytestring, Cabal, containers + , data-default, directory, exceptions, filepath, hslogger, IfElse + , MissingH, mtl, network, network-uri, optparse-applicative + , process, QuickCheck, text, time, transformers, unix, unix-compat + , utf8-string }: mkDerivation { pname = "git-repair"; - version = "1.20151215"; - sha256 = "e1e5756f7ffba86a36abcdc296e0730b2a74e0f5e7711b0b6b89a09eb6f10463"; + version = "1.20161111"; + sha256 = "4ce6447c2a2b678b7fd3f677aa29b8f1b018d5d11822bf5488df83e6c9cbaf54"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ + base bytestring Cabal data-default directory exceptions filepath + hslogger IfElse MissingH process unix unix-compat + ]; executableHaskellDepends = [ async base bytestring containers directory exceptions filepath hslogger IfElse MissingH mtl network network-uri @@ -77980,25 +78170,27 @@ self: { }) {}; "hackport" = callPackage - ({ mkDerivation, array, base, base64-bytestring, binary, bytestring - , containers, cryptohash, deepseq, directory, ed25519 - , extensible-exceptions, filepath, ghc-prim, hashable, HTTP, HUnit - , MissingH, mtl, network, network-uri, old-locale, old-time, parsec - , pretty, process, random, regex-compat, split, stm, tar - , template-haskell, time, transformers, unix, xml, zlib + ({ mkDerivation, array, async, base, base16-bytestring + , base64-bytestring, binary, bytestring, containers, cryptohash + , deepseq, directory, ed25519, extensible-exceptions, filepath + , ghc-prim, hashable, HTTP, HUnit, MissingH, mtl, network + , network-uri, old-locale, old-time, parsec, pretty, process + , random, regex-compat, split, stm, tar, template-haskell, time + , transformers, unix, xml, zlib }: mkDerivation { pname = "hackport"; - version = "0.5"; - sha256 = "90594dc1ff022a8fd2779548835555576df134feaf875cadca24378ece7fd97f"; + version = "0.5.1"; + sha256 = "667af1dc76c2833dd1fec935c5e61cc331be3c7b20c77ff68206177f70eccdad"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base base64-bytestring binary bytestring containers - cryptohash deepseq directory ed25519 extensible-exceptions filepath - ghc-prim hashable HTTP MissingH mtl network network-uri old-locale - old-time parsec pretty process random regex-compat split stm tar - template-haskell time transformers unix xml zlib + array async base base16-bytestring base64-bytestring binary + bytestring containers cryptohash deepseq directory ed25519 + extensible-exceptions filepath ghc-prim hashable HTTP MissingH mtl + network network-uri old-locale old-time parsec pretty process + random regex-compat split stm tar template-haskell time + transformers unix xml zlib ]; testHaskellDepends = [ base binary bytestring containers deepseq directory @@ -78429,6 +78621,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hailgun-simple" = callPackage + ({ mkDerivation, base, email-validate, hailgun, mtl, text + , transformers + }: + mkDerivation { + pname = "hailgun-simple"; + version = "0.1.0.0"; + sha256 = "30526e6b7ec6083b090e880ef6fe942cc8425d3b2700bac565e4fc6629ec2954"; + libraryHaskellDepends = [ + base email-validate hailgun mtl text transformers + ]; + homepage = "https://github.com/cdepillabout/hailgun-simple"; + description = "Easy-to-use wrapper for the hailgun package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hails" = callPackage ({ mkDerivation, authenticate, base, base64-bytestring, binary , blaze-builder, bson, bytestring, conduit, conduit-extra @@ -85079,8 +85287,8 @@ self: { }: mkDerivation { pname = "heckle"; - version = "2.0.1.1"; - sha256 = "ba4defee459e282b1308ee66ed9148ea9bd936eae41136f82c6ffbb71981dd14"; + version = "2.0.1.5"; + sha256 = "64655fc2c10b00e31cbd8ba6ca6a339fdb184f580f56e24258ecf85605e7d97b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85281,6 +85489,8 @@ self: { pname = "heist"; version = "1.0.1.0"; sha256 = "fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb"; + revision = "1"; + editedCabalFile = "35cc7972ed625260f5f5885852551b9151cea0fad1c9855af09c5d82e20ae830"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -88752,6 +88962,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gsl;}; + "hmatrix-gsl-stats_0_4_1_6" = callPackage + ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex + , vector + }: + mkDerivation { + pname = "hmatrix-gsl-stats"; + version = "0.4.1.6"; + sha256 = "1bf5bb87312525256868872a5d51e43d851b75ef549a8834052263171b91cd71"; + libraryHaskellDepends = [ + base binary hmatrix storable-complex vector + ]; + libraryPkgconfigDepends = [ gsl ]; + homepage = "http://code.haskell.org/hmatrix-gsl-stats"; + description = "GSL Statistics interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gsl;}; + "hmatrix-mmap" = callPackage ({ mkDerivation, base, hmatrix, mmap }: mkDerivation { @@ -90097,7 +90325,7 @@ self: { description = "Haskell binding to libopencc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {opencc = null;}; + }) {inherit (pkgs) opencc;}; "hopencl" = callPackage ({ mkDerivation, base, bytestring, c2hs, HUnit, OpenCL, QuickCheck @@ -92243,8 +92471,8 @@ self: { ({ mkDerivation, base, containers, directory, filepath, process }: mkDerivation { pname = "hsc2hs"; - version = "0.68"; - sha256 = "13834608a7a768e4aeeefee0a79660b2fc7c91bb83e036f0c1cb7b0543c61fda"; + version = "0.68.1"; + sha256 = "507bf174c7ab14667d452efb6b539798a944f2a5fd4cd45120a1afb8551ebe75"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92795,6 +93023,8 @@ self: { pname = "hsdev"; version = "0.2.1.0"; sha256 = "8d89f4cf2e67c2e55a94068538818e297efa07429a26b4009eff5d04724e7794"; + revision = "1"; + editedCabalFile = "2ed64491515bb9af5b43ee11a203925987797d5492a3c143a37ad6eae8a7c8f6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93153,6 +93383,28 @@ self: { }) {inherit (pkgs) blas; inherit (pkgs) gsl; inherit (pkgs) liblapack;}; + "hsignal_0_2_7_5" = callPackage + ({ mkDerivation, array, base, binary, blas, bytestring, gsl + , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, liblapack + , mtl, storable-complex, vector + }: + mkDerivation { + pname = "hsignal"; + version = "0.2.7.5"; + sha256 = "0f61f820556c431c3811643cc40e49a6d6c68075da1be0b39298a41c1c7119ac"; + libraryHaskellDepends = [ + array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats + hstatistics mtl storable-complex vector + ]; + librarySystemDepends = [ blas liblapack ]; + libraryPkgconfigDepends = [ gsl ]; + homepage = "http://code.haskell.org/hsignal"; + description = "Signal processing and EEG data analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) blas; inherit (pkgs) gsl; + inherit (pkgs) liblapack;}; + "hsilop" = callPackage ({ mkDerivation, base, directory, filepath, haskeline, xdg-basedir }: @@ -94861,6 +95113,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hstatistics_0_2_5_4" = callPackage + ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random + , vector + }: + mkDerivation { + pname = "hstatistics"; + version = "0.2.5.4"; + sha256 = "e657ac9bb672b502d5dec0e8920679a5833be5bfe0a8a981b7eccc0a99a0e47b"; + libraryHaskellDepends = [ + array base hmatrix hmatrix-gsl-stats random vector + ]; + homepage = "http://code.haskell.org/hstatistics"; + description = "Statistics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hstats" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -99378,6 +99647,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ieee754_0_7_9" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ieee754"; + version = "0.7.9"; + sha256 = "dc1860c545d7143ea8c7e53509ac535ca2932495f0f89b2801c960295cfcdd15"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/patperry/hs-ieee754"; + description = "Utilities for dealing with IEEE floating point numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ieee754-parser" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -104056,23 +104338,17 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , filepath, http-types, lens, primitive, process, QuickCheck - , ref-tf, stm, template-haskell, text, time, transformers, vector - , wai, wai-app-static, wai-websockets, warp, websockets + ({ mkDerivation, aeson, base, bytestring, containers, filepath + , http-types, lens, primitive, process, ref-tf, stm + , template-haskell, text, time, transformers }: mkDerivation { pname = "jsaddle"; - version = "0.5.2.0"; - sha256 = "216fe089de60352956df2aa3abcb1e28861e81d1943ae1a17ac7947aad18a4fb"; + version = "0.6.0.1"; + sha256 = "16bca9ea2c962ecaeb42961b9795de61504f1c214a20d189c3e3483cdbc557e1"; libraryHaskellDepends = [ aeson base bytestring containers filepath http-types lens primitive - process ref-tf stm template-haskell text time transformers wai - wai-app-static wai-websockets warp websockets - ]; - testHaskellDepends = [ - base bytestring doctest filepath http-types process QuickCheck text - vector wai wai-app-static wai-websockets warp websockets + process ref-tf stm template-haskell text time transformers ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -104085,8 +104361,8 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.5.0.1"; - sha256 = "fb64e3a7924c6191e39f61845fec44acc14502b5d70e6ec3b8fd12dbadb9904a"; + version = "0.6.0.0"; + sha256 = "ef270104ea9a4eef9eca156bd2406f1ad453f1d7543e9dc3054d4549e8a85e37"; libraryHaskellDepends = [ base base-compat jsaddle lens text transformers ]; @@ -104110,6 +104386,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jsaddle-warp" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , filepath, http-types, jsaddle, lens, primitive, process + , QuickCheck, ref-tf, stm, text, time, transformers, wai + , wai-websockets, warp, websockets + }: + mkDerivation { + pname = "jsaddle-warp"; + version = "0.6.0.1"; + sha256 = "c91ba8f83df56044247ee8deadec3889346c640b069efed2b8035162e8c4cfc0"; + libraryHaskellDepends = [ + aeson base containers http-types jsaddle stm text time transformers + wai wai-websockets warp websockets + ]; + testHaskellDepends = [ + base bytestring doctest filepath jsaddle lens primitive process + QuickCheck ref-tf + ]; + description = "Interface for JavaScript that works with GHCJS and GHC"; + license = stdenv.lib.licenses.mit; + }) {}; + + "jsaddle-wkwebview" = callPackage + ({ mkDerivation, aeson, base, bytestring, jsaddle }: + mkDerivation { + pname = "jsaddle-wkwebview"; + version = "0.6.0.0"; + sha256 = "cedc6b826bc2b07841aed149ecf3ad3c39f5ed75964f3ea49e0ee3c445b5373c"; + libraryHaskellDepends = [ aeson base bytestring jsaddle ]; + description = "Interface for JavaScript that works with GHCJS and GHC"; + license = stdenv.lib.licenses.mit; + }) {}; + "jsc" = callPackage ({ mkDerivation, base, jmacro, lens, template-haskell, text , transformers, webkitgtk3, webkitgtk3-javascriptcore @@ -104323,8 +104632,8 @@ self: { }: mkDerivation { pname = "json-bytes-builder"; - version = "0.4"; - sha256 = "f4f6084ee679640c97a62e0bf108fc7526fab7d69e786c881281c94e416e2e97"; + version = "0.5"; + sha256 = "b2c1114ef0a164fdf6b5c0899790fd5c91fa98b66b4a65475ba82829a5efa3ad"; libraryHaskellDepends = [ base base-prelude bytestring scientific semigroups text ]; @@ -113044,6 +113353,8 @@ self: { pname = "logging-facade"; version = "0.1.1"; sha256 = "60f9f29d54e9756825400f281101872ed87de55271e87571068838a7b3d98da2"; + revision = "1"; + editedCabalFile = "fc89005336a9b64c524183154716ebf8a26c27f8fa5730225f818f0128c2a2b2"; libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base hspec ]; description = "Simple logging abstraction that allows multiple back-ends"; @@ -113590,8 +113901,8 @@ self: { }: mkDerivation { pname = "lp-diagrams"; - version = "2.0.0"; - sha256 = "8ff64960d7874d4a34867d8834eac9c535b73175f0abe8743b50dfd886aabf50"; + version = "2.1.0"; + sha256 = "289129d3581ea5276c3e9a829322bc1ce38ca62094390706a5fa2c6f176c37be"; libraryHaskellDepends = [ base containers gasp graphviz labeled-tree lens mtl parsek polynomials-bernstein process reflection text typography-geometry @@ -115727,27 +116038,25 @@ self: { }) {}; "marxup" = callPackage - ({ mkDerivation, base, configurator, containers, cubicbezier - , directory, dlist, filepath, glpk-hs, graphviz, labeled-tree, lens - , mtl, parsek, polynomials-bernstein, pretty, process, text - , typography-geometry, vector + ({ mkDerivation, base, configurator, containers, directory, dlist + , filepath, haskell-src-exts, labeled-tree, lens, lp-diagrams, mtl + , parsek, pretty, process, text }: mkDerivation { pname = "marxup"; - version = "3.0.0.1"; - sha256 = "1675a378317ff0b1b3e2500ae8b4e62555dc85c4ab8d8f72c0d3cc227c4edf07"; + version = "3.1.0.0"; + sha256 = "21dded8147b7eed7ae4ae5a1ba10648467f77334e01351d1dff754fc59585f2f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers cubicbezier directory filepath glpk-hs graphviz - labeled-tree lens mtl polynomials-bernstein process text - typography-geometry vector + base containers directory filepath haskell-src-exts labeled-tree + lens lp-diagrams mtl process text ]; executableHaskellDepends = [ base configurator dlist parsek pretty ]; description = "Markup language preprocessor for Haskell"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -118472,15 +118781,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "modify-fasta_0_8_2_2" = callPackage + "modify-fasta_0_8_2_3" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative - , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text - , text-show + , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split + , text, text-show }: mkDerivation { pname = "modify-fasta"; - version = "0.8.2.2"; - sha256 = "76d72306f18d23ef72ec8dada391483136689f3b0a2f074ec79506759908100f"; + version = "0.8.2.3"; + sha256 = "dcee07de4f97b10c557cc3a18aee35d75caf8ef65bdc104bcd6785bfabc7465e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118489,7 +118798,7 @@ self: { ]; executableHaskellDepends = [ base containers fasta mtl optparse-applicative pipes pipes-text - split text + semigroups split text ]; homepage = "https://github.com/GregorySchwartz/modify-fasta"; description = "Modify fasta (and CLIP) files in several optional ways"; @@ -120036,6 +120345,8 @@ self: { pname = "monky"; version = "2.1.0.0"; sha256 = "044ea050aa7be67209652fb1a8cca97ad017a2effcdd41432c959a1b840439d0"; + revision = "1"; + editedCabalFile = "8dac5d11177a4374041712a519d50cb6b1fd41fffe201e77eff44f103257c446"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120981,12 +121292,12 @@ self: { }) {}; "mtl-c" = callPackage - ({ mkDerivation, base, mtl }: + ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "mtl-c"; - version = "0.1"; - sha256 = "eb852379c1710af26179c148114b5269f568e3b8317b1a5716f2a07d00942159"; - libraryHaskellDepends = [ base mtl ]; + version = "0.1.1"; + sha256 = "2dd7da3c2ed207aa2e4bb5b49aa09e537cfe8c2cae241d026bc52cd091f6ea8b"; + libraryHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/fumieval/mtl-c"; description = "Very strict CPS'd transformers"; license = stdenv.lib.licenses.bsd3; @@ -122019,6 +122330,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mustache_2_1_2" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring + , cmdargs, containers, directory, either, filepath, hspec, lens + , mtl, parsec, process, scientific, tar, template-haskell + , temporary, text, th-lift, unordered-containers, vector, wreq + , yaml, zlib + }: + mkDerivation { + pname = "mustache"; + version = "2.1.2"; + sha256 = "383305b302400070f0b4f6d95f28d5b6b9ffc5d6d660421bb18d122351880f80"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory either filepath mtl + parsec scientific template-haskell text th-lift + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs filepath text yaml + ]; + testHaskellDepends = [ + aeson base base-unicode-symbols bytestring directory filepath hspec + lens process tar temporary text unordered-containers wreq yaml zlib + ]; + homepage = "https://github.com/JustusAdam/mustache"; + description = "A mustache template parser library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mustache-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , optparse-applicative, parsec, pretty-show, scientific, text @@ -122809,15 +123151,16 @@ self: { }) {}; "nanovg" = callPackage - ({ mkDerivation, base, bytestring, containers, freeglut, GLEW + ({ mkDerivation, base, bytestring, c2hs, containers, freeglut, GLEW , hspec, inline-c, mesa, QuickCheck, text, vector }: mkDerivation { pname = "nanovg"; - version = "0.5.0.0"; - sha256 = "26fae2bd7cc430b5fa46200ae0100779f481cde5c236d33f87a78feca3678f6e"; + version = "0.5.1.0"; + sha256 = "2e76eaf2b3814d5651a6c13bea84c561d416d0138303cd3826ed89a399c6e437"; libraryHaskellDepends = [ base bytestring containers text vector ]; librarySystemDepends = [ freeglut GLEW mesa ]; + libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; homepage = "https://github.com/cocreature/nanovg-hs"; description = "Haskell bindings for nanovg"; @@ -124886,6 +125229,8 @@ self: { pname = "ngx-export"; version = "0.2.4.2"; sha256 = "547a786039d88cbb0aa6ba355c8930245232121a06b63bbf005f725bc8f93ffa"; + revision = "1"; + editedCabalFile = "d02abcd1d1c9458ec03f8966a90143cd4353a41ed4e4d42f2f55f194abc01305"; libraryHaskellDepends = [ async base bytestring template-haskell unix ]; @@ -125042,13 +125387,14 @@ self: { }) {}; "nix-eval" = callPackage - ({ mkDerivation, base, process, QuickCheck, tasty, tasty-quickcheck + ({ mkDerivation, base, hindent, process, QuickCheck, strict, tasty + , tasty-quickcheck }: mkDerivation { pname = "nix-eval"; - version = "0.1.0.2"; - sha256 = "f603ce62cd8abaab8cf09c8cf3f8b17332b0490658310eadea5242826b2ef419"; - libraryHaskellDepends = [ base process ]; + version = "0.3.3.0"; + sha256 = "4bf250e5a866b4cdfc9d9feaf6c186bfdd45ea04dcfa30dcb1131aa38d7910b1"; + libraryHaskellDepends = [ base hindent process strict ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; homepage = "http://chriswarbo.net/git/nix-eval"; description = "Evaluate Haskell expressions using Nix to get packages"; @@ -126735,15 +127081,14 @@ self: { "ombra" = callPackage ({ mkDerivation, base, gl, hashable, hashtables, transformers - , unordered-containers, vect, vector + , unordered-containers, vect }: mkDerivation { pname = "ombra"; - version = "0.1.1.0"; - sha256 = "d23a834bfd3195eadc37e9f8b443dfec9b2d223bec8ab1e7eecfb1278055de72"; + version = "0.2.0.0"; + sha256 = "d2b256d023b9124176fc132860ba2338556ad6757ad2703bcc853d0c8bc318d9"; libraryHaskellDepends = [ base gl hashable hashtables transformers unordered-containers vect - vector ]; homepage = "https://github.com/ziocroc/Ombra"; description = "Render engine"; @@ -129184,8 +129529,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc-preamble"; - version = "1.1.0"; - sha256 = "2200bed5ca32cb6fd74b53dec3e913c0298ada8434154f97c34991a1e9fe568f"; + version = "1.2.1"; + sha256 = "99e0988741a8b820ca951b2aabc35d251119c84e0a8245bf0c9b55cbe0e22121"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -132346,8 +132691,8 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "10.2"; - sha256 = "8b27c1af6318c385027b1fa89c7459a0cbb274383148ec1d434c16cf8111216a"; + version = "10.4"; + sha256 = "333f39cc5317bd188435e001b3dfbe44d5b2afbc536b59e76b86fa23d827e9f7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135149,12 +135494,12 @@ self: { }) {}; "pong-server" = callPackage - ({ mkDerivation, base, hspec, network, QuickCheck }: + ({ mkDerivation, base, data-default, hspec, network, QuickCheck }: mkDerivation { pname = "pong-server"; - version = "0.0.2.0"; - sha256 = "2964703036c52a24afc15522f3ad0a5eee5ee14f3153dd35a9e3ddd7501761ad"; - libraryHaskellDepends = [ base network ]; + version = "0.0.2.1"; + sha256 = "145242c8ad672f358eb83f503ba5f92478040d943236b25010d343085f42779a"; + libraryHaskellDepends = [ base data-default network ]; testHaskellDepends = [ base hspec network QuickCheck ]; homepage = "http://github.com/RobertFischer/pong-server#readme"; description = "A simple embedded pingable server that runs in the background"; @@ -137911,8 +138256,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.2.1"; - sha256 = "757188dbf42e595e3b2eee8df4b30076ae929df636e83750ae99777612cc0cf2"; + version = "3.2.2"; + sha256 = "255082b7c52f4892e2e7aa4b5f68ffe0da897025b59e3cbcd6b8e3f3f20354fe"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141442,24 +141787,22 @@ self: { "rattletrap" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bimap, binary , binary-bits, bytestring, containers, data-binary-ieee754 - , filepath, hlint, tasty, tasty-hspec, template-haskell, text + , filepath, tasty, tasty-hspec, template-haskell, temporary, text , vector }: mkDerivation { pname = "rattletrap"; - version = "0.2.0"; - sha256 = "874bb97133deed106534ab4a8b387d3bb14a7ad89504a9e2767301491bc3c077"; + version = "1.0.0"; + sha256 = "faba10702e6e41b73ab6b30d3232c1dfdf648ab5131392bdf24da81fc0f34e49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bimap binary binary-bits bytestring containers - data-binary-ieee754 text vector - ]; - executableHaskellDepends = [ - aeson aeson-casing base binary bytestring template-haskell + aeson aeson-casing base bimap binary binary-bits bytestring + containers data-binary-ieee754 template-haskell text vector ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ - base binary bytestring filepath hlint tasty tasty-hspec + base bytestring filepath tasty tasty-hspec temporary ]; homepage = "https://github.com/tfausak/rattletrap#readme"; description = "Parse and generate Rocket League replays"; @@ -142701,6 +143044,32 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "reduce-equations" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , haskell-src-exts, MissingH, mtl, QuickCheck, quickspec + , stringable, tasty, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "reduce-equations"; + version = "0.1.1.0"; + sha256 = "255b5757a180d042c96d55a4fc165796801b83217cebb4237a30685b68ab57ad"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers haskell-src-exts mtl QuickCheck + quickspec stringable text transformers + ]; + executableHaskellDepends = [ aeson base ]; + testHaskellDepends = [ + aeson base bytestring containers directory haskell-src-exts + MissingH QuickCheck quickspec stringable tasty tasty-quickcheck + text + ]; + homepage = "http://chriswarbo.net/projects/repos/reduce-equations.html"; + description = "Simplify a set of equations by removing redundancies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reducers" = callPackage ({ mkDerivation, array, base, bytestring, containers, fingertree , hashable, semigroupoids, semigroups, text, transformers @@ -143351,8 +143720,8 @@ self: { }: mkDerivation { pname = "regex-do"; - version = "2.2"; - sha256 = "3da54464f6cac1c8410b04ddeb6152908377adc9b9f94fc2190c69988e5d1f7b"; + version = "2.6.1"; + sha256 = "bb10301f247b92037562e7fe263e0f443c7076ca03044fe7e938e20136d6533e"; libraryHaskellDepends = [ array base bytestring regex-base regex-pcre stringsearch text ]; @@ -144913,6 +145282,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "req-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec + , http-client, req, resourcet, temporary, transformers + }: + mkDerivation { + pname = "req-conduit"; + version = "0.1.0"; + sha256 = "689a8592555b39859ab0d2e50b111217112d51077553dc7103d84afc865ca447"; + libraryHaskellDepends = [ + base bytestring conduit http-client req resourcet transformers + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra hspec req resourcet temporary + transformers + ]; + homepage = "https://github.com/mrkkrp/req-conduit"; + description = "Conduit helpers for the req HTTP client library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reqcatcher" = callPackage ({ mkDerivation, base, http-client, http-types, HUnit, lens , network, tasty, tasty-hunit, text, wai, warp, wreq @@ -147386,6 +147775,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "runtime-arbitrary" = callPackage + ({ mkDerivation, base, ifcxt, QuickCheck, template-haskell }: + mkDerivation { + pname = "runtime-arbitrary"; + version = "0.1.0.6"; + sha256 = "012e31cb21f0a057aa8a08c71834d0a5fff52c9742064fea956cd54d4e6069d1"; + libraryHaskellDepends = [ base ifcxt QuickCheck template-haskell ]; + homepage = "http://chriswarbo.net/projects/repos/runtime-arbitrary.html"; + description = "Runtime generation of Arbitrary values"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "rvar" = callPackage ({ mkDerivation, base, MonadPrompt, mtl, random-source , transformers @@ -153479,6 +153880,19 @@ self: { license = "GPL"; }) {}; + "show-prettyprint" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }: + mkDerivation { + pname = "show-prettyprint"; + version = "0.1.0.2"; + sha256 = "212012543071bd0d983b003c107dbf551f44331d94ff3429cd53a51815c58c22"; + libraryHaskellDepends = [ ansi-wl-pprint base trifecta ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/quchen/show-prettyprint#readme"; + description = "Robust prettyprinter for output of auto-generated Show instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "show-type" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -153573,6 +153987,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shunya-library" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "shunya-library"; + version = "0.1.0.4"; + sha256 = "a497607995efa72ded74f07eb4305afc1bfe9c9df0c70f9334fa062d6f6db1c6"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/githubuser/shunya-library#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "shunyalib" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "shunyalib"; + version = "0.1.0.1"; + sha256 = "ea423c1b87c14dea651bbb6fbbaa6b6c186c7c8014e8308e176071091deb06fa"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/penguinshunya/shunyalib"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sibe" = callPackage ({ mkDerivation, base, Chart, Chart-cairo, containers , data-default-class, deepseq, directory, hmatrix, JuicyPixels @@ -153965,8 +154403,8 @@ self: { }: mkDerivation { pname = "simple-effects"; - version = "0.6.0.0"; - sha256 = "f448eb1750229b71894a9f482981de64439093ddd72abe5a8672fbaaae135189"; + version = "0.6.0.1"; + sha256 = "df8de9fae3ee9c2226565af8f8c4171d1b79678de37e3b280cda3ca013b52944"; libraryHaskellDepends = [ base ghc-prim interlude-l lens list-t monad-control mtl transformers transformers-base @@ -155746,6 +156184,8 @@ self: { pname = "snap"; version = "1.0.0.1"; sha256 = "293f16c1404793121d3d85abb6287bbb32f5dc1d82b12146d4bb650052322db8"; + revision = "1"; + editedCabalFile = "81129d186348ab67fda4278bb6c8575ee7a7caed3e6069e0045f464a4ed911ab"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist filepath hashable heist @@ -155886,6 +156326,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snap-core_1_0_1_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , case-insensitive, containers, deepseq, directory, filepath + , hashable, HUnit, io-streams, lifted-base, monad-control, mtl + , old-locale, parallel, QuickCheck, random, readable, regex-posix + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, transformers, transformers-base, unix-compat + , unordered-containers, vector, zlib + }: + mkDerivation { + pname = "snap-core"; + version = "1.0.1.0"; + sha256 = "f5d2a8b690e77b03626e7bd1856011fc2a13b286939176bde7b61c064aafa37c"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-builder case-insensitive + containers directory filepath HUnit io-streams lifted-base + monad-control mtl old-locale random readable regex-posix text time + transformers transformers-base unix-compat unordered-containers + vector + ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder case-insensitive + containers deepseq directory filepath hashable HUnit io-streams + lifted-base monad-control mtl old-locale parallel QuickCheck random + readable regex-posix test-framework test-framework-hunit + test-framework-quickcheck2 text time transformers transformers-base + unix-compat unordered-containers vector zlib + ]; + homepage = "http://snapframework.com/"; + description = "Snap: A Haskell Web Framework (core interfaces and types)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snap-cors" = callPackage ({ mkDerivation, attoparsec, base, bytestring, case-insensitive , hashable, network, network-uri, snap, text, transformers @@ -157351,14 +157825,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "socket_0_6_2_0" = callPackage + "socket_0_7_0_0" = callPackage ({ mkDerivation, async, base, bytestring, QuickCheck, tasty , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "socket"; - version = "0.6.2.0"; - sha256 = "c7aed50b213c56c03f22a537acfd794e99564f50f412ec2dcaee6dd9cd9bad1c"; + version = "0.7.0.0"; + sha256 = "84dad156fe2d792194e86c4496db648e5fe0bbb55db2070b93058d6aa5f08962"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck @@ -158099,8 +158573,8 @@ self: { }: mkDerivation { pname = "spatial-math"; - version = "0.3.1.0"; - sha256 = "0b3ab1617e6c5eb74aacdc156d5b74fd1c1ed8d416d793f7b6e2d279773573da"; + version = "0.4.0.0"; + sha256 = "e54b9ecf64ca50aea8b7d4e152bbb462672ac74518d844617bfccbf5c584c5e3"; libraryHaskellDepends = [ base binary cereal ghc-prim lens linear TypeCompose ]; @@ -161893,6 +162367,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {stripe-tests = null;}; + "strips" = callPackage + ({ mkDerivation, base, containers, hspec, mtl }: + mkDerivation { + pname = "strips"; + version = "0.1.0.0"; + sha256 = "6235efbdbf6505b9579266f047020240f642d1f3ee20e8b07480a638e0f71dce"; + revision = "1"; + editedCabalFile = "7bd62d7118703833b341b9e596a402ab58e339fe925cfc8b2650b2491fe57ae1"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ base containers hspec mtl ]; + homepage = "https://github.com/y-kamiya/strips-haskell#readme"; + description = "resolver using strips algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "strive" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-client, http-client-tls, http-types, markdown-unlit @@ -165042,8 +165531,8 @@ self: { }: mkDerivation { pname = "tasty-discover"; - version = "1.0.0"; - sha256 = "a4c4a3fcf1a3908ebd8f3dbbf1714b2dd50026285f4ba73bc868f79533c0e0a0"; + version = "1.0.1"; + sha256 = "d64eb1d6f2d21de2e55fc21cb666423a35d79c4732cc7a0931d6995bbd58adbd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165053,8 +165542,8 @@ self: { executableHaskellDepends = [ base directory filepath tasty-th ]; testHaskellDepends = [ base ]; homepage = "https://github.com/lwm/tasty-discover/"; - description = "Automatically discover and run Tasty framework tests"; - license = "GPL"; + description = "Test discovery for the tasty framework"; + license = stdenv.lib.licenses.gpl3; }) {}; "tasty-expected-failure" = callPackage @@ -167504,8 +167993,8 @@ self: { ({ mkDerivation, base, deepseq, text, vector }: mkDerivation { pname = "text-zipper"; - version = "0.8.3"; - sha256 = "3baf7623d26dc96f19e30c1c54e3be19607b8bd7917ea62e8d35a2b233e4e09f"; + version = "0.9"; + sha256 = "4601bf9bc703a85a5053f507474b8d0227c3391b4ce95ef0d22f9affa0dfd9b6"; libraryHaskellDepends = [ base deepseq text vector ]; homepage = "https://github.com/jtdaugherty/text-zipper/"; description = "A text editor zipper library"; @@ -167824,6 +168313,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-expand-syns_0_4_1_0" = callPackage + ({ mkDerivation, base, containers, syb, template-haskell }: + mkDerivation { + pname = "th-expand-syns"; + version = "0.4.1.0"; + sha256 = "c198f592cc5cd644da97209f1aca0decd10e0847dd676195cb5dcb6abbbe48ea"; + libraryHaskellDepends = [ base containers syb template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + description = "Expands type synonyms in Template Haskell ASTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-extras" = callPackage ({ mkDerivation, base, syb, template-haskell }: mkDerivation { @@ -170182,8 +170684,8 @@ self: { }: mkDerivation { pname = "torrent"; - version = "10000.0.0"; - sha256 = "5914bc8b4c32c10dc82bfe373ba73745e1e785424a052b0ede5352802aa1140c"; + version = "10000.0.1"; + sha256 = "ba7c9565f5397f7603b924a67537abe6738cdc20649ff3fb510b5731d1e18725"; libraryHaskellDepends = [ base bencode binary bytestring containers filepath syb ]; @@ -174510,12 +175012,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "unix_2_7_2_0" = callPackage + "unix_2_7_2_1" = callPackage ({ mkDerivation, base, bytestring, time }: mkDerivation { pname = "unix"; - version = "2.7.2.0"; - sha256 = "9444ea785b9f3547d3e04d2d42ead6bc3c2e0129390d9d41a655b18b0c322bf0"; + version = "2.7.2.1"; + sha256 = "fc05365594367779122465eee132162267c319c3679ff801f050ed30d18d099c"; libraryHaskellDepends = [ base bytestring time ]; homepage = "https://github.com/haskell/unix"; description = "POSIX functionality"; @@ -176696,6 +177198,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-binary-instances_0_2_3_3" = callPackage + ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }: + mkDerivation { + pname = "vector-binary-instances"; + version = "0.2.3.3"; + sha256 = "20158b1ab2fb8dd1bad57896fa3f75bb7fbc5354020c5715e997972b6ffb9f5c"; + libraryHaskellDepends = [ base binary vector ]; + testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; + homepage = "https://github.com/bos/vector-binary-instances"; + description = "Instances of Data.Binary and Data.Serialize for vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-buffer" = callPackage ({ mkDerivation, base, deepseq, vector }: mkDerivation { @@ -176911,8 +177427,8 @@ self: { ({ mkDerivation, base, deepseq, vector }: mkDerivation { pname = "vector-sized"; - version = "0.4.0.0"; - sha256 = "4f13d24329b6a60eebfe4d31026cf3b489c622b8afad4f30650f6664f61f1061"; + version = "0.4.0.1"; + sha256 = "88880ec1fafecf2ef3ab545c43ff3256a32dc7dd854eec4aaa0d6bd4afd7b008"; libraryHaskellDepends = [ base deepseq vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -177756,6 +178272,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vty_5_12" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers + , data-default, deepseq, directory, filepath, hashable, HUnit + , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec + , QuickCheck, quickcheck-assertions, random, smallcheck, stm + , string-qq, terminfo, test-framework, test-framework-hunit + , test-framework-smallcheck, text, transformers, unix, utf8-string + , vector + }: + mkDerivation { + pname = "vty"; + version = "5.12"; + sha256 = "999cc0c66a6e08cada8810f91b0f08e33282361cc01182ea3774e96b13642a56"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers data-default deepseq + directory filepath hashable microlens microlens-mtl microlens-th + mtl parallel parsec stm terminfo text transformers unix utf8-string + vector + ]; + executableHaskellDepends = [ + base containers data-default microlens microlens-mtl mtl + ]; + testHaskellDepends = [ + base blaze-builder bytestring Cabal containers data-default deepseq + HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions + random smallcheck stm string-qq terminfo test-framework + test-framework-hunit test-framework-smallcheck text unix + utf8-string vector + ]; + homepage = "https://github.com/coreyoconnor/vty"; + description = "A simple terminal UI library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -179350,8 +179903,10 @@ self: { }: mkDerivation { pname = "warc"; - version = "0.3.0"; - sha256 = "f1a2d1f51ec16ccf21b5fd0a74a5e485d3bc207deda8ba0e6944971688b19dfc"; + version = "0.3.1"; + sha256 = "2b8752553865feee48aa41d9940bc752e8d22dd866d1ba3e901fb3f7f9dd9510"; + revision = "1"; + editedCabalFile = "194f11d8f498f829f3f9dfd4ac145d1afbf6fdde1394fa4564377bcc47acbc76"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181210,8 +181765,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.2.12"; - sha256 = "fabd09aa41a108a0d10fbb2611c3a7c0faf123103809428e235d2dbfa8080ade"; + version = "0.2.13"; + sha256 = "3c6ab5d67238b760d883c3943c3131720d0f07f4edb037c6531b9a827529f7d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181350,6 +181905,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wordpass_1_0_0_7" = callPackage + ({ mkDerivation, base, containers, deepseq, directory, filepath + , hflags, random-fu, random-source, text, unix-compat, vector + }: + mkDerivation { + pname = "wordpass"; + version = "1.0.0.7"; + sha256 = "2283d16807261457c54022ca028e3c3a7fec1df6b66b9074ddbf0f14e721d9d8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers deepseq directory filepath random-fu random-source + text unix-compat vector + ]; + executableHaskellDepends = [ + base containers deepseq directory filepath hflags random-fu + random-source text unix-compat vector + ]; + homepage = "https://github.com/mgajda/wordpass"; + description = "Dictionary-based password generator"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "words" = callPackage ({ mkDerivation, base, directory, text }: mkDerivation { @@ -184666,6 +185245,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod_1_4_3_1" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , conduit, conduit-extra, data-default, directory, fast-logger + , monad-control, monad-logger, resourcet, safe, semigroups + , shakespeare, streaming-commons, template-haskell, text + , transformers, unix, unordered-containers, wai, wai-extra + , wai-logger, warp, yaml, yesod-auth, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod"; + version = "1.4.3.1"; + sha256 = "8ad23252817780afc10aee5cf1bd862b3cf46e08aabb884477e874caa351ab21"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring conduit conduit-extra + data-default directory fast-logger monad-control monad-logger + resourcet safe semigroups shakespeare streaming-commons + template-haskell text transformers unix unordered-containers wai + wai-extra wai-logger warp yaml yesod-auth yesod-core yesod-form + yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-angular" = callPackage ({ mkDerivation, aeson, base, containers, shakespeare , template-haskell, text, transformers, yesod @@ -185409,6 +186015,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-elements" = callPackage + ({ mkDerivation, base, blaze-html, yesod-core }: + mkDerivation { + pname = "yesod-elements"; + version = "1.0"; + sha256 = "d4a0cf90675bb146acf2e7fa6e743501f20b8efc7b9beac53e6081e9c1851134"; + libraryHaskellDepends = [ base blaze-html yesod-core ]; + description = "Non template haskell markup building function in the spirit of lucid"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-eventsource" = callPackage ({ mkDerivation, base, blaze-builder, conduit, transformers, wai , wai-eventsource, wai-extra, yesod-core @@ -185510,6 +186127,31 @@ self: { 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 + , semigroups, shakespeare, template-haskell, text, time + , transformers, wai, xss-sanitize, yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.4.9"; + sha256 = "bd53f12d97a89e93b15fc6b06e63fbe041301635508f933203596f349a74110d"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet semigroups shakespeare + template-haskell text time transformers wai xss-sanitize yesod-core + yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + homepage = "http://www.yesodweb.com/"; + description = "Form handling support for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers, yesod-core, yesod-form From 7daf0b8b6ee364d5c570a9a222445c862b64becd Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sat, 12 Nov 2016 07:41:03 -0500 Subject: [PATCH 0244/1749] git-annex: update sha256 for new version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e4ceff8e7819..37bc19a2b21e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -43,7 +43,7 @@ self: super: { src = pkgs.fetchFromGitHub { owner = "joeyh"; repo = "git-annex"; - sha256 = "1np1v2x5n9dl39cbwlqbjap1j5120q4n8p18cm1884vdxidbkc01"; + sha256 = "0bi4ynhjx265yaryx7yd5wmwf44hav8bmhkj0knwynb6kpl92qp8"; rev = drv.version; }; })).overrideScope (self: super: { From 8d5ddd2563c325a2123cf1abf789b9a8d64cd74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 14 Nov 2016 10:09:04 +0100 Subject: [PATCH 0245/1749] telegraf: 1.0.1 -> 1.1.1 --- pkgs/servers/monitoring/telegraf/default.nix | 4 +- .../{deps-1.0.1.nix => deps-1.1.1.nix} | 76 +++++-------------- 2 files changed, 22 insertions(+), 58 deletions(-) rename pkgs/servers/monitoring/telegraf/{deps-1.0.1.nix => deps-1.1.1.nix} (87%) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 40f580ffddf5..51d242d9ee3c 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.0.1"; + version = "1.1.1"; goPackagePath = "github.com/influxdata/telegraf"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "1qn90rybdb2ybdyfk2f2yqpsgrya95bgiglmxnf2x1fapjpm7434"; + sha256 = "02sldgbsxifd7s3awjj0a4wf7rrcz2xin02b6ygyqxyhj1kqj8i6"; }; goDeps = ./. + builtins.toPath "/deps-${version}.nix"; diff --git a/pkgs/servers/monitoring/telegraf/deps-1.0.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.1.1.nix similarity index 87% rename from pkgs/servers/monitoring/telegraf/deps-1.0.1.nix rename to pkgs/servers/monitoring/telegraf/deps-1.1.1.nix index 29652a200f1e..c7c2468f9a11 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.0.1.nix +++ b/pkgs/servers/monitoring/telegraf/deps-1.1.1.nix @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/aerospike/aerospike-client-go"; - rev = "45863b7fd8640dc12f7fdd397104d97e1986f25a"; - sha256 = "0cnsq8waah9m8m6y6cjz2sppac38aq8gsykw6d8zps0w4rjgf1aw"; + rev = "7f3a312c3b2a60ac083ec6da296091c52c795c63"; + sha256 = "05ancqplckvni9xp6xd4bv2pgkfa4v23svfcg27m8xinzi4ry219"; }; } { @@ -194,8 +194,8 @@ fetch = { type = "git"; url = "https://github.com/golang/snappy"; - rev = "427fb6fc07997f43afa32f35e850833760e489a7"; - sha256 = "1hgk9zhkfdvxrz13k0glqwlz414803zkrzd01mv6fjhpsjmcx53b"; + rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"; + sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn"; }; } { @@ -266,17 +266,8 @@ fetch = { type = "git"; url = "https://github.com/influxdata/influxdb"; - rev = "e094138084855d444195b252314dfee9eae34cab"; - sha256 = "0vv243lqwl4rwgg1zaxlw42zfjjad4vcafaiisvvkyamnndzlkla"; - }; - } - { - goPackagePath = "github.com/influxdata/telegraf"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/telegraf"; - rev = "215f1b57d06845708e0867b11b9c853a56b00d81"; - sha256 = "1qn90rybdb2ybdyfk2f2yqpsgrya95bgiglmxnf2x1fapjpm7434"; + rev = "fc57c0f7c635df3873f3d64f0ed2100ddc94d5ae"; + sha256 = "07cv1gryp4a84a2acgc8k8alr7jw4jwphf12cby8jjy1br35jrbq"; }; } { @@ -289,12 +280,12 @@ }; } { - goPackagePath = "github.com/jmespath/go-jmespath"; + goPackagePath = "github.com/influxdata/wlog"; fetch = { type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d"; - sha256 = "1kgzwiyqn24ba9kgpjxlq1h746gnyby0psbjj9mp2yx0h1i0kc4z"; + url = "https://github.com/influxdata/wlog"; + rev = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"; + sha256 = "04kw4kivxvr3kkmghj3427b1xyhzbhnfr971qfn3lv2vvhs8kpfl"; }; } { @@ -374,8 +365,8 @@ fetch = { type = "git"; url = "https://github.com/nats-io/nats"; - rev = "b13fc9d12b0b123ebc374e6b808c6228ae4234a3"; - sha256 = "08cj053v0v7i9k7pn7c54hn3pm1c8g53gjhiv969hf4mk2h75q1i"; + rev = "ea8b4fd12ebb823073c0004b9f09ac8748f4f165"; + sha256 = "0i5f6n9k0d2vzdy20sqygmss5j45y72irxsi80grjsh7qkxa6vn1"; }; } { @@ -383,8 +374,8 @@ fetch = { type = "git"; url = "https://github.com/nats-io/nuid"; - rev = "4f84f5f3b2786224e336af2e13dba0a0a80b76fa"; - sha256 = "18ckzxmlg6ihjqd3r6ds8blgga58zibk52xp3lz5c7kv0hf6xa8y"; + rev = "a5152d67cf63cbfb5d992a395458722a45194715"; + sha256 = "0fphar5bz735wwa7549j31nxnm5a9dyw472gs9zafz0cv7g8np40"; }; } { @@ -405,15 +396,6 @@ sha256 = "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1"; }; } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } { goPackagePath = "github.com/prometheus/client_golang"; fetch = { @@ -464,8 +446,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "4d0c402af66c78735c5ccf820dc2ca7de5e4ff08"; - sha256 = "1wkp7chzpz6brq2y0k2mvsf0iaknns279wfsjn5gm6gvih49lqni"; + rev = "1516eb9ddc5e61ba58874047a98f8b44b5e585e8"; + sha256 = "1pnl1g2l1y5vmnraq97rbm0nirprqvfzxsp6h4xacn1429jdl5bv"; }; } { @@ -473,17 +455,8 @@ fetch = { type = "git"; url = "https://github.com/soniah/gosnmp"; - rev = "eb32571c2410868d85849ad67d1e51d01273eb84"; - sha256 = "0f6r3q2lhnjz506blygml6mfnp22fjy586zwiixrzch0jbwl4yf6"; - }; - } - { - goPackagePath = "github.com/sparrc/aerospike-client-go"; - fetch = { - type = "git"; - url = "https://github.com/sparrc/aerospike-client-go"; - rev = "d4bb42d2c2d39dae68e054116f4538af189e05d5"; - sha256 = "0z2d3k1k6qh60aq81dr9g8y2mb19wwlx5isy0nqg0gzx3jb7v7xz"; + rev = "3fe3beb30fa9700988893c56a63b1df8e1b68c26"; + sha256 = "0a0vlxx1plqj9fi863wd8ajbzl705wgma4qk75v949azgn1yx9ib"; }; } { @@ -554,8 +527,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3"; - sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj"; + rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6"; + sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp"; }; } { @@ -567,15 +540,6 @@ sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; }; } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9"; - sha256 = "04va4pqygfzr89fx873k44bmivk7nybqalybi6q96lnn45h2scbr"; - }; - } { goPackagePath = "golang.org/x/text"; fetch = { From a6d6a3972f22e47d76a286da5369d79f2e002c87 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Mon, 14 Nov 2016 10:49:40 +1100 Subject: [PATCH 0246/1749] plink-ng: init at 1.90b3 --- .../science/biology/plink-ng/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/science/biology/plink-ng/default.nix diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix new file mode 100644 index 000000000000..eb4d2714a127 --- /dev/null +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, zlib, openblas, darwin}: + +stdenv.mkDerivation rec { + name = "plink-ng-${version}"; + version = "1.90b3"; + + src = fetchFromGitHub { + owner = "chrchang"; + repo = "plink-ng"; + rev = "v${version}"; + sha256 = "1zhffjbwpd50dxywccbnv1rxy9njwz73l4awc5j7i28rgj3davcq"; + }; + + buildInputs = [ zlib ] ++ (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ openblas ]) ; + + buildPhase = '' + sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h + ${if stdenv.cc.isClang then "sed -i 's|g++|clang++|g' Makefile.std" else ""} + make ZLIB=-lz ${if stdenv.isDarwin then "" else "BLASFLAGS=-lopenblas"} -f Makefile.std + ''; + + installPhase = '' + mkdir -p $out/bin + cp plink $out/bin + ''; + + meta = { + description = "A comprehensive update to the PLINK association analysis toolset"; + homepage = "https://www.cog-genomics.org/plink2"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3a881fc9ad2..4c2690d1c651 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16350,6 +16350,8 @@ in paml = callPackage ../applications/science/biology/paml { }; plink = callPackage ../applications/science/biology/plink/default.nix { }; + + plink-ng = callPackage ../applications/science/biology/plink-ng/default.nix { }; samtools = callPackage ../applications/science/biology/samtools/default.nix { }; From dbee36359179186a62d540b6ad83257d6daa366a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:05:25 +0100 Subject: [PATCH 0247/1749] pythonPackages.boost: version of boost for specific interpreter Several Python packages require boost. pkgs.boost is built with Python 2.7 and therefore libboost_python.so was compatible only with 2.7. --- pkgs/top-level/python-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4212b0aa56c8..999d10c3dc64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2200,6 +2200,10 @@ in { }; }; + # Build boost for this specific Python version + # TODO: use separate output for libboost_python.so + boost = pkgs.boost.override {inherit python;}; + buttersink = buildPythonPackage rec { name = "buttersink-0.6.8"; @@ -19990,7 +19994,7 @@ in { sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; }; - buildInputs = with self; [ pkgs.boost pkgs.freetype pkgs.ftgl pkgs.mesa ]; + buildInputs = with self; [ boost pkgs.freetype pkgs.ftgl pkgs.mesa ]; meta = { description = "Python bindings for FTGL (FreeType for OpenGL)"; From 6c7d501a7bd8737b72de648344cc473b680fe9a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:08:57 +0100 Subject: [PATCH 0248/1749] pythonPackages.pyopencl: init at 2016.2 --- .../python-modules/pyopencl/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/pyopencl/default.nix diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix new file mode 100644 index 000000000000..d09f38914b5a --- /dev/null +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchurl +, buildPythonPackage +, Mako +, pytest +, numpy +, cffi +, pytools +, decorator +, appdirs +, six +, opencl-headers +, opencl-icd +}: + +buildPythonPackage rec { + pname = "pyopencl"; + version = "2016.2"; + name = "${pname}-${version}"; + + buildInputs = [ pytest opencl-headers opencl-icd ]; + + propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ]; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "1b94540cf59ea71a3ef234a8f1d0eb2b4633c112f0f554fb69e52b4a0337d82b"; + }; + + # gcc: error: pygpu_language_opencl.cpp: No such file or directory + doCheck = false; + + meta = { + description = "Python wrapper for OpenCL"; + homepage = https://github.com/pyopencl/pyopencl; + license = stdenv.lib.licenses.mit; + maintainer = stdenv.lib.maintainers.fridh; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 999d10c3dc64..883b2df3fb1a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20128,6 +20128,8 @@ in { }; }; + pyopencl = callPackage ../development/python-modules/pyopencl { }; + pyrr = buildPythonPackage rec { name = "pyrr-${version}"; version = "0.7.2"; From 450edd4b7276153231f6939686155fb3013bbe9f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:16:18 +0100 Subject: [PATCH 0249/1749] python-packages.nix: make pythonAtLeast and pythonOlder available --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 883b2df3fb1a..7f119a1edfff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -29,7 +29,7 @@ let in { - inherit python bootstrapped-pip isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; + inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; # helpers From dc1b2ed11fd6e2627369f7c903d7a2f528b17d73 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:18:54 +0100 Subject: [PATCH 0250/1749] pythonPackages.llvmlite: 0.13.0 -> 0.14.0 and move expression in separate file. --- .../python-modules/llvmlite/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 40 +-------------- 2 files changed, 51 insertions(+), 39 deletions(-) create mode 100644 pkgs/development/python-modules/llvmlite/default.nix diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix new file mode 100644 index 000000000000..65d5c95114db --- /dev/null +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, fetchurl +, buildPythonPackage +, python +, llvm +, pythonOlder +, isPyPy +, enum34 +}: + +buildPythonPackage rec { + pname = "llvmlite"; + name = "${pname}-${version}"; + version = "0.14.0"; + + disabled = isPyPy; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "1ybgsmvamj0i51dvrn268ziczpm63y2h4sgagf6fkgkpydrr01g8"; + }; + + propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; + + # Disable static linking + # https://github.com/numba/llvmlite/issues/93 + patchPhase = '' + substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" + + substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" + ''; + # Set directory containing llvm-config binary + preConfigure = '' + export LLVM_CONFIG=${llvm}/bin/llvm-config + ''; + checkPhase = '' + ${python.executable} runtests.py + ''; + + __impureHostDeps = stdenv.lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + + passthru.llvm = llvm; + + meta = { + description = "A lightweight LLVM python binding for writing JIT compilers"; + homepage = "http://llvmlite.pydata.org/"; + license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f119a1edfff..4a579ecda325 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13661,45 +13661,7 @@ in { }; }; - llvmlite = let - llvm = pkgs.llvm_38; - in buildPythonPackage rec { - name = "llvmlite-${version}"; - version = "0.13.0"; - - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/llvmlite/${name}.tar.gz"; - sha256 = "f852be3391acb2e77ef484c5d0ff90e7cf2821dcf9575e358a1f08c274c582eb"; - }; - - propagatedBuildInputs = with self; [ llvm ] ++ optional (pythonOlder "3.4") enum34; - - # Disable static linking - # https://github.com/numba/llvmlite/issues/93 - patchPhase = '' - substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" - - substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" - ''; - # Set directory containing llvm-config binary - preConfigure = '' - export LLVM_CONFIG=${llvm}/bin/llvm-config - ''; - checkPhase = '' - ${self.python.executable} runtests.py - ''; - - __impureHostDeps = optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; - - meta = { - description = "A lightweight LLVM python binding for writing JIT compilers"; - homepage = "http://llvmlite.pydata.org/"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; - }; - }; + llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_38;}; lockfile = buildPythonPackage rec { name = "lockfile-${version}"; From 6435a85c3fdc61f798c42076ffafaafabb98d724 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:20:13 +0100 Subject: [PATCH 0251/1749] pythonPackages.numba: 0.27.0 -> 0.29.0 and move expression in a separate file. --- .../python-modules/numba/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 36 +--------------- 2 files changed, 44 insertions(+), 35 deletions(-) create mode 100644 pkgs/development/python-modules/numba/default.nix diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix new file mode 100644 index 000000000000..1feb9e009e27 --- /dev/null +++ b/pkgs/development/python-modules/numba/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchurl +, python +, buildPythonPackage +, isPy27 +, isPy33 +, isPy3k +, numpy +, llvmlite +, argparse +, funcsigs +, singledispatch +, libcxx +}: + +buildPythonPackage rec { + version = "0.29.0"; + name = "numba-${version}"; + + src = fetchurl { + url = "mirror://pypi/n/numba/${name}.tar.gz"; + sha256 = "00ae294f3fb3a99e8f0a9f568213cebed26675bacc9c6f8d2e025b6d564e460d"; + }; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + + propagatedBuildInputs = [numpy llvmlite argparse] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch; + + # Copy test script into $out and run the test suite. + checkPhase = '' + cp runtests.py $out/${python.sitePackages}/numba/runtests.py + ${python.interpreter} $out/${python.sitePackages}/numba/runtests.py + ''; + # ImportError: cannot import name '_typeconv' + doCheck = false; + + meta = { + homepage = http://numba.pydata.org/; + license = stdenv.lib.licenses.bsd2; + description = "Compiling Python code using LLVM"; + maintainers = with stdenv.lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a579ecda325..dde6ea286727 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15734,41 +15734,7 @@ in { }; }; - numba = buildPythonPackage rec { - version = "0.27.0"; - name = "numba-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/numba/${name}.tar.gz"; - sha256 = "5fc8069cdc839b8b44ac6c54260902f60cbd77bd027b20999970a81cce7008ba"; - }; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; - - propagatedBuildInputs = with self; [numpy llvmlite argparse] ++ optional (!isPy3k) funcsigs ++ optional (isPy27 || isPy33) singledispatch; - # Future work: add Cuda support. - #propagatedBuildInputs = with self; [numpy llvmlite argparse pkgs.cudatoolkit6]; - #buildPhase = '' - # export NUMBAPRO_CUDA_DRIVER= - # export NUMBAPRO_NVVM=${pkgs.cudatoolkit6} - # export NUMBAPRO_LIBDEVICE= - #''; - - # Copy test script into $out and run the test suite. - checkPhase = '' - cp runtests.py $out/${python.sitePackages}/numba/runtests.py - ${python.interpreter} $out/${python.sitePackages}/numba/runtests.py - ''; - # ImportError: cannot import name '_typeconv' - doCheck = false; - - meta = { - homepage = http://numba.pydata.org/; - license = licenses.bsd2; - description = "Compiling Python code using LLVM"; - maintainers = with maintainers; [ fridh ]; - }; - }; + numba = callPackage ../development/python-modules/numba { }; numexpr = buildPythonPackage rec { version = "2.5.2"; From 5cfcbd89e91c1a43a9556ad065222e4f02155eb2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:21:28 +0100 Subject: [PATCH 0252/1749] pythonPackages.pytools: fix tests --- pkgs/top-level/python-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dde6ea286727..c772e34b379b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8973,15 +8973,18 @@ in { sha256 = "0g5w1cira1bl9f2ji11cbr9daj947nrfydydymjp4bbxbpl2jnaq"; }; - doCheck = pythonOlder "3.5"; - buildInputs = with self; [ decorator appdirs six numpy + pytest ]; + checkPhase = '' + py.test -k 'not test_persistent_dict' + ''; + meta = { homepage = https://github.com/inducer/pytools/; description = "Miscellaneous Python lifesavers."; From 05ca19c679d29749e7dbdc2fe6d2af005872102f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:22:21 +0100 Subject: [PATCH 0253/1749] pythonPackages.pycuda: 2016.1 -> 2016.1.2 and disable tests because they require an available cuda device. --- .../python-modules/pycuda/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index d97a23746fd2..471ffbe6c354 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -1,4 +1,5 @@ { buildPythonPackage +, fetchurl , fetchFromGitHub , boost , numpy @@ -12,6 +13,7 @@ , mkDerivation , stdenv , pythonOlder +, isPy35 }: let compyte = import ./compyte.nix { @@ -19,22 +21,21 @@ let }; in buildPythonPackage rec { - name = "pycuda-${version}"; - version = "2016.1"; + pname = "pycuda"; + version = "2016.1.2"; + name = "${pname}-${version}"; - src = fetchFromGitHub { - owner = "inducer"; - repo = "pycuda"; - rev = "609817e22c038249f5e9ddd720b3ca5a9d58ca11"; - sha256 = "0kg6ayxsw2gja9rqspy6z8ihacf9jnxr8hzywjwmj1izkv24cff7"; - }; + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "0dvf1cnrlvmrc7i100n2ndrnd7fjm7aq3wpmk2nx5h7hwb3xmnx7"; + }; preConfigure = '' findInputs ${boost.dev} boost_dirs propagated-native-build-inputs export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib - + ${python.interpreter} configure.py --boost-inc-dir=$BOOST_INCLUDEDIR \ --boost-lib-dir=$BOOST_LIBRARYDIR \ --no-use-shipped-boost \ @@ -45,7 +46,12 @@ buildPythonPackage rec { ln -s ${compyte} $out/${python.sitePackages}/pycuda/compyte ''; - doCheck = pythonOlder "3.5"; + # Requires access to libcuda.so.1 which is provided by the driver + doCheck = false; + + checkPhase = '' + py.test + ''; propagatedBuildInputs = [ numpy From e23724dc96b7f42b4e44dd7632503db1bb0e80b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:23:53 +0100 Subject: [PATCH 0254/1749] pythonPackages.reikna: init at 0.6.7 --- .../python-modules/reikna/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/reikna/default.nix diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix new file mode 100644 index 000000000000..14ebe52eae9e --- /dev/null +++ b/pkgs/development/python-modules/reikna/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchurl +, buildPythonPackage +, sphinx +, pytestcov +, pytest +, Mako +, numpy +, funcsigs +, withCuda ? false, pycuda +, withOpenCL ? true, pyopencl +}: + +buildPythonPackage rec { + pname = "reikna"; + name = "${pname}-${version}"; + version = "0.6.7"; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "810b349eb9339aa0d13bca99a3d8a380972708474b8c0990d188ec6074358d62"; + }; + + buildInputs = [ sphinx pytestcov pytest ]; + + propagatedBuildInputs = [ Mako numpy funcsigs ] + ++ stdenv.lib.optional withCuda pycuda + ++ stdenv.lib.optional withOpenCL pyopencl; + + checkPhase = '' + py.test + ''; + + # Requires device + doCheck = false; + + meta = { + description = "GPGPU algorithms for PyCUDA and PyOpenCL"; + homepage = http://github.com/fjarri/reikna; + license = stdenv.lib.licenses.mit; + maintainer = stdenv.lib.maintainers.fridh; + + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c772e34b379b..7f4d4594ca42 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21852,6 +21852,8 @@ in { }; }; + reikna = callPackage ../development/python-modules/reikna { }; + repocheck = buildPythonPackage rec { name = "repocheck-2015-08-05"; disabled = isPy26 || isPy27; From 26abed22223d7e882ddd091a943787cbab37c771 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 3 Nov 2016 18:31:57 +0100 Subject: [PATCH 0255/1749] ecasound: init at 2.9.1 --- pkgs/applications/audio/ecasound/default.nix | 32 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/audio/ecasound/default.nix diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix new file mode 100644 index 000000000000..36ce40490222 --- /dev/null +++ b/pkgs/applications/audio/ecasound/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchurl +, alsaLib +, audiofile +, libjack2 +, liblo +, liboil +, libsamplerate +, libsndfile +, lilv +, lv2 +}: + +# TODO: fix readline, ncurses, lilv, liblo, liboil and python. See configure log. + +stdenv.mkDerivation rec { + name = "ecasound-${version}"; + version = "2.9.1"; + + src = fetchurl { + url = "http://ecasound.seul.org/download/ecasound-${version}.tar.gz"; + sha256 = "1wyws3xc4f9pglrrqv6k9137sarv4asizqrxz8h0dn44rnzfiz1r"; + }; + + buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ]; + + meta = { + description = "Ecasound is a software package designed for multitrack audio processing"; + license = with stdenv.lib.licenses; [ gpl2 lgpl21 ]; + homepage = http://nosignal.fi/ecasound/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6a3f16f569..10a13b31f28a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -824,6 +824,8 @@ in dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; + ecasound = callPackage ../applications/audio/ecasound { }; + edac-utils = callPackage ../os-specific/linux/edac-utils { }; eggdrop = callPackage ../tools/networking/eggdrop { }; From 811e59f099e76c9a6ff2ec723096064c66afc4a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 3 Nov 2016 18:32:29 +0100 Subject: [PATCH 0256/1749] ssr: init at 2016-11-03 --- .../audio/soundscape-renderer/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/audio/soundscape-renderer/default.nix diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix new file mode 100644 index 000000000000..c6609814ea0b --- /dev/null +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, fetchgit +, autoreconfHook +, help2man +, pkgconfig +, libsndfile +, fftwFloat +, libjack2 +, libxml2 +, qt4 +, boost +, ecasound +, glibcLocales +, mesa # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL +}: + +stdenv.mkDerivation rec { + name = "soundscape-renderer-unstable-${version}"; + + version = "2016-11-03"; + + src = fetchgit { + url = https://github.com/SoundScapeRenderer/ssr; + rev = "0dd0136dd24e47b63d8a4e05de467f5c7b047ec9"; + sha256 = "095x2spv9bmg6pi71mpajnghbqj58ziflg16f9854awx0qp9d8x7"; + }; + + # Without it doesn't find all of the boost libraries. + BOOST_LIB_DIR="${boost}/lib"; + + LC_ALL = "en_US.UTF-8"; + + buildInputs = [ autoreconfHook boost boost.dev ecasound mesa help2man pkgconfig libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; + + # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 + # 2) Make it find ecasound headers + # 3) Fix locale for help2man + prePatch = '' + substituteInPlace configure.ac --replace 'git describe ||' 'git describe 2> /dev/null ||'; + substituteInPlace configure.ac --replace '/{usr,opt}/{,local/}' '${ecasound}/' + substituteInPlace man/Makefile.am --replace '--locale=en' '--locale=en_US.UTF-8' + ''; + + meta = { + homepage = http://spatialaudio.net/ssr/; + description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction"; + license = stdenv.lib.licenses.gpl3; + maintainer = stdenv.lib.maintainers.fridh; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10a13b31f28a..02c064fa61e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14601,6 +14601,8 @@ in git = gitMinimal; }; + ssr = callPackage ../applications/audio/soundscape-renderer {}; + stalonetray = callPackage ../applications/window-managers/stalonetray {}; stp = callPackage ../applications/science/logic/stp {}; From 215a41355b12d016b0f2553a9560626c79ebb94b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 14 Nov 2016 12:21:10 +0000 Subject: [PATCH 0257/1749] terraform: 0.7.9 -> 0.7.10 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 6d5c04e601ef..1c5f13ad8973 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.9"; + version = "0.7.10"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "0fqd6k88zhhq0ncnpr3y3k55wrxpd75fizs54cjgjd873b90sm8h"; + sha256 = "187hcnrjdysqzjlkj73fpvhi90zmkfkz1fy7g4fx78i1zxqiabz8"; }; postInstall = '' From f82b7768cd5751a8ee3cff4a1f37cab1d1d62f8a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 14 Nov 2016 13:53:03 +0100 Subject: [PATCH 0258/1749] libpsl: 0.14.0 -> 0.15.0 --- pkgs/development/libraries/libpsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index e4cb2e61eeb0..be77b383cd92 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -11,14 +11,14 @@ let owner = "publicsuffix"; }; - libVersion = "0.14.0"; + libVersion = "0.15.0"; in stdenv.mkDerivation rec { name = "libpsl-${version}"; version = "${libVersion}-list-${listVersion}"; src = fetchFromGitHub { - sha256 = "1nqawm41rxaxddrqnwhxw1cgcpf74q6jw756sh0x8zbsjc73mbfq"; + sha256 = "1n8vg8pslpgin84ygb0s0nqfljml32l5bv5fyc8ysnpbdsj6gxkb"; rev = "libpsl-${libVersion}"; repo = "libpsl"; owner = "rockdaboot"; From 7981d3437de6a3fecd36f722bc882ceb2cf0eb64 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 14 Nov 2016 14:14:52 +0100 Subject: [PATCH 0259/1749] aha: 0.4.9 -> 0.4.10.1 --- pkgs/tools/text/aha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index b83f97a4b8d7..6bccd16edf7d 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "aha-${version}"; - version = "0.4.9"; + version = "0.4.10.1"; src = fetchFromGitHub { - sha256 = "0g7awnh7z4cj3kkmldg6kl8dsvdvs46vbf273crmpswk0r4hzj80"; + sha256 = "0j4jn8c0bhvbmpp2ynkw1y0l5dm49s7g5rmsvdxh0g1sjai161ss"; rev = version; repo = "aha"; owner = "theZiz"; From 91ae568ec75d4ac2f483554c0259736aea96230e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Nov 2016 09:36:06 -0500 Subject: [PATCH 0260/1749] broadcom_sta: Fix hash --- pkgs/os-specific/linux/broadcom-sta/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index c3842959883a..5814c184e660 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { (fetchpatch { name = "linux-4.8.patch"; url = "https://aur.archlinux.org/cgit/aur.git/plain/004-linux48.patch?h=broadcom-wl-dkms"; - sha256 = "0s8apf6l3qm9kln451g4z0pr13f4jdgyval1vfl2abg0dqc5xfhs"; + sha256 = "1g1gazxx67kxyw242cli6bf62il7ikzmf0w6v14k44j6b4bihcax"; }) ]; From a87c8ad05f5399cd6cdfda47348d1673c6cd637f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Nov 2016 09:40:27 -0500 Subject: [PATCH 0261/1749] linux: 4.9-rc4 -> 4.9-rc5 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index bb79494e171e..5838d2db1faf 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9-rc4"; - modDirVersion = "4.9.0-rc4"; + version = "4.9-rc5"; + modDirVersion = "4.9.0-rc5"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "09w3milw95916g1mc19phw6w51kma7f1i3dfjar2ijnrcri3hvmx"; + sha256 = "0fpfczs13dwsy6nf0a0838399l34pxwxxljs472scvx9jbarm9j9"; }; features.iwlwifi = true; From a0fa2eca17d0b8ed03ef80ac8ffecc62b7dfb477 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 14 Nov 2016 15:46:33 +0100 Subject: [PATCH 0262/1749] mesa: 12.0.1 -> 13.0.1 --- pkgs/development/libraries/mesa/default.nix | 10 +++------ .../libraries/mesa/dlopen-absolute-paths.diff | 22 ------------------- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/libraries/mesa/dlopen-absolute-paths.diff diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 5ff884fd3c1d..ed82a6cdb509 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -26,7 +26,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then else let - version = "12.0.3"; + version = "13.0.1"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -40,7 +40,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1"; + sha256 = "0cd7axwihwsay0i9fvcw14cldbxyvf8b8rd5sh53plvppyr2z5ki"; }; prePatch = "patchShebangs ."; @@ -51,11 +51,7 @@ stdenv.mkDerivation { patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch - ] ++ optional stdenv.isLinux - (substituteAll { - src = ./dlopen-absolute-paths.diff; - libudev = systemd.lib; - }); + ]; postPatch = '' substituteInPlace src/egl/main/egldriver.c \ diff --git a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff deleted file mode 100644 index 9a5226572239..000000000000 --- a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/loader.c b/loader.c -index 4fdf3c2..69ea22d 100644 ---- a/src/loader/loader.c -+++ b/src/loader/loader.c -@@ -112,7 +112,7 @@ static void *udev_handle = NULL; - static void * - udev_dlopen_handle(void) - { -- char name[80]; -+ char name[256]; - unsigned flags = RTLD_NOLOAD | RTLD_LOCAL | RTLD_LAZY; - int version; - -@@ -126,7 +126,7 @@ udev_dlopen_handle(void) - /* First try opening an already linked libudev, then try loading one */ - do { - for (version = 1; version >= 0; version--) { -- snprintf(name, sizeof(name), "libudev.so.%d", version); -+ snprintf(name, sizeof(name), "@libudev@/lib/libudev.so.%d", version); - udev_handle = dlopen(name, flags); - if (udev_handle) - return udev_handle; From 52d4599b5291bec64ed3927aa29e06bb3376e5d9 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 14 Nov 2016 16:21:38 +0100 Subject: [PATCH 0263/1749] Revert "Update hash for xnu 3248.60.10, the tarball changed upstream, it seems." This reverts commit 328ad178588c8a2bc690f937ef60acef41162ec8. --- pkgs/os-specific/darwin/apple-source-releases/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index c66096c2fedc..8625ac72c104 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -213,7 +213,7 @@ let ppp = applePackage "ppp" "osx-10.11.6" "1dql6r1v0vbcs04958nn2i6p31yfsxyy51jca63bm5mf0gxalk3f" {}; removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; - xnu = applePackage "xnu" "osx-10.11.6" "1vij2q5bpvp1sd2maf154mjk9g5z5hxyzcg5wcd4z7i8j5h36xnv" {}; + xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; From 56fdd19bc835fc5b30892ed6e8123f731905fc7b Mon Sep 17 00:00:00 2001 From: = Date: Mon, 14 Nov 2016 17:15:14 +0100 Subject: [PATCH 0264/1749] w_scan: init at 20161022 --- pkgs/applications/video/w_scan/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/video/w_scan/default.nix diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix new file mode 100644 index 000000000000..59ba63b32eeb --- /dev/null +++ b/pkgs/applications/video/w_scan/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "w_scan-${version}"; + version = "20161022"; + + src = fetchurl { + url = "http://wirbel.htpc-forum.de/w_scan/${name}.tar.bz2"; + sha256 = "0y8dq2sm13xn2r2lrqf5pdhr9xcnbxbg1aw3iq1szds2idzsyxr0"; + }; + + meta = { + description = "Small CLI utility to scan DVB and ATSC transmissions"; + homepage = http://wirbel.htpc-forum.de/w_scan/index_en.html; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nico202 ] ; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ffd389caa16..c828c363082b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12877,6 +12877,8 @@ in puddletag = callPackage ../applications/audio/puddletag { }; + w_scan = callPackage ../applications/video/w_scan { }; + wavesurfer = callPackage ../applications/misc/audio/wavesurfer { }; wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { }; From 2c2b6ae45564d27b3297807cedde14bc3314401a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Nov 2016 17:35:35 +0100 Subject: [PATCH 0265/1749] google-fonts: Add a check to ensure that there are no duplicate font names Issue #20282. --- pkgs/data/fonts/google-fonts/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index ee637f880adf..fd3425e3c7c3 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { ofl/mrbedford \ ofl/siamreap \ ofl/terminaldosislight + + if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then + echo "error: duplicate font names" + exit 1 + fi ''; installPhase = '' From 84e9328028daabfd16e9f6e756ffe30b73a9e4f7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 19:09:25 +0100 Subject: [PATCH 0266/1749] virtualbox: python is always needed even when not building bindings. --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 9e51fd0abe20..14a87151e97e 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -50,9 +50,9 @@ in stdenv.mkDerivation { buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl - pkgconfig which libXmu libpng patchelfUnstable ] + pkgconfig which libXmu libpng patchelfUnstable python ] ++ optional javaBindings jdk - ++ optional pythonBindings python + ++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio ++ optionals (headless) [ libXrandr ] ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ]; From eb5831a28eb11574db1811fffcf34acbb5ea8c03 Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Mon, 14 Nov 2016 20:25:28 +0100 Subject: [PATCH 0267/1749] nodejs-7_x: 7.0.0 -> 7.1.0 --- pkgs/development/web/nodejs/v7.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix index 420f2b0412f0..544f438cf86a 100644 --- a/pkgs/development/web/nodejs/v7.nix +++ b/pkgs/development/web/nodejs/v7.nix @@ -10,19 +10,12 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "7.0.0"; + version = "7.1.0"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "16l9r91z4dxmgc01fs1y8jdh8xjnmyyrq60isyznnxfnq9v3qv71"; + sha256 = "10a9rwi9v8ylpxydfh1f59smqbljk5axqwghp1qszqwh40d87bjm"; }; - patches = nodejs.patches ++ [ - (fetchpatch { - url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch"; - sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i"; - }) - ]; - }) From 870fc844126d7fec49bfff4f82fcc852248ffd92 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 11 Nov 2016 20:06:22 +0100 Subject: [PATCH 0268/1749] python: adding (python*Full) aliases for all versions of cpython --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ffd389caa16..6cb32f3ce4df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5556,7 +5556,13 @@ in # These are for compatibility and should not be used inside Nixpkgs. pythonFull = python.override{x11Support=true;}; python2Full = python2.override{x11Support=true;}; + python26Full = python26.override{includeModules=true;self=python26Full;}; + python27Full = python27.override{x11Support=true;}; python3Full = python3.override{x11Support=true;}; + python33Full = python33.override{x11Support=true;}; + python34Full = python34.override{x11Support=true;}; + python35Full = python35.override{x11Support=true;}; + python36Full = python36.override{x11Support=true;}; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python2Packages; From 5a0665846ed4f3c742b3ff1c7336b0b387f180b7 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS)" Date: Mon, 14 Nov 2016 20:36:59 +0000 Subject: [PATCH 0269/1749] plover: move out of python-packages.nix --- pkgs/applications/misc/plover/default.nix | 26 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 27 ----------------------- 3 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 pkgs/applications/misc/plover/default.nix diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix new file mode 100644 index 000000000000..b8fa38268c38 --- /dev/null +++ b/pkgs/applications/misc/plover/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, python27Packages, wmctrl }: + +python27Packages.buildPythonPackage rec { + name = "plover-${version}"; + version = "3.1.0"; + + meta = with stdenv.lib; { + description = "OpenSteno Plover stenography software"; + maintainers = with maintainers; [ twey kovirobi ]; + license = licenses.gpl2; + }; + + src = fetchurl { + url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; + sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4"; + }; + + # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 + postPatch = '' + substituteInPlace setup.py --replace " in sys_platform" " == sys_platform" + ''; + + buildInputs = with python27Packages; [ pytest mock ]; + propagatedBuildInputs = with python27Packages; [ six setuptools pyserial appdirs hidapi + wxPython xlib wmctrl ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cb32f3ce4df..e16ab3922dd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14158,6 +14158,8 @@ in gtksharp = gtk-sharp-2_0; }; + plover = callPackage ../applications/misc/plover { }; + plugin-torture = callPackage ../applications/audio/plugin-torture { }; pmenu = callPackage ../applications/misc/pmenu { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3b95a5f896c6..1e84a6a9a392 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14878,33 +14878,6 @@ in { }; }; - - plover = buildPythonPackage rec { - name = "plover-${version}"; - version = "3.1.0"; - disabled = !isPy27; - - meta = { - description = "OpenSteno Plover stenography software"; - maintainers = with maintainers; [ twey kovirobi ]; - license = licenses.gpl2; - }; - - src = pkgs.fetchurl { - url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4"; - }; - - # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 - postPatch = '' - substituteInPlace setup.py --replace " in sys_platform" " == sys_platform" - ''; - - buildInputs = with self; [ pytest mock ]; - propagatedBuildInputs = with self; [ six setuptools pyserial appdirs hidapi - wxPython xlib pkgs.wmctrl ]; - }; - pygal = buildPythonPackage rec { version = "2.0.10"; name = "pygal-${version}"; From e2c4c64668e56446c0769c75a3ea1c656917d9a0 Mon Sep 17 00:00:00 2001 From: Adam Beckmeyer Date: Mon, 14 Nov 2016 16:28:09 -0500 Subject: [PATCH 0270/1749] Python: pint: init at 0.7.2 --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1e84a6a9a392..96c412551d26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14878,6 +14878,22 @@ in { }; }; + pint = buildPythonPackage rec { + name = "pint-${version}"; + version = "0.7.2"; + + meta = { + description = "Physical quantities module"; + license = licenses.bsd3; + homepage = "https://github.com/hgrecco/pint/"; + }; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/pint/Pint-${version}.tar.gz"; + sha256 = "1bbp5s34gcb9il2wyz4spznshahwbjvwi5bhjm7bnxk358spvf9q"; + }; + }; + pygal = buildPythonPackage rec { version = "2.0.10"; name = "pygal-${version}"; From aa23309a39794cd769d473cc8616dc96b872e3f0 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 14 Nov 2016 13:30:28 -0800 Subject: [PATCH 0271/1749] Add a patch for cctools to work with Xcode 8 --- .../darwin/cctools/ld-tbd-v2.patch | 98 +++++++++++++++++++ pkgs/os-specific/darwin/cctools/port.nix | 1 + 2 files changed, 99 insertions(+) create mode 100644 pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch diff --git a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch new file mode 100644 index 000000000000..9aae2be1d033 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch @@ -0,0 +1,98 @@ +diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +index 09c0e12..ac6b085 100644 +--- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp ++++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +@@ -187,6 +187,7 @@ struct DynamicLibrary { + ld::File::ObjcConstraint _objcConstraint; + Options::Platform _platform; + std::vector _allowedClients; ++ std::vector _allowableClients; + std::vector _reexportedLibraries; + std::vector _symbols; + std::vector _classes; +@@ -246,6 +247,14 @@ class TBDFile { + }); + } + ++ void parseAllowableClients(DynamicLibrary& lib) { ++ if ( !hasOptionalToken("allowable-clients") ) ++ return; ++ parseFlowSequence([&](Token name) { ++ lib._allowableClients.emplace_back(name); ++ }); ++ } ++ + void parseReexportedDylibs(DynamicLibrary& lib) { + if ( !hasOptionalToken("re-exports") ) + return; +@@ -306,6 +315,21 @@ class TBDFile { + return false; + } + ++ void skipUUIDs(DynamicLibrary& lib) { ++ expectToken("uuids"); ++ while ( true ) { ++ auto token = next(); ++ if ( token == "]" ) ++ break; ++ } ++ } ++ ++ void skipParentUmbrella(DynamicLibrary& lib) { ++ if (!hasOptionalToken("parent-umbrella")) ++ return; ++ next(); ++ } ++ + void parsePlatform(DynamicLibrary& lib) { + expectToken("platform"); + +@@ -410,6 +434,7 @@ class TBDFile { + } + + parseAllowedClients(lib); ++ parseAllowableClients(lib); + parseReexportedDylibs(lib); + parseSymbols(lib); + if ( !hasOptionalToken("-") ) +@@ -455,17 +480,21 @@ class TBDFile { + return result.front(); + } + +- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) { ++ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) { + auto selectedArchName = parseAndSelectArchitecture(requestedArchName); + if (selectedArchName.empty()) + throwf("invalid arch"); + ++ if(isTbdV2) ++ skipUUIDs(lib); + parsePlatform(lib); + parseInstallName(lib); + parseCurrentVersion(lib); + parseCompatibilityVersion(lib); + parseSwiftVersion(lib); + parseObjCConstraint(lib); ++ if(isTbdV2) ++ skipParentUmbrella(lib); + parseExportsBlock(lib, selectedArchName); + } + +@@ -476,7 +505,8 @@ public: + _tokenizer.reset(); + DynamicLibrary lib; + expectToken("---"); +- parseDocument(lib, requestedArchName); ++ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2"); ++ parseDocument(lib, requestedArchName, isTbdV2); + expectToken("..."); + return lib; + } +@@ -486,6 +516,7 @@ public: + auto token = next(); + if ( token != "---" ) + return false; ++ hasOptionalToken("!tapi-tbd-v2"); + return !parseAndSelectArchitecture(requestedArchName).empty(); + } + diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 2f13277d70c7..41fb090710cb 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -25,6 +25,7 @@ let ] ++ stdenv.lib.optionals stdenv.isDarwin [ # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed. ./undo-unknown-triple.patch + ./ld-tbd-v2.patch ]; enableParallelBuilding = true; From 1aaa57654904f83072852b19449bffa0a7dbf3d9 Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Mon, 14 Nov 2016 22:39:47 +0100 Subject: [PATCH 0272/1749] 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 0273/1749] 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 04121437bea46a74c71eaca507007a4e9c9ac20a Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Mon, 14 Nov 2016 12:26:59 +1100 Subject: [PATCH 0274/1749] singularity: init 2.2 --- lib/maintainers.nix | 1 + .../virtualization/singularity/default.nix | 25 +++++ .../singularity-tools/default.nix | 100 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 4 files changed, 130 insertions(+) create mode 100644 pkgs/applications/virtualization/singularity/default.nix create mode 100644 pkgs/build-support/singularity-tools/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b15f4542fb55..73e23170d827 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -198,6 +198,7 @@ jagajaga = "Arseniy Seroka "; javaguirre = "Javier Aguirre "; jb55 = "William Casarin "; + jbedo = "Justin Bedő "; jcumming = "Jack Cummings "; jefdaj = "Jeffrey David Johnson "; jfb = "James Felix Black "; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix new file mode 100644 index 000000000000..e318a0b64d7b --- /dev/null +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "singularity-${version}"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "singularityware"; + repo = "singularity"; + rev = version; + sha256 = "19g43gfdy5s8y4252474cp39d6ypn5dd37wp0s21fgd13vqy26px"; + }; + + buildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + homepage = http://singularity.lbl.gov/; + description = "Designed around the notion of extreme mobility of compute and reproducible science, Singularity enables users to have full control of their operating system environment"; + license = "BSD license with 2 modifications"; + platforms = platforms.linux; + maintainers = [ maintainers.jbedo ]; + }; +} diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix new file mode 100644 index 000000000000..3c27b9fc1ad9 --- /dev/null +++ b/pkgs/build-support/singularity-tools/default.nix @@ -0,0 +1,100 @@ +{ runCommand +, stdenv +, storeDir ? builtins.storeDir +, writeScript +, singularity +, writeReferencesToFile +, bash +, vmTools +, gawk +, utillinux +, e2fsprogs +, squashfsTools }: + +rec { + shellScript = name: text: + writeScript name '' + #!${stdenv.shell} + set -e + ${text} + ''; + + mkLayer = { + name, + contents ? [], + }: + runCommand "singularity-layer-${name}" { + inherit contents; + } '' + mkdir $out + for f in $contents ; do + cp -ra $f $out/ + done + ''; + + buildImage = { + name, + contents ? [], + diskSize ? 1024, + runScript ? "#!${stdenv.shell}\nexec /bin/sh", + runAsRoot ? null, + extraSpace ? 0 + }: + let layer = mkLayer { + inherit name; + contents = contents ++ [ bash runScriptFile ]; + }; + runAsRootFile = shellScript "run-as-root.sh" runAsRoot; + runScriptFile = shellScript "run-script.sh" runScript; + result = vmTools.runInLinuxVM ( + runCommand "singularity-image-${name}.img" { + buildInputs = [ singularity e2fsprogs utillinux gawk ]; + layerClosure = writeReferencesToFile layer; + preVM = vmTools.createEmptyImage { + size = diskSize; + fullName = "singularity-run-disk"; + }; + } + '' + rm -rf $out + mkdir disk + mkfs -t ext3 -b 4096 /dev/${vmTools.hd} + mount /dev/${vmTools.hd} disk + cd disk + + # Run root script + ${stdenv.lib.optionalString (runAsRoot != null) '' + mkdir -p ./${storeDir} + mount --rbind ${storeDir} ./${storeDir} + unshare -imnpuf --mount-proc chroot ./ ${runAsRootFile} + umount -R ./${storeDir} + ''} + + # Build /bin and copy across closure + mkdir -p bin nix/store + for f in $(cat $layerClosure) ; do + cp -ar $f ./$f + for f in $f/bin/* ; do + if [ ! -e bin/$(basename $f) ] ; then + ln -s $f bin/ + fi + done + done + + # Create runScript + ln -s ${runScriptFile} singularity + + # Size calculation + cd .. + umount disk + size=$(resize2fs -P /dev/${vmTools.hd} | awk '{print $NF}') + mount /dev/${vmTools.hd} disk + cd disk + + export PATH=$PATH:${e2fsprogs}/bin/ + singularity create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out + tar -c . | singularity import $out + ''); + + in result; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3a881fc9ad2..63c725e2625f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -282,6 +282,8 @@ in pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; + singularity-tools = callPackage ../build-support/singularity-tools { }; + srcOnly = args: callPackage ../build-support/src-only args; substituteAll = callPackage ../build-support/substitute/substitute-all.nix { }; @@ -13253,6 +13255,8 @@ in slack = callPackage ../applications/networking/instant-messengers/slack { }; + singularity = callPackage ../applications/virtualization/singularity { }; + spectrwm = callPackage ../applications/window-managers/spectrwm { }; wlc = callPackage ../development/libraries/wlc { }; From c2d05207a3a6659adcca3885c39c17b5fa9cdc06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 14 Nov 2016 23:53:58 +0100 Subject: [PATCH 0275/1749] mesa: drop systemd build-time dependency After the update dropping libudev (upstream) there's no use for it. --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ed82a6cdb509..e923f87722ae 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch , pkgconfig, intltool, autoreconfHook, substituteAll -, file, expat, libdrm, xorg, wayland, systemd, openssl +, file, expat, libdrm, xorg, wayland, openssl , llvmPackages, libffi, libomxil-bellagio, libva , libelf, libvdpau, python2 , grsecEnabled ? false @@ -112,7 +112,7 @@ stdenv.mkDerivation { libffi wayland libvdpau libelf libXvMC libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/ (python2.withPackages (ps: [ ps.Mako ])) - ] ++ optional stdenv.isLinux systemd; + ]; enableParallelBuilding = true; From d83d2ba4f3b831ded72c7b29a2ddb9b7a528efca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 21:58:43 +0100 Subject: [PATCH 0276/1749] pythonPackages.setuptools: 26.1.1 -> 28.8.0 --- .../python-modules/bootstrapped-pip/default.nix | 4 ++-- pkgs/development/python-modules/setuptools/default.nix | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 0fd6c1873b53..7039755198c0 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -6,8 +6,8 @@ let sha256 = "ea8033fc9905804e652f75474d33410a07404c1a78dd3c949a66863bd1050ebd"; }; setuptools_source = fetchurl { - url = "https://files.pythonhosted.org/packages/3b/c7/e9724e6f81c96248fba5876054418c11d327b3093d075790903cd66fad44/setuptools-26.1.1-py2.py3-none-any.whl"; - sha256 = "226c9ce65e76c6069e805982b036f36dc4b227b37dd87fc219aef721ec8604ae"; + url = "https://files.pythonhosted.org/packages/3b/7e/293d19ccd106119e35db4bf3e111b1895098f618b455b758aa636496cf03/setuptools-28.8.0-py2.py3-none-any.whl"; + sha256 = "2e59d06ac798efce29c567ee0e0687514efca529a665b8f364cf497cd10d21b2"; }; argparse_source = fetchurl { url = "https://pypi.python.org/packages/2.7/a/argparse/argparse-1.4.0-py2.py3-none-any.whl"; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 3a38dee3174f..bba5a6c942b0 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,14 +1,15 @@ { stdenv, lib, fetchurl, python, wrapPython }: stdenv.mkDerivation rec { - shortName = "setuptools-${version}"; + pname = "setuptools"; + shortName = "${pname}-${version}"; name = "${python.libPrefix}-${shortName}"; - version = "26.1.1"; # 18.4 and up breaks python34Packages.characteristic and many others + version = "28.8.0"; src = fetchurl { - url = "mirror://pypi/s/setuptools/${shortName}.tar.gz"; - sha256 = "475ce28993d7cb75335942525b9fac79f7431a7f6e8a0079c0f2680641379481"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${shortName}.tar.gz"; + sha256 = "432a1ad4044338c34c2d09b0ff75d509b9849df8cf329f4c1c7706d9c2ba3c61"; }; buildInputs = [ python wrapPython ]; From 27a6d618816a348464a4e51500d79f8394f07646 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 21:58:53 +0100 Subject: [PATCH 0277/1749] pythonPackages.pip: 8.1.2 -> 9.0.1 --- .../python-modules/bootstrapped-pip/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 7039755198c0..ed8bbab29a7a 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -15,11 +15,11 @@ let }; in stdenv.mkDerivation rec { name = "${python.libPrefix}-bootstrapped-pip-${version}"; - version = "8.1.2"; + version = "9.0.1"; src = fetchurl { - url = "https://pypi.python.org/packages/9c/32/004ce0852e0a127f07f358b715015763273799bd798956fa930814b60f39/pip-${version}-py2.py3-none-any.whl"; - sha256 = "18cjrd66mn4a0gwa99zzs89lrb0xn4xmajdzya6zqd7v16cdsr34"; + url = "https://files.pythonhosted.org/packages/b6/ac/7015eb97dc749283ffdec1c3a88ddb8ae03b8fad0f0e611408f196358da3/pip-9.0.1-py2.py3-none-any.whl"; + sha256 = "690b762c0a8460c303c089d5d0be034fb15a5ea2b75bdf565f40421f542fefb0"; }; unpackPhase = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 071ca6f2bd52..ddb610da817e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18419,12 +18419,13 @@ in { }; pip = buildPythonPackage rec { - version = "8.1.2"; - name = "pip-${version}"; + pname = "pip"; + version = "9.0.1"; + name = "${pname}-${version}"; src = pkgs.fetchurl { - url = "mirror://pypi/p/pip/pip-${version}.tar.gz"; - sha256 = "0cmpsy9lr9diskkypswm9s8glgr7w3crzh1im4zqlqv7z8zv092d"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "09f243e1a7b461f654c26a725fa373211bb7ff17a9300058b205c61658ca940d"; }; # pip detects that we already have bootstrapped_pip "installed", so we need From 96798a27020356d32470eea9f51fb361c228078e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 14 Nov 2016 22:27:36 +0100 Subject: [PATCH 0278/1749] xorg.libXi: 1.7.7 -> 1.7.8 The announcement claims it resolves some crashes. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 640c200e7cf2..2c27d6483bed 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -823,11 +823,11 @@ let }) // {inherit fontconfig freetype libX11 xproto libXrender ;}; libXi = (mkDerivation "libXi" { - name = "libXi-1.7.7"; + name = "libXi-1.7.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXi-1.7.7.tar.bz2; - sha256 = "0c70n4aq0ba628wr88ih4740nci9d9f6y3v96sx376vvlm7q6vwr"; + url = mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2; + sha256 = "1fr7mi4nbcxsa88qin9g2ipmzh595ydxy9qnabzl270laf6zmwnq"; }; buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index b2b5f2dc2366..161d7bda85e9 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -71,7 +71,7 @@ mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 -mirror://xorg/individual/lib/libXi-1.7.7.tar.bz2 +mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 From 999ac3056d81dab04e9406771a73753d47985a3a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 15 Nov 2016 01:22:31 +0100 Subject: [PATCH 0279/1749] cjdns test: fix typo Noticed by @vcunat https://github.com/NixOS/nixpkgs/commit/daf3ba426b2558e73ef2742fab1a73c782ef62a6#commitcomment-19820962 --- nixos/tests/cjdns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index f61c82b916ad..f32ec52dfc26 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -54,7 +54,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.cjdns = { UDPInterface = { bind = "0.0.0.0:1024"; - connectTo."192.168.0.1:1024}" = + connectTo."192.168.0.1:1024" = { password = carolPassword; publicKey = carolPubKey; }; From 02e9c88d778b06909d4ef5a2e7e417aaeecb89a7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 15 Nov 2016 02:02:25 +0100 Subject: [PATCH 0280/1749] clamav: don't bundle freshclam config with package Building clamav is expensive due to the bundled llvm. Closes #20304. --- nixos/modules/services/security/clamav.nix | 2 +- pkgs/tools/security/clamav/default.nix | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index e4e5c1253b77..89ac1c01f521 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -16,7 +16,7 @@ let ${cfg.daemon.extraConfig} ''; - pkg = pkgs.clamav.override { freshclamConf = cfg.updater.config; }; + pkg = pkgs.clamav; in { options = { diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 0cb34b2e73c9..7473f056ce97 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl -, libmilter, pcre, freshclamConf ? null }: +, libmilter, pcre }: stdenv.mkDerivation rec { name = "clamav-${version}"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn"; }; - buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ]; + buildInputs = [ + zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre + ]; configureFlags = [ "--with-zlib=${zlib.dev}" @@ -22,11 +24,8 @@ stdenv.mkDerivation rec { "--with-libcurl=${curl.dev}" "--with-pcre=${pcre.dev}" "--enable-milter" - "--disable-clamav" ]; - fixupPhase = if (freshclamConf != null) then ''echo "${freshclamConf}" > $out/etc/freshclam.conf'' else ""; - meta = with stdenv.lib; { homepage = http://www.clamav.net; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; From 72b1ea861cf819e22b87a7f3a136857451cc3a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Thu, 10 Nov 2016 12:46:49 +0100 Subject: [PATCH 0281/1749] libdivecomputer: init at 0.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- .../libraries/libdivecomputer/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/libdivecomputer/default.nix diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix new file mode 100644 index 000000000000..23ab36fe09f0 --- /dev/null +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libdivecomputer-${version}"; + version = "0.5.0"; + + src = fetchurl { + url = "http://www.libdivecomputer.org/releases/${name}.tar.gz"; + sha256 = "11n2qpqg4b2h7mqifp9qm5gm1aqwy7wj1j4j5ha0wdjf55zzy30y"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.libdivecomputer.org; + description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; + maintainers = [ maintainers.mguentner ]; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6a3f16f569..e1cf864ce97b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7665,6 +7665,8 @@ in libdiscid = callPackage ../development/libraries/libdiscid { }; + libdivecomputer = callPackage ../development/libraries/libdivecomputer { }; + libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; libdmtx = callPackage ../development/libraries/libdmtx { }; From 9e1e3b288062abf37847307adeee17f3c8dddc42 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 15 Nov 2016 04:40:33 +0100 Subject: [PATCH 0282/1749] clamav service: refactor * Sync systemd units with upstream. Upstream uses SIGUSR2 instead of SIGHUP to reload the clamd service. * Convert freshclam service to a oneshot service activated by a systemd timer. This way we can make clamd wait for freshclam to finish fetching the virus database before failing to start if the database doesn't exist yet. * Fixes console tools to work as expected as they require hardcoded config file locations. --- nixos/modules/rename.nix | 2 + nixos/modules/services/security/clamav.nix | 95 ++++++++++++++-------- pkgs/tools/security/clamav/default.nix | 11 +++ 3 files changed, 73 insertions(+), 35 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 44e07f4618de..0d2e0f981db8 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -30,6 +30,8 @@ with lib; (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ]) (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "") + (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ]) + # Old Grub-related options. (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ]) (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ]) diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 89ac1c01f521..b045e140546d 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -3,26 +3,37 @@ with lib; let clamavUser = "clamav"; stateDir = "/var/lib/clamav"; - runDir = "/var/run/clamav"; - logDir = "/var/log/clamav"; + runDir = "/run/clamav"; clamavGroup = clamavUser; cfg = config.services.clamav; + pkg = pkgs.clamav; + clamdConfigFile = pkgs.writeText "clamd.conf" '' DatabaseDirectory ${stateDir} LocalSocket ${runDir}/clamd.ctl - LogFile ${logDir}/clamav.log PidFile ${runDir}/clamd.pid + TemporaryDirectory /tmp User clamav + Foreground yes ${cfg.daemon.extraConfig} ''; - pkg = pkgs.clamav; + + freshclamConfigFile = pkgs.writeText "freshclam.conf" '' + DatabaseDirectory ${stateDir} + Foreground yes + Checks ${toString cfg.updater.frequency} + + ${cfg.updater.extraConfig} + + DatabaseMirror database.clamav.net + ''; in { options = { services.clamav = { daemon = { - enable = mkEnableOption "clamd daemon"; + enable = mkEnableOption "ClamAV clamd daemon"; extraConfig = mkOption { type = types.lines; @@ -34,16 +45,27 @@ in }; }; updater = { - enable = mkEnableOption "freshclam updater"; + enable = mkEnableOption "ClamAV freshclam updater"; frequency = mkOption { + type = types.int; default = 12; description = '' Number of database checks per day. ''; }; - config = mkOption { + interval = mkOption { + type = types.str; + default = "hourly"; + description = '' + How often freshclam is invoked. See systemd.time(7) for more + information about the format. + ''; + }; + + extraConfig = mkOption { + type = types.lines; default = ""; description = '' Extra configuration for freshclam. Contents will be added verbatim to the @@ -68,50 +90,53 @@ in gid = config.ids.gids.clamav; }; - services.clamav.updater.config = mkIf cfg.updater.enable '' - DatabaseDirectory ${stateDir} - Foreground yes - Checks ${toString cfg.updater.frequency} - DatabaseMirror database.clamav.net - ''; + environment.etc."clamav/freshclam.conf".source = freshclamConfigFile; + environment.etc."clamav/clamd.conf".source = clamdConfigFile; - systemd.services.clamd = mkIf cfg.daemon.enable { + systemd.services.clamav-daemon = mkIf cfg.daemon.enable { description = "ClamAV daemon (clamd)"; - path = [ pkg ]; - after = [ "network.target" "freshclam.service" ]; - requires = [ "freshclam.service" ]; + after = mkIf cfg.updater.enable [ "clamav-freshclam.service" ]; + requires = mkIf cfg.updater.enable [ "clamav-freshclam.service" ]; wantedBy = [ "multi-user.target" ]; + restartTriggers = [ clamdConfigFile ]; + preStart = '' - mkdir -m 0755 -p ${logDir} mkdir -m 0755 -p ${runDir} - chown ${clamavUser}:${clamavGroup} ${logDir} chown ${clamavUser}:${clamavGroup} ${runDir} ''; + serviceConfig = { - ExecStart = "${pkg}/bin/clamd --config-file=${clamdConfigFile}"; - Type = "forking"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - Restart = "on-failure"; - RestartSec = "10s"; - StartLimitInterval = "1min"; + ExecStart = "${pkg}/bin/clamd"; + ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID"; + PrivateTmp = "yes"; + PrivateDevices = "yes"; + PrivateNetwork = "yes"; }; }; - systemd.services.freshclam = mkIf cfg.updater.enable { - description = "ClamAV updater (freshclam)"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - path = [ pkg ]; + systemd.timers.clamav-freshclam = mkIf cfg.updater.enable { + description = "Timer for ClamAV virus database updater (freshclam)"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = cfg.updater.interval; + Unit = "clamav-freshclam.service"; + }; + }; + + systemd.services.clamav-freshclam = mkIf cfg.updater.enable { + description = "ClamAV virus database updater (freshclam)"; + restartTriggers = [ freshclamConfigFile ]; + preStart = '' mkdir -m 0755 -p ${stateDir} chown ${clamavUser}:${clamavGroup} ${stateDir} ''; + serviceConfig = { - ExecStart = "${pkg}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - Restart = "on-failure"; - RestartSec = "10s"; - StartLimitInterval = "1min"; + Type = "oneshot"; + ExecStart = "${pkg}/bin/freshclam"; + PrivateTmp = "yes"; + PrivateDevices = "yes"; }; }; }; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 7473f056ce97..88df4d78d26b 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -10,11 +10,17 @@ stdenv.mkDerivation rec { sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn"; }; + # don't install sample config files into the absolute sysconfdir folder + postPatch = '' + substituteInPlace Makefile.in --replace ' etc ' ' ' + ''; + buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ]; configureFlags = [ + "--sysconfdir=/etc/clamav" "--with-zlib=${zlib.dev}" "--with-libbz2-prefix=${bzip2.dev}" "--with-iconv-dir=${libiconv}" @@ -26,6 +32,11 @@ stdenv.mkDerivation rec { "--enable-milter" ]; + postInstall = '' + mkdir $out/etc + cp etc/*.sample $out/etc + ''; + meta = with stdenv.lib; { homepage = http://www.clamav.net; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; From 12f7968273156b80a73cb7031b37af213fae125a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Thu, 10 Nov 2016 13:00:50 +0100 Subject: [PATCH 0283/1749] libmarble-ssrf: init at 2016-11-09 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- .../libraries/libmarble-ssrf/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/libmarble-ssrf/default.nix diff --git a/pkgs/development/libraries/libmarble-ssrf/default.nix b/pkgs/development/libraries/libmarble-ssrf/default.nix new file mode 100644 index 000000000000..1d6c54134393 --- /dev/null +++ b/pkgs/development/libraries/libmarble-ssrf/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, doxygen, pkgconfig, cmake, qtbase, qtscript, qtquick1 }: + +stdenv.mkDerivation rec { + name = "libmarble-ssrf-${version}"; + version = "2016-11-09"; + + src = fetchgit { + sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd"; + url = "git://git.subsurface-divelog.org/marble"; + rev = "4325da93b7516abb6f93a1417adc10593dacd794"; + }; + + buildInputs = [ qtbase qtscript qtquick1 ]; + nativeBuildInputs = [ doxygen pkgconfig cmake ]; + + enableParallelBuilding = true; + + preConfigure = '' + cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Release \ + -DQTONLY=TRUE -DQT5BUILD=ON \ + -DBUILD_MARBLE_TESTS=NO \ + -DWITH_DESIGNER_PLUGIN=NO \ + -DBUILD_MARBLE_APPS=NO" + ''; + + meta = with stdenv.lib; { + description = "Qt library for a slippy map with patches from the Subsurface project"; + homepage = "http://subsurface-divelog.org"; + license = licenses.lgpl21; + maintainers = [ maintainers.mguentner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1cf864ce97b..9c546d7b6b8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2368,6 +2368,8 @@ in makebootfat = callPackage ../tools/misc/makebootfat { }; + libmarble-ssrf = qt55.callPackage ../development/libraries/libmarble-ssrf { }; + matrix-synapse = callPackage ../servers/matrix-synapse { }; memtester = callPackage ../tools/system/memtester { }; From 2e15a8f2dde53484082d48b14d3557b8009f61ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Thu, 10 Nov 2016 13:02:13 +0100 Subject: [PATCH 0284/1749] libgit2: reinit at 0.23.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- pkgs/development/libraries/git2/0.23.nix | 27 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/git2/0.23.nix diff --git a/pkgs/development/libraries/git2/0.23.nix b/pkgs/development/libraries/git2/0.23.nix new file mode 100644 index 000000000000..3cf429ab1d73 --- /dev/null +++ b/pkgs/development/libraries/git2/0.23.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv }: + +stdenv.mkDerivation (rec { + version = "0.23.2"; + name = "libgit2-${version}"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/libgit2/libgit2/tarball/v${version}"; + sha256 = "1d3901bmgvdnmzrx21afi1d0llsqmca3ckj942p0i2wpdpr1kbcp"; + }; + + cmakeFlags = "-DTHREADSAFE=ON"; + + nativeBuildInputs = [ cmake python pkgconfig ]; + buildInputs = [ zlib libssh2 openssl http-parser ]; + + meta = { + description = "the Git linkable library"; + homepage = http://libgit2.github.com/; + license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; all; + }; +} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { + NIX_LDFLAGS = "-liconv"; + propagatedBuildInputs = [ libiconv ]; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c546d7b6b8e..da3a256b2a9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7031,6 +7031,7 @@ in ); libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { }; + libgit2_0_23 = callPackage ../development/libraries/git2/0.23.nix { }; gle = callPackage ../development/libraries/gle { }; From 90377526eba1b9d0747f541e21340578369796b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Thu, 10 Nov 2016 13:02:53 +0100 Subject: [PATCH 0285/1749] subsurface: init at 4.5.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- pkgs/applications/misc/subsurface/default.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 69 insertions(+) create mode 100644 pkgs/applications/misc/subsurface/default.nix diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix new file mode 100644 index 000000000000..be4a004fb8ba --- /dev/null +++ b/pkgs/applications/misc/subsurface/default.nix @@ -0,0 +1,64 @@ +{ + stdenv, + cmake, + curl, + fetchgit, + grantlee, + libdivecomputer, + libgit2, + libmarble-ssrf, + libssh2, + libxml2, + libxslt, + libzip, + pkgconfig, + qtbase, + qtconnectivity, + qttools, + qtwebkit, + sqlite +}: + +stdenv.mkDerivation rec { + version = "4.5.6"; + name = "subsurface-${version}"; + + # use fetchgit instead of the official tgz is not complete + src = fetchgit { + sha256 = "156rqcszy0c4plk2mv7wdd4h7s7mygpq5sdc64pjfs4qvvsdj10f"; + url = "git://git.subsurface-divelog.org/subsurface"; + rev = "4d8d7c2a0fa1b4b0e6953d92287c75b6f97472d0"; + branchName = "v4.5-branch"; + }; + + buildInputs = [ qtbase libdivecomputer libmarble-ssrf libxslt + libzip libxml2 grantlee qtwebkit qttools + qtconnectivity libgit2 libssh2 curl ]; + nativeBuildInputs = [ pkgconfig cmake ]; + + enableParallelBuilding = true; + + # hack incoming... + preConfigure = '' + marble_libs=$(echo $(echo $CMAKE_LIBRARY_PATH | grep -o "/nix/store/[[:alnum:]]*-libmarble-ssrf-[a-zA-Z0-9\-]*/lib")/libssrfmarblewidget.so) + cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Debug \ + -DMARBLE_LIBRARIES=$marble_libs \ + -DNO_PRINTING=OFF \ + -DUSE_LIBGIT23_API=1" + ''; + + meta = with stdenv.lib; { + description = "Subsurface is an open source divelog program that runs on Windows, Mac and Linux"; + longDescription = '' + Subsurface can track single- and multi-tank dives using air, Nitrox or TriMix. + It allows tracking of dive locations including GPS coordinates (which can also + conveniently be entered using a map interface), logging of equipment used and + names of other divers, and lets users rate dives and provide additional notes. + ''; + homepage = https://subsurface-divelog.org; + license = licenses.gpl2; + maintainers = [ maintainers.mguentner ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da3a256b2a9f..e797055daead 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3718,6 +3718,11 @@ in sstp = callPackage ../tools/networking/sstp {}; + subsurface = + qt55.callPackage ../applications/misc/subsurface { + libgit2 = pkgs.libgit2_0_23; + }; + sudo = callPackage ../tools/security/sudo { }; suidChroot = callPackage ../tools/system/suid-chroot { }; From 520db3b907243e427982988b7ca3c75b1d65dc81 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Tue, 15 Nov 2016 00:54:52 -0500 Subject: [PATCH 0286/1749] beamPackages.hex: 0.11.3 -> 0.14.0 (#19994) --- pkgs/development/beam-modules/hex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index 2cb06b07e597..69559a26c8fa 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -8,13 +8,13 @@ let pkg = self: stdenv.mkDerivation rec { name = "hex"; - version = "v0.11.3"; + version = "v0.14.0"; src = fetchFromGitHub { owner = "hexpm"; repo = "hex"; - rev = "f5e200ad95f030f0a7ab88a86545dd0dde1ee521"; - sha256 = "0n4cgmnbmglarydls9pmxznbzp49pv85ncbd4f2lp1fm7qr08xfw"; + rev = "${version}"; + sha256 = "042rcwznb6cf9khn4l969axf7vhk53gy3rp23y6c8fhfp1472pai"; }; setupHook = writeText "setupHook.sh" '' From 9cbf8a06526385482e9732f9283fe73674756c02 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 14 Nov 2016 22:04:32 -0800 Subject: [PATCH 0287/1749] Fix buildMachines example: use lists, not string (#20361) Using the example before this commit resulted in the following error: ``` error: value is a string while a list was expected, at /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/services/misc/nix-daemon.nix:349:37 ``` --- nixos/modules/services/misc/nix-daemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 333782d15bcb..e2bbd4b01aa1 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -172,8 +172,8 @@ in sshKey = "/root/.ssh/id_buildfarm"; system = "x86_64-linux"; maxJobs = 2; - supportedFeatures = "kvm"; - mandatoryFeatures = "perf"; + supportedFeatures = [ "kvm" ]; + mandatoryFeatures = [ "perf" ]; } ]; description = '' From bf570a494abfbf093afe90f19b50c33a86023498 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 15 Nov 2016 11:11:52 +0100 Subject: [PATCH 0288/1749] digikam5: 5.1.0 -> 5.3.0 --- pkgs/applications/graphics/digikam/{5.1.nix => 5.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/applications/graphics/digikam/{5.1.nix => 5.nix} (95%) diff --git a/pkgs/applications/graphics/digikam/5.1.nix b/pkgs/applications/graphics/digikam/5.nix similarity index 95% rename from pkgs/applications/graphics/digikam/5.1.nix rename to pkgs/applications/graphics/digikam/5.nix index 6bd572e99bba..3e5d1b7b52ef 100644 --- a/pkgs/applications/graphics/digikam/5.1.nix +++ b/pkgs/applications/graphics/digikam/5.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { name = "digikam-${version}"; - version = "5.1.0"; + version = "5.3.0"; src = fetchurl { url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; - sha256 = "1w97a5cmg39dgmjgmjwa936gcrmxjms3h2ww61qi1lny84p5x4a7"; + sha256 = "0p1y5kgkz7lzzqpf7qd3mmg59zfdkkz9jg7knldd8dl94wkzlv5k"; }; nativeBuildInputs = [ cmake ecm makeQtWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db2102238f1b..4e03e6eaa75d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15519,7 +15519,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam5 = kde5.callPackage ../applications/graphics/digikam/5.1.nix {}; + digikam5 = kde5.callPackage ../applications/graphics/digikam/5.nix {}; drumkv1 = callPackage ../applications/audio/drumkv1 { }; From afab1a948eef1b0f1579a8cd50b77b7f2761ae78 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 15 Nov 2016 13:11:25 +0100 Subject: [PATCH 0289/1749] grsecurity: 4.8.7-201611102210 -> 201611142350 --- 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 3d4ba5d2b58d..2f7398a0a4b2 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.7"; - grrev = "201611102210"; - sha256 = "1n7avhvzy4njf9wky38l99i18v1rr05bgspivnp440j8d6nh60nh"; + grrev = "201611142350"; + sha256 = "002zm8j130ras0dabp95bb82c5h8y9z66jl81jip226y3bk3b019"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 520064e4b59ce5287cd3335f416995e520db3cd3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 15 Nov 2016 07:15:04 -0600 Subject: [PATCH 0290/1749] networkmanager: multiple outputs --- pkgs/tools/networking/network-manager/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index d96bc08495f0..0bd79890dc02 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204"; }; + outputs = [ "out" "dev" ]; + preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file From cec12416773c0bde99bcb80f8e2fe9482a6a5352 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Nov 2016 16:18:43 -0600 Subject: [PATCH 0291/1749] pygobject3: multiple outputs --- pkgs/development/python-modules/pygobject/3.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index dfddd7dddbdb..33bb1d5a4cab 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -10,6 +10,8 @@ mkPythonDerivation rec { sha256 = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ pkgconfig glib gobjectIntrospection ] ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; From 6f36042eeaf9a9d7627c8b854bfde593888716ef Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Nov 2016 20:29:03 -0600 Subject: [PATCH 0292/1749] atkmm: multiple outputs --- pkgs/development/libraries/atkmm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index a10d730d06e4..e1cfb488be88 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd"; }; + outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ atk glibmm ]; nativeBuildInputs = [ pkgconfig ]; From 13bef32e735f49e261e914d4c33b5584ec7f2e1e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Nov 2016 20:29:18 -0600 Subject: [PATCH 0293/1749] cairomm: multiple outputs --- pkgs/development/libraries/cairomm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index fbf3cd57e3b9..017516f6b490 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ cairo libsigcxx ]; buildInputs = [ fontconfig freetype ] From c871bb489b472aeb87323161d666639cfc09d959 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Nov 2016 20:29:37 -0600 Subject: [PATCH 0294/1749] gtkmm2: multiple outputs --- pkgs/development/libraries/gtkmm/2.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 119e3f77f670..1ec2a7cd6f0d 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [pkgconfig]; propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ]; From a6c2b2ef0efb15fc2e60ae8a99c28b1daa003309 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Nov 2016 20:29:46 -0600 Subject: [PATCH 0295/1749] gtkmm3: multiple outputs --- pkgs/development/libraries/gtkmm/3.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 8b2383f33cce..49055f6b4a95 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ epoxy ]; From 992bc3e762e9bc6b3edeaffe516fd31d1dad871b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 14 Nov 2016 09:35:46 -0600 Subject: [PATCH 0296/1749] pangomm: multiple outputs --- pkgs/development/libraries/pangomm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 6850c13b44e9..b99498f2013e 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pango glibmm cairomm ]; From 456414c519af9523536c4a2c79e470eba751f33d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Nov 2016 09:19:26 -0600 Subject: [PATCH 0297/1749] installation-cd-graphical-kde: use KDE 5 --- .../cd-dvd/installation-cd-graphical-kde.nix | 86 ++++++------------- 1 file changed, 26 insertions(+), 60 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index b5ee57d9e22e..5876aab93a7a 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -1,20 +1,38 @@ # This module defines a NixOS installation CD that contains X11 and -# KDE 4. +# KDE 5. { config, lib, pkgs, ... }: with lib; { - imports = [ ./installation-cd-base.nix ../../profiles/graphical.nix ]; + imports = [ ./installation-cd-base.nix ]; - # Provide wicd for easy wireless configuration. - #networking.wicd.enable = true; + services.xserver = { + enable = true; + + # Automatically login as root. + displayManager.slim = { + enable = true; + defaultUser = "root"; + autoLogin = true; + }; + + desktopManager.kde5.enable = true; + + # Enable touchpad support for many laptops. + synaptics.enable = true; + }; environment.systemPackages = - [ # Include gparted for partitioning disks. + [ pkgs.glxinfo + + # Include gparted for partitioning disks. pkgs.gparted + # Firefox for reading the manual. + pkgs.firefox + # Include some editors. pkgs.vim pkgs.bvi # binary editor @@ -32,23 +50,12 @@ with lib; # Don't start the X server by default. services.xserver.autorun = mkForce false; - # Auto-login as root. - services.xserver.displayManager.kdm.extraConfig = - '' - [X-*-Core] - AllowRootLogin=true - AutoLoginEnable=true - AutoLoginUser=root - AutoLoginPass="" - ''; - # Custom kde-workspace adding some icons on the desktop - system.activationScripts.installerDesktop = let openManual = pkgs.writeScript "nixos-manual.sh" '' #!${pkgs.stdenv.shell} cd ${config.system.build.manual.manual}/share/doc/nixos/ - konqueror ./index.html + firefox ./index.html ''; desktopFile = pkgs.writeText "nixos-manual.desktop" '' @@ -57,55 +64,14 @@ with lib; Type=Application Name=NixOS Manual Exec=${openManual} - Icon=konqueror + Icon=firefox ''; in '' mkdir -p /root/Desktop ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop - ln -sfT ${pkgs.kde4.konsole}/share/applications/kde4/konsole.desktop /root/Desktop/konsole.desktop + ln -sfT ${pkgs.kde5.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop ''; - services.xserver.desktopManager.kde4.kdeWorkspacePackage = let - pkg = pkgs.kde4.kde_workspace; - - plasmaInit = pkgs.writeText "00-defaultLayout.js" '' - loadTemplate("org.kde.plasma-desktop.defaultPanel") - - for (var i = 0; i < screenCount; ++i) { - var desktop = new Activity - desktop.name = i18n("Desktop") - desktop.screen = i - desktop.wallpaperPlugin = 'image' - desktop.wallpaperMode = 'SingleImage' - - var folderview = desktop.addWidget("folderview"); - folderview.writeConfig("url", "desktop:/"); - - //Create more panels for other screens - if (i > 0){ - var panel = new Panel - panel.screen = i - panel.location = 'bottom' - panel.height = screenGeometry(i).height > 1024 ? 35 : 27 - var tasks = panel.addWidget("tasks") - tasks.writeConfig("showOnlyCurrentScreen", true); - } - } - ''; - - in - pkgs.runCommand pkg.name - { inherit (pkg) meta; } - '' - mkdir -p $out - cp -prf ${pkg}/* $out/ - chmod a+w $out/share/apps/plasma-desktop/init - cp -f ${plasmaInit} $out/share/apps/plasma-desktop/init/00-defaultLayout.js - ''; - - # Disable large stuff that's not very useful on the installation CD. - services.xserver.desktopManager.kde4.enablePIM = false; - } From dc598510aab4fb91c9ad5e2bb0bdba44a668add7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Nov 2016 12:33:38 -0600 Subject: [PATCH 0298/1749] kde5.plasma-desktop: display desktop folder by default Plasma 5 displays only a wallpaper on the desktop by default. I reason that if the user wants an empty desktop, they can make ~/Desktop empty. It's empty by default anyway. --- pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix index 7e8823e2db96..8d4098ca31f2 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix @@ -38,4 +38,9 @@ plasmaPackage rec { "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg" "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics.dev}/include/xorg" ]; + postInstall = '' + # Display ~/Desktop contents on the desktop by default. + sed -i "$out/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \ + -e 's/Containment=org.kde.desktopcontainment/Containment=org.kde.plasma.folder/' + ''; } From 12951219c61d4070a786366ca5aa3f601b4aae64 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 14 Nov 2016 09:35:34 -0600 Subject: [PATCH 0299/1749] ldns: multiple outputs --- pkgs/development/libraries/ldns/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index c279d698e129..883625e551a7 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1kf8pkwhcssvgzhh6ha1pjjiziwvwmfaali7kaafh6118mcy124b"; }; + outputs = [ "out" "dev" ]; + patches = [ ./perl-5.22-compat.patch ]; postPatch = '' @@ -19,6 +21,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill" ]; + postInstall = '' + moveToOutput "bin/ldns-config" "$dev" + ''; + meta = with stdenv.lib; { description = "Library with the aim of simplifying DNS programming in C"; license = licenses.bsd3; From 87c4a20cb8be2559cc66297f1ad51738f2ed420b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Nov 2016 15:36:32 -0600 Subject: [PATCH 0300/1749] kde5.oxygen: use kdeWrapper instead of makeQtWrapper --- pkgs/desktops/kde-5/plasma/oxygen.nix | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/oxygen.nix b/pkgs/desktops/kde-5/plasma/oxygen.nix index 44a7575526f1..f880f2e3ab23 100644 --- a/pkgs/desktops/kde-5/plasma/oxygen.nix +++ b/pkgs/desktops/kde-5/plasma/oxygen.nix @@ -1,19 +1,20 @@ { - plasmaPackage, - ecm, makeQtWrapper, + plasmaPackage, kdeWrapper, + ecm, frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras }: -plasmaPackage { - name = "oxygen"; - nativeBuildInputs = [ ecm makeQtWrapper ]; - propagatedBuildInputs = [ - frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons - ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras - ]; - postInstall = '' - wrapQtProgram "$out/bin/oxygen-demo5" - wrapQtProgram "$out/bin/oxygen-settings5" - ''; +let + unwrapped = plasmaPackage { + name = "oxygen"; + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ + frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons + ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras + ]; + }; +in +kdeWrapper unwrapped { + targets = [ "bin/oxygen-demo5" "bin/oxygen-settings5" ]; } From c9146d7e5f253c65d7c422ce2c7ee2a12261f83b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 14 Nov 2016 09:48:05 -0600 Subject: [PATCH 0301/1749] kde5: don't install oxygen-icons5 if breeze-icons is present --- nixos/modules/services/x11/desktop-managers/kde5.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index bc010d1ce1cf..07f6a402e81a 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -141,13 +141,12 @@ in kde5.konsole kde5.print-manager - # Oxygen icons moved to KDE Frameworks 5.16 and later. - (kde5.oxygen-icons or kde5.oxygen-icons5) + # Install Breeze icons if available + (kde5.breeze-icons or kde5.oxygen-icons5 or kde5.oxygen-icons) pkgs.hicolor_icon_theme - kde5.kde-gtk-config + kde5.kde-gtk-config kde5.breeze-gtk - pkgs.phonon-backend-gstreamer pkgs.qt5.phonon-backend-gstreamer ] @@ -155,9 +154,6 @@ in # If it is not available, Orion is very similar to Breeze. ++ lib.optional (!(lib.hasAttr "breeze-gtk" kde5)) pkgs.orion - # Install Breeze icons if available - ++ lib.optional (lib.hasAttr "breeze-icons" kde5) kde5.breeze-icons - # Install activity manager if available ++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd @@ -217,7 +213,6 @@ in kde5.ecm # for the setup-hook kde5.plasma-workspace kde5.breeze-icons - (kde5.oxygen-icons or kde5.oxygen-icons5) ]; }; From 8c3aa5a484b66dcf00365253e59d012976e03714 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 14 Nov 2016 09:59:22 -0600 Subject: [PATCH 0302/1749] kde5: add enableQt4Support option --- .../cd-dvd/installation-cd-graphical-kde.nix | 5 ++++- .../modules/services/x11/desktop-managers/kde5.nix | 13 ++++++++++++- pkgs/desktops/kde-5/plasma/default.nix | 8 -------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index 5876aab93a7a..bf233e24797f 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -18,7 +18,10 @@ with lib; autoLogin = true; }; - desktopManager.kde5.enable = true; + desktopManager.kde5 = { + enable = true; + enableQt4Support = false; + }; # Enable touchpad support for many laptops. synaptics.enable = true; diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 07f6a402e81a..9b51b92faa4d 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -22,6 +22,15 @@ in description = "Enable the Plasma 5 (KDE 5) desktop environment."; }; + enableQt4Support = mkOption { + type = types.bool; + default = true; + description = '' + Enable support for Qt 4-based applications. Particularly, install the + Qt 4 version of the Breeze theme and a default backend for Phonon. + ''; + }; + }; }; @@ -105,7 +114,7 @@ in kde5.sonnet kde5.threadweaver - kde5.breeze + kde5.breeze-qt5 kde5.kactivitymanagerd kde5.kde-cli-tools kde5.kdecoration @@ -160,6 +169,8 @@ in # frameworkintegration was split with plasma-integration in Plasma 5.6 ++ lib.optional (lib.hasAttr "plasma-integration" kde5) kde5.plasma-integration + ++ lib.optionals cfg.enableQt4Support [ kde5.breeze-qt4 pkgs.phonon-backend-gstreamer ] + # Optional hardware support features ++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index bb123fcdab44..36850824d63c 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -44,14 +44,6 @@ let inherit (srcs.breeze) src version; }; breeze-qt5 = callPackage ./breeze-qt5.nix {}; - breeze = - let - version = (builtins.parseDrvName breeze-qt5.name).version; - in - symlinkJoin { - name = "breeze-${version}"; - paths = map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]; - }; breeze-grub = callPackage ./breeze-grub.nix {}; breeze-plymouth = callPackage ./breeze-plymouth {}; kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; From 66d9772f0b79d4999b9f032f720d87ea7682377f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 14 Nov 2016 17:52:50 -0600 Subject: [PATCH 0303/1749] installation-cd-graphical-kde: put manual link directly on desktop --- .../cd-dvd/installation-cd-graphical-kde.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index bf233e24797f..c44dff3bb60d 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -53,21 +53,14 @@ with lib; # Don't start the X server by default. services.xserver.autorun = mkForce false; - # Custom kde-workspace adding some icons on the desktop system.activationScripts.installerDesktop = let - openManual = pkgs.writeScript "nixos-manual.sh" '' - #!${pkgs.stdenv.shell} - cd ${config.system.build.manual.manual}/share/doc/nixos/ - firefox ./index.html - ''; - desktopFile = pkgs.writeText "nixos-manual.desktop" '' [Desktop Entry] Version=1.0 Type=Application Name=NixOS Manual - Exec=${openManual} - Icon=firefox + Exec=firefox ${config.system.build.manual.manual}/share/doc/nixos/index.html + Icon=text-html ''; in '' From 7397dabc981eacb6069c447a8c56739846c84ee7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 14 Nov 2016 18:02:09 -0600 Subject: [PATCH 0304/1749] startkde: install default GTK config if needed --- .../kde-5/plasma/startkde/startkde.sh | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh index 256f9949e834..d3b460f966b6 100755 --- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh +++ b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh @@ -6,6 +6,34 @@ export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}@QT_PLUGIN_PATH@" export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}@QML_IMPORT_PATH@" export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}@QML2_IMPORT_PATH@" +# Set the default GTK 2 theme +if [ ! -e $HOME/.gtkrc-2.0 -a -e /run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc ]; then + cat >$HOME/.gtkrc-2.0 <$HOME/.config/gtk-3.0/settings.ini < Date: Mon, 14 Nov 2016 21:07:26 -0600 Subject: [PATCH 0305/1749] startkde: initialize kcminputrc if missing --- pkgs/desktops/kde-5/plasma/startkde/startkde.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh index d3b460f966b6..63c62f12321e 100755 --- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh +++ b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh @@ -7,7 +7,8 @@ export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}@QML_IMPORT_PATH@" export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}@QML2_IMPORT_PATH@" # Set the default GTK 2 theme -if [ ! -e $HOME/.gtkrc-2.0 -a -e /run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc ]; then +if ! [ -e $HOME/.gtkrc-2.0 ] \ + && [ -e /run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc ]; then cat >$HOME/.gtkrc-2.0 <$HOME/.config/gtk-3.0/settings.ini <$configDir/kcminputrc < Date: Sat, 12 Nov 2016 11:46:44 -0600 Subject: [PATCH 0306/1749] kde5.applications: 16.08.2 -> 16.08.3 --- pkgs/desktops/kde-5/applications/fetch.sh | 2 +- pkgs/desktops/kde-5/applications/srcs.nix | 2064 ++++++++++----------- 2 files changed, 1033 insertions(+), 1033 deletions(-) diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh index 666acf1a8cb4..845548c4f5bc 100644 --- a/pkgs/desktops/kde-5/applications/fetch.sh +++ b/pkgs/desktops/kde-5/applications/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://ftp.ussg.iu.edu/kde/stable/applications/16.08.2/ --cut-dirs=1 -A '*.tar.xz' ) +WGET_ARGS=( http://ftp.ussg.iu.edu/kde/stable/applications/16.08.3/ --cut-dirs=1 -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix index a8c984ad6457..f6f13a2f2e5e 100644 --- a/pkgs/desktops/kde-5/applications/srcs.nix +++ b/pkgs/desktops/kde-5/applications/srcs.nix @@ -3,2067 +3,2067 @@ { akonadi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-16.08.2.tar.xz"; - sha256 = "141da3xj9d5gwksh9lz93s4zsvpadf314345ai6lirhhi99683g6"; - name = "akonadi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-16.08.3.tar.xz"; + sha256 = "1k967l551r4kzj2hyfikr7ky8n77rhcniscw7f8a42vmdxnr5jvy"; + name = "akonadi-16.08.3.tar.xz"; }; }; akonadi-calendar = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-calendar-16.08.2.tar.xz"; - sha256 = "0jpmh5051mxcndaf1clldz7zzfhfyi8qxz87lj20s0d4gzrf6cpw"; - name = "akonadi-calendar-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-calendar-16.08.3.tar.xz"; + sha256 = "1wh69vns5aw2av1hfcrz0gymqv8884xl0ss0yvcg9s478l550yj9"; + name = "akonadi-calendar-16.08.3.tar.xz"; }; }; akonadi-contacts = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-contacts-16.08.2.tar.xz"; - sha256 = "0d3cjyq4i778zvy13wm2gfpzkibsr17wgxydqm5ac5wkl30wb07l"; - name = "akonadi-contacts-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-contacts-16.08.3.tar.xz"; + sha256 = "12cdqkx7i7wahqf5zb4dxmbvzidvxw77imsjqaw0qw7jd5hnybmd"; + name = "akonadi-contacts-16.08.3.tar.xz"; }; }; akonadi-mime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-mime-16.08.2.tar.xz"; - sha256 = "0q1g6g1dyj82ya8dfnq87asx9qnmqypsmb873y20i8x3pkzjwzld"; - name = "akonadi-mime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-mime-16.08.3.tar.xz"; + sha256 = "1jlsqlfyr1rl1ny2nyccwiqzs72fi2qzim3qg4j6749y3imi8rvx"; + name = "akonadi-mime-16.08.3.tar.xz"; }; }; akonadi-notes = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-notes-16.08.2.tar.xz"; - sha256 = "0ryw21y25iq28rn75gibfxlwgyx0fz1y37lkgnqfcl3mwj16gcb4"; - name = "akonadi-notes-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-notes-16.08.3.tar.xz"; + sha256 = "1fmpsqywpv4p65kdlisy5z57zba34h70djcdh3ch5rmmsxz75c0s"; + name = "akonadi-notes-16.08.3.tar.xz"; }; }; akonadi-search = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-search-16.08.2.tar.xz"; - sha256 = "063y170nfdi279pbh9zdyhrga2hf0xsb20bn2p210vhmwhi7l51r"; - name = "akonadi-search-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-search-16.08.3.tar.xz"; + sha256 = "1whj5vzg33nlh756n5jcw2fj6yqf7wmq4lpvsj8k7hs9gnw7vqzd"; + name = "akonadi-search-16.08.3.tar.xz"; }; }; analitza = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/analitza-16.08.2.tar.xz"; - sha256 = "1rh58dfpnxyahpqz49p935pa01mxci9bbqddayv1807my2i5kz2h"; - name = "analitza-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/analitza-16.08.3.tar.xz"; + sha256 = "0q9336z6468qsw1rqlifagwppwanrnpr23srqqgifwi4wh25ky7q"; + name = "analitza-16.08.3.tar.xz"; }; }; ark = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ark-16.08.2.tar.xz"; - sha256 = "043nl64g6374diczkrq7prid4fr8ll625df2nhqnaz79fnh1ysv8"; - name = "ark-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ark-16.08.3.tar.xz"; + sha256 = "021cjgw25zryjwmbslbnm5vg5ddgl5knxvqldrwjjhkqw2pzc4y7"; + name = "ark-16.08.3.tar.xz"; }; }; artikulate = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/artikulate-16.08.2.tar.xz"; - sha256 = "1pcpwqpd7xk796bc5gyydqqrvqm592jhyh8swvlsdqadczlqnn9h"; - name = "artikulate-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/artikulate-16.08.3.tar.xz"; + sha256 = "0g5ya2cyjpnrzsccdqja1z6x5hh49a9r9m6c8408hv8bssigyvd1"; + name = "artikulate-16.08.3.tar.xz"; }; }; audiocd-kio = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/audiocd-kio-16.08.2.tar.xz"; - sha256 = "0m85j4lrdas47l501f20i44q7w7qwxvpdy754zp4nf5wzm7nvjdv"; - name = "audiocd-kio-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/audiocd-kio-16.08.3.tar.xz"; + sha256 = "1d7qxp6v1g9rpjfh457hzi7h67d9550wa3fm4d4xja227zqqx63q"; + name = "audiocd-kio-16.08.3.tar.xz"; }; }; baloo-widgets = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/baloo-widgets-16.08.2.tar.xz"; - sha256 = "1r784qd1j3y1ff6y494m8qyfdjsz626agwdj05h6igngvw1ywff2"; - name = "baloo-widgets-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/baloo-widgets-16.08.3.tar.xz"; + sha256 = "04zm0jfpvnq821kcjylac7g0zlwldkvxadmrvj9qy28vh4k8wi3m"; + name = "baloo-widgets-16.08.3.tar.xz"; }; }; blinken = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/blinken-16.08.2.tar.xz"; - sha256 = "0nqkw6abnzbx80d25ba0b6bix1ngr3wfrxlfjqdk4gmb1m34dkcm"; - name = "blinken-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/blinken-16.08.3.tar.xz"; + sha256 = "0r71s877dhf3ib3hwhfl3k3ldz671dw6ym3jjnavp2pl6h0wc6hv"; + name = "blinken-16.08.3.tar.xz"; }; }; bomber = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/bomber-16.08.2.tar.xz"; - sha256 = "1zcqxkfy57lw03v6fpf44asbdf8q9ivn323li9ks0kwzzc2nk7f9"; - name = "bomber-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/bomber-16.08.3.tar.xz"; + sha256 = "1cqdv36s1y92hk9ghvm3ha67b1j7h7srv6cig6m5rvyaxpy2gw4f"; + name = "bomber-16.08.3.tar.xz"; }; }; bovo = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/bovo-16.08.2.tar.xz"; - sha256 = "0clbhcg6bw8nrjw3nynlhcglgxasxw2b15ski25cf9cvrq3cahn7"; - name = "bovo-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/bovo-16.08.3.tar.xz"; + sha256 = "0z6ij7p0vckni0aa412ap8agcqrid98qif3c655m69hmw3arf6k9"; + name = "bovo-16.08.3.tar.xz"; }; }; calendarsupport = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/calendarsupport-16.08.2.tar.xz"; - sha256 = "1h9w8mk2gwnfbm9520bfmqbzjjg1211lpvzbq8ba4jg3l99d69j6"; - name = "calendarsupport-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/calendarsupport-16.08.3.tar.xz"; + sha256 = "1r8v1sydragkf9gcvkc9rjlm9h7mah01ayw5pg8pjaxhbfsva8ad"; + name = "calendarsupport-16.08.3.tar.xz"; }; }; cantor = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/cantor-16.08.2.tar.xz"; - sha256 = "1zi989fklw4qs0yj2zs0rpbaq1yfd9dax6ric376s2r85mrdfvjc"; - name = "cantor-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/cantor-16.08.3.tar.xz"; + sha256 = "0i2sd4vp7dvqjh41rr4wv9ij1jriyj9kn69z9i0iig389gwza0n7"; + name = "cantor-16.08.3.tar.xz"; }; }; cervisia = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/cervisia-16.08.2.tar.xz"; - sha256 = "1pnjiww36689vzqg8aixn8q7jf9j295i18gr8ggck80ccxrrf7rd"; - name = "cervisia-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/cervisia-16.08.3.tar.xz"; + sha256 = "14p6j8nzdjn2s4v0h5yj8r3yl89sq93z7naq2bifg7nxalazbz27"; + name = "cervisia-16.08.3.tar.xz"; }; }; dolphin = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/dolphin-16.08.2.tar.xz"; - sha256 = "1d6r7fi4cmdhxbrks8x0ar9s147zi4d6ap1pbxjmlxfa1v7jmmls"; - name = "dolphin-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/dolphin-16.08.3.tar.xz"; + sha256 = "0zqv75d06s7c59yx2w4dkr37mhafhwys4fqp44mpbf1x8yw1ijgx"; + name = "dolphin-16.08.3.tar.xz"; }; }; dolphin-plugins = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/dolphin-plugins-16.08.2.tar.xz"; - sha256 = "0cpcfgl77s02zi4hhsg9fnnmfrl0crk8vyacfis8j59zwcjf5n3d"; - name = "dolphin-plugins-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/dolphin-plugins-16.08.3.tar.xz"; + sha256 = "05rdq5zgp8px9gii4wnnf3qpwnv4h5i621q72ain0mpvapzb3q4v"; + name = "dolphin-plugins-16.08.3.tar.xz"; }; }; dragon = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/dragon-16.08.2.tar.xz"; - sha256 = "0rv300ggjz4mclw5k406hjbg0a7jh5gkp9ycb897qaj4cfzw59x8"; - name = "dragon-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/dragon-16.08.3.tar.xz"; + sha256 = "0s94vnr9hz5gzgs555phwl9y9m9jw0ysimv56mh8n56f6ar9za5m"; + name = "dragon-16.08.3.tar.xz"; }; }; eventviews = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/eventviews-16.08.2.tar.xz"; - sha256 = "1mphb53nl2y8z42m47prh9nm6s42z2xcsk3c0ssk5glyq52g3z00"; - name = "eventviews-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/eventviews-16.08.3.tar.xz"; + sha256 = "1qsjmym821b7v81rxb9af30idny4zw3czzkqx3370wa6hbsma9b2"; + name = "eventviews-16.08.3.tar.xz"; }; }; ffmpegthumbs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ffmpegthumbs-16.08.2.tar.xz"; - sha256 = "1q2gkbfy57r23k7wchlnxmcy0phw41rwz5hl7mi9hliz1dlvkhc0"; - name = "ffmpegthumbs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ffmpegthumbs-16.08.3.tar.xz"; + sha256 = "0j9c65kl6gh3j5g5jvjjx3hb3s5hcyzy6hz1fswp2v9sihaf7jrc"; + name = "ffmpegthumbs-16.08.3.tar.xz"; }; }; filelight = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/filelight-16.08.2.tar.xz"; - sha256 = "0jw6vpd6nnn9fbmfcas5g938ir7q3sk5b0x6advspci0asngnins"; - name = "filelight-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/filelight-16.08.3.tar.xz"; + sha256 = "07hc63cabv237nq38x8dnjqnfpicw6czliar0yc66k37vhdxvkjh"; + name = "filelight-16.08.3.tar.xz"; }; }; gpgmepp = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/gpgmepp-16.08.2.tar.xz"; - sha256 = "0828qlhdi1i26n2xgyb01c0q77m6jlppbxv6mprryxq0ma88940a"; - name = "gpgmepp-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/gpgmepp-16.08.3.tar.xz"; + sha256 = "0sda2ib5ymyzsji2v7aqdgfy6mhhfs6s3wyngb2k3q8hshv4xi5z"; + name = "gpgmepp-16.08.3.tar.xz"; }; }; granatier = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/granatier-16.08.2.tar.xz"; - sha256 = "0qx1rlgm9dznk387yv6ylvi2i97a652bi1nvr86syiwgydawb5ag"; - name = "granatier-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/granatier-16.08.3.tar.xz"; + sha256 = "07lhy7zbykhcnfyiymw6xhdpg8ng6xn0k3fca6afi16a0zk1hpnl"; + name = "granatier-16.08.3.tar.xz"; }; }; grantleetheme = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/grantleetheme-16.08.2.tar.xz"; - sha256 = "0mviqfbzd8jb8ni4maydcdni034p52wm2ndms0r5f4az5mq1vs8i"; - name = "grantleetheme-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/grantleetheme-16.08.3.tar.xz"; + sha256 = "1s2rz8ahm0dxij8v9czb1qcasp1igr20ipb4hc34y5ds9vmwrc7i"; + name = "grantleetheme-16.08.3.tar.xz"; }; }; gwenview = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/gwenview-16.08.2.tar.xz"; - sha256 = "0y2pk0a0wk2srfcyk401ymy2qmp413448r7larmgnw1yy0fbp8l2"; - name = "gwenview-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/gwenview-16.08.3.tar.xz"; + sha256 = "122nd5chwf6mcj3d7wz0jwz9wrzw1dk5c29nb7k8kbapsrhs27x3"; + name = "gwenview-16.08.3.tar.xz"; }; }; incidenceeditor = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/incidenceeditor-16.08.2.tar.xz"; - sha256 = "1z25z2pc3m6lnw3hpcjrrpj0f8jfbjav4i9kz6f97cs1rrklabym"; - name = "incidenceeditor-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/incidenceeditor-16.08.3.tar.xz"; + sha256 = "03kfjkxmjjwb974gplqhwvjiw6cgvxziqzrn4jmk3di3nl954mxj"; + name = "incidenceeditor-16.08.3.tar.xz"; }; }; jovie = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/jovie-16.08.2.tar.xz"; - sha256 = "1iia5ja90ypid2mm59njr2jg4hlsqz727fipa1v88c5nx31fqn9s"; - name = "jovie-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/jovie-16.08.3.tar.xz"; + sha256 = "1lb3qnhdc2prrbi07gwvgx0bca2w4w5zwllp547h4lgjjc69s1mv"; + name = "jovie-16.08.3.tar.xz"; }; }; juk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/juk-16.08.2.tar.xz"; - sha256 = "0l0scc3706ap2jfyvhv0shp3l5jw5r5jma1y6ikv0r85h9sxv6lw"; - name = "juk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/juk-16.08.3.tar.xz"; + sha256 = "1c83nm0rr6d67666pd1fynxgsxkhlfz1y3dkfm8mvxd7hx7164x3"; + name = "juk-16.08.3.tar.xz"; }; }; kaccessible = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kaccessible-16.08.2.tar.xz"; - sha256 = "1j7zm4qk0sfax3h85mljrh40ys0snmilj5fqbqv5cad8kna3v3gg"; - name = "kaccessible-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kaccessible-16.08.3.tar.xz"; + sha256 = "0p2w862dkzngmryfj46xnam50gcv516igdgs8skcj9jw19gr828q"; + name = "kaccessible-16.08.3.tar.xz"; }; }; kaccounts-integration = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kaccounts-integration-16.08.2.tar.xz"; - sha256 = "03k7h6lg39d6yvmz6b1i9a4cfakfncr91iw5bvy47xf4myp16dkr"; - name = "kaccounts-integration-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kaccounts-integration-16.08.3.tar.xz"; + sha256 = "03cf9nb2bxzx5kq0a94y1b1jj7ypidnpkcfbixdmkwfwwybrfm0w"; + name = "kaccounts-integration-16.08.3.tar.xz"; }; }; kaccounts-providers = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kaccounts-providers-16.08.2.tar.xz"; - sha256 = "1lz3wx78h0kpc218ngrgqnws89ar1cpra0h7dywswvh3ndnd1iiz"; - name = "kaccounts-providers-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kaccounts-providers-16.08.3.tar.xz"; + sha256 = "06ccw3ncliyhjwv2mv8yxmhxl161q51k740yilbgf3lz1qywn3bz"; + name = "kaccounts-providers-16.08.3.tar.xz"; }; }; kajongg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kajongg-16.08.2.tar.xz"; - sha256 = "08wz24z1rdqz3vkg0vwfm2w6mjl8psbs1c13x4h3ia2l456b2y73"; - name = "kajongg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kajongg-16.08.3.tar.xz"; + sha256 = "0hkc50rd8yag9dlc27fp633fn1zf0g81d605d29n96kxj03shdah"; + name = "kajongg-16.08.3.tar.xz"; }; }; kalarmcal = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kalarmcal-16.08.2.tar.xz"; - sha256 = "0h9xx2k78i0jyiqn4rcr79lcgqp7zsy980mbvv5zyddisjs5hd9x"; - name = "kalarmcal-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kalarmcal-16.08.3.tar.xz"; + sha256 = "06arrlsws3a3arsixd33dna2ghq4wywka3dmvgdl8g0cjrcm5c18"; + name = "kalarmcal-16.08.3.tar.xz"; }; }; kalgebra = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kalgebra-16.08.2.tar.xz"; - sha256 = "02y4nrkf7dk8crmqdz7wg6gflm0zg3392m55zfsj6ad3vy78p1gg"; - name = "kalgebra-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kalgebra-16.08.3.tar.xz"; + sha256 = "0g5xqwbxmrhhxmhsi1d2sllnr9sg64pa3wrlhpwcag9l4rggl902"; + name = "kalgebra-16.08.3.tar.xz"; }; }; kalzium = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kalzium-16.08.2.tar.xz"; - sha256 = "0jl77cr107gykfkdkxgnknlg1rhb9w6llwhva6863v57n6gq1hgh"; - name = "kalzium-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kalzium-16.08.3.tar.xz"; + sha256 = "1ywhn0rmqyl9cvzg4jybhl4bvllgbaj2j0cm2pd93ssnp2ispvnp"; + name = "kalzium-16.08.3.tar.xz"; }; }; kamera = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kamera-16.08.2.tar.xz"; - sha256 = "1pghfxs3l20iv92dl39qh9rvdgqcrzmlrwjbmdjs8rdyb4cm0ivc"; - name = "kamera-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kamera-16.08.3.tar.xz"; + sha256 = "0lx0yqj0xd5878pb3nqfj0ibs3m78s1c3hx2hayny8i00nq2vm33"; + name = "kamera-16.08.3.tar.xz"; }; }; kanagram = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kanagram-16.08.2.tar.xz"; - sha256 = "0q4v7g0a746qj62vjy09z5d50b6p6x3dfzciracz3jngsbngkkh6"; - name = "kanagram-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kanagram-16.08.3.tar.xz"; + sha256 = "0bci8h83jww94yqv1i6xxznhi2r755fs29qxb85wmgcnff0bfmlj"; + name = "kanagram-16.08.3.tar.xz"; }; }; kapman = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kapman-16.08.2.tar.xz"; - sha256 = "0rfbn8p2fbgb3w9w7kn6s7q8yk6024sqc5l1f2k1b79g4f3mng82"; - name = "kapman-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kapman-16.08.3.tar.xz"; + sha256 = "0fb6czdgpm19hgf3dpvj1hj7hh1zq226i00hi4qdakfwxpngxrav"; + name = "kapman-16.08.3.tar.xz"; }; }; kapptemplate = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kapptemplate-16.08.2.tar.xz"; - sha256 = "1anjn061cbssbdvv9mvbafjwpxck9lxvxrmbjj1hq4z47z2hdh4h"; - name = "kapptemplate-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kapptemplate-16.08.3.tar.xz"; + sha256 = "1f3zy1ffhhd3gn9pfmjf2igcka1xlik4vwmpxgb56gq5kw7y8glj"; + name = "kapptemplate-16.08.3.tar.xz"; }; }; kate = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kate-16.08.2.tar.xz"; - sha256 = "0ch23k1n3csk2pc8xmsbp262ya3vng3n5lc3hcr2g03jkrjab214"; - name = "kate-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kate-16.08.3.tar.xz"; + sha256 = "0xsfak6bb7nzik6dk840xv37ys4pz58908zx76z7i4vl6yqyyjxy"; + name = "kate-16.08.3.tar.xz"; }; }; katomic = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/katomic-16.08.2.tar.xz"; - sha256 = "07njyf7lnysvy2h6jql0z28yl1h6j3njrqnlxz4mf83ds09d73w6"; - name = "katomic-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/katomic-16.08.3.tar.xz"; + sha256 = "17q5gwd40vxamwbdrayfhayh2qbrm4i2y9hawx63dqdvc20ijj0z"; + name = "katomic-16.08.3.tar.xz"; }; }; kblackbox = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kblackbox-16.08.2.tar.xz"; - sha256 = "13spiwy2sjcfiz7hjg2jrx5aflnmccg3d5ki37bk72vcwg21i30y"; - name = "kblackbox-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kblackbox-16.08.3.tar.xz"; + sha256 = "0vpyclqzxafjnvlkkvg9czimqr9l610vnhlw11ia032haffq4qrf"; + name = "kblackbox-16.08.3.tar.xz"; }; }; kblocks = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kblocks-16.08.2.tar.xz"; - sha256 = "0ck0b8jxxcpz84sailh4i9c80dqqrw95fy8jgknwwb85w1a82r5v"; - name = "kblocks-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kblocks-16.08.3.tar.xz"; + sha256 = "1bvhs8bmz7wsc4nz4bxns7i50b2r09kbwrqfn685c39l2zv60gp0"; + name = "kblocks-16.08.3.tar.xz"; }; }; kblog = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kblog-16.08.2.tar.xz"; - sha256 = "1n9camf91p4igbn54j3n8jgqv9154y54fvyn0dlajmwf3ir8lyk9"; - name = "kblog-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kblog-16.08.3.tar.xz"; + sha256 = "19mh29xirx2rb6db5wxjd6am8wjx5mz0s0qszysrm7s9njsp2sqi"; + name = "kblog-16.08.3.tar.xz"; }; }; kbounce = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kbounce-16.08.2.tar.xz"; - sha256 = "0mka3s4vx1gbzavhdbhy24jfginkl8v6ab9za47cfyiwnirscry7"; - name = "kbounce-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kbounce-16.08.3.tar.xz"; + sha256 = "0f2m8x2mi89y15hvlk9xzd2prgv4fwhal02avjz0b6swggrs8shg"; + name = "kbounce-16.08.3.tar.xz"; }; }; kbreakout = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kbreakout-16.08.2.tar.xz"; - sha256 = "0kyxd112yfdp14d73s3dbg393r11gmb7bc0ibb4a5ab7ki3vvp5h"; - name = "kbreakout-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kbreakout-16.08.3.tar.xz"; + sha256 = "1rbyracpvvi4l9hn09k1w67cjkcnnnaqwr3maqj77mzh8wbsj1d3"; + name = "kbreakout-16.08.3.tar.xz"; }; }; kbruch = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kbruch-16.08.2.tar.xz"; - sha256 = "0m4zk03gxim4bxxzy391jkspjslf4i3gk23h7jpzwvp2yppibzxk"; - name = "kbruch-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kbruch-16.08.3.tar.xz"; + sha256 = "14yvildw0aji3lrb2xfafncqkwls3jjfvcbj1hi15gp3xxxr6s4z"; + name = "kbruch-16.08.3.tar.xz"; }; }; kcachegrind = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcachegrind-16.08.2.tar.xz"; - sha256 = "0hflqnx4cbqjx61cmxh4y2xkxzqxfw52m7snwhzyd9nlc1f842f4"; - name = "kcachegrind-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcachegrind-16.08.3.tar.xz"; + sha256 = "1rjipi3x2yl9yplyksw66hrnrnscld0fsb8zsmf692x7gprb9wjd"; + name = "kcachegrind-16.08.3.tar.xz"; }; }; kcalc = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcalc-16.08.2.tar.xz"; - sha256 = "19zxdikqw922q4nc5nfm63pcaq3dg2d6bvcgxw7nd8r1jbn94acm"; - name = "kcalc-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcalc-16.08.3.tar.xz"; + sha256 = "05ky1kvfk6n2qhqdwg9mlm0q5096776p8gvkh2nhzlajr4klzqdz"; + name = "kcalc-16.08.3.tar.xz"; }; }; kcalcore = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcalcore-16.08.2.tar.xz"; - sha256 = "1r0r0mk7yzi8h6mn81aaldcfa4vgxsz17sj5dm5m2p0mr42jxip3"; - name = "kcalcore-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcalcore-16.08.3.tar.xz"; + sha256 = "024n78zj10wlr2a50gh3fshlsb1maqbix5f4i66f26j3z2d2z7gc"; + name = "kcalcore-16.08.3.tar.xz"; }; }; kcalutils = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcalutils-16.08.2.tar.xz"; - sha256 = "0achb65qs07b17qhdvfhl7w2qjfls00bycmg8jl789lz0jpdsgg7"; - name = "kcalutils-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcalutils-16.08.3.tar.xz"; + sha256 = "1wyq6hx1hilpk480h4c9j1hgj41s21nwcmm9b178143173p2pp5z"; + name = "kcalutils-16.08.3.tar.xz"; }; }; kcharselect = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcharselect-16.08.2.tar.xz"; - sha256 = "1r50jpyl8a79qgz3gb1apzwrgkx5h7s9m645smi1y5af7qh6dkvy"; - name = "kcharselect-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcharselect-16.08.3.tar.xz"; + sha256 = "0wjwpqjck9k27xq1avz3l9ndi28kmcb05zvvf17jhsq9zmqr2lj8"; + name = "kcharselect-16.08.3.tar.xz"; }; }; kcolorchooser = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcolorchooser-16.08.2.tar.xz"; - sha256 = "1sms0wms94lrykpsj45y8g34dnkkibszahv5303zbzg1ndak4a5i"; - name = "kcolorchooser-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcolorchooser-16.08.3.tar.xz"; + sha256 = "0dk0f2xq4s85n0v3hfhiy0b3pkjvq4wz7pwc6h91kg50mm0mgjy0"; + name = "kcolorchooser-16.08.3.tar.xz"; }; }; kcontacts = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcontacts-16.08.2.tar.xz"; - sha256 = "0y8i5302jndpwms0wksf71yqxvz67x8wbwfkjjmlr3n6g477cvf3"; - name = "kcontacts-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcontacts-16.08.3.tar.xz"; + sha256 = "01hip3p0f6br42lx89zcxmvrsqfclp0v8j7nzvrrzbdnn9x58b6w"; + name = "kcontacts-16.08.3.tar.xz"; }; }; kcron = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcron-16.08.2.tar.xz"; - sha256 = "05v5lwcdys0r715x21ddzgl1f3m1vqw8jmyb7igcb4m14iixvfwk"; - name = "kcron-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcron-16.08.3.tar.xz"; + sha256 = "16dbfil36b0kfdga118gbd1j6x7xd1x3hcc0ikhgysz8wzliaqs2"; + name = "kcron-16.08.3.tar.xz"; }; }; kde-baseapps = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-baseapps-16.08.2.tar.xz"; - sha256 = "1p7h1jygqiwdgwi1g5pr7rq0219i6qq6mrg0c0shcfvvi926dg10"; - name = "kde-baseapps-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-baseapps-16.08.3.tar.xz"; + sha256 = "18a2r2g5cz4s923p3369aam4qr00gsngk6nn4lk3k5a4qqavpsa7"; + name = "kde-baseapps-16.08.3.tar.xz"; }; }; kdebugsettings = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdebugsettings-16.08.2.tar.xz"; - sha256 = "0aixcx4fcnrhz7g9dwl65khn2d5a667jchsxjnlwwrxhff2djy3z"; - name = "kdebugsettings-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdebugsettings-16.08.3.tar.xz"; + sha256 = "0jc4kciaq69wiankz5krfsj4lf0r88msnqcr10k1byjm50b4qnpb"; + name = "kdebugsettings-16.08.3.tar.xz"; }; }; kde-dev-scripts = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-dev-scripts-16.08.2.tar.xz"; - sha256 = "1iis5zlfz0ylycpz1i9s99grhp6pzskwv9hmsr620mj2fhcy3nwv"; - name = "kde-dev-scripts-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-dev-scripts-16.08.3.tar.xz"; + sha256 = "1g3c1wlv4rr9hxx1f6xiryswqprq1wq4lrlwx3gw3dmnpxwbnzld"; + name = "kde-dev-scripts-16.08.3.tar.xz"; }; }; kde-dev-utils = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-dev-utils-16.08.2.tar.xz"; - sha256 = "1sm540r4nfr8azw9bvsmjbqy709039sk0z7rv3d5mh3d6f363my1"; - name = "kde-dev-utils-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-dev-utils-16.08.3.tar.xz"; + sha256 = "1zzph1la4hgjqaryhm4dggsyv4gxwd0zgg5sw23v9qvp0z0hhzqf"; + name = "kde-dev-utils-16.08.3.tar.xz"; }; }; kdeedu-data = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdeedu-data-16.08.2.tar.xz"; - sha256 = "1m8831nr9f97fz9vxca4bcwwvv5nicd4y74sgp6xm3v41xqwda6b"; - name = "kdeedu-data-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdeedu-data-16.08.3.tar.xz"; + sha256 = "1c7svm52j05xxha4kb5zi81z5rgbj08cahpqwr8g7dszp5m8xals"; + name = "kdeedu-data-16.08.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdegraphics-mobipocket-16.08.2.tar.xz"; - sha256 = "0y19q7r4pbfkqf0mb80h9rqzc13q9csllb9b8ca536bcjh41r6yy"; - name = "kdegraphics-mobipocket-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdegraphics-mobipocket-16.08.3.tar.xz"; + sha256 = "0rbinw4r0bcxmkai2hb2p8zys654jybwgxigj4337s991l5zlrvd"; + name = "kdegraphics-mobipocket-16.08.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdegraphics-thumbnailers-16.08.2.tar.xz"; - sha256 = "155nfj6apbvrs2p69yj0ic0ybp59air0a3wdwz5sw84y47dslnaz"; - name = "kdegraphics-thumbnailers-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdegraphics-thumbnailers-16.08.3.tar.xz"; + sha256 = "1ygyhv20pyzfagkf25f6wshcvhyhamxxnrw075m11dg0hg3qlh9z"; + name = "kdegraphics-thumbnailers-16.08.3.tar.xz"; }; }; kde-l10n-ar = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ar-16.08.2.tar.xz"; - sha256 = "0aaxwb4sr2bq5cmcr0j7n7dbvih52d5gwbcx17ksip0fp7y0cgnr"; - name = "kde-l10n-ar-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ar-16.08.3.tar.xz"; + sha256 = "1ka2vq86g112gvfd4j2jl8dm8hvxjrn5cd2ddcagp3fg2rxm2si7"; + name = "kde-l10n-ar-16.08.3.tar.xz"; }; }; kde-l10n-ast = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ast-16.08.2.tar.xz"; - sha256 = "1s55wrb2ll4fh0f648yybg6mxgsvikanwplw88kk254gxailbvi4"; - name = "kde-l10n-ast-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ast-16.08.3.tar.xz"; + sha256 = "02h7laxf4fsanb4scqgfrw815sj3dhvz4n17cdj8nvg4x7pydkys"; + name = "kde-l10n-ast-16.08.3.tar.xz"; }; }; kde-l10n-bg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-bg-16.08.2.tar.xz"; - sha256 = "15slc3an490xcbkwhfkysrzx3xg0h1mrwzp4bxsrsvqcjw4nlrdy"; - name = "kde-l10n-bg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-bg-16.08.3.tar.xz"; + sha256 = "0crhf9i43l8p0ds9v3k8ghgxrjc4c8gxwrs7afm6lmqh3lb3miz2"; + name = "kde-l10n-bg-16.08.3.tar.xz"; }; }; kde-l10n-bs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-bs-16.08.2.tar.xz"; - sha256 = "1117i784lwi9ci1ryd46x01pjraw30lma0z4kcg987xpj6ww22ha"; - name = "kde-l10n-bs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-bs-16.08.3.tar.xz"; + sha256 = "1ny1pcdl0xbm40c2jlzgvlkcmy1p2l9p14n827zipbj67by8dlh0"; + name = "kde-l10n-bs-16.08.3.tar.xz"; }; }; kde-l10n-ca = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ca-16.08.2.tar.xz"; - sha256 = "07f6h2prkm7iq3bwvn5p9y32xzis3p21sgxpg1x6663w3603w2pa"; - name = "kde-l10n-ca-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ca-16.08.3.tar.xz"; + sha256 = "044l2z3n5vn4zbj7nby22f7pg5qcv16yzbgikck6jfdahn56c0d0"; + name = "kde-l10n-ca-16.08.3.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-16.08.2"; + version = "ca_valencia-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ca@valencia-16.08.2.tar.xz"; - sha256 = "05fw1dj1rfsi1j8mzvjvqwvdv7zkjcj4y0fb9wm9wzcqlsl742wv"; - name = "kde-l10n-ca_valencia-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ca@valencia-16.08.3.tar.xz"; + sha256 = "1agmp003bdkhc8jx5124cs8yw73ga6b12gppaqwxl8c9cgd09yai"; + name = "kde-l10n-ca_valencia-16.08.3.tar.xz"; }; }; kde-l10n-cs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-cs-16.08.2.tar.xz"; - sha256 = "1vfn41kayimddrcg2h6zrx3sc31vq2zlv6bkpg29h6yddir6xjgk"; - name = "kde-l10n-cs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-cs-16.08.3.tar.xz"; + sha256 = "0li4rnpns7wvxgrg9lxzimx7lxk2cl2w0zqk9g0c8zwqrrl64d23"; + name = "kde-l10n-cs-16.08.3.tar.xz"; }; }; kde-l10n-da = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-da-16.08.2.tar.xz"; - sha256 = "0k8cs5m9aypgjkrvwrff4qvaanppaizryc6wncqr9jj13hr2vz1q"; - name = "kde-l10n-da-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-da-16.08.3.tar.xz"; + sha256 = "14cpwl8p2n0bfj2hbbm9fv1i8r20xfrp16iy9kdym5x4k80c5lzc"; + name = "kde-l10n-da-16.08.3.tar.xz"; }; }; kde-l10n-de = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-de-16.08.2.tar.xz"; - sha256 = "01kfh8zlf7r3dlmi96nvl4gksxryd10aqrnddhwjxni29l2sqjil"; - name = "kde-l10n-de-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-de-16.08.3.tar.xz"; + sha256 = "09sq6sbli9gjfkwqmcqjscbakxbnn2czb4d3pyni3v0i7x4xgmgl"; + name = "kde-l10n-de-16.08.3.tar.xz"; }; }; kde-l10n-el = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-el-16.08.2.tar.xz"; - sha256 = "1b6q3xriy9bv5537v2salz4vi4yx4hlx73aga4ic4pas8n0fn155"; - name = "kde-l10n-el-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-el-16.08.3.tar.xz"; + sha256 = "11vv237skajqc50dpcz0abn7xcly8a161yp56fn6zn1zdlcw4p02"; + name = "kde-l10n-el-16.08.3.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-16.08.2"; + version = "en_GB-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-en_GB-16.08.2.tar.xz"; - sha256 = "12cf5cx7kmc0wg752xpaz4jr4m3vxaahhxd0cp41p3lrb3079g2c"; - name = "kde-l10n-en_GB-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-en_GB-16.08.3.tar.xz"; + sha256 = "10anibggfqdp90d9jsv2n8aqk4wrgdq1pjxz60784f9bm1lq9xbx"; + name = "kde-l10n-en_GB-16.08.3.tar.xz"; }; }; kde-l10n-eo = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-eo-16.08.2.tar.xz"; - sha256 = "07rwf3jcrs7r16hpyf4mz9fk41qi1nfm6x6qlf6xlpi7ynxgyyj0"; - name = "kde-l10n-eo-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-eo-16.08.3.tar.xz"; + sha256 = "15dhramx79rh6v7891fa878dikh74cx4knisrmg50ih5fgyr8rrm"; + name = "kde-l10n-eo-16.08.3.tar.xz"; }; }; kde-l10n-es = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-es-16.08.2.tar.xz"; - sha256 = "1m366lxafwxa390nyvxwslbk653m1g6nwv9hr4mmpcnf2xxqsq2b"; - name = "kde-l10n-es-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-es-16.08.3.tar.xz"; + sha256 = "0zshw10drqgsdcdlzci7ghpcmww69dr5nc8i9fakg9jj4pfblkv5"; + name = "kde-l10n-es-16.08.3.tar.xz"; }; }; kde-l10n-et = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-et-16.08.2.tar.xz"; - sha256 = "0n08x8102hlzl3xp3d306lxf47b7870wxvr95krnchbrnmb847jv"; - name = "kde-l10n-et-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-et-16.08.3.tar.xz"; + sha256 = "04g4wvpmxrcma6dhw6py8xbhpxs4rsls69y98ljigd7y518ss6qa"; + name = "kde-l10n-et-16.08.3.tar.xz"; }; }; kde-l10n-eu = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-eu-16.08.2.tar.xz"; - sha256 = "0kacy7cbjd4pgzr54x9y28lk28rdbilqamg5gv2lxz3l2rqbnkpf"; - name = "kde-l10n-eu-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-eu-16.08.3.tar.xz"; + sha256 = "1gvgmlvc2qphy16y5m9xl0v6530909jzlvxfglamdwcchcc5rhj6"; + name = "kde-l10n-eu-16.08.3.tar.xz"; }; }; kde-l10n-fa = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fa-16.08.2.tar.xz"; - sha256 = "1nznmql7i2dkziyam6czyd8j0spjg276l9nwqnznrzpjnpks1dl2"; - name = "kde-l10n-fa-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-fa-16.08.3.tar.xz"; + sha256 = "0ph0ssqjxi6g93kzg8p888s8258zdzpyaq712zcfhjcr7zx8ld32"; + name = "kde-l10n-fa-16.08.3.tar.xz"; }; }; kde-l10n-fi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fi-16.08.2.tar.xz"; - sha256 = "0rxf7hcjrhmv7zrrrc9bv65dxwiw0vywwn7j92jvsw5psbb9yf1x"; - name = "kde-l10n-fi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-fi-16.08.3.tar.xz"; + sha256 = "0b7psgnc5mv38cx4iynacpq5q8nbvfm4fn6q9lwfj6x5h57xzd59"; + name = "kde-l10n-fi-16.08.3.tar.xz"; }; }; kde-l10n-fr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fr-16.08.2.tar.xz"; - sha256 = "07b9a4vlnampg7i7nb4ykh1cp77pdf5k0h6aa0mjg1rjycpwflv3"; - name = "kde-l10n-fr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-fr-16.08.3.tar.xz"; + sha256 = "0q65wjjq4j1hg4bakbms2qamqqhqlchcbmy9fqc1aghbi3b871h8"; + name = "kde-l10n-fr-16.08.3.tar.xz"; }; }; kde-l10n-ga = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ga-16.08.2.tar.xz"; - sha256 = "08dgs9rz52mk4bl41h5k4p0cpqjw381aw3h6xw8080lj9zh0nvbn"; - name = "kde-l10n-ga-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ga-16.08.3.tar.xz"; + sha256 = "0drq7jxgdr01z75ybbalaxmr0r860f82i5ny1limnsqvmfh92p6b"; + name = "kde-l10n-ga-16.08.3.tar.xz"; }; }; kde-l10n-gl = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-gl-16.08.2.tar.xz"; - sha256 = "0986i04gfa6yw3ljmlx857src7lda8cwqdkk68cbxfi371ly0spl"; - name = "kde-l10n-gl-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-gl-16.08.3.tar.xz"; + sha256 = "0y6vj77nkinii1bfw975lyhbjzvmd7r23pn29cz3l0p3bfd3yzkd"; + name = "kde-l10n-gl-16.08.3.tar.xz"; }; }; kde-l10n-he = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-he-16.08.2.tar.xz"; - sha256 = "0xbbf3jpsmyq8k3d2qq3y75jq9wmf6iy46s52qbmr0pbdg288h3c"; - name = "kde-l10n-he-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-he-16.08.3.tar.xz"; + sha256 = "1q6q5rqvww1f29qfr3prd7fkxzvx7inf5wnzmla9kdnax7p9z3rs"; + name = "kde-l10n-he-16.08.3.tar.xz"; }; }; kde-l10n-hi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hi-16.08.2.tar.xz"; - sha256 = "1cfmn3qafmps51mld735synlsf8h1nfb84ji9qv64qpw2gjvpp9n"; - name = "kde-l10n-hi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-hi-16.08.3.tar.xz"; + sha256 = "1qnncfg7vfw4ikcm23j1l6cmycg2m168d76h1fnznx4bdyfybblq"; + name = "kde-l10n-hi-16.08.3.tar.xz"; }; }; kde-l10n-hr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hr-16.08.2.tar.xz"; - sha256 = "11kfxqjavmh9bcaivm5zd82r0b3d4rz8zmc2awc1433i6wgdxrkq"; - name = "kde-l10n-hr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-hr-16.08.3.tar.xz"; + sha256 = "1kzl6fycifrmb2lil9vifas0jcczsw0aqpr2r6fjlvbw7p2zc42n"; + name = "kde-l10n-hr-16.08.3.tar.xz"; }; }; kde-l10n-hu = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hu-16.08.2.tar.xz"; - sha256 = "0m714qii2z1bc8kv112bf9wpq078yaqgzd1m4h2apyj1rzl8sni8"; - name = "kde-l10n-hu-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-hu-16.08.3.tar.xz"; + sha256 = "0kj5ivz7xw0a79rcprjp4bra90s12421ppbipvgnllc2rcixgkki"; + name = "kde-l10n-hu-16.08.3.tar.xz"; }; }; kde-l10n-ia = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ia-16.08.2.tar.xz"; - sha256 = "1r10w7dpxmgby3igh57yli6hp1paxwh1m4vkzi5f91fgh2s8qjjg"; - name = "kde-l10n-ia-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ia-16.08.3.tar.xz"; + sha256 = "0cmv9jwbabaynx0wa1nhn9pgib60kg7b71ilcqhxnm5lqvws88pi"; + name = "kde-l10n-ia-16.08.3.tar.xz"; }; }; kde-l10n-id = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-id-16.08.2.tar.xz"; - sha256 = "1r26h3rlgh91f00qzmkzmd3sflsmvyxdcy92ljj1g64wh9cigh66"; - name = "kde-l10n-id-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-id-16.08.3.tar.xz"; + sha256 = "1zz3237l26fz7ca33l9dvq1b8kkdi4gdzqxqslkb10q36z2gsni1"; + name = "kde-l10n-id-16.08.3.tar.xz"; }; }; kde-l10n-is = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-is-16.08.2.tar.xz"; - sha256 = "0ldxw1sl7sr7v0783cby6qp5ig2x5dq2s8w7k3fh1qa88cp1nsld"; - name = "kde-l10n-is-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-is-16.08.3.tar.xz"; + sha256 = "1mcwg8v08dv524ahhkv3wmnmac9pf534i45za9y0wl1kkcgp8949"; + name = "kde-l10n-is-16.08.3.tar.xz"; }; }; kde-l10n-it = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-it-16.08.2.tar.xz"; - sha256 = "0knvilb2p9s1cr354bzwhxzmfi49g17v3clqdvlcyglghkz94aam"; - name = "kde-l10n-it-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-it-16.08.3.tar.xz"; + sha256 = "15k52l0mq7qclb4adwvcz4bngisbj476vlphqnjhnav9nj5cm84f"; + name = "kde-l10n-it-16.08.3.tar.xz"; }; }; kde-l10n-ja = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ja-16.08.2.tar.xz"; - sha256 = "0x3sfprw1pvjkivva05cg9nbzml2g4vzidvjq37vp7nkyfdxldcp"; - name = "kde-l10n-ja-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ja-16.08.3.tar.xz"; + sha256 = "0p6nd7hlv6yvxi5y808wzjbidk1gpa2fj50i66lxzq3xl7rajli3"; + name = "kde-l10n-ja-16.08.3.tar.xz"; }; }; kde-l10n-kk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-kk-16.08.2.tar.xz"; - sha256 = "1jmqahyhxz798yqlc25lyj3x6xa426czkydbikpngb3775wy918z"; - name = "kde-l10n-kk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-kk-16.08.3.tar.xz"; + sha256 = "0ffnlmq2qnmcqk9h4yvl0z00x2f5yyicg1qf1jlxk9fvhbg5xpmv"; + name = "kde-l10n-kk-16.08.3.tar.xz"; }; }; kde-l10n-km = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-km-16.08.2.tar.xz"; - sha256 = "00p7grks0cjca5r2xvmf4kxvpjqasbjcss938x9ss6wc0knq8laa"; - name = "kde-l10n-km-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-km-16.08.3.tar.xz"; + sha256 = "1ln9dc278sv9r99psy27m1qhbyaw6dzg3kwr11pbp517253ggj7j"; + name = "kde-l10n-km-16.08.3.tar.xz"; }; }; kde-l10n-ko = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ko-16.08.2.tar.xz"; - sha256 = "0w14n8vzvmwiliqnakg4s76cka1qp0j0azc632aaiy6d17g0yw2k"; - name = "kde-l10n-ko-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ko-16.08.3.tar.xz"; + sha256 = "07lbblm4aqj7jp25clz7sil9ficrbvwpd9pvpfrz530q8y74hsjf"; + name = "kde-l10n-ko-16.08.3.tar.xz"; }; }; kde-l10n-lt = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-lt-16.08.2.tar.xz"; - sha256 = "1yj119r7p9bjk405ml5383y5jqrhaj9v4ksjiyhjs8l5zx0pjb3b"; - name = "kde-l10n-lt-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-lt-16.08.3.tar.xz"; + sha256 = "1cssd4z8dxlld61kakb6vnb5hksswl1dkr1bsxv5q622hjrp037c"; + name = "kde-l10n-lt-16.08.3.tar.xz"; }; }; kde-l10n-lv = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-lv-16.08.2.tar.xz"; - sha256 = "0g173n4nqiw7mk6phys4dlis6dfd9iw0kpv4hhvz4b54i67wamvw"; - name = "kde-l10n-lv-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-lv-16.08.3.tar.xz"; + sha256 = "0wnrcfgm5l3ifnywz67k186g5vh0648dhmymfcz6fmqf3ipfl4h4"; + name = "kde-l10n-lv-16.08.3.tar.xz"; }; }; kde-l10n-mr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-mr-16.08.2.tar.xz"; - sha256 = "1696gqib17f250p5y0vfjxcx8w4wx1lhi8nqy9bbjj6acmahishj"; - name = "kde-l10n-mr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-mr-16.08.3.tar.xz"; + sha256 = "0kkwpn12z1f8rs91yqh8x155nbrkwgj1z5fx4kcs1nc7xyvfpbff"; + name = "kde-l10n-mr-16.08.3.tar.xz"; }; }; kde-l10n-nb = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nb-16.08.2.tar.xz"; - sha256 = "0z2v14m329r8687qpvf0qxnbvpp48mvl1yri16203bya8q44764j"; - name = "kde-l10n-nb-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nb-16.08.3.tar.xz"; + sha256 = "0070dgr1apn345a8bwgbxiz2a0andmfx54vd5pv3hgj6n9jrmq07"; + name = "kde-l10n-nb-16.08.3.tar.xz"; }; }; kde-l10n-nds = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nds-16.08.2.tar.xz"; - sha256 = "0d7nzwll2hqlb3ca3zdwr9x4rnhvv3fgxammzac07gib1aq27lap"; - name = "kde-l10n-nds-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nds-16.08.3.tar.xz"; + sha256 = "103wfwl18fmz8h184c3qcwfyh784pfzsd2dgd000xs28pcc5kc22"; + name = "kde-l10n-nds-16.08.3.tar.xz"; }; }; kde-l10n-nl = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nl-16.08.2.tar.xz"; - sha256 = "0hq7gqg6nqb06kg8pgjf36w6lx6kv0z4v0lz4wac47v10jipcix4"; - name = "kde-l10n-nl-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nl-16.08.3.tar.xz"; + sha256 = "1zjnzcpivcs26qp5h153jd1qr98dnr1f8347cb9iz79q41zjn21z"; + name = "kde-l10n-nl-16.08.3.tar.xz"; }; }; kde-l10n-nn = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nn-16.08.2.tar.xz"; - sha256 = "02935kj4gw93lyjik6vqk40rnpblib0pq1dl0im2mavfym2nacjj"; - name = "kde-l10n-nn-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nn-16.08.3.tar.xz"; + sha256 = "1lm701iml2sfzp2dz5nlh6kflp3lfbcsdlipk9wwsqnjs3zr436y"; + name = "kde-l10n-nn-16.08.3.tar.xz"; }; }; kde-l10n-pa = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pa-16.08.2.tar.xz"; - sha256 = "08qq6lkr9jrsl12slqfhp83vkamr5nv9x7hr91g8xgg1s9i3aj3z"; - name = "kde-l10n-pa-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pa-16.08.3.tar.xz"; + sha256 = "0j6dyfg8vw1dj226ngxd4yb2qfnj4g7c36cfmmmlfr9d8ds8xw0p"; + name = "kde-l10n-pa-16.08.3.tar.xz"; }; }; kde-l10n-pl = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pl-16.08.2.tar.xz"; - sha256 = "0ylsc89nsmbjm4c5gbnh5qczmr7bal7037bm5nsmrh7aqkwg1s1x"; - name = "kde-l10n-pl-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pl-16.08.3.tar.xz"; + sha256 = "0nr7vxw4d0z8g51zls46r3kbm0dfbry09cpmahdpk6zlgcvlg5zz"; + name = "kde-l10n-pl-16.08.3.tar.xz"; }; }; kde-l10n-pt = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pt-16.08.2.tar.xz"; - sha256 = "0cbaf2vnr56qa0qfhr4cgdmbq3hbck9wfcx5a7bvvaglck95f4gq"; - name = "kde-l10n-pt-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pt-16.08.3.tar.xz"; + sha256 = "0il1gwr9jl8z2lp9j7zb18x7kbzcv6p37kbww5l6xr3gc744fiaf"; + name = "kde-l10n-pt-16.08.3.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-16.08.2"; + version = "pt_BR-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pt_BR-16.08.2.tar.xz"; - sha256 = "048ssv4bhx8bn2q8nsh5n0m1nl64qadndwrh3hx3avd7jjnj7l4s"; - name = "kde-l10n-pt_BR-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pt_BR-16.08.3.tar.xz"; + sha256 = "0b5m5p19n6a9mclvhh5p2s6k0vjwspnal223ddc0xk34060f4ch7"; + name = "kde-l10n-pt_BR-16.08.3.tar.xz"; }; }; kde-l10n-ro = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ro-16.08.2.tar.xz"; - sha256 = "05pi6v5hp3yki0hiy19gggz1mpk7ykjz6f94k6cv63vinvai6gpw"; - name = "kde-l10n-ro-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ro-16.08.3.tar.xz"; + sha256 = "08nanwr2s37215kkik8issn9va65dxlam55lfabybvybw6b0s7x5"; + name = "kde-l10n-ro-16.08.3.tar.xz"; }; }; kde-l10n-ru = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ru-16.08.2.tar.xz"; - sha256 = "18kk3iyn1dyir43dxlrs0jcdin001h0qfzm9cszxlz52yx5vn4ba"; - name = "kde-l10n-ru-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ru-16.08.3.tar.xz"; + sha256 = "1xbssbm3za3y0fh02j62s94vkz1nfdl37g458h1qagyawm04vwdq"; + name = "kde-l10n-ru-16.08.3.tar.xz"; }; }; kde-l10n-sk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sk-16.08.2.tar.xz"; - sha256 = "0gxia3j689a315jww9cfw802vhz226zd3ci6i45ffrj5sdpm0bcs"; - name = "kde-l10n-sk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sk-16.08.3.tar.xz"; + sha256 = "0ixqh1xj3nqwq7nsxhk4c7d5w8n77plld4ap4brd4r188pfswvdr"; + name = "kde-l10n-sk-16.08.3.tar.xz"; }; }; kde-l10n-sl = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sl-16.08.2.tar.xz"; - sha256 = "1d6gxc2jcnjzjrp6aw63l86wsqkdg4qw3zz5pc0j1qc5ihaak6pm"; - name = "kde-l10n-sl-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sl-16.08.3.tar.xz"; + sha256 = "0d4n5sp82jfap0cq167ybqsvyp06vla8y3clma25cyyksk9r355w"; + name = "kde-l10n-sl-16.08.3.tar.xz"; }; }; kde-l10n-sr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sr-16.08.2.tar.xz"; - sha256 = "0mixdfpvryg1ch917nxc469m7fzgy5dkbxadc55kzgy9k18vry30"; - name = "kde-l10n-sr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sr-16.08.3.tar.xz"; + sha256 = "1bb2dbkb80q2y7s9nka8x4q8cc6lqx7ddry83rp97sia1fckgn6g"; + name = "kde-l10n-sr-16.08.3.tar.xz"; }; }; kde-l10n-sv = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sv-16.08.2.tar.xz"; - sha256 = "10day8y3fqdf9rg24wmxa38snpkry08swcgzh2qxy2wlg7w1n2ld"; - name = "kde-l10n-sv-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sv-16.08.3.tar.xz"; + sha256 = "1n7dj3alqf59b4n9ckhk35pw5qvlkbw70bw48b2mzsh6rm9l6njs"; + name = "kde-l10n-sv-16.08.3.tar.xz"; }; }; kde-l10n-tr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-tr-16.08.2.tar.xz"; - sha256 = "19a5cribm12pi0y84vfwmigkyvn8d4ylvx07g9df4iapjf2kgs54"; - name = "kde-l10n-tr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-tr-16.08.3.tar.xz"; + sha256 = "0k1lwngg5v4wzc8imx33q68cdva4f61jqfibjrza4sf6la69vr6p"; + name = "kde-l10n-tr-16.08.3.tar.xz"; }; }; kde-l10n-ug = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ug-16.08.2.tar.xz"; - sha256 = "0p2ijv13wk02sm065nk328pdl2qn22sashwdzw5viy6hr67z8igv"; - name = "kde-l10n-ug-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ug-16.08.3.tar.xz"; + sha256 = "1xi90k2ghgz9fh3lb1l7pbnmz17bi5mvyvg7dwwm3ni7q4k696lf"; + name = "kde-l10n-ug-16.08.3.tar.xz"; }; }; kde-l10n-uk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-uk-16.08.2.tar.xz"; - sha256 = "0m03z8yac3mbsp78zskyiw316im7fr2197lmjl6prfz8hdvblyqm"; - name = "kde-l10n-uk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-uk-16.08.3.tar.xz"; + sha256 = "114snhzp2v6fp7glvwbjd97byzfisp94zr2ia5np5xcpfkpww9g7"; + name = "kde-l10n-uk-16.08.3.tar.xz"; }; }; kde-l10n-wa = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-wa-16.08.2.tar.xz"; - sha256 = "08zv0pl9gm7xpykzvb7cf4gx0r78jrfx33281iam3496bgl9iz63"; - name = "kde-l10n-wa-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-wa-16.08.3.tar.xz"; + sha256 = "1qimv935j50sb7n7x4ga10x4zkasn9yddh1drs0k5i7r02sq8nzv"; + name = "kde-l10n-wa-16.08.3.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-16.08.2"; + version = "zh_CN-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-zh_CN-16.08.2.tar.xz"; - sha256 = "1fzkykipaqlabzmddzk694h26cw15r8vwn3f6033pbgpd47rxmh7"; - name = "kde-l10n-zh_CN-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-zh_CN-16.08.3.tar.xz"; + sha256 = "024y7lvjkx8djwd9qmjkj3q9ri3fbnlsxcyjr5jy5yi10ccwf9v6"; + name = "kde-l10n-zh_CN-16.08.3.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-16.08.2"; + version = "zh_TW-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-zh_TW-16.08.2.tar.xz"; - sha256 = "0i02bbpkn802wzavyj3ilmp889v6frkbb1zp8q9wsrvdwv71zmrj"; - name = "kde-l10n-zh_TW-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-zh_TW-16.08.3.tar.xz"; + sha256 = "1m5npa3jrsc0kn3mqkp3pagix95ialpk4fikbiq44laxn7xph5yi"; + name = "kde-l10n-zh_TW-16.08.3.tar.xz"; }; }; kdelibs = { - version = "4.14.25"; + version = "4.14.26"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdelibs-4.14.25.tar.xz"; - sha256 = "00idq3iqd72gjyqj79ci8992jlww877m3znjvvlnh8s97y4kwpds"; - name = "kdelibs-4.14.25.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdelibs-4.14.26.tar.xz"; + sha256 = "043asa5i30s3j1knpshhxw1a5a1alh1b5b719gdzpm1hxgn3f79r"; + name = "kdelibs-4.14.26.tar.xz"; }; }; kdenetwork-filesharing = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdenetwork-filesharing-16.08.2.tar.xz"; - sha256 = "0k9c1mjdr754qgzhfmx0qrh7lf1hlp698wq6mynw31b45ngx26n9"; - name = "kdenetwork-filesharing-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdenetwork-filesharing-16.08.3.tar.xz"; + sha256 = "0zfswqxh0ng5w44hzfpsjhmnv7nf1jc3qfmfvmmlb0h1ynfdbqmy"; + name = "kdenetwork-filesharing-16.08.3.tar.xz"; }; }; kdenlive = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdenlive-16.08.2.tar.xz"; - sha256 = "1lw0dayp2hryqpfw2090fzj7yqxi1y8bmpzadljqkl1glb6sd16l"; - name = "kdenlive-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdenlive-16.08.3.tar.xz"; + sha256 = "0s5bdb5xxjaqb7zmvm119mc7zacagglv21dd4v6sahg0mf1qvfin"; + name = "kdenlive-16.08.3.tar.xz"; }; }; kdepim = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdepim-16.08.2.tar.xz"; - sha256 = "15w9yyyld84hp0mzlw0iv9bl3f4dk560l6mynrq5ccya90lfrnc2"; - name = "kdepim-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz"; + sha256 = "1l0rvi33i9hzr9c3nqzbr3cnz046ccf7s3v54mdmxfdk5x0ynkms"; + name = "kdepim-16.08.3.tar.xz"; }; }; kdepim-addons = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdepim-addons-16.08.2.tar.xz"; - sha256 = "06plflqj1p3jhn8c2jm2vm55yhiwa7wsvndh86q39ajw5qw60mhx"; - name = "kdepim-addons-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdepim-addons-16.08.3.tar.xz"; + sha256 = "0ddhya9f6hbdakdna4hnbwiwvc1ar95jgxhr36hf6s37bxh7755l"; + name = "kdepim-addons-16.08.3.tar.xz"; }; }; kdepim-apps-libs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdepim-apps-libs-16.08.2.tar.xz"; - sha256 = "1vygdkh43b0aajxywy6sa01khx8zvsv1n3aainqcbn8jndxlkb82"; - name = "kdepim-apps-libs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdepim-apps-libs-16.08.3.tar.xz"; + sha256 = "1ygdmv30pzrgv3f222nv52mvc83ags9dvwl2ma4l8frb13xb1r15"; + name = "kdepim-apps-libs-16.08.3.tar.xz"; }; }; kdepim-runtime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdepim-runtime-16.08.2.tar.xz"; - sha256 = "0dg3ww5l6mq7xi4z1j7b4w2d7i425wbz1gwml0a9ajy3v0k14vqb"; - name = "kdepim-runtime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdepim-runtime-16.08.3.tar.xz"; + sha256 = "1q7d2c1rjli5dl162zibzhmg2q4hxxlqjp7r78amq90vhv975kc6"; + name = "kdepim-runtime-16.08.3.tar.xz"; }; }; kde-runtime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-runtime-16.08.2.tar.xz"; - sha256 = "1q0m4nywap0qmg9fj9z2d8b7j9bvykniqq9jga3jmys5g2cjn205"; - name = "kde-runtime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-runtime-16.08.3.tar.xz"; + sha256 = "1g5ni75byraf9268p0n74i81zb46agp9ac243m8jfzh8vdm2q5kk"; + name = "kde-runtime-16.08.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdesdk-kioslaves-16.08.2.tar.xz"; - sha256 = "11png8q0ci86if2g49nrmx63l8pxcmp789k9kkamnzsx79y6arq2"; - name = "kdesdk-kioslaves-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdesdk-kioslaves-16.08.3.tar.xz"; + sha256 = "12q015nm9qfcscsvqrkibj1cfh651890k982sbqqdn0dm5932lnj"; + name = "kdesdk-kioslaves-16.08.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdesdk-thumbnailers-16.08.2.tar.xz"; - sha256 = "1dmmm6l5yy64l6hqqjx4d5cycgx1wzjv81ll9jizgg8c5cknhi8l"; - name = "kdesdk-thumbnailers-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdesdk-thumbnailers-16.08.3.tar.xz"; + sha256 = "1dy4566pdx890n60sn5v7hms2prjh674pm6gbxg1il4i4qcpfv4z"; + name = "kdesdk-thumbnailers-16.08.3.tar.xz"; }; }; kdewebdev = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdewebdev-16.08.2.tar.xz"; - sha256 = "0dm013da1i2z0n6svmm0yqzgn3j608ldc2w80dvgkvykh85z5ccy"; - name = "kdewebdev-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdewebdev-16.08.3.tar.xz"; + sha256 = "0r9qsm3idfhm7aglik7whzcwjjn572gwmlcgxy2cvpn15nqa344l"; + name = "kdewebdev-16.08.3.tar.xz"; }; }; kdf = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdf-16.08.2.tar.xz"; - sha256 = "0lvzyxn434rqknqmzwi6ih60gvkd24i2ms0ziypkh5ihs9scbmg7"; - name = "kdf-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdf-16.08.3.tar.xz"; + sha256 = "1fkjmdwp5pnlvz2mac4zq93wnb6jj4ymj4448qbhxypncrh6sym3"; + name = "kdf-16.08.3.tar.xz"; }; }; kdgantt2 = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdgantt2-16.08.2.tar.xz"; - sha256 = "1hhfrcjv6yx69ahnhc641h6sh9fp9m69jkb85aav2pydnps1p4bp"; - name = "kdgantt2-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdgantt2-16.08.3.tar.xz"; + sha256 = "01p3cqqhghvx42mrmxkrsm7cp23972gi86sagjw070scw71fpv0c"; + name = "kdgantt2-16.08.3.tar.xz"; }; }; kdiamond = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdiamond-16.08.2.tar.xz"; - sha256 = "0kaqxxm30kxvkbzgzj69zzsql903qbkczlkmxfb9x2zp2484f7jq"; - name = "kdiamond-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdiamond-16.08.3.tar.xz"; + sha256 = "035m2911zbkvhydihaqbgwl7vs8z03hcsq8ph7wvnsdvd1f895ib"; + name = "kdiamond-16.08.3.tar.xz"; }; }; kfloppy = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kfloppy-16.08.2.tar.xz"; - sha256 = "0jkbamqbdggf72k1xszaan890nhqz4qwhd8d0mbgm2nhzbs9q1cb"; - name = "kfloppy-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kfloppy-16.08.3.tar.xz"; + sha256 = "14y9a8nq2cdaj5r6xdqwfm6fa8w3wbx80hrps2bkxyx696hc1lkl"; + name = "kfloppy-16.08.3.tar.xz"; }; }; kfourinline = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kfourinline-16.08.2.tar.xz"; - sha256 = "0cb2kap8bp35ijnhghp9df4kai7vizayzcax0p3wamv0zy4zfx4b"; - name = "kfourinline-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kfourinline-16.08.3.tar.xz"; + sha256 = "04wpswi9c7c79g4sz6cr7jrdmdfwwqr2p8kd0zs2snygcr4h3fcq"; + name = "kfourinline-16.08.3.tar.xz"; }; }; kgeography = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kgeography-16.08.2.tar.xz"; - sha256 = "0s88gzyy0ldz10vlklnvwi7aip0vn5gnawikqn80xfw3vwb5zyki"; - name = "kgeography-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kgeography-16.08.3.tar.xz"; + sha256 = "09hsihvvdzbr1dz8zlwy7nyjk87pl7f714k3k3b0b0wpx9swxkq0"; + name = "kgeography-16.08.3.tar.xz"; }; }; kget = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kget-16.08.2.tar.xz"; - sha256 = "1pna3rw76n1lg9l805ccisxirrmxw23n2az5nd95wsck77lgxnr6"; - name = "kget-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kget-16.08.3.tar.xz"; + sha256 = "1709if0yqp0axy88v56zrchirkcjgl8q38qf0zbfng0bbbszik61"; + name = "kget-16.08.3.tar.xz"; }; }; kgoldrunner = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kgoldrunner-16.08.2.tar.xz"; - sha256 = "0r14mspzyigj4md7zzjq06sswb1y4m4232kfkwg4p7yp8xpsr56c"; - name = "kgoldrunner-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kgoldrunner-16.08.3.tar.xz"; + sha256 = "03g3j1zrq3513jijnl3ih61xkpxl4mqy6mjmilq5cs745bmzkad4"; + name = "kgoldrunner-16.08.3.tar.xz"; }; }; kgpg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kgpg-16.08.2.tar.xz"; - sha256 = "0bx4d4i4n8v58yyqcb7pz70cpikymmjz9nd69mly9g8hj8jwqnll"; - name = "kgpg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kgpg-16.08.3.tar.xz"; + sha256 = "17kr13lvicv4lrl4ls4l66xh35xz60nrszwagb0qk34wcgzc090p"; + name = "kgpg-16.08.3.tar.xz"; }; }; khangman = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/khangman-16.08.2.tar.xz"; - sha256 = "172ciifrcydyhmawzxx3k1aq564ywjlj5wqfbjgxaf7pj3pbxndk"; - name = "khangman-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/khangman-16.08.3.tar.xz"; + sha256 = "1ipkp003pp6z783qb7fzhky3kn4ccmlqijxysk7ccbsr9myfvdyk"; + name = "khangman-16.08.3.tar.xz"; }; }; khelpcenter = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/khelpcenter-16.08.2.tar.xz"; - sha256 = "1iiz4w4zzf28g336hypmhf50lndwl6rj3y46wbj1mzpc99wrrxhr"; - name = "khelpcenter-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/khelpcenter-16.08.3.tar.xz"; + sha256 = "13vzqjaqqzi46c9gmijhbq1i3fmk3pbkkg26mn3745m2xc6j2cvi"; + name = "khelpcenter-16.08.3.tar.xz"; }; }; kholidays = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kholidays-16.08.2.tar.xz"; - sha256 = "12fawyvy5nyiyr4zfbkwi5p0m5kgbcs4ly4f7bdq7qy7qbw6k8b6"; - name = "kholidays-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kholidays-16.08.3.tar.xz"; + sha256 = "0hxb2c526vw8rvfp14snvwihsqvr1l30vnzhxznl3dhm44lmvdn9"; + name = "kholidays-16.08.3.tar.xz"; }; }; kidentitymanagement = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kidentitymanagement-16.08.2.tar.xz"; - sha256 = "00q21hfyfyhkh7ip14q0a8rgngigm17hs5gp8r6gymvcysp3glny"; - name = "kidentitymanagement-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kidentitymanagement-16.08.3.tar.xz"; + sha256 = "0vv1y0mwxlb4g5a01jgi1nizw530w0fhy0kab6syxzgmnibj6vsf"; + name = "kidentitymanagement-16.08.3.tar.xz"; }; }; kig = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kig-16.08.2.tar.xz"; - sha256 = "14p9cl7mbb04lz5l2ajbfxlqli065v09bc22nyjcsin45rxvdvmn"; - name = "kig-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kig-16.08.3.tar.xz"; + sha256 = "1ln2i322ara79f90rwrcv5xfa0cnkksyhj25h2xn9x7d5ig4by96"; + name = "kig-16.08.3.tar.xz"; }; }; kigo = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kigo-16.08.2.tar.xz"; - sha256 = "13lkzhb00bmynkwrshvwl8r270zsxp6bj5ca75xy3g4vmp04gy0i"; - name = "kigo-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kigo-16.08.3.tar.xz"; + sha256 = "0vz7329i8pfax9nxb7xc0yws4f3mn4ms93358wvhyblbma4zaf4l"; + name = "kigo-16.08.3.tar.xz"; }; }; killbots = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/killbots-16.08.2.tar.xz"; - sha256 = "1vrzj91ff78g6w34vb68ljp2dpckc80545n9bhk8x1pr1s3jl3ks"; - name = "killbots-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/killbots-16.08.3.tar.xz"; + sha256 = "08f9gvvy3sx7ibikgxzjawfzzznfig8dfmgmfczj56fys7rvh2y5"; + name = "killbots-16.08.3.tar.xz"; }; }; kimap = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kimap-16.08.2.tar.xz"; - sha256 = "1j0bsbzp669mxizr3vaxfg3wjavg7zx3xfrjrmwabl0h04hmkn0g"; - name = "kimap-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kimap-16.08.3.tar.xz"; + sha256 = "03nl3q8cv92jpdgdg8pfhwzwlkqpcpz13p6p4q47vvmgglp63qnw"; + name = "kimap-16.08.3.tar.xz"; }; }; kio-extras = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kio-extras-16.08.2.tar.xz"; - sha256 = "1j5bmnq77yg5wpha0xl2cm4n2m0frw5dvr24i4ypvvqnpb1gim7q"; - name = "kio-extras-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kio-extras-16.08.3.tar.xz"; + sha256 = "1rd5ks73vqf6x4rs0qjsy0ipl6lgxgwqbwmcxar5m50b5jksl4xk"; + name = "kio-extras-16.08.3.tar.xz"; }; }; kiriki = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kiriki-16.08.2.tar.xz"; - sha256 = "03vanq33hd7hlspckfydbbiavzv7g7maswca4zzd9sinybx45r7a"; - name = "kiriki-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kiriki-16.08.3.tar.xz"; + sha256 = "0n37mmkq1jmdh3jlrjzmb88cnbnwzcjbp2dy6mz4f5iliv9ws54v"; + name = "kiriki-16.08.3.tar.xz"; }; }; kiten = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kiten-16.08.2.tar.xz"; - sha256 = "0kj1abs4f1ff0spkzwn5xxabcfb0xny7dlsa7lb0fbyvyczq3jgd"; - name = "kiten-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kiten-16.08.3.tar.xz"; + sha256 = "0qds7c62jsgf5lyx2sjhw5xxxq7qh35ccpvpc7l004g4blwb7mna"; + name = "kiten-16.08.3.tar.xz"; }; }; kjumpingcube = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kjumpingcube-16.08.2.tar.xz"; - sha256 = "1rnmwz729jain4pv0wpb8x95k6cx0bvb2wk46sjm2p80202clb0r"; - name = "kjumpingcube-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kjumpingcube-16.08.3.tar.xz"; + sha256 = "1lv6irlvfpbpbhk3vazv07frwz3y7084y3hirdjb2xih8gbsljrm"; + name = "kjumpingcube-16.08.3.tar.xz"; }; }; kldap = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kldap-16.08.2.tar.xz"; - sha256 = "18myysm48c8b6lpgl76x70na0k6qw47zrmmax2yfhbi4fsi13sg4"; - name = "kldap-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kldap-16.08.3.tar.xz"; + sha256 = "1h4czdxw0p4lakx0j0pf2v13ny5lnc56jhhjjb9ddm44b50fg4vg"; + name = "kldap-16.08.3.tar.xz"; }; }; kleopatra = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kleopatra-16.08.2.tar.xz"; - sha256 = "0pi2j6yrdw5nhm7kb3k5gg1qgs2dyijqv6r07xx3r260v98jz9jb"; - name = "kleopatra-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kleopatra-16.08.3.tar.xz"; + sha256 = "0ncr4sc6qs50n1w85gf350iq9l28665is53jzbm288151zanp4dd"; + name = "kleopatra-16.08.3.tar.xz"; }; }; klettres = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/klettres-16.08.2.tar.xz"; - sha256 = "07jqr3n67g0rgcdnxh4bmak6335w86irdla791bpkdl1swxwmvqi"; - name = "klettres-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/klettres-16.08.3.tar.xz"; + sha256 = "14m1k0y1lbkqrpwnjx8020d23fmpgq0jg97hr4q8fzs4h71lpyr7"; + name = "klettres-16.08.3.tar.xz"; }; }; klickety = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/klickety-16.08.2.tar.xz"; - sha256 = "08nk4ihr8np36kzs4g94psh9xd5d8rpbhjd047pmw5226yv0lcr5"; - name = "klickety-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/klickety-16.08.3.tar.xz"; + sha256 = "0izkwi0h2mc204wsmyg5hspnnc3xa8ypdzbw1rwgsd8nxv3sphbv"; + name = "klickety-16.08.3.tar.xz"; }; }; klines = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/klines-16.08.2.tar.xz"; - sha256 = "18w4mc781ysjhr9krvvwac2c0hz7hqzks957i35d0jvs5675l1ds"; - name = "klines-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/klines-16.08.3.tar.xz"; + sha256 = "0p1pbljqp01g9ssih5aplsi97aszc68smkpilbazxfvwc4q3x1ag"; + name = "klines-16.08.3.tar.xz"; }; }; kmag = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmag-16.08.2.tar.xz"; - sha256 = "0x5x2gs5cs3vhr0ss14iy4pd5rxx1ry67ic52nnj7baa3b4kqssq"; - name = "kmag-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmag-16.08.3.tar.xz"; + sha256 = "0ph7zf1awj47wzvp5dq80rvx0himrk6s8qhmnjvgpm0nqyfv7xh0"; + name = "kmag-16.08.3.tar.xz"; }; }; kmahjongg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmahjongg-16.08.2.tar.xz"; - sha256 = "03yj71cz4ca847niw26vrssd56pjjgc04fmzv7vxlx25jb73cn13"; - name = "kmahjongg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmahjongg-16.08.3.tar.xz"; + sha256 = "0fxkbq1p174lppklvi5lzmgi3g7411nhi33fsmdmwyxbngrm4yih"; + name = "kmahjongg-16.08.3.tar.xz"; }; }; kmailtransport = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmailtransport-16.08.2.tar.xz"; - sha256 = "0dggvmhp0w085pq0fwf83zzv3rhckmcnzzjznsn7fzw2lxj6ns90"; - name = "kmailtransport-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmailtransport-16.08.3.tar.xz"; + sha256 = "08xi04xr7mjg8m2bnp42ymvn9ynv4q8y3dnql1v4225pjzmp6bkg"; + name = "kmailtransport-16.08.3.tar.xz"; }; }; kmbox = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmbox-16.08.2.tar.xz"; - sha256 = "1jny5qcadw1ssfcfwbhfwwn0v5n6rd1v0rj92n7vj814ni41yk62"; - name = "kmbox-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmbox-16.08.3.tar.xz"; + sha256 = "0iaqq4mrfj4qqaj76i7crjriyjsk3h6rf3cisygvkkfyyb69nz17"; + name = "kmbox-16.08.3.tar.xz"; }; }; kmime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmime-16.08.2.tar.xz"; - sha256 = "06rg1w5k53dvrhr2pcclhdlpf9784c4s7d3zyklwlc7r93bk0mch"; - name = "kmime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmime-16.08.3.tar.xz"; + sha256 = "0j9nfsmfl1sw9hz3al9smxri1hr58ygmyxawlr91iyglzswxaakb"; + name = "kmime-16.08.3.tar.xz"; }; }; kmines = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmines-16.08.2.tar.xz"; - sha256 = "02dbsrspg5x2avgdc0hrl522qzkki3hzr9k8zrbcjdh3j2rli965"; - name = "kmines-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmines-16.08.3.tar.xz"; + sha256 = "0rnjdds4skxj9pxajfnybki4ikq99k5myaw80qk5dc08gnrmw4fz"; + name = "kmines-16.08.3.tar.xz"; }; }; kmix = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmix-16.08.2.tar.xz"; - sha256 = "0fgvzcvxvic72mckxj8hwwh0fs851c61p560rvp13lzwwjl1l290"; - name = "kmix-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmix-16.08.3.tar.xz"; + sha256 = "1p3gcll4ywwxwphygrwqrp1565va52q8nnccyxisd3h833lqfk3k"; + name = "kmix-16.08.3.tar.xz"; }; }; kmousetool = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmousetool-16.08.2.tar.xz"; - sha256 = "13fa5r3gzngbcma8xmgr5im5kwxqcpnb260z0jmx7la67rrd4igh"; - name = "kmousetool-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmousetool-16.08.3.tar.xz"; + sha256 = "1iihk8jcysz49q3a5nnn0s468yca1x7chwqpvqqr694fn3wizkfg"; + name = "kmousetool-16.08.3.tar.xz"; }; }; kmouth = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmouth-16.08.2.tar.xz"; - sha256 = "11xhzxh7rg0lzwq1wkr9a0dlsy70fy2d7nrmhi787xlgmcq1d1h8"; - name = "kmouth-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmouth-16.08.3.tar.xz"; + sha256 = "1km072jnp5cc3ib4ja0lxd29pspi9wyhbp8bgcph5m33kw2n3cbq"; + name = "kmouth-16.08.3.tar.xz"; }; }; kmplot = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmplot-16.08.2.tar.xz"; - sha256 = "1mflaypy1ncg22pchfm632ik3kj65c3g1h48zirb6a0njzma81bf"; - name = "kmplot-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmplot-16.08.3.tar.xz"; + sha256 = "0lv2jfg6klm3z9mpp298g1d7vxff5hdaj332pzblvp2m51sbhrdv"; + name = "kmplot-16.08.3.tar.xz"; }; }; knavalbattle = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/knavalbattle-16.08.2.tar.xz"; - sha256 = "1w85z4m5yfj51z4yn60w83yfm2fnx96b313j4ysqgwzn6qsvw269"; - name = "knavalbattle-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/knavalbattle-16.08.3.tar.xz"; + sha256 = "1kjndhwc4l4rspygaxdr8dj9s9rj8ayq1k0z7r8v5qz2355farc8"; + name = "knavalbattle-16.08.3.tar.xz"; }; }; knetwalk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/knetwalk-16.08.2.tar.xz"; - sha256 = "1nd2ddcf1m7nbxsmqiv8b9kxsifxyczy0qkdm02fl27hjz45jsa3"; - name = "knetwalk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/knetwalk-16.08.3.tar.xz"; + sha256 = "18l80ffcavy9q7sj396qj4xw1yghljl24762ygd9q0kmmanw4h8y"; + name = "knetwalk-16.08.3.tar.xz"; }; }; kolf = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kolf-16.08.2.tar.xz"; - sha256 = "1afbdms3fzbl62g76c40d2k96djf5srl4xkpa20rm0by1ksfjcbg"; - name = "kolf-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kolf-16.08.3.tar.xz"; + sha256 = "15gggr983pcz44q44m1yvkbyp5kwbmpyx3ijb2yxx1bvn4d5bp85"; + name = "kolf-16.08.3.tar.xz"; }; }; kollision = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kollision-16.08.2.tar.xz"; - sha256 = "18bi7diwzql96w41s7kmrvynrwg1h8ihifw2cb8ganjlp215r216"; - name = "kollision-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kollision-16.08.3.tar.xz"; + sha256 = "18kvvl87ykkrhjikq53rgj53ap73x2wld6b4aryd4jrwmj5wby39"; + name = "kollision-16.08.3.tar.xz"; }; }; kolourpaint = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kolourpaint-16.08.2.tar.xz"; - sha256 = "12rs8qgc30vma45ri7k3awigiqsk703lbl6k8dxbiir6nqdvz4n9"; - name = "kolourpaint-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kolourpaint-16.08.3.tar.xz"; + sha256 = "0igv18nrhwhylvm7nr4mfvyp2bpcgn6c3r8r61rrsl908qmv4byv"; + name = "kolourpaint-16.08.3.tar.xz"; }; }; kompare = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kompare-16.08.2.tar.xz"; - sha256 = "130019r4623wkmw44s62wnn01l96bc0b0d3l0m6nzgilxq8xj7xw"; - name = "kompare-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kompare-16.08.3.tar.xz"; + sha256 = "1ji33dhbak38w0b9dlrv1v4kh5lyp5pm2v77v0lka71l75cvc7g7"; + name = "kompare-16.08.3.tar.xz"; }; }; konquest = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/konquest-16.08.2.tar.xz"; - sha256 = "1m5pifwhzviz5hry0a26nvfh4j962mc7dnvl5n7yjwgnmk8m609m"; - name = "konquest-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/konquest-16.08.3.tar.xz"; + sha256 = "1b8fx5k6fncw82d6i8kc07qk2k4y4fwdvwlqn2pxdixp3fk1fj12"; + name = "konquest-16.08.3.tar.xz"; }; }; konsole = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/konsole-16.08.2.tar.xz"; - sha256 = "0kjf2yj5kz70pswrpkggz1zhwvm819r1qhg16i6xg43cpsfsim85"; - name = "konsole-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/konsole-16.08.3.tar.xz"; + sha256 = "09s8y3w2mrifpl9pfjrzf0q5fgfcdph0s8x85y7262mikwvqfx36"; + name = "konsole-16.08.3.tar.xz"; }; }; kontactinterface = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kontactinterface-16.08.2.tar.xz"; - sha256 = "1c8q9jywr8c3yag2vxlmkl5ri7wm7miyhgqkxavs9lyxbqqkcgnw"; - name = "kontactinterface-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kontactinterface-16.08.3.tar.xz"; + sha256 = "1kw04ixc6blmygi3wyyk8a3qnyd0a9d85r2jql3mzhz5gczik7b8"; + name = "kontactinterface-16.08.3.tar.xz"; }; }; kopete = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kopete-16.08.2.tar.xz"; - sha256 = "0jxrgb36snfgqbl4q1myala63pyrvaw1jvc9pf5bbkx8xpr5pk2c"; - name = "kopete-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kopete-16.08.3.tar.xz"; + sha256 = "0ia43yqmb802nqjlklgpyqy5pnkp9mlr7hhic0lmgvr0jyid43pz"; + name = "kopete-16.08.3.tar.xz"; }; }; kpat = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kpat-16.08.2.tar.xz"; - sha256 = "12mm57bpx92kbrk9f1xzvlg7knfhivgrqwa90lj6mgdsa39g27v2"; - name = "kpat-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kpat-16.08.3.tar.xz"; + sha256 = "1jb7a5ii8qvaqvivbd0hn2vxn9l9s83ahrx8idnlhqj1yriyhyqa"; + name = "kpat-16.08.3.tar.xz"; }; }; kpimtextedit = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kpimtextedit-16.08.2.tar.xz"; - sha256 = "1ybwx73zzyknlrg7yw8yb8dkr0wwk9632s3w7g64nskm5ps51vvv"; - name = "kpimtextedit-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kpimtextedit-16.08.3.tar.xz"; + sha256 = "0bkf43i7wdyign63gwz2215dr66zfpy43f8pszif5jqzlnc84kba"; + name = "kpimtextedit-16.08.3.tar.xz"; }; }; kppp = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kppp-16.08.2.tar.xz"; - sha256 = "0xp6qcdnl3dcivkx0mavzjw2shah1wl8vd5b15chnf1qn1pa00qv"; - name = "kppp-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kppp-16.08.3.tar.xz"; + sha256 = "04pszpig2dyvrprfkalxhfad3d9v5sl8sjb3r403wmvd701xbknh"; + name = "kppp-16.08.3.tar.xz"; }; }; kqtquickcharts = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kqtquickcharts-16.08.2.tar.xz"; - sha256 = "16qzqv3g7kckc5biphzzv7gmly2519mihd89118yksymp70cznh6"; - name = "kqtquickcharts-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kqtquickcharts-16.08.3.tar.xz"; + sha256 = "1kdd0n6a8v4paya9xw8si8c60k448mrgwz163qa3w54ylxmh2xqb"; + name = "kqtquickcharts-16.08.3.tar.xz"; }; }; krdc = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/krdc-16.08.2.tar.xz"; - sha256 = "1jxkv7fsml1iq87y9jm04dhp7qxqyv5dnvp1yg5225xnvq2lhrzn"; - name = "krdc-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/krdc-16.08.3.tar.xz"; + sha256 = "00kvijidg387wp1wv8brhdbhc3daa06n2k2vn0cfyh18s815mwbs"; + name = "krdc-16.08.3.tar.xz"; }; }; kremotecontrol = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kremotecontrol-16.08.2.tar.xz"; - sha256 = "1p5cvls132p585v5yxaw6b9fadmr1qzijh86z232amfb8iax23zg"; - name = "kremotecontrol-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kremotecontrol-16.08.3.tar.xz"; + sha256 = "0h2cjc10s876clsap93blmgbv75vxkjlpkns7n14420mz45j7aga"; + name = "kremotecontrol-16.08.3.tar.xz"; }; }; kreversi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kreversi-16.08.2.tar.xz"; - sha256 = "10nn66422vr5sav7yf5z1vq84v7kl94f4zv2w4ywrgbaknwkhyf7"; - name = "kreversi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kreversi-16.08.3.tar.xz"; + sha256 = "0dpk6jnn6sqqn8xagy3dsvf6c4irir0l8pfp3xjr3s6hx3jbgqn9"; + name = "kreversi-16.08.3.tar.xz"; }; }; krfb = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/krfb-16.08.2.tar.xz"; - sha256 = "0kz7x4mwby8v7d3wr9fpd362db9fmh0agym5rq4q8d68wvzgbyi9"; - name = "krfb-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/krfb-16.08.3.tar.xz"; + sha256 = "0kgm1wpxnjr79w2mqq6q5mg2ajzlim9c83030jdzqd5dr1y8gvdl"; + name = "krfb-16.08.3.tar.xz"; }; }; kross-interpreters = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kross-interpreters-16.08.2.tar.xz"; - sha256 = "13jc263vj0jsqvhlcag8an5ixs3dn2q35q1p29wyy1fpd80snhcj"; - name = "kross-interpreters-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kross-interpreters-16.08.3.tar.xz"; + sha256 = "1629b9ihg3g5d0p5a0f7igfsmwn45jlsy7gqbdmrwzlbynrbq0jv"; + name = "kross-interpreters-16.08.3.tar.xz"; }; }; kruler = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kruler-16.08.2.tar.xz"; - sha256 = "1cy7jx8nc9ajzpis13dvg7hpd1a76splc5yrqyhbmb7cga50098l"; - name = "kruler-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kruler-16.08.3.tar.xz"; + sha256 = "0awhsaysqsgnvmflrz4svd2vbnmhykb6cfn2331mphv4ycyi0zyf"; + name = "kruler-16.08.3.tar.xz"; }; }; ksaneplugin = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksaneplugin-16.08.2.tar.xz"; - sha256 = "1glvx52gzrprywmi8n3npjfm5ixx8ibx7126n6n284jwigcr580g"; - name = "ksaneplugin-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksaneplugin-16.08.3.tar.xz"; + sha256 = "0hg1xw45x6xk8q893hm72skhhm4p1v1afbvdxqasaggl6l8765xh"; + name = "ksaneplugin-16.08.3.tar.xz"; }; }; kscd = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kscd-16.08.2.tar.xz"; - sha256 = "0axjc68ag84pvdskbhwqyg40qmnil9n6m8x3z4k24cgajr83hmbq"; - name = "kscd-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kscd-16.08.3.tar.xz"; + sha256 = "1dyh79x5zgc20f18hysvmnfpg7f2wxjssracyihg2b8cyhzz2g70"; + name = "kscd-16.08.3.tar.xz"; }; }; kshisen = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kshisen-16.08.2.tar.xz"; - sha256 = "1605fmsrg2pyydg303kf49hncdjcdq8m2g2xam0c96bdn44kd7cp"; - name = "kshisen-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kshisen-16.08.3.tar.xz"; + sha256 = "0xmjk6pij18sf3mq8hp3fmcvhqdx6l44hvk6nmp6v4y7fxw3fry4"; + name = "kshisen-16.08.3.tar.xz"; }; }; ksirk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksirk-16.08.2.tar.xz"; - sha256 = "196fjfyrwspzcm2hlqr09a079sr8p4gp80c4xfj1dhmfavs3cmvx"; - name = "ksirk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksirk-16.08.3.tar.xz"; + sha256 = "0bwnlfa162n6a5kxzbbxwgxj7rgpi5zqaj0arqwlq075b1kyfniq"; + name = "ksirk-16.08.3.tar.xz"; }; }; ksnakeduel = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksnakeduel-16.08.2.tar.xz"; - sha256 = "0nw1fsd7q9ar0922v3gkpig8smvlw0va6jh9a4v8g4pfsk5avii5"; - name = "ksnakeduel-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksnakeduel-16.08.3.tar.xz"; + sha256 = "1g26ip287fnlv95vmk69ji76mr8lpnjrgj855rdi64p16wxwirjp"; + name = "ksnakeduel-16.08.3.tar.xz"; }; }; kspaceduel = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kspaceduel-16.08.2.tar.xz"; - sha256 = "1ww7cz89jkn28qpk0a3xpcv9ngh39wwzpiam64pjlnniycxw3zk8"; - name = "kspaceduel-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kspaceduel-16.08.3.tar.xz"; + sha256 = "0ycfw4mr25apr21ffxv0pdxbrda09k4him19hck3yjkkhgwzq7a0"; + name = "kspaceduel-16.08.3.tar.xz"; }; }; ksquares = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksquares-16.08.2.tar.xz"; - sha256 = "04j30ld2ly6gm1va0yw2vsfrvab5kla6dlxir31375b1w85gfhil"; - name = "ksquares-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksquares-16.08.3.tar.xz"; + sha256 = "1x7gj4bxq2aza2cis3br2y20nbljx4n988f70wark9ywz8hydg5z"; + name = "ksquares-16.08.3.tar.xz"; }; }; kstars = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kstars-16.08.2.tar.xz"; - sha256 = "117hk0wj649f2b158sad0jcqsrb1a8cw0blx3yz83fxw8z160j2x"; - name = "kstars-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kstars-16.08.3.tar.xz"; + sha256 = "1a86zqbwp9vwbf1xd7j5a90krcyn2gps38g57hi8dvblx8qlfv4m"; + name = "kstars-16.08.3.tar.xz"; }; }; ksudoku = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksudoku-16.08.2.tar.xz"; - sha256 = "0y3w626g3ah8r3yipxsqg71gh886higlmr8ai0sc8179gcmy84zd"; - name = "ksudoku-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksudoku-16.08.3.tar.xz"; + sha256 = "0fjlw7krvi3z1aaiivzkbl2hya2fv2gwfahckfbs05vs0br288iy"; + name = "ksudoku-16.08.3.tar.xz"; }; }; ksystemlog = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksystemlog-16.08.2.tar.xz"; - sha256 = "02l7bchc767jcdpyras24k57qddq7pk4h7jaa22ns134977rw8yb"; - name = "ksystemlog-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksystemlog-16.08.3.tar.xz"; + sha256 = "1c5xb9m4k5hwz5fv6hvigp12cykgcrkc95axaxhfvas0g9z226hq"; + name = "ksystemlog-16.08.3.tar.xz"; }; }; kteatime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kteatime-16.08.2.tar.xz"; - sha256 = "02knfjpb0p3bgdfwqjp3fqnqz4i6cqshhy14w71wviprybb40cxd"; - name = "kteatime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kteatime-16.08.3.tar.xz"; + sha256 = "0af9dvwihq3dj5zps8d9ahx6zvp9ifwhiswk6v0w887vyf5nym36"; + name = "kteatime-16.08.3.tar.xz"; }; }; ktimer = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktimer-16.08.2.tar.xz"; - sha256 = "197m6ywq2bs7kclwxsdv7w4mqfhs9ad3wgcbw6m3yvkyz03xl3p8"; - name = "ktimer-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktimer-16.08.3.tar.xz"; + sha256 = "0yyc6hykfz3smznskldn192zpjli3dfjkkqp3h5akwaag2fkzds9"; + name = "ktimer-16.08.3.tar.xz"; }; }; ktnef = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktnef-16.08.2.tar.xz"; - sha256 = "0mpavsp6p2ipxf90ararnvz7qvb51fy3w7rh5giv3j9wc37awi39"; - name = "ktnef-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktnef-16.08.3.tar.xz"; + sha256 = "0c1zzn18gxyd6wxvwxw36jbas1hccyfyk44nxpqjfs7g1wpzzg3q"; + name = "ktnef-16.08.3.tar.xz"; }; }; ktouch = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktouch-16.08.2.tar.xz"; - sha256 = "08zzibxcv8gh527j0qwnhjs4rsk01hrx5iqa9d4r2b508h6xcwm2"; - name = "ktouch-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktouch-16.08.3.tar.xz"; + sha256 = "0pjdj9idqizvnw3ld3kp27cx92s033kp9mv8wrf0f9rvzp4q8iny"; + name = "ktouch-16.08.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-accounts-kcm-16.08.2.tar.xz"; - sha256 = "1ql13gkc16a0xjs159pjkw810dph0f3c8lvjxlgzg5dnavjpkmsm"; - name = "ktp-accounts-kcm-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-accounts-kcm-16.08.3.tar.xz"; + sha256 = "0g3l2s3kmy4k7gkx5gvdcfvx9szr33cxj3g21qzyy0kga381gxzm"; + name = "ktp-accounts-kcm-16.08.3.tar.xz"; }; }; ktp-approver = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-approver-16.08.2.tar.xz"; - sha256 = "1n885817as1j9s8c6ppj02hcih4v7k778q88lbxwnps32la7m6n9"; - name = "ktp-approver-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-approver-16.08.3.tar.xz"; + sha256 = "1k4g6vidi0xxl3gijc502lzmrnk7aqvjc0gdzy0f21avbk8j7hq2"; + name = "ktp-approver-16.08.3.tar.xz"; }; }; ktp-auth-handler = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-auth-handler-16.08.2.tar.xz"; - sha256 = "1vfnj1id8jisxsalghr13blx8x19r376dc2v4w46jqxj1xaiwglx"; - name = "ktp-auth-handler-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-auth-handler-16.08.3.tar.xz"; + sha256 = "1hda8xgi60avy65x8pwh76xa4h2li2awrwjnndk45zca8ysr1rnw"; + name = "ktp-auth-handler-16.08.3.tar.xz"; }; }; ktp-call-ui = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-call-ui-16.08.2.tar.xz"; - sha256 = "0jk09x53cimcs24cj3ay9al0r91xjwqf5cjnj16ibbnqhxd8rym1"; - name = "ktp-call-ui-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-call-ui-16.08.3.tar.xz"; + sha256 = "1ywklfiqpq1826hhl00h45cslzbfqark4l7lb86lk9m0pibzj6sd"; + name = "ktp-call-ui-16.08.3.tar.xz"; }; }; ktp-common-internals = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-common-internals-16.08.2.tar.xz"; - sha256 = "1mw4cmrpk705dcka1v3fhvfz3q1r142yrik98jma8v4pjlm84n70"; - name = "ktp-common-internals-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-common-internals-16.08.3.tar.xz"; + sha256 = "07h6v78b70ri1g6a9axpldfq6h4r890nbr63nsd7fxp2gf2m4byp"; + name = "ktp-common-internals-16.08.3.tar.xz"; }; }; ktp-contact-list = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-contact-list-16.08.2.tar.xz"; - sha256 = "0rsljaimdqvrxfp8sq1bckzkx23xr5pq2q9mrgh0zy39abmdak25"; - name = "ktp-contact-list-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-contact-list-16.08.3.tar.xz"; + sha256 = "0xk822sr3aizlbh307vdxacalwil2ll4376wdc1dw1d8pdf1sbq2"; + name = "ktp-contact-list-16.08.3.tar.xz"; }; }; ktp-contact-runner = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-contact-runner-16.08.2.tar.xz"; - sha256 = "0b3rhrvgmkwcsk9jdr6j8kg80zrwdsza8297hrzfv76bpxn60dbn"; - name = "ktp-contact-runner-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-contact-runner-16.08.3.tar.xz"; + sha256 = "0pzf7d6v8kd6vwn4ir3b5k3l819cpb6w68q6n3p97gsmgwj1q9vg"; + name = "ktp-contact-runner-16.08.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-desktop-applets-16.08.2.tar.xz"; - sha256 = "0d8ypp531zhb6i8w703hr02cb863z0g8sbaadrrp3x4h2dff2kcv"; - name = "ktp-desktop-applets-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-desktop-applets-16.08.3.tar.xz"; + sha256 = "0pdr9zm4ryr176anir4v57b1qnjb3my3lp43bjs61ggrmi0164zn"; + name = "ktp-desktop-applets-16.08.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-filetransfer-handler-16.08.2.tar.xz"; - sha256 = "0vh6h9cbamscjm22rib1dx8crr6r4a1bq5p2rrq6bq56zp78gkfb"; - name = "ktp-filetransfer-handler-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-filetransfer-handler-16.08.3.tar.xz"; + sha256 = "1873gy2s250micc0d85g478ashzfqfs9z5qdz2fnmn7mdsmq0l7x"; + name = "ktp-filetransfer-handler-16.08.3.tar.xz"; }; }; ktp-kded-module = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-kded-module-16.08.2.tar.xz"; - sha256 = "1lh1pi7xi60dsyz5g608lsfhpr5p8vqsfdc2cmyaalkcixb7s4wg"; - name = "ktp-kded-module-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-kded-module-16.08.3.tar.xz"; + sha256 = "0ly7apbq7amzdpmhcpa1cy2v7r73pzqv02aa8w0hv8mg9akwr0rk"; + name = "ktp-kded-module-16.08.3.tar.xz"; }; }; ktp-send-file = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-send-file-16.08.2.tar.xz"; - sha256 = "0q6mnirx6k8xs6pkfwrrhgg1i75xrd9bsg2liyjrjgbgm1lwm0jz"; - name = "ktp-send-file-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-send-file-16.08.3.tar.xz"; + sha256 = "1ql78n63m39rr5hylkyqxh1f1w7w9sf9jkj484p5nmkni3k7i6h6"; + name = "ktp-send-file-16.08.3.tar.xz"; }; }; ktp-text-ui = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-text-ui-16.08.2.tar.xz"; - sha256 = "1wrxa65rx0vjd57qk4c7ak43vb9h8yv7r7618hnfycjr0mgr6gf5"; - name = "ktp-text-ui-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-text-ui-16.08.3.tar.xz"; + sha256 = "0p4pzcrmw2vwv1dna33ar5d3jm2lwmra9v46m2nm2wqy38q7k0b8"; + name = "ktp-text-ui-16.08.3.tar.xz"; }; }; ktuberling = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktuberling-16.08.2.tar.xz"; - sha256 = "0337fvw21h62y8zlib93fyk5wbwrgkakpyd78q5mcn5sazq7nb67"; - name = "ktuberling-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktuberling-16.08.3.tar.xz"; + sha256 = "11xdh4pzcy71b697agc9biwyx8h1ana1ayahqw36cckkcrs1c4mm"; + name = "ktuberling-16.08.3.tar.xz"; }; }; kturtle = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kturtle-16.08.2.tar.xz"; - sha256 = "1fljwnxr8vvy78mlwf58p48wv45g6k4w9xs6kzb0j3xayg389x36"; - name = "kturtle-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kturtle-16.08.3.tar.xz"; + sha256 = "0g0c28wdmx89cgl0bf60c4gvp31xih4anabbk2cjd7ikf7ifcv47"; + name = "kturtle-16.08.3.tar.xz"; }; }; kubrick = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kubrick-16.08.2.tar.xz"; - sha256 = "19avy6001n7kbxnbqbxxv62qwn015z8jjslys6s81if8bh9b81bl"; - name = "kubrick-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kubrick-16.08.3.tar.xz"; + sha256 = "127p0c023gcv3rhgraah7qg05mjqcwk519qzym1afj0rm9w40g13"; + name = "kubrick-16.08.3.tar.xz"; }; }; kuser = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kuser-16.08.2.tar.xz"; - sha256 = "0vlckiy3n0ghfzjkl22pk29qrl8y7hh6a9q4bfj7a8mwmkskr8qc"; - name = "kuser-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kuser-16.08.3.tar.xz"; + sha256 = "0yhwlcq24hyn00mfjc8qqr05gy3p2h8j1ls24jdka7h5l6kwvcpq"; + name = "kuser-16.08.3.tar.xz"; }; }; kwalletmanager = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kwalletmanager-16.08.2.tar.xz"; - sha256 = "0nmriayyhxhf43kladp6bpzrrmdfgf6lbyr1ibpqp33mqrxqgiqf"; - name = "kwalletmanager-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kwalletmanager-16.08.3.tar.xz"; + sha256 = "0rii58dqw9dcs809zc70cb2vwgp7g2154sq55r67v3v0hcq2paq8"; + name = "kwalletmanager-16.08.3.tar.xz"; }; }; kwordquiz = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kwordquiz-16.08.2.tar.xz"; - sha256 = "0xlhl3n1dl1y6d1kbbcw4p60hkyjlvavrslq1h7wwjp99pmqr333"; - name = "kwordquiz-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kwordquiz-16.08.3.tar.xz"; + sha256 = "13jqclk45niqi6m9wjj4hdl11ybzcs3k2hilcf2rzx88karfkvwf"; + name = "kwordquiz-16.08.3.tar.xz"; }; }; libgravatar = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libgravatar-16.08.2.tar.xz"; - sha256 = "0nssi286sra4rggvljwvqwx5r2h0h26wmafq764vj97qqw2r3ikw"; - name = "libgravatar-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libgravatar-16.08.3.tar.xz"; + sha256 = "047ipm4hsv2kmsi873rciqyfnszzz4p1f0i237zadx2bxr96fikw"; + name = "libgravatar-16.08.3.tar.xz"; }; }; libkcddb = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkcddb-16.08.2.tar.xz"; - sha256 = "0hvhl4266h1a05bvid1x7kfaxqa5fcnr4f243k5ksjp7sxcba1j2"; - name = "libkcddb-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkcddb-16.08.3.tar.xz"; + sha256 = "1jm0wzq1bknvfn1sqwwd95szjz6lpnyrxcnccmgscnl5rss1rsin"; + name = "libkcddb-16.08.3.tar.xz"; }; }; libkcompactdisc = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkcompactdisc-16.08.2.tar.xz"; - sha256 = "1vvhbqg7rzcfqadglvjrifnla6gi6aawh0ki36zshi48jhpg978w"; - name = "libkcompactdisc-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkcompactdisc-16.08.3.tar.xz"; + sha256 = "091jg5f8v4j8a5iam2ljycizvgncwn188lym9s757p6xap9j73f4"; + name = "libkcompactdisc-16.08.3.tar.xz"; }; }; libkdcraw = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkdcraw-16.08.2.tar.xz"; - sha256 = "179dv05qkn2h0szzqm6l09ln491q2jz6j0fwczakh7lvlrdb2zxa"; - name = "libkdcraw-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkdcraw-16.08.3.tar.xz"; + sha256 = "0svfi7cdasrx1xkmyhkzh5ynj29qn7ry3ryyylayjj1p9yrlqr2s"; + name = "libkdcraw-16.08.3.tar.xz"; }; }; libkdegames = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkdegames-16.08.2.tar.xz"; - sha256 = "1zzpdlyrhhzqis9f9q3b1b50ljcsmpccxq0bdqkjm3ahzw8rvdig"; - name = "libkdegames-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkdegames-16.08.3.tar.xz"; + sha256 = "0mbp69clwk6qcv79gxadjl8ka7kbhlgavp3wlpbknxldr74zrqml"; + name = "libkdegames-16.08.3.tar.xz"; }; }; libkdepim = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkdepim-16.08.2.tar.xz"; - sha256 = "1w7bkkcpyw4b14qz7jh9kw5z2q7qdk78lac3fh448xdhf1ci6svg"; - name = "libkdepim-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkdepim-16.08.3.tar.xz"; + sha256 = "1id6vhv6dlzyvw141kc2sawpjdqpdfq15dbnbj8hwr2g9jslyd6r"; + name = "libkdepim-16.08.3.tar.xz"; }; }; libkeduvocdocument = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkeduvocdocument-16.08.2.tar.xz"; - sha256 = "1f0vyblxyha6c09nkya7q4v0j24463qpxxkkghm2z1xb0fwc852x"; - name = "libkeduvocdocument-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkeduvocdocument-16.08.3.tar.xz"; + sha256 = "0y74gyyxxjysacr4klia7kwm7wphj82ygdxljidbmvp5bmxc8iw9"; + name = "libkeduvocdocument-16.08.3.tar.xz"; }; }; libkexiv2 = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkexiv2-16.08.2.tar.xz"; - sha256 = "00phw7qax09k2aapyx1rp5w7ifn73i7w83jpz3sr24njxbg49261"; - name = "libkexiv2-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkexiv2-16.08.3.tar.xz"; + sha256 = "0wlh2zxh4yzn5g1dl9ffkim5v8wi888mrfnfxw2y4yrzw65bk9yi"; + name = "libkexiv2-16.08.3.tar.xz"; }; }; libkface = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkface-16.08.2.tar.xz"; - sha256 = "10arzszgjx8zs0d2b0i74bf00bs0csikny4d9j5w5hiim4qhxza6"; - name = "libkface-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkface-16.08.3.tar.xz"; + sha256 = "0xln9pz4v4gihz8pg1ijmp6ifmr0b5bp5fn6mkii8cwz1x12qvg7"; + name = "libkface-16.08.3.tar.xz"; }; }; libkgeomap = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkgeomap-16.08.2.tar.xz"; - sha256 = "1h91bdld51snajrws9g4pr7n3nlwmpnpg95xhh91fykiqlw919ig"; - name = "libkgeomap-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkgeomap-16.08.3.tar.xz"; + sha256 = "0rqscfd6jb1pypr8mdlc5jfn5wn4z5x553gp4nkpq37dwsgzsxm4"; + name = "libkgeomap-16.08.3.tar.xz"; }; }; libkipi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkipi-16.08.2.tar.xz"; - sha256 = "13gkcjx3x6j5150pkbb5ijzasl4418rhlfxq70966zrsn9a7v6ad"; - name = "libkipi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkipi-16.08.3.tar.xz"; + sha256 = "09pfsb7498bwzz1nxrmmddi7wj8a516xknzza08ls7pd6zm1y096"; + name = "libkipi-16.08.3.tar.xz"; }; }; libkleo = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkleo-16.08.2.tar.xz"; - sha256 = "16k8qqhrchxc8hk4l6hi94nhn8pavqm0snh357bx293f5rxvk51g"; - name = "libkleo-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkleo-16.08.3.tar.xz"; + sha256 = "0jhhzvpgpn77qisxw0bv1zjcfwcrc7kwdffvqdnnc8hgjmvrb5c4"; + name = "libkleo-16.08.3.tar.xz"; }; }; libkmahjongg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkmahjongg-16.08.2.tar.xz"; - sha256 = "12lnqpdpzcpljsdhj7y624g4iigam2cym7yv1czir26nfflk61ij"; - name = "libkmahjongg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkmahjongg-16.08.3.tar.xz"; + sha256 = "0ymzxl37dscqn90dm90y7fxgqlrjqdx2djhqgc6nfk5g50rzlwry"; + name = "libkmahjongg-16.08.3.tar.xz"; }; }; libkomparediff2 = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkomparediff2-16.08.2.tar.xz"; - sha256 = "0d08mgswjck9lfagf0wh556vy1k2k8414ps6jhikmsbff6s44i35"; - name = "libkomparediff2-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkomparediff2-16.08.3.tar.xz"; + sha256 = "019ibb277nqxygmky254p95n91kza92sb26xqrqz1mi8wvaqmi75"; + name = "libkomparediff2-16.08.3.tar.xz"; }; }; libksane = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libksane-16.08.2.tar.xz"; - sha256 = "1clk8yh3sb61xll0wpni2ccixsvxp4d0k5k8ygyb3m1glf802z5a"; - name = "libksane-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libksane-16.08.3.tar.xz"; + sha256 = "1wbvdffibifhdd7cdly7rf6kg25322xapnabylcyaz31r5qczq10"; + name = "libksane-16.08.3.tar.xz"; }; }; libksieve = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libksieve-16.08.2.tar.xz"; - sha256 = "0a0gym7y4qp83fs94y0xvm5i1qbh1vxy1wz2rw74k82cbj1yzviw"; - name = "libksieve-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libksieve-16.08.3.tar.xz"; + sha256 = "0yi7x90k923v350bvsan7k40xrlz0w506j2ffw5xmr97zqnhhq47"; + name = "libksieve-16.08.3.tar.xz"; }; }; lokalize = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/lokalize-16.08.2.tar.xz"; - sha256 = "13misqakj232y7ib89clgcc7r6byw7n2894x0ylkahj8synm1y3c"; - name = "lokalize-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/lokalize-16.08.3.tar.xz"; + sha256 = "0vk3rpzm0bjfh6sr1dgqpsf81rg8vvynwqm68646pfj38k54yf8m"; + name = "lokalize-16.08.3.tar.xz"; }; }; lskat = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/lskat-16.08.2.tar.xz"; - sha256 = "1i2s10csw9k6zjw9yk03l9p5xmg2gpw86xbsxp094xcncg7yml3v"; - name = "lskat-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/lskat-16.08.3.tar.xz"; + sha256 = "19g2c0by67wnh8k8wg2wq45bablhzqaml04pvmy5zbf4vnvmcbyy"; + name = "lskat-16.08.3.tar.xz"; }; }; mailcommon = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/mailcommon-16.08.2.tar.xz"; - sha256 = "1s3n834i9c33ldrrsq8vqsllnnicaginrqj7cm6lm317q0mgiiiw"; - name = "mailcommon-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/mailcommon-16.08.3.tar.xz"; + sha256 = "080wf6ly7wrrj8ic9nz2cs7qcj6qvmfm8nfvlwymkzn4yyshf9rv"; + name = "mailcommon-16.08.3.tar.xz"; }; }; mailimporter = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/mailimporter-16.08.2.tar.xz"; - sha256 = "08a0b7yk02df2fhr7cazm4x3v1qg67rzk0z2f14ssp7sz835bpia"; - name = "mailimporter-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/mailimporter-16.08.3.tar.xz"; + sha256 = "13cpfvbyr2i3ny3k0dd02353r693cn948cjakzw9jrfb7ha0rab8"; + name = "mailimporter-16.08.3.tar.xz"; }; }; marble = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/marble-16.08.2.tar.xz"; - sha256 = "1y8mqafji4lr8q1caipdgbrqcbivirzi8r6vw1iz3fjfbhi71c77"; - name = "marble-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/marble-16.08.3.tar.xz"; + sha256 = "0lxax24p3l04qcy2hmyb6c69s7cayjcq6m03nw8nbpjwlmik4b8w"; + name = "marble-16.08.3.tar.xz"; }; }; messagelib = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/messagelib-16.08.2.tar.xz"; - sha256 = "1kmiww8051bfldxb1yx1b45k78ihvsm3z7pbmdnw06nlz8a8xycb"; - name = "messagelib-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/messagelib-16.08.3.tar.xz"; + sha256 = "11qk72h45adgf4vmqb6vy8far8j9yr3s3ndj415iw3s07wkinhqa"; + name = "messagelib-16.08.3.tar.xz"; }; }; minuet = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/minuet-16.08.2.tar.xz"; - sha256 = "1cshjbzdjfs0g8lqxq6n7hnh032scrymapfc8il58rb3hir2fa0s"; - name = "minuet-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/minuet-16.08.3.tar.xz"; + sha256 = "0p3x1f4nsamhrdnmvpmnv9swi96823sb2sh6r0lfgyzamkkj5mhm"; + name = "minuet-16.08.3.tar.xz"; }; }; okteta = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/okteta-16.08.2.tar.xz"; - sha256 = "0gzriksvd8f409j63hyiqrj4j739f6apf99r4ic6271y50np9fk0"; - name = "okteta-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/okteta-16.08.3.tar.xz"; + sha256 = "01pl32wzv46xxq3mgb0vpw35vwmmdrkc4qfsm750ay58x99wm5hq"; + name = "okteta-16.08.3.tar.xz"; }; }; okular = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/okular-16.08.2.tar.xz"; - sha256 = "1hih12hk0jckprfphb0l67qpsrc2vgxvvvjb9wnvxqyvy29sk37k"; - name = "okular-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/okular-16.08.3.tar.xz"; + sha256 = "1wz4pmzi4wv5zc92lr8qrqfqmg2lymzfqhh6b33iqr39jkv504xx"; + name = "okular-16.08.3.tar.xz"; }; }; palapeli = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/palapeli-16.08.2.tar.xz"; - sha256 = "1skx37v3vx45xdn8m3g69qw1rnkhzzmnfxv5z0yiqvc9jdxl1zrh"; - name = "palapeli-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/palapeli-16.08.3.tar.xz"; + sha256 = "13pcwpks5bg9bw43lb4k2is22a7mzhkwl0sclp7lb9wn8qc831ns"; + name = "palapeli-16.08.3.tar.xz"; }; }; parley = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/parley-16.08.2.tar.xz"; - sha256 = "19m8czgzvr7rg5hcgig4sf28rngqdsx27c3p7qrmwg9xw2b3pgbr"; - name = "parley-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/parley-16.08.3.tar.xz"; + sha256 = "1s3h4ywc84bnhm217jcffiwb3654j8nikl0zzzi1sigr9vhc9xmz"; + name = "parley-16.08.3.tar.xz"; }; }; picmi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/picmi-16.08.2.tar.xz"; - sha256 = "1z90b98rf7b089kl4gcll86xlq4d49lh4nl6lngbb6vv7xgcz740"; - name = "picmi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/picmi-16.08.3.tar.xz"; + sha256 = "0qywy9n1ifyc5srqx3b0xzhmsv7h54llsxv0m9yxngrbnc7jc3bw"; + name = "picmi-16.08.3.tar.xz"; }; }; pimcommon = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/pimcommon-16.08.2.tar.xz"; - sha256 = "1gkx3qqnmckf9hy9kysgil2m6kg1h920ywj8kq0fafxhg57w6pc1"; - name = "pimcommon-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/pimcommon-16.08.3.tar.xz"; + sha256 = "06v8ak03rc7zmxmasqq12xi4misg73jag0vjy67a5izbqn613pry"; + name = "pimcommon-16.08.3.tar.xz"; }; }; poxml = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/poxml-16.08.2.tar.xz"; - sha256 = "0kpimgj0mrdbpma0pm2la1686y2nac4y5zd61qlmsczk0sc0g1d5"; - name = "poxml-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/poxml-16.08.3.tar.xz"; + sha256 = "0zp0lrlha5npagb4d04c2ga4kpxgi96si29xncff59nvw8l5p1cf"; + name = "poxml-16.08.3.tar.xz"; }; }; print-manager = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/print-manager-16.08.2.tar.xz"; - sha256 = "06560241d1r4ca17n62r26yxdccnkx58k4w127z1xsi12bjihf1v"; - name = "print-manager-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/print-manager-16.08.3.tar.xz"; + sha256 = "07bd7jyz2iwfw7vf63jkvhjk6la1gkjwz8nva3ms78b48byd96bx"; + name = "print-manager-16.08.3.tar.xz"; }; }; rocs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/rocs-16.08.2.tar.xz"; - sha256 = "0404sp8hf73r0mxn94j4371m2ks6gkwkm13mn8ycig2ys0w6dc6w"; - name = "rocs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/rocs-16.08.3.tar.xz"; + sha256 = "1z4l75gr5ixfzyk2198asbm8i6nv03wg0srxgf62pxx5ycvmkygw"; + name = "rocs-16.08.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/signon-kwallet-extension-16.08.2.tar.xz"; - sha256 = "12vsk3fydpjwai3l4gm1irhc0157qn8hb81d96kr07zg8k3jqjhf"; - name = "signon-kwallet-extension-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/signon-kwallet-extension-16.08.3.tar.xz"; + sha256 = "11n1ychcl3piar7mk3lqxi70vjw6558nwzlqkjprlj8kqbcwphg0"; + name = "signon-kwallet-extension-16.08.3.tar.xz"; }; }; spectacle = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/spectacle-16.08.2.tar.xz"; - sha256 = "1aylgyfsmg2jmgg090glns2qmy5bqsf43fwglvwmmfbly0h5i03h"; - name = "spectacle-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/spectacle-16.08.3.tar.xz"; + sha256 = "1ma5q9c66mbnbdv2izgfx7jpzlph3mvi9dkq89vkyr2hi3nznp4b"; + name = "spectacle-16.08.3.tar.xz"; }; }; step = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/step-16.08.2.tar.xz"; - sha256 = "1kiyc009cf0pw6qfn3ravfbch8cvsv5iv6cas8mcszh1wil3y14h"; - name = "step-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/step-16.08.3.tar.xz"; + sha256 = "0lii1jydca6ksvk0qqy08acq354xwwvh5rjkj58x836fxrb39y9d"; + name = "step-16.08.3.tar.xz"; }; }; svgpart = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/svgpart-16.08.2.tar.xz"; - sha256 = "1idfmmmg65cqga1klmd2vwp8abpafda4z1fsd4p383wfjkmwgp09"; - name = "svgpart-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/svgpart-16.08.3.tar.xz"; + sha256 = "0xriqcqffqdamxavby7gwjl4pxchslamci6xg0xwx7n0w9qa6vgv"; + name = "svgpart-16.08.3.tar.xz"; }; }; sweeper = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/sweeper-16.08.2.tar.xz"; - sha256 = "0y777yz51rs9m9lrx41mrj0wmp83vz6xc353acdk8ilm8lfqc9qh"; - name = "sweeper-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/sweeper-16.08.3.tar.xz"; + sha256 = "01c89p54h497fk9pwj0hz86vyfqnx83iajmr3pskfsbh601xmipd"; + name = "sweeper-16.08.3.tar.xz"; }; }; syndication = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/syndication-16.08.2.tar.xz"; - sha256 = "171swz7dqxp8c198hlprpj3lzdryvbz3603iawxh6663fa1da2lx"; - name = "syndication-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/syndication-16.08.3.tar.xz"; + sha256 = "0dqhrzw8xbh1zpxkj40sw72g6sfzhm0slsnvmx3p3ivas0slmqbf"; + name = "syndication-16.08.3.tar.xz"; }; }; umbrello = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/umbrello-16.08.2.tar.xz"; - sha256 = "0m32lxzilzyycw9jb72zxzprcwk19sj5h45hvz6w9nvrk9k80a6h"; - name = "umbrello-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/umbrello-16.08.3.tar.xz"; + sha256 = "0r1cw17pyyiq4052bdms4vn1vwzwlcyymili0d9m1n0ib8q9dpsd"; + name = "umbrello-16.08.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/zeroconf-ioslave-16.08.2.tar.xz"; - sha256 = "0yl1cnpn86gkbdg0h8y1kdyjj4b3n3wmp9ifmczfd6jw7hsvwrm6"; - name = "zeroconf-ioslave-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/zeroconf-ioslave-16.08.3.tar.xz"; + sha256 = "16hani3ajdysyrw5gy86360zki54kgmlzn65ishl6lzp8c8bp7q9"; + name = "zeroconf-ioslave-16.08.3.tar.xz"; }; }; } From 39297fa36bb12d100421bc3831ea999fbfd37536 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 15 Nov 2016 14:33:56 +0100 Subject: [PATCH 0307/1749] rush: 1.7 -> 1.8 (#20424) --- pkgs/shells/rush/default.nix | 6 +++--- pkgs/shells/rush/fix-format-security-error.patch | 12 ++++++++++++ pkgs/shells/rush/gets.patch | 13 ------------- 3 files changed, 15 insertions(+), 16 deletions(-) create mode 100644 pkgs/shells/rush/fix-format-security-error.patch delete mode 100644 pkgs/shells/rush/gets.patch diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index bbad1f8cdf47..8280897c47ae 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "rush-1.7"; + name = "rush-1.8"; src = fetchurl { url = "mirror://gnu/rush/${name}.tar.gz"; - sha256 = "0fh0gbbp0iiq3wbkf503xb40r8ljk42vyj9bnlflbz82d6ipy1rm"; + sha256 = "1vxdb81ify4xcyygh86250pi50krb16dkj42i5ii4ns3araiwckz"; }; - patches = [ ./gets.patch ]; + patches = [ ./fix-format-security-error.patch ]; doCheck = true; diff --git a/pkgs/shells/rush/fix-format-security-error.patch b/pkgs/shells/rush/fix-format-security-error.patch new file mode 100644 index 000000000000..ed3ad0aa4c1f --- /dev/null +++ b/pkgs/shells/rush/fix-format-security-error.patch @@ -0,0 +1,12 @@ +diff -Nur rush-1.8.orig/lib/wordsplit.c rush-1.8/lib/wordsplit.c +--- rush-1.8.orig/lib/wordsplit.c 2016-08-18 20:11:43.000000000 +0200 ++++ rush-1.8/lib/wordsplit.c 2016-11-14 14:37:02.976177414 +0100 +@@ -2330,7 +2330,7 @@ + break; + + default: +- wsp->ws_error (wordsplit_strerror (wsp)); ++ wsp->ws_error ("%s", wordsplit_strerror (wsp)); + } + } + diff --git a/pkgs/shells/rush/gets.patch b/pkgs/shells/rush/gets.patch deleted file mode 100644 index 94b1f5dd2f51..000000000000 --- a/pkgs/shells/rush/gets.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- rush-1.7/gnu/stdio.in.h.org 2010-06-13 19:14:59.000000000 +0200 -+++ rush-1.7/gnu/stdio.in.h 2013-12-30 14:29:55.000000000 +0100 -@@ -138,8 +138,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ -+#if defined gets - #undef gets - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ From 4c70064cc5b149738147aa187fe1a275a846f0e6 Mon Sep 17 00:00:00 2001 From: Tim Digel Date: Tue, 15 Nov 2016 15:12:16 +0100 Subject: [PATCH 0308/1749] erlang: 18.3.4 -> 18.3.4.4 --- pkgs/development/interpreters/erlang/R18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 5d9c5dac3d8e..10e5313ce8bb 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -20,7 +20,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + "${optionalString javacSupport "-javac"}"; - version = "18.3.4"; + version = "18.3.4.4"; # Minor OTP releases are not always released as tarbals at # http://erlang.org/download/ So we have to download from @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = "otp"; rev = "OTP-${version}"; - sha256 = "1f8nhybzsdmjvkmkzpjj3wj9jzx8mihlvi6gfp47fxkalansz39h"; + sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk"; }; buildInputs = From 76b1413a87fbe2be095f81154ce1cd4edccb69ec Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 15 Nov 2016 23:45:57 +0900 Subject: [PATCH 0309/1749] firefox-bin: 49.0.2 -> 50.0 (#20434) --- .../browsers/firefox-bin/sources.nix | 366 +++++++++--------- 1 file changed, 183 insertions(+), 183 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 9d895a383e1d..ac4bc88e1280 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,189 +4,189 @@ # ruby generate_sources.rb 46.0.1 > sources.nix { - version = "49.0.2"; + version = "50.0"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ach/firefox-49.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "34e58b3394e51a48e168513e73d916e76ff8cbb733cb85483c3f71076b31fb2d2fd72cc19994339cc23ec84989caf23514e84a393946ecbd2765ac388672ae27"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ach/firefox-49.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "fb640df0aa14ddf92db3f8cf94598b7321b2b9f6a0360de20a2c8a70e697e3a0e6f13b13704ce766766c8a7a428e4601e8cdc3044d64558976c81e34cb5b1a2d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/af/firefox-49.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "8772744f9ef9ad3a0f37fcdddb90b08a105d65f347e6e1fdf66955a95a3e12e5e18dae2b1f75895fa73914744c0a9d98556e84c6a1813f4dc9d22d7633749688"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/af/firefox-49.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "475ad078d26386336954a747ca32722422122638632c75d8f8302875b5d3ae9c6271352e700ebfbf7bd226fa5d740c6eb4aeda83e6df712aa03583d54e7cfedc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/an/firefox-49.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "782e1a0d98506a66413f4420609e51ef8b49ff711b89345b806f243414fdbb1d179b1ad3e74f25e0aeeac0103ca75fb497cb2a6a94e1b138f98c593350a34c85"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/an/firefox-49.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "2130aefd45506e9dfa56183955dae528edca747bbd186b108a5fc31cd0271017ec9d8d2f88ac061e2de94b3c235876d6c20f65c11c4a6ae95625db3633553d74"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ar/firefox-49.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "aa3d9ac9cb446b63d1275a4bc2172a127a002f07a2c98771fe09e5585e2617a9bf8bd3171dfec839a47ffae10b47a65c9c76403449207b745e8b587d5356ba10"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ar/firefox-49.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "4e1649a2feeafedd73f3b7a137105dc6fde8cd83e49b1ca58c65367e262e9abbe3b2be73e0b778503b33458dccc99a9ca8bb3f9a6a01a7989c20ac8a262f7bf8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/as/firefox-49.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "db178c3bdcff6f2c8166d28a380bf47c457c53bebb5d0bdd811af96d41b2233c7e487ac17a61a479979f494dca78800c289ce4e1f00a371bbd4e1478ecafedbe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/as/firefox-49.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "bc37a83dcfc488a32421a784559f6c236230c3ce189888c695ee2f476024f5d60dbf83782eac5f41824a63cf6d9c7e2f775717dd664ab311b1c4337c0a9489c6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ast/firefox-49.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "7699c57014e5a8545fafe2a11c8dfb066d5f0c9fa3257264df78d2926b86cdf5dd44846ff3ce755eb13f9e34b60a78777b9ae5d0799890ad93bd390109ca055a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ast/firefox-49.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "a2f0af3df56a3a99afa9f8144760545724f48ea454f84d51988773003d3550340402736a592cea1bfc3b4b728f8d38eee53fd22aadb6fc032902b14a5692b153"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/az/firefox-49.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "20f5911c186a9e11ac9f1913bbb4a5c4d6cdf99e4225c8025df0967420b18452cc10f8bc1d6508607b27ba067b2e9dfbeb68bf3ed08469d87997121363990705"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/az/firefox-49.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "85fa4add0e7dfcb5209c36a56438aa1480462bbaef29340fc76f710de81a419a3d6a58ccfc28592ffecc0464bae51b75cf0e658d078d7a18251849d5333a98e9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/be/firefox-49.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "b93544226bca7eac5220878f34b23e1a9a740dc2bfeef4bec90057bd0197d77e6eec142e04f072f227d379a085660f3d19e112e3f55233dd82ad59e9e91f6635"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/be/firefox-49.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "fe752476db9babd70882ba947b860a810f76dfb9f2dde8ccdefe72ce960a7676440fbefc261c3b70a6d6ded6874166b81c34ad62c159b1e55101b804e93b02e0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bg/firefox-49.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "b0436dc79fd6064e5d455d6ecd5f835b6b1cd855aa147675502468c9a332698b4d91e505eb92a45bf2aaa8479074eeda745c7340852a071a4ebe4b19a6e9ded4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bg/firefox-49.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "892af8626ee894bdf6408ebeae6c5239b5531a52b0f107cf7f207f4f87225a0f3d690aab233e0e6db9628b29cc572d65fbb4ed3f3ba0c15b54c54fca195929fe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bn-BD/firefox-49.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "371dcf9a6cffa6fa5a505d390e082d6703a4ca906be8870a07d28d47a00f94808ee456409e24d50d1ac75affffcb2b1f341aed638a0c6d54407f7d7bf1484e07"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bn-BD/firefox-49.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "866629e3b07bfc6884c6974d411b553f48edb18ab3b01d2d8b74e72b2d0c1bec4d8ccf451c00dc3567f939d78f7b16837c8b9c54e875a987294f7c9e88d85395"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bn-IN/firefox-49.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "a87004782631b26012dbac62f6a3c2dd5303a65e1c3a23113e9a20419f280450a4bbc7008d3e78448db65f6bcd670011e27a76dc5f930d96e480e1fc6e8a3e3b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bn-IN/firefox-49.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "4195e49bd40edf6aa3767be6c706d66e5d2a22c6e8effb57d101684934f5497d01abdc7f897c296e9129710365d0b34cb3f6f595a244d03bf0b25cd725433c11"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/br/firefox-49.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "a2977e3e4d926cc21e2dea941f34a7b75f0d99d454ae9de6a97f95e31277402420fb3efbf606098feac0832355b7ab36e2da90ca7b85cfcc3a9065bcbcc90c55"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/br/firefox-49.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "7c26ed2e7b9e37c97e4186fa02610205e4b4b4540a29efe0ecaa0851e65ffbbeca3b26b47ae99b8f87baf2212a8c5b6ab69cbc51ee4d3ef6805cd37cb8a936bb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bs/firefox-49.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "08f93fb2c29e2f090702570a9390088954328f22a69d50a2eabccc3893e1f28ecde95011b3c0ee1f2082a447d61f86d4417b5e54b39858b666c69b6ea546257e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bs/firefox-49.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "1b4d4e9f74532974f7cf0382c2e4ca6cbee1dda11037df203f5a643305876e9bb33965ecbf68935b9ad626e77f86886b3deeebfd9326251f3dfe2b11a70c24fd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ca/firefox-49.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "e9b270bd2b2b2e48dace759ea61d0c78e4b0eaa4f9e44d418e37c55fb8ca96ca16304649b1d57b30a31575c2dc3abc4b4e40d89ac32fcf8beedba055bd38049d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ca/firefox-49.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "d44b1c0b434f92bff6edc4c514d5263f2d48e31a741ab10f8ca3a29c831b24058c1952ec09d4f2e2318d0b851281b0d228ee7941fd07e4828939b7652d86f08e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cak/firefox-49.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "6b687dd14de728612de1ac96534a57ee1a82bb5e069cb1a5715ca688d19f33fe00079339a7fd93e13674c3fecd645ffebb36ba84bc597ed047ff4f3e51d9aa68"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cak/firefox-49.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "35a68ed2b047a70253af24112554e733274bd531b5cf85bd82893d8abae19f56eb9e712b564ea44a3c72fcd9887338a314a02f9dfec747d5eb51fcc5b91e8e7f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cs/firefox-49.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "c206bd2c38e38ceb7722aeaa607f29ecefde9c9a7dce67f3685948e2bd347e18807398b050d65a0a0f7aa75af28eb360733a2b55a1004845d24ca00276f8894e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cs/firefox-49.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "7b0a0236d16b6443cd701b6b87347839d218e458a99b62cb8a85e47fad46d7dbcc778042906db189532e37f4392fcdc08c150e81baf838e47af1894a9a3f03b7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cy/firefox-49.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "0d1a025f349ab6a87d82fdcedb2b5d5227fadde3b071d54347e66e4cfb9200b9a3e689898b286d5d9e92d05989e817c75e8ee633026a81e2c36fbfd89bd63ebb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cy/firefox-49.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "e52b74c7ed70df4d9d182ddf43d3aa385f8d9d3020a51553b2abf03ba1e1002c56571b199f8e96155eef25bcd296add90c59eb389e5f96b9b671a67819532a42"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/da/firefox-49.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "9760bc438dbf5d318d34767898e4c585435694ba051fc3e88b9c21fe64d2513ae306d30655c021af6feb43de62576630dabbdf84dc379978ad7f27293206863c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/da/firefox-49.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "cbaa47308c0718da93615fff7fddd026d9396dba581b9a095bb86025a63e0eafa900aef6ef306888cb6c8371d9c5d5fca7f8facfc3f603746d17b3acfabbdd54"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/de/firefox-49.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "5bbfafea2170467dd84a297dc3308d73b01b41c89bac3fccde203205bd8a2ef6b699d239df22938d4edc71e6074b4d797f4ecebe6140ecf28e75e07a35bd86c0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/de/firefox-49.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "2b86397fa086b15afb255f733ae12e821ab57b5045e3cb5e47bda703bfa170ef879c966049c2bca5c15f76136af250489c49e313674e878e1d0815d02e5e5d84"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/dsb/firefox-49.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "e761e49fe6d38ff37688b6b700c943ef5461e99990ddddb6b642403b9ed99cd815286860907245d27c3561f1e26d16b757a631ebc13de05df61b86bcba272f1a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/dsb/firefox-49.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "ce65e525200dc1b6890c1ee5c847e2c720680b28221c700367d373f0eb262f10aee1831348c27b03af9218cfc14b40106130d62005107c674b5e4e89bd8183f0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/el/firefox-49.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "559e97300b603e1159beefc3d58715b437a9741cfef77f8c36955825e103d3510a88617601e95ab230b7dc27185b6ac091aa7659b7fb059a6c4780ed5efd3977"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/el/firefox-49.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "ddfdce0ad9215c2a41e659c8bcb0aa7f04bd4906e5420ea47c64158a15ab111f8cb4bb410fcbaa2a747e74621dc8fd13fcb63861f5bce06bb045c4170501bad4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-GB/firefox-49.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "cc32b9418874f1fb60d2103a03a99bf56d2565be31e530e19ffdc4fa3f855d6baf8ee6e03363b1ad3beef624c9865774abae8563c7744e995ab13a3c4b50ca3d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-GB/firefox-49.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "85b3f54f69de86a3461e977934a21ce1226af04c3df07635e592b1531c06084a31d5fe50687990d982994cea747c1a32e4f6ee65c90954752c05494c5a144583"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-US/firefox-49.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "fc7309f05662a2bed24566076047a7ab328bd098c3764c7b8ac8f58388be7225a26d9e917542b712338b29cfc06a603569750d607818946e2880f66aee8a892c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-US/firefox-49.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "cad0ee863c3362e3e2798ad9c3026d5ea5ed8f46ad9409922fcd8e4a9fff9fa7d383bd32d7e0e13aed98116f85463060a99044398a7673fd2015a97eea06ed1f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-ZA/firefox-49.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "1f5411b427384132e5a4922249d1cc5596942840ddb3225864e888651dc50dcc601de59d52caae242e3c09733113955162a061446181ab85a582047baef019dd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-ZA/firefox-49.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "7846e2db723636407eaff1f7d8327f683ed2e76600e0b2ff4cdbf4a2f5ffbb54bc7f8004a4604abe128fe15809f7ac257cb4c895c5a8d434e20fa896f73881c2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/eo/firefox-49.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "71544335b093db847bbb75d95d85ce79fca7ef628172fae7a4aaa42f1860ec700472e75cb42b5cd7ecaddd62e86cf99cd105b2afb03f6a523cf8ab430398101b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/eo/firefox-49.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "1712059dd0583535706f91819aa664732120b9771a2db9c19374b82dd99c3b08c5f96747936c4e004182e5a4c7226e38aa567385a91810b2d6569080881defb4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-AR/firefox-49.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "7641053300343cae1ba6167cec8f35f02f7536b1d711dbe3522a52c3de841d4a1ad8798295ebf01805a7897118797c641cef380fcb00b59ccc6c609023df242c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-AR/firefox-49.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "1c25707e13c94039cbd2f05c72c8cff35c26f31566a89f238d27c5277362a4c9b26f57c85b35ca9740b14a8771c9dfd54346b1db8d843827d61184d9ad7063d2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-CL/firefox-49.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "d9a10289461272833bdc1423b0e943633edb352ec3db52511f64c35b9f36c8a9b807432799ad140d6086a839992bdacfd864f0110756d5991f288abf1e9060f8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-CL/firefox-49.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "e96dbfeb2c5d17f0e174d7975e57ec964c8dc6c4322b510a1819eabc081f371f43b63bc85085c8ff0bb0380afc9c2583ae4bc0aa4224dad99e0134746b96019f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-ES/firefox-49.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "db99c4ccdb514ee68291fc41f38a0c0fca22bd235831b4c079a649e6e5b5a6b87dbd7512ba44c72dec31a173d128907298866b4855ab7259168402e3709e4114"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-ES/firefox-49.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "0f2497e1dd719905494e2290f2dd09ac51b51058fbc27b65a23eac3e2d5e49adbb88a845e51393154ba69e2d5e67d7cd1911753efaf43838587ad417f39da251"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-MX/firefox-49.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "d612e453d1f952c65a5352f54f52189cb8b92ccbb7bf8a191efaa7f919748dc8538f07152b3182839ccb3f66171d7e1d48a1927a3a346e51dd23018d144b0453"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-MX/firefox-49.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "f1c47ebab9dc88932ccb93b24b7411080dde9ebb335b1d8f56041d1841f8425d104d0c1cb765f01222325ca5be10208f8b3326ad5aaae474ccee3c828648b4a4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/et/firefox-49.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "683ec0c1eb4716b9b8ae897052a1208492a24ca6803ce890d5ad4044fbca57a6d8c58581c54faff5753134b6144d157202d047e0b80cda1125df0d9e495e7457"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/et/firefox-49.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "a3da302a585a4cad943a71a8f6fa9376821e4ab4953acd56ffd3f3993fd9e8971bc0ac1b2e5c37a8ade28a0fdaa0b47b277abed18f38246cb1885de532186afa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/eu/firefox-49.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "988a8c2411dc43e4599c9db2a94e220738049e2cca4fc59ca073e2c215a71598809d5102356fa36132b5ab0e5a552183252ecc17688ad83a76eefe726f62e7c7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/eu/firefox-49.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "873ace38cbcdcd022f932c1753eb9b4c9124a41b2589e89a84f050f90383483b6fa8d793a830d79860fe6f20295b5a8971775136e70877256f9b23900c7b236f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fa/firefox-49.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "0a1119a749db6cc2b277f4c1037d8163b6f35a0bd76ac0c121941502a821ea9c698822096037c242f29ffe85aa58fe97da821eed0b8995ef8f94f373567cef95"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fa/firefox-49.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "68aba1cc55f22c39af1c68e4e77e5f8eed5005a1f7c4903b03a3cd711a9583a99042cf82d2dbdeb74b897ea1d840888ef7a417d9f6142b626d8c2f3654e01794"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ff/firefox-49.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "9cbef7bc67fe071cf40734eeaa64be8ee0b7f3c5428cfeaf5b81eb4eef5c4fb38e36af6de389164b2b0a65f2cfa0d14b2e933883d343cef1212f03f6da9c1801"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ff/firefox-49.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "d8b5362bea1305546da3681c98452594c5b15ccb57945efdb7b6971cfd07b7b940c9952a8db8143ab9bc8ef55f034ef9c8a162ea9b8dd4a82af033f99c34d9cf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fi/firefox-49.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "4f07573325b6def42bbe66e7dac08396520b66eea71230fcb432724cd6187c11d21325ae6084ed6c8c416b31f2a582fbb0efdf98905c566cebfdfae002875714"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fi/firefox-49.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "f5dd198d264426ca8e759eef8801e31d90f628788451ea4802397a525938790a7b83a68fdba6839ff669239c79915f9596cc7f0ed48454fa528833041d9b7e85"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fr/firefox-49.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "135da7e143fda33c6821002a0153cee11dff432bb75036731af68296142558f371d595f448dcb74b848b5e7a9318e80f2d0627c1554d9fb47de6143b5d2fd046"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fr/firefox-49.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "b57bcc4602433cd703ec660b57b3b7d72c5e859b69d8b12c77a8250a09c6148fcbbfbc3bba59a984d8dc3ab284c11dab9cec1ea67e9d1f56e5f0b177e11358bf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fy-NL/firefox-49.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "901833140bdb0eaa7375fb9f83a395fb62de11df2b094b65e4fdf9c1c1b55e1fbc61330fab861214c843bdca5722f1f0f5c25765b15c883434fbc571d86768e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fy-NL/firefox-49.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "3aadc1c35a8d498b336fc9f6300a467efc1d51161dc15099fe8d588deb4eb6f4255d2730ac21c9cbb98b136ac5f31993458368892969d0bd00423e778fcc09ea"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ga-IE/firefox-49.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "42f85212a3826f2a80c957ab717e918b0f3ca622cd057ef091f5ad749bc6b3173db3e8d0029ad1cd79d33b1d0b88eaa2b8e3de22ff76895cf1abe3f166610c83"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ga-IE/firefox-49.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "e2103c5af60b6d318f8f009418811f0f7c27933ccf1b72ca998b8e66dcd61c3e833a8b3a9f078f0ec212202cafdba25f8054cb13f999a8aae88310ca6439b797"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gd/firefox-49.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "b00d74f2f954395027d48a1c91325ac21c0bbfc2d20a44242f5bd8f74780d6e2fa46e4344113592b5b4f6c8d106406eb62d2373f3b8adb042cc8fcebc3237f98"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gd/firefox-49.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "fd1c042d586a59ba35d77095cc8f9a72a74a68c3e90318050854433f74b79a62019535f0baa63e33c7687cef401ab1668694ad1fa54a6dd731c77ccad66f599e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gl/firefox-49.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "e339859eaf9b2bdd8b4c09e2b3c22f35a8b72bf9a5c3fe4756576c34318cd1219c663190596196801acc09652e8710c8133e91e9abf30a1fd9e4c2721a9270db"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gl/firefox-49.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "3beb1c6cdd6372615283af42074c4356009addc9ad41d98b01d008896182831c6275dc2398dbd477b9befacfd88a84415d2a45ef2f03d4748de8c5837fa4e7c8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gn/firefox-49.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "dbf599e7eb564146977cc59587b40bcf02c0e6b0e853ab71715635884d883e0427fd53df6950e7da9bcecd979bcf5f9c5a08cde9894e8b68d6faf42467baa020"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gn/firefox-49.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "0e6f7818fa7c22483ef976684730b93e5793cbbcf79ff96645f9527b41d1bdbec8b0c25aba7ef5a3c4895888a9374dbb259ffa7ee95a1c3eb3633d46848711a5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gu-IN/firefox-49.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "c439babad0a48b8eb495b65510f33879038b950ff11820f7cf9fc7363092e761a95c9e9b7b9b51b7621efd4b39ae4ba45bdbd0ecf9fa14aa2bcba656a38a1106"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gu-IN/firefox-49.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "48d9c9233115365bbdd5fcc4d5a59f5e254394b030387f4338086552734376bd77a7d4405ba75807e78b332d49fc04dbe4f2ce9c4d4fc625eeaf5ccf2cf29a14"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/he/firefox-49.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "a74cf826abb5ad09b4ad76e5292eed081c904560fa7579c8ea2663bace3e23f630f7410782e47b44bb123693b5a053513e07e3377b36770d3deee4bbf8334b4e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/he/firefox-49.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "0266dbce27dbd09262b892d4bb6f8179cc5f710ad27618c6f3fc2f4a4850d715c12162729d17b87b60327b057fcf5e8ce0e8d64c7fdfcd56f41f0396e34ff5f2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hi-IN/firefox-49.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "ffe0bfc30861ffbbc50fac77fff688bc716e4485c11134757c6ea1096ab6a76311d69480f47bbb6ee9d67b6c00061436d8d402b31e3c97b86283cf0a027d1b49"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hi-IN/firefox-49.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "9ade7154bd38c9fac3291574d0ba956ef39c47d49d24c4a0006ff28b6065ee020074287e093742bc073b3d5f9e32ca517f84054ae5df72e513a7c4dd1da05903"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hr/firefox-49.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "0d1d75e61fd2e70e09168e1cfef9a936868d49c31a0df036b15a98f5eec353c122748369eca9ccbf696621702ec3e2521b76ce92a6c9ee0cc4ac7e20ab6beae5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hr/firefox-49.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "da7ba8fbb68ea0028408ceadb328fdd59b2df2514948cabf14da56ae548441b697598eb199772e65fd6fa001ce5e116fe8bdff9818c54110dd4a9574a021400e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hsb/firefox-49.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "f3bb00b3725fb8c5817923a2a40af5e21abe9b85304be2787987132822af9318cb7b1c7f1f9657543e1b8e07f09870411e00c061ddcf293c5ea0634784197390"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hsb/firefox-49.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "7119d7730d4231d2e1a9c3da810fa1f030afd4fcfdd19df2e7879ce294bc114468324bec41126aa3a234604d30d4fa7517028ceb9c4258b470b4c45b6e796131"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hu/firefox-49.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "41f68050eab542a96482f63769b3cd760b5a61ef06c5e11af78be7428d287d06e61bc5367b9cbf30a96cd33e785c21f939639e64071ed1828e0a2e9bd834b584"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hu/firefox-49.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "295f9f02994d40c658f70819d42ed9e5066b55675acf4f639ffa88b5b922d586b9bede8a20608a4c6e7533b206dfbd5b4c78d933d05c0d45e6d248c7e8ede611"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hy-AM/firefox-49.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "80a2f18d1f2a306005761c7df5a7eac3d5c1a0ddf8a556e9ad641ae1d0f099c359d9950a1e29f9444c191d27659242935b8ce760d80118096c4334047ef4c3a3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hy-AM/firefox-49.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "318767607dff10d4ddc5b18e77756eef267a49c5a8d866c88f971cd126577632c9385c7f9981282f2720af82a7c050db098312e07c5d8e7f442d6610fa93f935"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/id/firefox-49.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "33355c4b3a5bfc0737bf8d473bfa0b91eab12ebf1f7960f2c06e2b70940e928712398147eafed5e3e72ebd1cae3ed0df262bdd3fbd9b8314f52afeae1540ccb9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/id/firefox-49.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "dcf596d4013b5d370802b0f717e327d2cd2c6fad377e77e3230d2d1f9b9cb081bcd6af514a56aa06bec625c5fc55213022eec4ed6fc45289dcd459205deffead"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/is/firefox-49.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "4e8bc5fcf1dd6e059bb1aa79955040f3a59c814b3bd3812c59df83a9ae7e07d0b9bec64c14ae33ee9f6688ad027e3545d54a435fda8a340f11f4bdb96200b5f0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/is/firefox-49.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "5368d47f4676eb165b91bed0d9e53f0f0e9bfb4b0edd821e17b689267b90d7932c84b8668c1e5f06f7ee3dc6a66fffa2516446f1ad40faaa87d7fd521053085c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/it/firefox-49.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "23d8b1e901f213a84123192796cc314ef6bcf664f31c15aecbf1112911a4df76aad41b93806067437cbd40c0722b54ee1139911b32057efa2f783819d39fa2e7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/it/firefox-49.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "378e7765f081bb2abd25bff5bb3a89046a9f2bf09390c2830f916f8c7e811d32359cbaea832d433062fdd31b9251242361483851e91a15070b0420cc7a5d6344"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ja/firefox-49.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "f20fb6d3bc76c5ae40b11547ee1f4542460f781bc19a88fdd70dd95e5fb74de2adc3e642283d2baa7ef26cc49e5574addadbb5b18a804dd77b9c83900c15809a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ja/firefox-49.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "aec4ba1d3c33bd586649b219a1fcd7beae8e51bdab1b44c311414cf141f452550a41e6a5044fb2ed9a184938f49e2196f97bda93e0cf5c7400463222da1e920e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/kk/firefox-49.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "b7e72ef90953825ef50d98acdb0040b9a452e5e7f3661dd1e574eb045cf8679375afdf6695e866a9e70eb2d46c38d3eea5918b8373bddd6956ea42fcc3c50a3a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/kk/firefox-49.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "c2c03344eb5cbfdc3555221fd66b245c38ee9fb5df40806ca475b1b5a94ac7c488816d18946c7cea0b8a556519d4d40d39224ee327ec59fd399c3c8e761fe575"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/km/firefox-49.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "1f79fd7893de0c5c773912ce5c96ccd81f29fa5ff879ff882d96dfd778b12c05f9476fa8e01a2f84d35dafbb53aeaeeb53f9a06a7abeb0b93482dd8c430891b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/km/firefox-49.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "ccd6987dc3bcb13f483c12015933801b6e4e85d0de1f9179e7e959ee7f6d75bee79de67551bde5ade7c5d0afdd58aa9367fef13f9caf0f31c9626742e20f03ba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/kn/firefox-49.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "c63724966e962bd383ae8ba0dca744c547c9a794f0f96f1a51bb2bad04a786ae3f00a09a39d679c28db254c37a99795f474042fb8dee46754ddfb0a7c50297bb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/kn/firefox-49.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "8916c80f522578152783af409b5df23ea554f4d711a1d85de1445678372eb856a2798263b2e638d72a5dedf3870fbde5c23ebefe7d051bc5c781f0363447a112"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ko/firefox-49.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "da33a16e3f8b414cc32b9dd3b4993d8c3645fae0066e92f50d659dda50de664ce6a15c0959f0b3883c7ddb23e14620e5d045fc0961da4c6c57bf638ef238e871"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ko/firefox-49.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "fba1f0fd69974d679c52246b9977f4d03d70c32ef4c77831d3305eaa30c4e19cca36692bee92aaa5195a4db34b162b909dd4b56370a4391aed33897b7f36463c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lij/firefox-49.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "28879f30f4db7f26f5bccf9219dcefcbf79437dcbe84d2ba7a27406d4ea4e6b4f3941bf2944400952c37df861f65db98ba60581df33a49a3b513c260ec33afca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lij/firefox-49.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "d0eea75c2bcf8f1040025807ff496c7e48b0949b633d475367b9721cf6c3447d2a30137afcdd54217f1d226cd67e3e5413d348eab9b63f95f3bb96b43e5fa5b4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lt/firefox-49.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "0991e328fc606eea0c7b67dca5a19c2c94a925d20e998994bee262a90fd69ba592936f29fe88ace97607c1bc3207f5f30ffafb5044a6e088967dbc2880bab154"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lt/firefox-49.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "eaa6aeabf0f1c00cbd08d69e2a03d332ac9b022711aca0b09794ead8989fcc714313e8157de1884cdd3364b1fbeeaf62d31d61aab9baf34bfe97b5f56a55682b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lv/firefox-49.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "113b76cc2e5f0467b7cf02091857dc60bdb1fcb965089ad8a7196dbb15494642d161836d79035c26c09aade1ea1eb5cd734dc23ff80402b5b1b45efae9770892"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lv/firefox-49.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "531f667d61dbf8b6cd90c918464e8456f907c964899b5819ac91fa6493b446ced18ada61c5a2227cc7bc044851142e03388e1b924cfc135cf5d61d1642369104"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mai/firefox-49.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "42ba06b3c89c9702574f89f225663dc438bf4d2c8cdc698e80e46bcbb292814fec2487b540a3b4e4cfb484c146a34bedfe3cde0af504b9453ee7f7dea6688c29"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mai/firefox-49.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "6dd7fac8a46343a0abf3958a044e534e0669894f30611aeb753a77cbb0da607f240672d1912490a3d05f312179d02ca96339e92f104298b9ccad45ab076bdd3e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mk/firefox-49.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "fbe110a9ba35be23b38511d5caffd2d1d0d365d881403b287980727987fe2b40ada8d6fa656faabc4eea4bd798f13ccc00de90091bf14cdc3dd4cacb28349f6d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mk/firefox-49.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "831d7f10a08bb9e6bb5ca163c8e172f9a4855b2062fca66c4832192eda45b20d64585f88ddb08268328e00f2d678b943e5d961f630cbd9730fd788997101ce8a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ml/firefox-49.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "5b7e6f3c8ae0dccff269c97b8efc3a77e0468f0689a90afa61cddf8e88c3f3f4c3d9bf5ca0100376dc7d23f4d676739a2582235edee8bea836366cd38a4f4fc4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ml/firefox-49.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "0a6ed3141038fdbd9c4a68dbac0178a3735d6777b60cbab679d6115e4c3b382bb59c6fe964924695a23975b44c064ad997d3f2f053b76dd8a0f241f157a86a54"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mr/firefox-49.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "ab8d8f2984e94a37116a49453e0662a56fb83b981ef15627f5e328dc7d2bb595f09d6efa51d8840ea351be48aef311c177ddb24238bee6a5b7bc3996f7f888ba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mr/firefox-49.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "7bb1f611b4304f514183cb445b2bdd8d74140a4758b4c3a9664d7f62137540db191eecedb52287e45c269198f3d952c3e617d3bdbce2606dcce3f12efa59f5de"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ms/firefox-49.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "c6ff426bd09681209a36776e2a4b4282f3c4d50b3c9509b1e964da536527e03ece806b6d615e035a8f7425752d4796f11bbeb51cf8ce10b7c4b2770096366d94"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ms/firefox-49.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "dc7ab98a4d65df6a7e3496bc4ed37db622c8c26f790a2072f869cae8e4232ca2a3a7e299af25e7bfd855516e2de41745ef2cfdf2452e4d98bd60881c0845f44e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nb-NO/firefox-49.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "e4a2cb87bdd925faf6518e38fc7ccfed781e679df22c5456239cc5aec0afb5aa48f774225ee6fdaf82c6de56ef53c8738f8396c76a133c5eeefbac6a9ab96af7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nb-NO/firefox-49.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "5f0e719b40e67832968a1e8c9df8c3ddf7890b3e82ed555a3a2369637202e5f4c9f2a0b8faf7a2f6aa6719b033e3ad4f27dae3d6b5b0f0333615a8bb636320d4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nl/firefox-49.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "cfc57c748e0f940ba164b13c64d1129263d890e489ec0753900696947f869ecb1793f69a1f8b2cd986eecdd857ff7e94c28985248950f6a15f6ab15acd9046ca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nl/firefox-49.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "e7bdfd3976ae41a5f9fbfbd6b177f5f6815e68d9069e8916123574afdacfd28e0032211e7b1760275bded18bd3602ebf5697702edf89990c3ebac3efac381861"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nn-NO/firefox-49.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "85fd914b626e27727461dc269c125539793e1a1c6001ea035c636bfee62d42ade799fb89bfba0bd4a915c5b33f6dd4569845cce3f189df1cb31ed2052fb90c30"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nn-NO/firefox-49.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "6a478dd27c868c5e5ec0cda838044ca132eb89d93dee8556591c5651ad9ef8a6d89522498dd5d004e8e84d7ae40c09c69faac63591270b211a60b37667196a6a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/or/firefox-49.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "335e08ee71febcca07e7d11310ed407a888aeb840c2cfc960a13706ce7ef1ecffcf6f8a21f65e1ae1606e88a3b383f9f3bb8d3110a8f3ae768c0c4277d3cf5fa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/or/firefox-49.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "e4c4708c363346af1e7e58664baff9003e890aa934ccbdebaf682ec4b140bed7ab9b93cf657440401672ef1cfb79916d63f164066cc8ead18546de4718aed9ad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pa-IN/firefox-49.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "67a60e43ef5670dc2d669efc62101b87a1caa97c8bf8052c66396efa75c11dd90717b78b7dbac17cb8207549d26ea41d8bdb2965ea249618258de5892c4a40b3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pa-IN/firefox-49.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "c77dbfb443da63d0503a9c3586d01517b463071bfa8b739397b070ce80b8fde2a6ae86ba4552a2efe995eb7eb47cef7f6e2688526c7455c9d308dfdbd229ae6f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pl/firefox-49.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "85f6e5525f0e1b6d691613903f1646c84bcb7758092101c5b64e2190221e5d041e66938845c97877dc79c72aacaf9da6d6009bfaf9745d7138b58bf957591880"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pl/firefox-49.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "0dfccd89d0c8a58a37b66e3034491139ad5fb16102f229c45f5ffcfabe77fc2f6a3a5d01f38c2471a770a1c8c8cf884e3a65cc793efe298366098280eab9da71"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pt-BR/firefox-49.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "8b4ac20ae1fc5a7370199c6dd1e56f2bdb8f394b84e61410d4d33916de3aaab13d1c36d9944f8d6676895838aaf5e8a8beb0d5eadc82429a827214f528968aab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pt-BR/firefox-49.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "2c34abddecd5a2b83d8abef842b165ebcf601b7b90ffb8dc80a265b5297ab33da193ba450210be025d9ac8f826b7b4227063d66c9624bbcee06f01c787406a91"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pt-PT/firefox-49.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "e5a1618114152348b19bc88f7e584d8bad09fedc893ccda0b38b55a1c449ec7f53f74dbae5901414edf74e4f3946e997e79da1ee597db29ff2f884460c2596a2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pt-PT/firefox-49.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "6cce28d554977a263c4d38675f88bfaccd4272c75ab82543b023f57ab503dcc806cb4f824681aef47dc788ed9fe85d54b0b1026cb0dcc4031267715929269fa7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/rm/firefox-49.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "f06f72078658dc8f28fe376af8459980b1ef0470c7fd9557afb3cb4052a14e4e57d6e6131b5f158859ff53efa76ddccb10b95a5731a3c42654907bb8e776db85"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/rm/firefox-49.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "73b537df635d7278f8251ee0de6ddaceb1f9f843187d7b5ec5f0a7ccb8670cf97020a4ad9d22a4479b12dd0e81c36b94f557fc99f45dc70e6efe1914395d788e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ro/firefox-49.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "8ce0260f462af9e2035987af36d90bf3b410d450cc69baada0326962b8a682c5b0e905c7d8a4d30875e4a6f09ca21a04c38db21955d3834c7edd3b5b72758e8b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ro/firefox-49.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "d195066b01b39292121e4016a93d5e2ca02e0f8c3941f371a8033bcfaa4bef2966244ab0def982b1d8814b8d4af95be14b3e4ca3b900401f142aba9376e9387a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ru/firefox-49.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "5860019163bd0bbb2f2a45396f74618358f294bc0a18cfdef148c28dde288050432bd4e1f68cab46b1d08e822f8850f5d940e6ab153a929052e5569199cfc2db"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ru/firefox-49.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "67c6e5e5fa32458db4fb4849796dc042a3f8f8a681c7cea52160f21841776dde9b746a068b090dd21d8db790b37d2306d344fcfc173a92291f73dd0b5d28b293"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/si/firefox-49.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "b218ca70de786cc046146d237283b808f54896c5efb8ca3a9ed2f5b6bc3201abba3ce0d01e3af453b097035b5a19ede69e8ce2543a84efd836d72cbdd3f60070"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/si/firefox-49.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "531f00041cb3eadf78b21f4bfef4429462b4bb3c497209724af5cfd75b879e2dfcf0f64135c79f6be1fa4c9b61a8735f18d6b74d4d6ffab0c252c2e02eb88ab9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sk/firefox-49.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "cefc02bb41d10e463af03b086da872e1cb191c5c44da2b69d0b3005c04d994cfd7c9a05205c2a74b46cf4fd920e12c3fd439da85b6ea8301a04ba07f0387b80a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sk/firefox-49.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "8334ff7e81e83e2a478705e1306fa8d1fe30edace143b5e84ddfafbb8d1b21fcb6875fcab4b36fc7f264fd738dac2821d21c0abffe71899691092ec67403ffe5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sl/firefox-49.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "2bb22102e3597987f81d02f0f162b94505d191c580016af1ad425d7722ec3913ed17d86292eef094d3631d4e0bb8adfcafc5372dbf6c17ce4fd73f4ce8695742"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sl/firefox-49.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "97c9d25d58f0fa546237e9f10ecf9faf52e98242aa233e105233fb36ef97de76719588032d1fcd6b85cf2bb2f096e158a3c02774eac7cb026788d6e336cb5015"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/son/firefox-49.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "8ceeced6f4800f66499a30a2ec2275f70006ab875a7f1c14c095da0400cc7b9e93251da2156df07f2c861f5ce30adf5cbd3c263b6173ba71cb201d0dcfb28aba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/son/firefox-49.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "8808edd0aced9810f191ea4e160aa316db12dfa663e6e085d848cbe2379d664a7c9005d5f9ee024d441398f47a87978d5182dc1b4b69bb9fc5a3b8be83f44457"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sq/firefox-49.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "cf278fecf4a9c7a2590ca4484643c0e430e2f696479d3c50f06068b8191d2353b93c254385c59bed7b077aa83718561c0b387890093f2f026133362a5f2c45d2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sq/firefox-49.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "5b89d98d4bd5f618472bf0531839a5faed960fcb4ecbfd03f894f1aada0f73126a6f9351e1096379e606c6e7ed1665457da9eec05132b5838340be254c091873"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sr/firefox-49.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "3a9549e949628d170e04e696db4f8b436ca240ecff99aff8cf7431391b73124b3278a04f5d758a1b3359de6fe264ba2552072582a8b385c797fc01049fbbd3c5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sr/firefox-49.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "45e4d83ebc97cd5da01e97a6bb083b3464d4b423dadc255ae49c927143be92843dc054357aafb6857f95fe004659833720453b049660f6dd6a75b4d433cde3f7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sv-SE/firefox-49.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "a203c9c80b4c64fec9ebef68279f70b23e1ddfe6a43ce5f6bcad48c9ccb3fbd1835b7a5783c1b4aec3e389301240007bd1fd402db692d2d9000dd5f28384feaf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sv-SE/firefox-49.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "8bdb4da9149743ec4e66f37e0346c46bd011105d09a6517ba8ec35eda4d47d06ea8763114f736cf98aa79b0dafec42e8c8f8285ae87ced63f51f60e2c7088cf6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ta/firefox-49.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "b6d1fa74bcb003f2c5a3dd57c226ecf1a7a99d2874ccf89a525ca23ec5809f12f2d1fee20ebbe9096d9fdd13714d93a46b8ce83544c582a94cb9e39f80fe3ddc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ta/firefox-49.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "0ed976141674b93154cd0f48cbeb70d5349a3642066bed36b53f9c9e8e78fd2c0409e4bff7de038d07480e0fed87fc96485296f4cda9a2a3b460c7dcab622ab7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/te/firefox-49.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "60c4e8c2a1d61ec87a6ce0e0a77a61412d3f9e28dd3310666da0c8ca58ccd93765f20315e8c4866138ede58465626fd16fba5196808fd716dff9ed9ccecd0e95"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/te/firefox-49.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "85fedf1de1c5ceaef81765031e8d5e24145bf1851331d82a319ac54ab0b3abf7f896d69262c82615015e8854649321a9352037c59baf0827c2d3d2d7f40fdfba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/th/firefox-49.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "cacc9b4ccee14f1bfb8c9828c69903933d92fcc73c8fe7b83eb5057e6636b4cc35d231746ecea4e319e7537f7af645fa0c0f8dc5bbc70a333f83ab06780a4ac5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/th/firefox-49.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "88070db1c08bc68231fd32c4ee812ab4c225a3b53a09773bc55ad82381813b822d12fefccbb4dce6b41bb89cc57ab423caf8051b9ecdbb9b9f8e55025d90ec4a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/tr/firefox-49.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "effa5261281a2c45549943d2ea757bd0f2a6100921566114bf6186695f906ee6a19a84992643f4ba5e434b397d4da976ef137cc3992965d269d3f8398def88e4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/tr/firefox-49.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "759cdbed5de7367fb04a412122423b863095743f15e310ec4b4416f89aa8b76cb74fbdbd05524ab0d6ca8f420057d9fe937c7f44e44d5079d35afcf8835e11c7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/uk/firefox-49.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "57937cd67abd7aca0e5ebfed3e890237dd305a45499dea46d31d8e4994195af0365e27981ba624068781df5b0f64437148564604dacf83f96ceb32448503ed41"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/uk/firefox-49.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "94ffa3c69613db6124278edeed6df2d11880a47941c8761eefd86b30eaa6f6b60e83d5fb5df25156613ab74f9f0491e58794042dc1df74909c14089b8cb3b232"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/uz/firefox-49.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "b5280fe0b3d5afcb37afc1c0d18d583f698eca1cd01abbe22ed9c3726db9327e9f758079856fedf23b533a9d64fd47ae9da733a1138ac715b4c0ff043618b89e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/uz/firefox-49.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "d6c658a6c76606ee2861b89f109e1de707e32d1b3136bc92de9f60f2257286b271a0594517d53bcc727a86cb457d33a27bc9574de60c4059b2a203fdd5601a2d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/vi/firefox-49.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "cbe65faa2d20a3740cf1ce97efa29f3e9e1697feef0f63f26d9f7577dc626114834f8435c3b7c7d3989bf3f985d5ac518ab59f6ba9eea4fa86b8f5a20dcf7cc2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/vi/firefox-49.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "919f2fdbf20f39698264a7760ce8df4c7d979bbc91a44ac6a2a258c2ceafa62bcc945dd07a3fb4a4535f47c4e90dc34e06ac0d58165d6ea8edd451bf147aa818"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/xh/firefox-49.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "f8c3c5424bf6bb41ac9143b20a57bb1e78688ad9ba9ba35a5fe00c524354ca9e65db3e0d4dd2b3447c76a80332b9f4adc16fc5daeab61e35ecf868ea935228cc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/xh/firefox-49.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "1d331b1b1c1bf3f84c7378189faa17ca112869b0fcaed57184d5f40d05c9d336a06fecd84bac2a2cbfff5494f0eab472fb4678a82af4541172b240f5baff68e7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/zh-CN/firefox-49.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "0f59002f5d5ae044a07d3c6136a5db19d4c3d067da8617614b8e8b68f266475fdccc32e1bc59bfd3195dff3e475a4e3f1cc6d505b560b8322744277b5d88885d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/zh-CN/firefox-49.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "1a18d792941b4a0d49c1321cd53d397a9c667de62cac58c75229c0b10327cb4e39b7c5df294be378aec581647de1f52c17a309724689f010d37141aa5691cd2a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/zh-TW/firefox-49.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "d58697f7898bf018958d5fc9389b4aa65c81c61fc104e51d758b0a15e19febf22c882b740f12536dfda3ba776019859637b66aa4e302735b31abcff098762175"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/zh-TW/firefox-49.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "4a53044f7e44e5239587256d24f8149ce0d4606bd53ac6a3f1ec48ca6950a67c1892036730ed7743ae53905ef3c33aa4e192805c8a279ced68c3202342439a77"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ach/firefox-50.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "d1fc1b384b44067920b63385d486d41e6fcd47ed14ab31dce708ae25029bb5b437ba5824725c90573d9ccd010c3d4c83131afaf2a2494fdee56a8b7f2ad3c24b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ach/firefox-50.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "cb4a8a03e4a2fd495c8fd6e9b42d6a9556ef7033b8aa6d587b45ed64f2d7b96e1cdaf3dd4413f1a55aaf4300c473ca6abda8cd823efc3a33f15b6f2c693cfc31"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/af/firefox-50.0.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "f2d22dda5b35a4a093fdde9fd6d99b7ba6540c5da218ab8ec87fdf1094b740c71a73e3bd62997fd4a3726a99c39a4c441e1cf3adfb5d56f07752dd508001c802"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/af/firefox-50.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "4dee2a39797423ae4f525b14a007019ac0f4ec2ca781c3ba2b2e6d62dc7fa538c1fa8d2f4b8d7eebdfbece391bcf56bf96a2ef74fb290ebfd217e7ce8f43717b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/an/firefox-50.0.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "56778bd3626177faaeed0a0da8d5db2913fe9fd0f2341b9f438a9862066a8e5818f2ae746f79e03c6c576c5735945c5df378c72269f80054bfb93228b881403b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/an/firefox-50.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "b509fddc94fca6960be4bf358391e2dcd256c70d7a0c730759ba2832b56b654c5d4aff74773499f7be4bf2238c6b575a97a4df28c5943439d0025dda9dab7c18"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ar/firefox-50.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "5480712a3a2a40872ca7ac9625d76761b81a64319b3bb8e675d86022973784621a104dd28c651d7ab633ec11f50823d1a849def5cb06016b54d44c86f586d383"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ar/firefox-50.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "2fc3d317f1afca7784f949bf56dec725228db5f41c8e3be855d5d2bedf416803ba7e32a1fb89628ab844967212cc3a7d0b6320f4a820563e71a70edf0637d3f9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/as/firefox-50.0.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "d6634c1ca6d82e2ed2e7e283431ed95dd65b1db558f50c73130b6d3804517a199d22819c74d6caf66cbbbb3185241990c7bc90fb4932249e5d19c6c48eee6caa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/as/firefox-50.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "1688ec07557c477fdb6ea2df524e28a3acc125016d6d2ea5042d8bc0cc8ba3a8e77f65f44ff41298502459f10749f615484aac9dd3ac6ffcfa8db04f6355d8b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ast/firefox-50.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "96ec194358754aa1c71c1d929fe0641544fb25bbc73e31a865b7f31b5def4320c56d56ffe81388348bc24ac9cb62c4d5055aa2e6b31124cbea9637c1e529f13b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ast/firefox-50.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "46497eb1eb6c432bddd6ae1e9a39f4d86c9f14d3f956302ab2bc5d57625a6f966f687d978e1e93bc351be2c0d32150a5b2873fbb62309698fa7c37794adefb00"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/az/firefox-50.0.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "208d81168e9cdabee3b590813d64bce6211ab9e3cc2bcd11ebeff90a2705f037d2c489a6a50c6e786ade80eaa17faf388b6540610e51f308da03e14e453cc7b1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/az/firefox-50.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "844f3be9b6f52d34f2fb87d8a881a50e49a4820fa97f522d9e462127b88ea4ffdd36a514f353fbbf80e702452a26e2dc30bcd750a0cbd43b26452937955c9c68"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/be/firefox-50.0.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "e0e2f3d6eef948867888f4564dd3322d5e44cde5573675c6d58fbbaddee65e787a31284172f688854e3646bb57e71961ca04ee4623ea3192be1483e5d677dcff"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/be/firefox-50.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "459f5192ca7a1f8dc6f3f22c106db1dd216a41cb11122050e02f86cec06e578fa033b00c1d8355a5a2a759fd8702a14dbaa3a706ec28c50911c2250d4561b228"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bg/firefox-50.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "3ce16e6e974c41d671a58c16b44f660f420dabb7eba7eba9213ba6d86fb029ff495f507a09a1669c6c3641a6dfa9b377a511141b0c3d55839a7ca1e2790a188d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bg/firefox-50.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "53e965cdf50e12a876a9301370029254953eea1bf4e6ff45ef62835a48d25630a59de0ef655b8bd1664e1746b656c556d0955f39ca2e0c9fbf95b795a93197e2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bn-BD/firefox-50.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "789eb6dc6f3f42051ba5f91999fb675955b568198dbe7cce3b2bfe3f3763859a1610009480edd348c857f42704da3338eea28617f97d8272b24a2ff95c7b2450"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bn-BD/firefox-50.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "9cd693b98776e426c0c6d66934c0f7beb7c692b0df5967d09c91889dd12a8a2652cd4641acaaf1c6d7aff9b740504ca54c4fe518496d855316eeb82f82c6f31b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bn-IN/firefox-50.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "b36d55da04a98b29291b65c6f6ced5ccc67bdce7d3265665258e2ad212c5c0f7928943f55b98678924ed1d05121e2d2beaf7fafea9044d7ea4e0263ae2aad3a8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bn-IN/firefox-50.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "f9049cd7d5d67fb52587710d5b7a273819439064a621af6de051a196c5ea597d0d27aaecf638eca1670ac08570df91be906d30935e1f79c2d53c080a5d715ccf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/br/firefox-50.0.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "c8c61f8ab7476c073776e27a9c8110ed5c2968782c9580b5d9afe3670472f984fb4e586a2ce50cc6b0f65dc3628f9fa632c12c9219cb9a5375c5d845f1d39f18"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/br/firefox-50.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "601f5785b61f6900c496cd73430d679d459ef8e4fe37463e752b483ddb16c4c879451fca67c97a4e74bf75473116c171f5ae4ce8da4fb17742785ef7d0baa365"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bs/firefox-50.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "c45716c519a29b5b94383b7c23c592b4d7922c0778abdd0c87519576ba1af459180dbdd87aee112cb9b7f607d3100cf38bb47c59ec1b2dabb6f96169f09c97c9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bs/firefox-50.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "a3a4873487737ca3ad80f4b683ee3342a340dee4543af007b21e7bec008c3187755857cfbd3aa63a16478e93d80b4f40ab1fda44cbf9bb7ed7abfc760073b535"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ca/firefox-50.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "5470ebe85f960627e9b9f08ae37fda4eaf0203542d8e4c2aca85ba54fa8fd8d1694b8722a67e647c9b71ceb75d7eeedb338f9b75f630694fe084160c241d6a1d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ca/firefox-50.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "98ac4372d48b0b7f714ea81da512ca46ccb2fc5d35c17a8e4e17f48942a34008de55935ed65295034376a6d6c6d0b9c984cf7eb82f9450a90adc7d714c8514c5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cak/firefox-50.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "499fc78ab65e872218282cecfdb72ea8ffc54cada9e9f533d5b678c235512489a3f75c78893058a05853372c23cce11e581cc95b9dc249c9932e9d0e4d9ede30"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cak/firefox-50.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "e92f0713a43a1ef4884de071ac598df37499bef2f636031f3e685308dcbc62bdd11ad5b633c4e35f07eb85279bf1114a0210a890f4813d68b114ca52a9122636"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cs/firefox-50.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "0f068b5756a5c6bea869207282cd916703ddabdefe815bdc08a27c70e9992a1041db9ce6dcbb3cc063788ee438cab624cf89ddea480765ef3f09d6b4467c3eb7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cs/firefox-50.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "12f0eae081ddaadbc89283f17b0f69ba677c4f368b29f6cc3bbe308be5beb5be7938019fdcd924abf274c49464ce23e03277e010fe40bbc78f7aba2b6ad8995b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cy/firefox-50.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "ab8a1f8afdece2b69a510a3946dd6fc5763c25bd03456ffe4181aa2b6c3f17471578a64ea1b0a65085ca8682bb7f6cd8c4939394c4686e9ffc3478aa2a7b3a7f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cy/firefox-50.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "2aec664a8884547a81b2cb0bb8a0cf2aa7f5f1ad6c02ead41e6e752cfd0d6739aa408b6d0461a88eacdadf4f2c8323f4de9f8d50669ce756c904510a243d964d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/da/firefox-50.0.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "77d28752fb60f2347393cd952329ab9ab128cbe3442117d2f4d53e84ea69ff10862d930a1884788db61bf6a910909d9ded46e56f2b3ea791a2e4f89b8dc1fab1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/da/firefox-50.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "e864623ef2af94a161f1a22d233480f7bf94adf0a9f75cb23caae207b47a5d34ba9d1d1cc00fe8a51121d3d465f5af087ac5020fc6ba246fc850c5ae4ff3edda"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/de/firefox-50.0.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "148e4c1990f0e68e0550f00d517355f0d2e81f744ec592b297ad3c6a1be12baadedc0d7485ac1585e09891a162fc3fcab1d96645a2b4ab04dbe3b2853fe837f4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/de/firefox-50.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "a13463559ebdd0409d9e2c5de410b748be28de1455fc5b38d8531fd3afaac17e5e5520435908788f5370d4d8329c9dd692d3c2c1e6e0cd00e7f0ec76b2797b1e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/dsb/firefox-50.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "699f12418a92ea82b3bf96b2b2217f20260dbea294c2e7a37f03f9a6f15820fc15cbfb73c0ef3f2e0ff10353b5e6f61a39a4c57d61d6e51da5ba48cce9b6a0a1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/dsb/firefox-50.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "7a8de523144d4f87062f2984788f77e2a36a12087d62e5bb3f054ae7251821aeb9b8d11b5f1c45304dfb9bdd2380f4b5a131c1d5c5a9918d23e0c419f0f27fc0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/el/firefox-50.0.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "9058fa8f99d96eb073581ba96ed37fb6d17ac87040730219962b0afa7348ae39582167b051d3c5e8f11ed6467b36fd73433c3262217f4990b917ad14470a4255"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/el/firefox-50.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "7b4230b827e08863c427ad1b059a8509d9e4bd8de953f588cf750b0dfef5e40bf310022301a2005152fea31c9fe14510c9503ee4fea2362c37e98e52f90abc16"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-GB/firefox-50.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "352ef41a90a9bb237a223d33235d98b0b1d319d30ff091e4b7c3bcf62c7f2511c8fb42d78bc8cbc41f52be4e0111975ad7e7e67e71611170409f41d126e648e4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-GB/firefox-50.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "d452f6bf0bf4a361ca42e9545dc98cae9dbaffe1815efc92e3ee59a91d59554a248b95737d6cfb0e1e40b6cff3fdbbb66a13ded7366572a2b7bb5acb15bcb62e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-US/firefox-50.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "ed9153779e91537aab0f44f86262663da2c0fd32850cb18c86a31952926d0df0ad07108989d698bfbe9f6fd4db8d4e000d5eccb10a9080f1ff0e7fc055e8319a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-US/firefox-50.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "f9c077f4f196cb664383824ef8899db8916890addafaf850aaa99629ede100cfd438af674f37dabe2bd5f8f1e56b870cc308476e5d13e5a24bd3f1694b9719fd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-ZA/firefox-50.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "baa0c4a63a9849dddabfc99f63f42ef007eaec21bfbd9929629c7b3201005256f4862046896a4099c143653bc29967d26c3db35dcf8b39bedc920b8c06625103"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-ZA/firefox-50.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "28c11301d9937a1a7489d2d26d86b44b942d84396a8c0ec4af2cda078ba7c2159452ed44a0132ff3c0d6b93487bead5de373aa0463eede5ea4a9cec3eb95c698"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/eo/firefox-50.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "400763f0273a3be94cde7c38bb410e654e99d190ace2a81d1b588f2bfb143fa7e4a425a9549b5edcdb02a324825d70faa65020752f236043d9e3448313062748"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/eo/firefox-50.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "8bcea2944595a7900dc3a55c4e1d8b0fd70bede700bb244bc75ae981f33e32b67e89878715114e073e64d17b5ab351019628224b47bfe33ddc9a195a0ef08ed4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-AR/firefox-50.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "57a5daa81df3381f32246813e352d453424264cf724b3666d796a0181f08ff0e1a57df53fd089facd5fa32ed072e7821412383de997141cf50fb8a8d73c0ade9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-AR/firefox-50.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "caad9fe9203dbcb03dde31c3a3826d9ab3fc6a8df9a55e79036848d055d7594988c479e6021762a94d5a47fd931aa8f6650947e34d3bbbaccb702002f967e5f3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-CL/firefox-50.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "61ea4becca8ccd9ee635567bb87e881b57ddda08ec00a0cdf4a50c80532789f9730a3a5e7a1c1368d6a80354369471603e89f3e7f2539c6dbce2a40b7821524f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-CL/firefox-50.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "748fec2bf32a63ee7eeb59835e17dc0c60ae78ff3fb3f05b59d4082e29475d8b3758c978a8fbf260ff616c32487e36f2efd0b51b69c8647e9997e8a6c7d0e5f1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-ES/firefox-50.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "2fa4107225c498691148f444eb6497e71111613097d50e4610ac0bec893acd7893e0f3bd4024e2351509f4778af281df3baea97a523d4be4540c6ff28f29aafb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-ES/firefox-50.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "1d9b298fc979b7baab7dfbfca12c172544cec8828afca494a75d0e0517b6cdc89693e94e3cd1c2887d7156a0fd54da9c59adbbc055947f1e9f4c4880f6a125fd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-MX/firefox-50.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "903146601206d5e196684fd908de24ea34d287aee2d03ce68fe2ae8092799a38054ec5a9be2d94b2d3680088eb4a58d2a8a8834652519dd3db2340667041e032"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-MX/firefox-50.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "e84dac8ca10564581f6a13b436a86010da60e88c38ae6f06c67129f2d3c33b4c1bf202810c19bd781aea7a55a809f4bb46cc8fed4b26e892dcd798731d19ea92"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/et/firefox-50.0.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "689674c1ce12fe8f04d0a2824d78ccc0e0685320dbfc83ce5ad00b07ef62dd34bac5ec9719d97241d790daaf20dedfaf63f05b062aff63ca87eaf9b43f796b9b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/et/firefox-50.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "37b8a6b008402ec8ae0dca89a062e9f6b0c84de04a3ebef98de45453252e3f373bc5c58c918c5e7caf05afd8c97fb4b691ec67b22330e3386ff8810d8b46dab9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/eu/firefox-50.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "54d5963fbed7204c0311430f620479ce5eeb0ee3f8d5dc2611c8bf7fc76ca6e44c26d5bc8156afc2406d17b7e6c72a966469333ee1426e2de053666a246a9008"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/eu/firefox-50.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "8296591b01349424dcdea4683795b5063b89d15aed67c299298abc2842e313b18c426e42e687fb7fabe7d6a54cb39af7ebbb1374ad0fbdba42d9c012a82ec8f0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fa/firefox-50.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "3da3bd8e914e155662c9d8377e198e3363b931d4c2483ed880b1d7f7199380165e44183d9e9bb8189a7d461f080c3a0b5cc5b2041c939a2fb8625e4728f4c8ed"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fa/firefox-50.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "1fbaceba15cd7e11b93c0e6977f5711e9aeae64d42e2b8a21aa42c814ee432c7cb0a64a84f0b5d1268275a69dfe2677859f37fb5f62e3d8c729473f4483fe794"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ff/firefox-50.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "21825fd0502866603d3878702d505e3db60e21fde005a4e3ce1d6ddb2c695859c56c1ee352f9a4dcfa6ab4f3bab7a8f7bb4f75d0868920af0186f16d88850d20"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ff/firefox-50.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "52ee181257cac9b916be9c804a1ff7e33f363a1ad2b6aafbbe00d461c4f9d1949345cd7b55d10df0eecf7f0e410ac07a9d7d5ae6dfe142cd594b5b72348726e1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fi/firefox-50.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "612013364ce9f9d984d00c815e8e76f1b45c2de7bc013bdf49aa83c46d522c940e694c530c8a1d9971c1c5a2234b1bdd438f41903fd777b29ea5d51df6c314b4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fi/firefox-50.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "aa93258af4ffa49068887638a33ff41ad29895ecc86ed329094a2b925b655755048b08f862cfb1a5c1d86365dcc1adef2227054c8b5eeac9f46268e1558d10ef"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fr/firefox-50.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "be02f1bcc28af5d4b3cd6e1eca126846cd1443a2f0caa3d1e59be0f3046c5373a22b3fd5c3a853601249ee3e34100cf308bfc1ba54c514bc4cce3b647ce0c691"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fr/firefox-50.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "008d3b64553faaff26ff79a2123d81c0df3d5aa2dc9a6c678cbf472bee47c11d235c59711c5915e5ac991401d076dc7f3edc1da8207481d1c1f871a79a4362b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fy-NL/firefox-50.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "74dbea8c626496a356a0b29fc302f03565dfcdd60e9ea4d68b8b3d3a45f43d66230b2c76919ec4cfd2e4b8d5d4d07d901912a471aeb582c3d35c5799c4d3dda4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fy-NL/firefox-50.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "982ed9e4b817e90b19b2c104b3eae8117b59bded0b066dc773b9515aa8daadc322dc80105a5bc961ce7b0a3c5630838a26492f014be41d92ebde140030dad5c1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ga-IE/firefox-50.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "4be2dfcaf244ec9a3ac64291dc1a77a6359fa4922bfda8a57d847418104adc7f591ae3ff51a5b2d0b2b04e916649889d852e9527b0b59f965fa90b3c091be431"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ga-IE/firefox-50.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "151ca36fa5fd165a1992a682934f0219fb2b85a7a9aab8f503f4cc6685bce5253c7c9317c71007e8fcb2064c3c63c4107c696b5c2651bb1aa3b25897a2d3b17e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gd/firefox-50.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "37dd8b1d6162c05bffe114ea632485316e99cade321f4bda64ee61718f85d61e39c85f543b221833ba3bfbffec29926c907c9ea9349fb54600172c64d1d751a8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gd/firefox-50.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "ae2b24bbbbac0eac95e559cb21561e15221d4d40acb4b6bc069c353e1c0af123cc396a960918683f88f2ab8d6b0207e585a83289704c18ff4735fea3c7e8f51a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gl/firefox-50.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "7105f05777629d12e7c90ec1574cc96a762938841e19185b3b077bdd52d6c28827e285eca95d2d6b0be899541981370f09944bad7773edd646b5199100f50b7f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gl/firefox-50.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "a7dec692e8500d9e884a46cb1f2e340522d770c35b5f0c2743448747ce4322cea63149679f7409162772bd9a13c8275d099ea22ad711ce124d426300e0bb9473"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gn/firefox-50.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "74a46b05abfe713b3f9df1fd651dccd97b281d7d5c5ff93856c6d88c50b0a49428610dc7d8fe6ad5748290d15c2194750e890ddb79b7f7b2eeee77cf9d277bed"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gn/firefox-50.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "486d32491f9f54d374fe24622477677ee90d09209c0eb74bcb52b93d33c2d0a8a540e195cdcc3fb117bf82ed0b777bee6465da51291f1d2998b0fcc1dcec1557"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gu-IN/firefox-50.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "e471f9cf94e85bcf3a0404c9ea0cec7adfb38b64f93a931b86a164814d7b8cdb95d9e78d3790b21235a4da816710ca7f2b9fc547ceb5c11f9d4ed949a7a68ab2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gu-IN/firefox-50.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "70399ee841ca80a3add669509249a57d5be11a7fd69aec4bfdf6eb0d5df5d40941fd59ebd79a0598699fc3adb5e162837691261e31922af8d8074caae6ea0977"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/he/firefox-50.0.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "dacacdfcc223c9709d0082be2a1f51568b8d8adece09640cfd4df74e29ee41c0cf28fc926899310d15a3ee81975f860ae00e896a825f3660ada72fc9318aa23e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/he/firefox-50.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "fbf321e64deba8b83d5e128179671b4c9fc6582ec5447b1a85044f1b142cbbf7f1a38abaab1b6d85f6ce9fff00575f3cc1dc08906f469a8f51b9a51f2d1c86ad"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hi-IN/firefox-50.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "3434e4e259373981127422de30f8d659789651ba5220135a05286ac76e5a468d6d80c9a09f379ea0f4f03f1542ba5fbec064c54718c73bfa85cdd3144ccf5991"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hi-IN/firefox-50.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "d400e6afb62dbcf65e1697bca8aca8d2aabd5391bce50b83201e28fd140c00cef11dcaa7d68ad69a9e82f31e93b3ae350bb0aa2ddf4370cc672a77510bdab89c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hr/firefox-50.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "2210439603d946eca55701bdb95449fffb898442efe85d31059d0314e033c39a8b460b6e7f95c08bb9da145acd27744dc7d59600111bddfee05302c9743aaf4f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hr/firefox-50.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "154d4124cd2fab2f7c01e8e8c4b55ceac6a6582d2c425517a04ab0ba7211f9a834840baf56042a106d59e33e2e6f616597e1f29a21b183567f410627a1bf658b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hsb/firefox-50.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "d33f95c47d6d56599b67e19185b629b05e35ef085d0b8fe08ae461aba3cf9d21b186667f55a5dceba1019fdee6fdc4c105b7e5d7f625252cca5f939c8b7a0cd7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hsb/firefox-50.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "a10434af0fd28a6c38a3bc57acd257dced2f2ec476ce18c7da07927295a98e8ec86f5dcc9012e2c6eb155b70d0ac7c143f74ead9f18bba932c192e5efff87087"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hu/firefox-50.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "f82ba0dea755c93cac27cdfa58b40a79cba3cf09efa126bd978aaead0d64716ec4f9aefbdc3a8e1af0d06fcf2279f1c545efb6177b641fbbcdc24052c7655860"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hu/firefox-50.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "65ae4501c718705163fdccf39e53ef9c753f8b841221832ad6967921e0e7b385a23c0dacf9a1d5f5b309cd1dbfa813879f5a2fd3f0ca93c3dec6865ff36ef5ca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hy-AM/firefox-50.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "dded53d77f186a64336517d5d0cc7777bea256de43cb31f96d35cffc64a55c703b9b986038e82949369348ac83a7a42d4356b72e329e635ec827ddad8d6b5cf9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hy-AM/firefox-50.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "95c883bed5f89a826241b0e8c0f8ca5db10a534a1045ac2b0bc4ac9c93b9dd788644bb3404a95883641c6ed18696096f198dfb74f243a6a6a2d9b59f5e075c4e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/id/firefox-50.0.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "1dbd123dc5a8c15eaf311964fa46175cbefd6a72c84f0e046bdcf0904d942f8e375ad0205e2b708403482ace902b8457377c988eb57aec5a64f366273f818177"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/id/firefox-50.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "d1ccf36aaf7f85cfbdf34f5ec80b73757fb5fa7d1a0f7929bb97e5ebe5ad0cd189d0d288a4ca9466467968234b5b3939b1ffd2650266e26c506c95d0ab36ef61"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/is/firefox-50.0.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "7092e252bb6ed7290d0e0acb6d6fa0be6a4b89e48610909b74a954246eac6066fc2931132afdd15aee617000f59ad042141fe8a83e1a37a1ec9f0bb96197330e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/is/firefox-50.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "1f4b21c65356dc4fb959072020123850654cd0eaecc6057f138608ecdcdca215a64089441d0a2cb2f0b892c430d41f5b24cfc202f3f2fc994ec2cfb5d520cfc3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/it/firefox-50.0.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "41a1e8b539b0eeefbae4c031a997fd8196a05ff4e7883288936b8a4caf6d30f0b6104aad3b955843bd982f8a6785e038bc15913a6423c4a8bc43c5815f890343"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/it/firefox-50.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "cdd26321281d3049b9e34ccbc153af22f8f6a8b43f989df7ad74c448f21b5bc318ec3f6d26d6b9e35e60efe856b831a26e2785bb08b005791ad5b5a7d68feb15"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ja/firefox-50.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "87a8b95bfb8171dd49999ae47f788b1818df0916fc66da9a4bacab5ffafd9791055e49ac5497d19aeb9404a62c6cb9874596f7d5a29c4c7355f119b5105e80bd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ja/firefox-50.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "04c6e5be875955cb4333ccf5bf8134c8485cd65bec9f86f3b06e8e9593bc45ca0d85ffccb7a0477287ed9a5700621d0555627c1261bcc2322d4c446086b6cdf1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/kk/firefox-50.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "e3e597bac7ec1aa163a1e758d23c633d9d453613f8b52bac4b566b6499b1fe1658fcaff1b466f37a752f862a48985a811606ac9c92ea65b8f75a9ff8c2172d7c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/kk/firefox-50.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "1f686ebf1cf1ca38e7e67a9ebfc73af6e9e72e648c34f7e3d2a0e4092c14697dd7608ab4ead11ce38edf3eaead09f96e01d81ad6b8491b54523f37268d1527e5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/km/firefox-50.0.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "b21bba0745523be576c2f99002e01463bbcf5a3dd122578bf78b5614c303e336d3e5c1a27a2b7ad88d53b7df4b063352c867fe66bfd25c167c17c7fc2e81622b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/km/firefox-50.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "9f6b1506ed8fa820f1619d30dc045781a1bcb92f6755c0aad38fc5143c522341ff62afc39d6158aab863996d400a89546d4d2b4fec4f207c01d5c1ad1df8163c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/kn/firefox-50.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "1822443cf61962f06ba82bfb5bf344aeedd12ee77e44acec0fb292ed6ec9fd843f2dab3e43caa0cb633107b8b79f30db88d0fbdfbbceaa5b6441141796a82699"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/kn/firefox-50.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "54542ebefdeecc74344396862dd443bc09c910ff02cc49980e40dc8ec202cc187ee925d560e3d5c409f88b92158aaea2fe2be3ac24a56d370e50f6a9d0caaff1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ko/firefox-50.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "0ca6dca9be0e957d35adfb7f95a38677836620be986fe2b99a5437d5dc64258d081b91c31502103ad61f8f7828d1d6f18049fdd3248721a44ea31a0648512366"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ko/firefox-50.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "9503bd88caf715738f8fcfb2b249fac0cb69873c4c5ed36eda4b06fd1e7f3032c7c8488613a042fc8236cbdaa93c1ef5d7a1d81d374559070006bbd714597313"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lij/firefox-50.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "666615b5905236e42c96c40d911a26b5d9c6c888d825d5bfeb6eccf9881668df41258920093c477e06470ba97046896390fc9fdae4e29e00ef5aad12064fd66a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lij/firefox-50.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "88d7accbd48856477137efde6b2b3d37b017c2b7126e4d37e0b328094e6d110e278ac75b61ac3a09cb5de63aa76b21adfb093327a099013d107fc772b1a7686a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lt/firefox-50.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "eb2300f63ac5983be2138afe6d588385b80595b736ec4d2f878bec3adebb27c5f1fa789103fd500e7297ae5034541287512602d6edf35035bff2c4d2b8f4c087"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lt/firefox-50.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "b45dbcde74268f95b2279ab735140a14ebb2c2a375e8dd296be95136d24f60c2ddf687f61a09218f9bc17575b0014827415b02dad4b3958540cb1fb2b78fff40"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lv/firefox-50.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "6252465e24583b2ee5599a47ff008287a3321955cdfccfb0a8d9b174e02b644e463c2aedf77d9ae9678cf2c682fbec07796a13fea060c735ccc6b11390c3792e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lv/firefox-50.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "068ecd5325471dffe741bcd02adcb3308497eb3c1e2a1679675e27fc8ac58e233457589a56d4eae658540a0876b2e3c1f39407b404a322ea079d95195ae736b9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mai/firefox-50.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "4690b802d91833bd96f7beaabd302ffd9bd40795893cd196a0f09ea47e333e7d645f0462b12fa0ca8909cdee07f2efab5094a0925d3fc11e48138098468ab43e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mai/firefox-50.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "88b4c27346fd74cea35eb635b02840ea771f015fd9f2700751ca26978f502ebce23cecf425e70cf558e38ad4ccb6cc86558190aeb559194005474b6777399591"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mk/firefox-50.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "171fe438b11434ef3ed68507d6bd1465b0d8f9af9a77fefcd2fc7730f0bc8a46a319d9e3d94227b2051e18b990cd8167103e0cf50293bfc0fa57a3b539b4fe5b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mk/firefox-50.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "1f59cd9237149dc22c540461abc640367f02d65103cd60e1d7afb8f43b973cf03122130fb6c665b418896932cae1d4deb7241b45f7d4dcdfe8ea69f0bd4b8143"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ml/firefox-50.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "0cfc6ff07e0fa2b194ca8851d52e3f819f96626d21b827fac14319c849f0fdde21d269637cd5c833d6f0adadd49656b9dbf603d1c0f761aea912c4b8f89917dd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ml/firefox-50.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "de1c49aff4dc4cc4fe2c57a658d1c7dd2ef7b7b7067247c1c261a89109548ba3d22ec7ae488b9c7d338fdef50317ed095ac4cb7390673c6e10e5eb28ffaa3d08"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mr/firefox-50.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "f4a470619058a8d509d4fb25f017f859628c0f502de4af7504ec189e70dd07460aedf7ad0dd36224c57eb6b6acad763d6781893369e1db7ed1e12050a0bbd6e2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mr/firefox-50.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "13e5c2fd2f0aab0ebf186d4042e3aaba4b5a7d01a6de1515e9ae34c2d1d81825fd6db52ae7994f0c6f711830dd95e32fbe61e1e09a020cae08a85f575ae2d22d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ms/firefox-50.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "3ee62d50bf8dbf1d013e61b19856efebe5a5624f4111286c81ccb4449a6d8124702106a49405570cfa810c0a32f0737e9cc105bd75229d466864e8471a5e5c44"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ms/firefox-50.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "39531760eb1cfe7ef58d7c2eb8eee3fa8c467e9880d3a1ddb0f957364949df0af06c0d03b91e50efe420f16c26df32ce5214979fa7088a79cd1de70691fa8a9c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nb-NO/firefox-50.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "e566041725660698d2c51941859301036801aef3596ff250ad9faa96d1333951ba388df09aaedf04204becfa9e177448fff5229845f6a8b5507784e4df0665c9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nb-NO/firefox-50.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "b11ca7ad3089bdcd2921a882395384cc2e35512488224e0d3b7b227c05436064a8fa6d174221adbcf405bf274a63e61d365a3a3b4b5a6d9f053714448cb267c7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nl/firefox-50.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "7f6f5a34bd1f2a6c9b637768af109f7612847258f45dd59d713004dc2b7c9cb46387310b000416d96e6ce1266e709f30df9fc48bdc97312f082ffa9c5ed3fc28"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nl/firefox-50.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "db633339a4ab8c788b267aa2435a13607a5d1fda365c06f1d90f19e5604b60a809dae31e8d135204fb14d8af8a67334dcf62a88e29102c30a19c1ecb9ef415ce"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nn-NO/firefox-50.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "841de10098e98a2148dd035983d7d1e2429e1b10789d5bdc8fad5d3276427eafc6ad9d9cf2db0038eab313484835a8ebd77098c7018f81fb0b9fb523c4841bdd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nn-NO/firefox-50.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "ae58d4a6a5d0b5ea1d5d080598fbcd6235c06657b4a3ee3b294bcd4f7360094a47a26bbdc6d5de8d2b782b3f243dda31bfb663bd3c7f81b0b980b9b75a089205"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/or/firefox-50.0.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "20d1a99edb738fde9791404ab0b55385386d33c74b1d2f944c1f8cd3b3175fc8a8ddf7351ab8f551a6d6299379e7551366a6cc02461c8ce3a28e59da4094e636"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/or/firefox-50.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "b3e77c5d5730c616170361d785ce138bba1ebff030b33d88eb3340eee53114e07e9129072e77e2cc10513b036bd05ccf7e1e1e46ab3a7c760b8eab7963a69152"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pa-IN/firefox-50.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "7e2a99511fb20a8f34a9fa18f66a45643cae32313818dde229239a48eed7ab8ddc71c501f8b14233e67daaf0f4dc914fb9ffbb0ef807a89209a5a46fe4ae62cb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pa-IN/firefox-50.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "8d3b86add09c64c76bbf0ce7530d43785704fd38c98859dc9c2c42364f58633de61de8dbe00dfae9f89f8c9960acc42eef317c1d87b8e7944daf54e18b295073"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pl/firefox-50.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "9aa2853624394395ac0f17ca3a0fbf90b8519e852e16b12ea8221a9ba146cb87d7e3b881e26db4be69aa9499e8f6c2f83be2ce7aca9a4c1ed8eaf562d98b80d5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pl/firefox-50.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "7dd5dfa772b8869eef4b47ba01380b84989135690fae5417ff029ce2b1226c7335239e4832fae760a311c184d21a6cf3f92f30531620614c16829084b41cb48d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pt-BR/firefox-50.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "d9a431bd40fdefe3c84e820c6d6df478dd26a8eefe7ec42537891fb8043ac0101363e256d953f85cf48f812aca09e8800aad4263f6999da1e079d75d09386031"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pt-BR/firefox-50.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "f1c2a10e5ecb74570c5e985ba09763d362105242b53fc9e9cd51098f3bc8f4f9280c7290b9ba4335e455ce9e3dd175f67554fb25aa86544d37fc609b8b98adca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pt-PT/firefox-50.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "0958cb1f5ef1260da0931cc4e16c81ab8995711acf846a2658c5f184968c13fd8d40af27613ce2b5c6e5ad462ee14f39f2a614294bea9cfb2dc875d0f0e8779c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pt-PT/firefox-50.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "5ae4cf72ebc9af54a7b24ae0a37947cb4e8045f674538d26ee642d4fb7547e6ee2fe5525c4e04b8aa41a34ec26276832663088ba379f6abbcc9ccde533388f7b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/rm/firefox-50.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "48c20ddc5d312f3720bdb8b40cde75830475fcc00ef579c100aa45d668416ae9dd048fe5711448eab59d50b019326aea7885110ef15112e7c4e58185dade84cb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/rm/firefox-50.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "4e2a66781f0d7e7349debaab08a6c532a82a603562a65437230c7301f2abc6674a6acbd4254c616e3bff8eab53978c780f870141cab42872a0361f853e3be6ee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ro/firefox-50.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "d2cbb5bd4e7dea0596c3fe16ce2dc383e4c8408f5a4f0a9035094a8b714961d3d541b473c586ec8a3140984e8ac902d940e5e86be5215321090c14fb67688a33"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ro/firefox-50.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "81ec70d793ece3f33ca7dbf7667764a9ed9d0234b084dbd2ea1e92bcce281ed71133f342618c30be4195da49247ac09b44eb27c9a2996cf07d5f5a17455ea939"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ru/firefox-50.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "07e460bf0545e35399c937f06a6a848e4967eed45e86562a6a9a673baeaf1beade10ff7bad1d3892f9304e6018bc87260e212c067a81ca7bc25f2a8e9fbc5f2c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ru/firefox-50.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "23a097dd2e8047f9623a35f4190c7acc70123f9f0347e2ca204bc7cd71da4b2c20a3c26192773eae70bc5fbaa7ec194b9137a8f30c28bae672c608c58bdb3f23"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/si/firefox-50.0.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "1bfac64a39a787f02311a0486badc56f0a3058362b6c4947b92688cc654e21c6502703464f0e3a90ec7eac35fb2596e3ddff7b23b3970316320d38e013d5db88"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/si/firefox-50.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "dddf6b5248c71ec8fd152d5d9ee24809add324d529fddfca6166c48e300e92a9bcc96084b2b3b99968044174cefa757e8af8f5d13198a0ff0fac59c321b3f00c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sk/firefox-50.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "1ca56172371a3470cec3ec174b6cc14fd5721bc29e3f7683d8f5009c5ace2a5aeb005d28cc9096398e79c03dbeb6a3f14677b9792ce95fb36c8c69d0070a0b78"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sk/firefox-50.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "2fa6ec9328ab40f46eae66e18ae167d9bccd4d5be43fe3ab5fce73059941178af8813bfe7fe26106ad569e6d1c03338e440ee32722f041e73ec63338828e4d23"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sl/firefox-50.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "b3aa500e2b55b502d60f322c63f08f5add6063b8b5f0f2d4cbecabd56b08ab8a20792f47c34daac6d9c56e9d74d10fc15ef3901f27442e5de2db0933932b3dfe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sl/firefox-50.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "c1deecac7551c39b3b47b0b97896ae8264519251e58f5f34272bf15f53f4d6b28a82bd8a55ff584d501aeed00b6c2d6c56a7d6594d2ea4129fa2f16951cec4d7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/son/firefox-50.0.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "4655634990c822e94bc9cea432a0c90de92dbdc3b6d033a546c8d30a23c078b5725e20151f61c60c92ade138aca083032c7182fb7030d53accf2586d03d435f4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/son/firefox-50.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "8c5a0d0e3a042750a72b40908a862e4e98d0350efe9f10ee7a1c0c27913ebdc94ebbf4cc216f12b7ba459b2b12c889df2715e2664a6eb3ad52107c3c791f26c3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sq/firefox-50.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "7a9616abba37469aa5c8686a726723f32059a682ab35c0d3ca179ae8c817490c01947b69d329e224526a972e9116d4755303fc99f601b1a4d2581e75b77924b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sq/firefox-50.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "39b28857af6b2ca281eda2525731987a9eb3474f538fcdc402d3bc067ed28d43c445f88355ed84a30c5f99f1b9f7281435501fb4dc89ba217ff9a0b2d7121026"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sr/firefox-50.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "318dd8b07c62f2c98c35695d36b4273d4e3189d0003b5047be5f5c1bf49ae9b82a33ea3244f37e354b4c6b0db75c068042c22a6949b2dc90045ae2f87a8b45c0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sr/firefox-50.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "690ff481c3c79ed3bb8b0ee3157a5f1708f53a985cefa245776a47ccb93ad769228fe76db665d8488884a93f397d219dd8474fd1a63744be54d7b9cfa58ef37e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sv-SE/firefox-50.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "d55e6447238a8bcd1521eae2167064eb4951bc11dcd7a16227ec4690d4ca7d56a567a70d2737a084bbe3aa4e5276970586b4bf21d16c85e2435ed60824d32a38"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sv-SE/firefox-50.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "f48485a6ce34e2915d91a4673af7bc050776bdbffb8e9dd3656691e9cd389c9534666969de7bef065c4825012594ee1e4e633b1fcf4f4947bdcf644c08962304"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ta/firefox-50.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "b7b006f1ff11895bca5b33cb138385055b902730892dccd5620d1537c3dba6c4a5a8c6a11d4a61ed0baa75feadccf04aad29ca251f7bf19c17c7d8db13c401b7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ta/firefox-50.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "1f7c5dd068f4829569b398691ebb719c851ff165844eb4ca1d26026a4d40926ebc3c71c4ddcaa5e8d9b9b159ed5d08d24e2b50d3a93d111cad3d3d02d5a26f43"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/te/firefox-50.0.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "ee698d3366f202ae4ff8ed2f1d8bbe1e592fa6200e9734469292d76595e3629d3818744ae05d1d37e7372c622f79b4e8c075011dd7b835a61aba86b272c6ac94"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/te/firefox-50.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "7037a57a9e456bed79b7527b35bd680c32a94204c94b1b9d0247c0e521867ea0c606875e11a3bce6f5c2271a5e322f3481cc5451fc413cec5a5f6f199a676a2b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/th/firefox-50.0.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "62870d113beadebcfafba9c6d133cdc88769f20088b788a8577a99afa85562df901f14ce1f2c8bf6e344ac31b8a8dcb96172a5724add11936f78aba7d26d5444"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/th/firefox-50.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "5c9cca0455a4da647b8f2b178bbe73037b1d5c7ffe95dd12ee3042ab982da0cea21ff9afd4b954805966d25b035d0ad83fe138dc80a7d345a81a01df722a9dba"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/tr/firefox-50.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "0f7e16b46d0c931e147f1f6efa7ba4d12d629bb909f220bfccd9646e968e52e1d7641ab174880313781f1c149ef7b4f6311acb042b704fd18337a31531fc8863"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/tr/firefox-50.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "864a500456f1728c2043e6841256a21613864501d7428248606495c8c34ceefe0db23b3dca6a3fca9f92a22af663109d41ffe46daf19d64aad379774848a448f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/uk/firefox-50.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "94cbfc40c5c9cbf13592a7134cc4ec2ee2fea4b733738acb45ca454e029228cf741111c5478961494a9e7965f771fca06aef0e58eca076721e8bfb11ee237202"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/uk/firefox-50.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "a4d7ca792c89f37fc1457e36beba54e75a5901bbad1832272a03b0bcaa3536ed237559aca38775e16940c035b117efd1caa1929e96c889843d2732d5cbbe38a4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/uz/firefox-50.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "e3b740953b1a9456321e684cb0dd606967d46d9ebc120d43a10244b88586c1ac4fa7cd6c7ede0fdb52690fb102e8a8a456c1c226ac7eecaa50776b52062e5285"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/uz/firefox-50.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "6a45689d06f4d52c5352d69049e55346c8791720f1d38257a49ad8ddeb9d94c0b0adafdb10a3432b4e4a75dd83eff618d7731a3bbf8752c979c0efc09b67a363"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/vi/firefox-50.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "f1691996ead43b59409f590a46bd97359183a05ca5f5bf49966d128b2de6b8bcc2fff2c3f73e3966a8f6182aff9c1dabb88e659ce128ca6ae4cf11aa877c8df1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/vi/firefox-50.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "9fd0fe5312763143d83677b11efd0dab2e84fd93cf4a884261d33dfc23d76facd7be7d6e3701e3dc9134bfe7ac7cf8d3138f63dc490964d1b6dd696451ae18cd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/xh/firefox-50.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "f15b3c3e4b57447023a6086b948b5f68bb5c6301c3e7f138d7e61b2cf34d87357b7e5894bcc6262552449a5d67c2548f52fa3942b01603c15cdc9803fa45660e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/xh/firefox-50.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "b28e30d95f608733099acfc6c39e0062bc3470d8ba386ea563d9b376f95e5a4bb9374d0fc360d0a387b9edd1ba252b437cf32c555c68667323648830efd96e45"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/zh-CN/firefox-50.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "b351d0c9f5bce2da39dd4dc500377e7a07812c6ee2c3359a15b095be562b90b43da6bd7c61435c04791278b9e47eb2ed9dbcb589fc86abdf84a16dea86c88dca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/zh-CN/firefox-50.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "3912d4ef5bd3e9cb5bd7e6f559c66e06568a1441394c41a9a47433c28a551f3c012717adb66f02441106e20cbf866a4a201af079f4f59b9c34ed1250fb64b22e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/zh-TW/firefox-50.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "1438e36a719409637e246b2d2b18b7493b00446daaa18579d2c1c45866e0aa597a8934e9d3c15893d987dccf1c1df5d4a03d34f37cbb3b3f2d2fcd52392621ca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/zh-TW/firefox-50.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "cd5f4baef991942ac555dcc8ed37857d4a9faa29befb8b8dcce82f000a87b0bf62f0ce208df7f7238b8d7e684294f33d63194bedb21e988085bc64241fcf633f"; } ]; } From 1624f7f17474bbcfe68ac6d78bbe62ae6bd57462 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Nov 2016 16:33:41 +0100 Subject: [PATCH 0310/1749] nss: 3.26 -> 3.27.1 --- .../libraries/nss/85_security_load.patch | 52 +++++++++---------- pkgs/development/libraries/nss/default.nix | 6 +-- 2 files changed, 27 insertions(+), 31 deletions(-) diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load.patch index 632cc418425c..9e4be3bf282e 100644 --- a/pkgs/development/libraries/nss/85_security_load.patch +++ b/pkgs/development/libraries/nss/85_security_load.patch @@ -1,8 +1,7 @@ -diff --git a/nss/cmd/shlibsign/shlibsign.c b/nss/cmd/shlibsign/shlibsign.c -index 63a4836..a128c1d 100644 ---- a/nss/cmd/shlibsign/shlibsign.c -+++ b/nss/cmd/shlibsign/shlibsign.c -@@ -862,6 +862,8 @@ int main(int argc, char **argv) +diff -ru -x '*~' nss-3.27.1-orig/nss/cmd/shlibsign/shlibsign.c nss-3.27.1/nss/cmd/shlibsign/shlibsign.c +--- nss-3.27.1-orig/nss/cmd/shlibsign/shlibsign.c 2016-10-03 16:55:58.000000000 +0200 ++++ nss-3.27.1/nss/cmd/shlibsign/shlibsign.c 2016-11-15 16:28:07.308117900 +0100 +@@ -871,6 +871,8 @@ libname = PR_GetLibraryName(NULL, "softokn3"); assert(libname != NULL); lib = PR_LoadLibrary(libname); @@ -11,22 +10,20 @@ index 63a4836..a128c1d 100644 assert(lib != NULL); PR_FreeLibraryName(libname); -diff --git a/nss/coreconf/config.mk b/nss/coreconf/config.mk -index 61d757b..b58a98b 100644 ---- a/nss/coreconf/config.mk -+++ b/nss/coreconf/config.mk -@@ -205,3 +205,6 @@ $(error Setting NSS_ENABLE_TLS_1_3 and NSS_DISABLE_ECC isn't a good idea.) - endif - DEFINES += -DNSS_ENABLE_TLS_1_3 +diff -ru -x '*~' nss-3.27.1-orig/nss/coreconf/config.mk nss-3.27.1/nss/coreconf/config.mk +--- nss-3.27.1-orig/nss/coreconf/config.mk 2016-10-03 16:55:58.000000000 +0200 ++++ nss-3.27.1/nss/coreconf/config.mk 2016-11-15 16:28:07.308117900 +0100 +@@ -217,3 +217,6 @@ + ifdef NSS_NO_PKCS11_BYPASS + DEFINES += -DNO_PKCS11_BYPASS endif + +# Nix specific stuff. +DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\" -diff --git a/nss/lib/pk11wrap/pk11load.c b/nss/lib/pk11wrap/pk11load.c -index 5c5d2ca..026e528 100644 ---- a/nss/lib/pk11wrap/pk11load.c -+++ b/nss/lib/pk11wrap/pk11load.c -@@ -429,6 +429,13 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) { +diff -ru -x '*~' nss-3.27.1-orig/nss/lib/pk11wrap/pk11load.c nss-3.27.1/nss/lib/pk11wrap/pk11load.c +--- nss-3.27.1-orig/nss/lib/pk11wrap/pk11load.c 2016-10-03 16:55:58.000000000 +0200 ++++ nss-3.27.1/nss/lib/pk11wrap/pk11load.c 2016-11-15 16:28:07.308117900 +0100 +@@ -429,6 +429,13 @@ * unload the library if anything goes wrong from here on out... */ library = PR_LoadLibrary(mod->dllName); @@ -40,11 +37,10 @@ index 5c5d2ca..026e528 100644 mod->library = (void *)library; if (library == NULL) { -diff --git a/nss/lib/util/secload.c b/nss/lib/util/secload.c -index eb8a9ec..f94f67d 100644 ---- a/nss/lib/util/secload.c -+++ b/nss/lib/util/secload.c -@@ -69,9 +69,14 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name) +diff -ru -x '*~' nss-3.27.1-orig/nss/lib/util/secload.c nss-3.27.1/nss/lib/util/secload.c +--- nss-3.27.1-orig/nss/lib/util/secload.c 2016-10-03 16:55:58.000000000 +0200 ++++ nss-3.27.1/nss/lib/util/secload.c 2016-11-15 16:29:50.482259746 +0100 +@@ -70,9 +70,14 @@ /* Remove the trailing filename from referencePath and add the new one */ c = strrchr(referencePath, PR_GetDirectorySeparator()); @@ -55,12 +51,12 @@ index eb8a9ec..f94f67d 100644 + } if (c) { size_t referencePathSize = 1 + c - referencePath; -- fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 1); +- fullName = (char*)PORT_Alloc(strlen(name) + referencePathSize + 1); + fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5); if (fullName) { memcpy(fullName, referencePath, referencePathSize); - strcpy(fullName + referencePathSize, name); -@@ -81,6 +86,11 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name) + strcpy(fullName + referencePathSize, name); +@@ -82,6 +87,11 @@ #endif libSpec.type = PR_LibSpec_Pathname; libSpec.value.pathname = fullName; @@ -71,9 +67,9 @@ index eb8a9ec..f94f67d 100644 + strcpy(fullName + referencePathSize, name); dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL #ifdef PR_LD_ALT_SEARCH_PATH - /* allow library's dependencies to be found in the same directory -@@ -88,6 +98,10 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name) - | PR_LD_ALT_SEARCH_PATH + /* allow library's dependencies to be found in the same directory +@@ -89,6 +99,10 @@ + | PR_LD_ALT_SEARCH_PATH #endif ); + if (! dlh) { diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 841795383805..ff8b0fec0a12 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.26"; + version = "3.27.1"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_26_RTM/src/${name}.tar.gz"; - sha256 = "0r65s5q8kk0vr48s0zr8xi610k7h072lgkkpp4z6jlxr19bkly4i"; + url = "mirror://mozilla/security/nss/releases/NSS_3_27_1_RTM/src/${name}.tar.gz"; + sha256 = "fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b"; }; buildInputs = [ nspr perl zlib sqlite ]; From c2b9404c02e567b163d62cfdc7f24f1b19e79680 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Nov 2016 16:57:33 +0100 Subject: [PATCH 0311/1749] firefox: 49.0.2 -> 50.0 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 650f4a3006a2..f9d5768903ea 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -141,8 +141,8 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "49.0.2"; - sha512 = "e9daa62c8e645ec034f1435afb579ddb5c503db313ea0cc3e48b7508f8368028979de07ca1426cc4c0f3ae82756f39dcb3b349712d520b8503a34afbd443fb1e"; + version = "50.0"; + sha512 = "cc325515e238cc3b78cb2cffcc2d80c9f233c0adf750c10100f0dccbab2aec6794f737d7374e600d547d5306de966dd00a0bf40a2dd71ec9dfacb6b157300a76"; }; firefox-esr-unwrapped = common { From 334a1a6f8ae550aa43c2562ee0f8abbbdea61548 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Sun, 13 Nov 2016 16:15:45 +0100 Subject: [PATCH 0312/1749] Revert "Fix icu4c expression for latest gcc (fixes #2341)" This reverts commit d393c6c53803a6c1d61fa5e58e283aaa4beba7b8. The commit removed C++11 compatibility on darwin by overriding the --std=c++0x flag in CXXFLAGS. Which lead to a failing build of mapnik, which depends on the move constructors being available in the icu-lib. Since it builds fine without the headerpad_max_install_names flag, we simply undo the change that introduced this flag. --- pkgs/development/libraries/icu/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index a7bf4af99fb3..ba8fe038ffac 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -16,9 +16,6 @@ stdenv.mkDerivation ({ outputs = [ "out" "dev" ]; outputBin = "dev"; - makeFlags = stdenv.lib.optionalString stdenv.isDarwin - "CXXFLAGS=-headerpad_max_install_names"; - # FIXME: This fixes dylib references in the dylibs themselves, but # not in the programs in $out/bin. buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; From 80eafb39e140b64f1366b26f5aa210ae2d80e68a Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Sun, 13 Nov 2016 13:18:39 +0100 Subject: [PATCH 0313/1749] mapnik: Make dependencies explicit for SCons This is necessary to fix the build for (at least) darwin. If the arguments are not specified explicitly then homebrew-install locations are assumed for at least "icu". Closes #20395. --- pkgs/development/libraries/mapnik/default.nix | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 1df9cf0492dc..e5845fee3041 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -24,7 +24,31 @@ stdenv.mkDerivation rec { ]; configurePhase = '' - scons configure PREFIX="$out" + scons configure PREFIX="$out" BOOST_INCLUDES="${boost.dev}/include" \ + BOOST_LIBS="${boost.out}/lib" \ + CAIRO_INCLUDES="${cairo.dev}/include" \ + CAIRO_LIBS="${cairo.out}/lib" \ + FREETYPE_INCLUDES="${freetype.dev}/include" \ + FREETYPE_LIBS="${freetype.out}/lib" \ + GDAL_CONFIG="${gdal}/bin/gdal-config" \ + HB_INCLUDES="${harfbuzz.dev}/include" \ + HB_LIBS="${harfbuzz.out}/lib" \ + ICU_INCLUDES="${icu.dev}/include" \ + ICU_LIBS="${icu.out}/lib" \ + JPEG_INCLUDES="${libjpeg.dev}/include" \ + JPEG_LIBS="${libjpeg.out}/lib" \ + PNG_INCLUDES="${libpng.dev}/include" \ + PNG_LIBS="${libpng.out}/lib" \ + PROJ_INCLUDES="${proj}/include" \ + PROJ_LIBS="${proj}/lib" \ + SQLITE_INCLUDES="${sqlite.dev}/include" \ + SQLITE_LIBS="${sqlite.out}/lib" \ + TIFF_INCLUDES="${libtiff.dev}/include" \ + TIFF_LIBS="${libtiff.out}/lib" \ + WEBP_INCLUDES="${libwebp}/include" \ + WEBP_LIBS="${libwebp}/lib" \ + XML2_INCLUDES="${libxml2.dev}/include" \ + XML2_LIBS="${libxml2.out}/lib" ''; buildPhase = false; From 9e851d3b110fa7548d7a9e103a4f1bd7aaa4d99e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 12:30:55 -0500 Subject: [PATCH 0314/1749] linux: 4.8.7 -> 4.8.8 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index a1f5230ac002..e6e26a4ae5a9 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.7"; + version = "4.8.8"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03qgqqy1kxdqpb844g2yfyq45xy77110hrz8ddqy0rlkia8kzx8m"; + sha256 = "0hm60zjsp22rbh8jz4d8rpwsj6bysmlcm0c5m1cxpnfj6cqcjp7w"; }; kernelPatches = args.kernelPatches; From 24c342fde7da069ddcd39f5d3afcd4ec4ec47b00 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 12:31:27 -0500 Subject: [PATCH 0315/1749] linux: 4.4.31 -> 4.4.32 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index e2d184c2c673..e307520cf6b8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.31"; + version = "4.4.32"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03fzi08xs9xp7r7bla6n3ykr81a365n8c5br1x7vwpgpacm63rk6"; + sha256 = "03n3wzbqc2h09ydwz3jybrc8ll6f2znr0k7f0hayj0qi5wx1rnpc"; }; kernelPatches = args.kernelPatches; From 703b404c62326d186ee5771b37e4c098827ffd41 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 13:15:10 -0500 Subject: [PATCH 0316/1749] kotlin: 1.0.5 -> 1.0.5-2 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index e1de97e17c40..52a47c50420e 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: stdenv.mkDerivation rec { - version = "1.0.5"; + version = "1.0.5-2"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha512 = "0bkgxr4an1fq890s3bw4izwc8ly29xk28gdibvnp2q9qd15rwrny5dgns697rnbw2gg0nn08q5p33asvbkac001cfabfphamjwndvc9"; + sha512 = "0z8phc51y8dfjnm95fs2dnmvhp7xm2am5xm71byh598flkpjmagnwah4j8z9fpg4qy94dwmqxf5zs3q8nfra89kmwskzpvp7bbibi0h"; }; propagatedBuildInputs = [ jre ] ; From 207b8d1c46e431a6ac2bfbdf14f9385098b4b51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 15 Nov 2016 19:22:39 +0100 Subject: [PATCH 0317/1749] firefox-esr: security-only update 45.4.0 -> 45.5.0 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index f9d5768903ea..5c3749f83fa1 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -147,8 +147,8 @@ in { firefox-esr-unwrapped = common { pname = "firefox-esr"; - version = "45.4.0esr"; - sha512 = "2955e02f829a10186a8b22320fb97d4b0fc2b45721fcffa6295653fd760d516ae72b5656547685ba1e0699b381e28044996d9ee12a8738842b4e6b8acd296715"; + version = "45.5.0esr"; + sha512 = "fadac65fcad4bd4701026c9f3d87ba7dec304205e3c375769db7f7de9e596877deed9b21d3e8c34c1ce8ae689dd2979b3627742dfbec9bc0cb16a5cb1ce7507d"; }; } From 3c3dfbc40255b26d5d2286a06eeac293991d4b88 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 15 Nov 2016 21:43:08 +0100 Subject: [PATCH 0318/1749] aha: 0.4.10.1 -> 0.4.10.2 --- pkgs/tools/text/aha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 6bccd16edf7d..9851f9596c36 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "aha-${version}"; - version = "0.4.10.1"; + version = "0.4.10.2"; src = fetchFromGitHub { - sha256 = "0j4jn8c0bhvbmpp2ynkw1y0l5dm49s7g5rmsvdxh0g1sjai161ss"; + sha256 = "14n0py8dzlvirawb8brq143nq0sy9s2z6in5589krrya0frlrlkj"; rev = version; repo = "aha"; owner = "theZiz"; From 2ca507a2b8408228cacb56f59dfbf0039bcff6c2 Mon Sep 17 00:00:00 2001 From: Stefan Goetz Date: Tue, 15 Nov 2016 22:01:29 +0100 Subject: [PATCH 0319/1749] youtube-dl: 2016-11-08.1 -> 2016-11-14.1 (#20440) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a2dd91e83bc9..fe6838d52000 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.11.08.1"; + version = "2016.11.14.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "95d45438254c949952127b269451da861682fb06a7ef62b5f5dc75bc40bfaeeb"; + sha256 = "d96b5e5fe7de67ea01c2be746c00dc78ffbf3f74654aa989db8baaf153243537"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From f11b7cf579d09341f701766ef7a360848808c255 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 16:11:29 -0500 Subject: [PATCH 0320/1749] gradle: 3.1 -> 3.2 --- 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 b995e76f63ab..dee5146e7307 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,11 +52,11 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-3.1"; + name = "gradle-3.2"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1z0h60w0wvdg2rlxg5izcbhnrzdmr3mdgs7p09cm4lr28d139pn7"; + sha256 = "0d9911011hg0rsqs7r4fz1xjrx0h43qji8s7f0vw0v926xlb68ak"; }; }; From 7df3d7446f868170848227cd972fa833c827f07c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 15 Nov 2016 16:31:55 -0500 Subject: [PATCH 0321/1749] Add initial basic support for cross-compiling to iOS --- .../darwin/apple-source-releases/default.nix | 11 +++- pkgs/os-specific/darwin/ios-cross/default.nix | 54 +++++++++++++++++++ pkgs/stdenv/cross/default.nix | 6 +++ pkgs/stdenv/default.nix | 6 ++- pkgs/top-level/all-packages.nix | 4 ++ 5 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/darwin/ios-cross/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 8625ac72c104..d86754ecc74c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, pkgs }: +{ stdenv, fetchurl, fetchzip, pkgs, fetchurlBoot }: let # This attrset can in theory be computed automatically, but for that to work nicely we need @@ -123,7 +123,14 @@ let }; }; - fetchApple = version: sha256: name: fetchurl { + fetchApple = version: sha256: name: let + # When cross-compiling, fetchurl depends on libiconv, resulting + # in an infinite recursion without this. It's not clear why this + # worked fine when not cross-compiling + fetch = if name == "libiconv" + then fetchurlBoot + else fetchurl; + in fetch { url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${versions.${version}.${name}}.tar.gz"; inherit sha256; }; diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix new file mode 100644 index 000000000000..d9f4320556c9 --- /dev/null +++ b/pkgs/os-specific/darwin/ios-cross/default.nix @@ -0,0 +1,54 @@ +{ runCommand +, lib +, llvm +, clang +, binutils +, stdenv +, coreutils +, gnugrep +}: { prefix, arch, simulator ? false }: let + sdkType = if simulator then "Simulator" else "OS"; + + sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}10.0.sdk"; + + /* TODO: Properly integrate with gcc-cross-wrapper */ + wrapper = import ../../../build-support/cc-wrapper { + inherit stdenv coreutils gnugrep; + nativeTools = false; + nativeLibc = false; + inherit binutils; + libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}"; + cc = clang; + extraBuildCommands = '' + # ugh + tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp + mv cc-cflags.tmp $out/nix-support/cc-cflags + echo "-target ${prefix} -arch ${arch} -idirafter ${sdk}/usr/include ${if simulator then "-mios-simulator-version-min=7.0" else "-miphoneos-version-min=7.0"}" >> $out/nix-support/cc-cflags + + # Purposefully overwrite libc-ldflags-before, cctools ld doesn't know dynamic-linker and cc-wrapper doesn't do cross-compilation well enough to adjust + echo "-arch ${arch} -L${sdk}/usr/lib -L${sdk}/usr/lib/system" > $out/nix-support/libc-ldflags-before + ''; + }; +in { + cc = runCommand "${prefix}-cc" {} '' + mkdir -p $out/bin + ln -sv ${wrapper}/bin/clang $out/bin/${prefix}-cc + mkdir -p $out/nix-support + echo ${llvm} > $out/nix-support/propagated-native-build-inputs + cat > $out/nix-support/setup-hook < Date: Tue, 15 Nov 2016 16:39:08 -0500 Subject: [PATCH 0322/1749] llvm-3.8: Fix segfault in llc --- pkgs/development/compilers/llvm/3.8/llvm.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 6112228bf4fc..fa647e62ff14 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -35,10 +35,14 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ ncurses zlib ]; + # Fix a segfault in llc + # See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html + patches = [ ./D17533-1.patch ]; + # hacky fix: New LLVM releases require a newer OS X SDK than # 10.9. This is a temporary measure until nixpkgs darwin support is # updated. - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc ''; From 459ab0e0fde940343efbd7eb79bf05a7c813faae Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 15 Nov 2016 16:41:24 -0500 Subject: [PATCH 0323/1749] Whoops, actually add patch for llvm --- .../compilers/llvm/3.8/D17533-1.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/development/compilers/llvm/3.8/D17533-1.patch diff --git a/pkgs/development/compilers/llvm/3.8/D17533-1.patch b/pkgs/development/compilers/llvm/3.8/D17533-1.patch new file mode 100644 index 000000000000..79ca953d6e5b --- /dev/null +++ b/pkgs/development/compilers/llvm/3.8/D17533-1.patch @@ -0,0 +1,60 @@ +commit eb92f5a745014532b83abfba04602fce87ca8393 +Author: Chuang-Yu Cheng +Date: Fri Apr 8 12:04:32 2016 +0000 + + CXX_FAST_TLS calling convention: performance improvement for PPC64 + + This is the same change on PPC64 as r255821 on AArch64. I have even borrowed + his commit message. + + The access function has a short entry and a short exit, the initialization + block is only run the first time. To improve the performance, we want to + have a short frame at the entry and exit. + + We explicitly handle most of the CSRs via copies. Only the CSRs that are not + handled via copies will be in CSR_SaveList. + + Frame lowering and prologue/epilogue insertion will generate a short frame + in the entry and exit according to CSR_SaveList. The majority of the CSRs will + be handled by register allcoator. Register allocator will try to spill and + reload them in the initialization block. + + We add CSRsViaCopy, it will be explicitly handled during lowering. + + 1> we first set FunctionLoweringInfo->SplitCSR if conditions are met (the target + supports it for the given machine function and the function has only return + exits). We also call TLI->initializeSplitCSR to perform initialization. + 2> we call TLI->insertCopiesSplitCSR to insert copies from CSRsViaCopy to + virtual registers at beginning of the entry block and copies from virtual + registers to CSRsViaCopy at beginning of the exit blocks. + 3> we also need to make sure the explicit copies will not be eliminated. + + Author: Tom Jablin (tjablin) + Reviewers: hfinkel kbarton cycheng + + http://reviews.llvm.org/D17533 + + git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@265781 91177308-0d34-0410-b5e6-96231b3b80d8 + +diff --git a/lib/CodeGen/TargetFrameLoweringImpl.cpp b/lib/CodeGen/TargetFrameLoweringImpl.cpp +index 679ade1..0a0e079 100644 +--- a/lib/CodeGen/TargetFrameLoweringImpl.cpp ++++ b/lib/CodeGen/TargetFrameLoweringImpl.cpp +@@ -63,12 +63,15 @@ void TargetFrameLowering::determineCalleeSaves(MachineFunction &MF, + const TargetRegisterInfo &TRI = *MF.getSubtarget().getRegisterInfo(); + const MCPhysReg *CSRegs = TRI.getCalleeSavedRegs(&MF); + ++ // Resize before the early returns. Some backends expect that ++ // SavedRegs.size() == TRI.getNumRegs() after this call even if there are no ++ // saved registers. ++ SavedRegs.resize(TRI.getNumRegs()); ++ + // Early exit if there are no callee saved registers. + if (!CSRegs || CSRegs[0] == 0) + return; + +- SavedRegs.resize(TRI.getNumRegs()); +- + // In Naked functions we aren't going to save any registers. + if (MF.getFunction()->hasFnAttribute(Attribute::Naked)) + return; From 0d4e1b5eddb57ed428ac30bfb248ea60ccc2bd2c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 15 Nov 2016 22:45:06 +0100 Subject: [PATCH 0324/1749] grsecurity: 4.8.7-201611142350 -> 4.8.8-201611150756 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index a1f5230ac002..e6e26a4ae5a9 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.7"; + version = "4.8.8"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03qgqqy1kxdqpb844g2yfyq45xy77110hrz8ddqy0rlkia8kzx8m"; + sha256 = "0hm60zjsp22rbh8jz4d8rpwsj6bysmlcm0c5m1cxpnfj6cqcjp7w"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 2f7398a0a4b2..3c6058c407a5 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.7"; - grrev = "201611142350"; - sha256 = "002zm8j130ras0dabp95bb82c5h8y9z66jl81jip226y3bk3b019"; + { kver = "4.8.8"; + grrev = "201611150756"; + sha256 = "04sankbjlrji3hrhgwfvmgkrh5ypblb706i0hch4sn3vcc0dq87b"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From f477bc98bec323cdb58735580f17701238a7bc68 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 15 Nov 2016 22:55:17 +0100 Subject: [PATCH 0325/1749] torbrowser: 6.0.5 -> 6.0.6 --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 900ad39ecb23..be93b291dcc2 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "6.0.5"; + version = "6.0.6"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "fc917bd702b1275cae3f7fa8036c3c44af9b4f003f3d4a8fbb9f6c0974277ad4" else - "e0c3ce406b6de082692ce3db52b6e04053e205194b26fbf0eee9014be543d98d"; + "0ydcbkpyrdwsqn841cxzpbr05nzly720xhsin89gjc1sirvmlxmx" else + "0q8ygkgs47wjq12l37kwm93v1420gzrlacwqc0yz4b3b58aa1d4z"; }; desktopItem = makeDesktopItem { From 845b56d25af40d90e3cd6ec4d60c6b3f091c7588 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 15 Nov 2016 16:59:09 -0500 Subject: [PATCH 0326/1749] Initial support for cross-compiling ghc --- pkgs/development/compilers/ghc/D2710.patch | 19 +++ pkgs/development/compilers/ghc/D2711.patch | 22 +++ pkgs/development/compilers/ghc/D2712.patch | 158 ++++++++++++++++++ pkgs/development/compilers/ghc/D2713.patch | 17 ++ ...pass-linker-flags-via-response-files.patch | 20 --- pkgs/development/compilers/ghc/head.nix | 60 ++++--- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/haskell-packages.nix | 7 +- 8 files changed, 263 insertions(+), 42 deletions(-) create mode 100644 pkgs/development/compilers/ghc/D2710.patch create mode 100644 pkgs/development/compilers/ghc/D2711.patch create mode 100644 pkgs/development/compilers/ghc/D2712.patch create mode 100644 pkgs/development/compilers/ghc/D2713.patch delete mode 100644 pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch diff --git a/pkgs/development/compilers/ghc/D2710.patch b/pkgs/development/compilers/ghc/D2710.patch new file mode 100644 index 000000000000..0ee1b06c7346 --- /dev/null +++ b/pkgs/development/compilers/ghc/D2710.patch @@ -0,0 +1,19 @@ +diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h +--- a/rts/LinkerInternals.h ++++ b/rts/LinkerInternals.h +@@ -303,4 +303,14 @@ + # define OBJFORMAT_MACHO + #endif + ++/* In order to simplify control flow a bit, some references to mmap-related ++ definitions are blocked off by a C-level if statement rather than a CPP-level ++ #if statement. Since those are dead branches when !RTS_LINKER_USE_MMAP, we ++ just stub out the relevant symbols here ++*/ ++#if !RTS_LINKER_USE_MMAP ++#define munmap(x,y) /* nothing */ ++#define MAP_ANONYMOUS 0 ++#endif ++ + #endif /* LINKERINTERNALS_H */ + diff --git a/pkgs/development/compilers/ghc/D2711.patch b/pkgs/development/compilers/ghc/D2711.patch new file mode 100644 index 000000000000..8d229f273999 --- /dev/null +++ b/pkgs/development/compilers/ghc/D2711.patch @@ -0,0 +1,22 @@ +diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c +--- a/rts/sm/Storage.c ++++ b/rts/sm/Storage.c +@@ -1314,7 +1314,7 @@ + ------------------------------------------------------------------------- */ + + #if (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS) +-void sys_icache_invalidate(void *start, size_t len); ++#include + #endif + + /* On ARM and other platforms, we need to flush the cache after +@@ -1327,7 +1327,7 @@ + (void)exec_addr; + #elif (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS) + /* On iOS we need to use the special 'sys_icache_invalidate' call. */ +- sys_icache_invalidate(exec_addr, ((unsigned char*)exec_addr)+len); ++ sys_icache_invalidate(exec_addr, len); + #elif defined(__GNUC__) + /* For all other platforms, fall back to a libgcc builtin. */ + unsigned char* begin = (unsigned char*)exec_addr; + diff --git a/pkgs/development/compilers/ghc/D2712.patch b/pkgs/development/compilers/ghc/D2712.patch new file mode 100644 index 000000000000..d938d70bbcfe --- /dev/null +++ b/pkgs/development/compilers/ghc/D2712.patch @@ -0,0 +1,158 @@ +diff --git a/includes/rts/OSThreads.h b/includes/rts/OSThreads.h +--- a/includes/rts/OSThreads.h ++++ b/includes/rts/OSThreads.h +@@ -15,7 +15,12 @@ + #ifndef RTS_OSTHREADS_H + #define RTS_OSTHREADS_H + +-#if defined(THREADED_RTS) /* to near the end */ ++#if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS) ++#define BUILD_OSTHREAD_POSIX ++#endif ++ ++ ++#if defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) /* to near end */ + + #if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS) + +@@ -205,13 +210,25 @@ + void releaseThreadNode (void); + #endif // !CMINUSMINUS + +-#else ++#endif /* defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) */ ++ ++#ifndef THREADED_RTS ++ ++#ifdef ACQUIRE_LOCK ++// If we have pthreads, we pull in the threading primitives even when the RTS ++// isn't threaded, but we expect these macros to be noops on non-threaded RTS. ++ ++#undef ACQUIRE_LOCK ++#undef RELEASE_LOCK ++#undef ASSERT_LOCK_HELD ++ ++#endif + + #define ACQUIRE_LOCK(l) + #define RELEASE_LOCK(l) + #define ASSERT_LOCK_HELD(l) + +-#endif /* defined(THREADED_RTS) */ ++#endif + + #ifndef CMINUSMINUS + // +diff --git a/rts/posix/OSThreads.c b/rts/posix/OSThreads.c +--- a/rts/posix/OSThreads.c ++++ b/rts/posix/OSThreads.c +@@ -35,7 +35,7 @@ + #endif + #endif + +-#if defined(THREADED_RTS) ++#if defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) + #include "RtsUtils.h" + #include "Task.h" + +@@ -225,47 +225,6 @@ + return NULL; + } + +-int +-forkOS_createThread ( HsStablePtr entry ) +-{ +- pthread_t tid; +- int result = pthread_create(&tid, NULL, +- forkOS_createThreadWrapper, (void*)entry); +- if(!result) +- pthread_detach(tid); +- return result; +-} +- +-void freeThreadingResources (void) { /* nothing */ } +- +-uint32_t +-getNumberOfProcessors (void) +-{ +- static uint32_t nproc = 0; +- +- if (nproc == 0) { +-#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN) +- nproc = sysconf(_SC_NPROCESSORS_ONLN); +-#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF) +- nproc = sysconf(_SC_NPROCESSORS_CONF); +-#elif defined(darwin_HOST_OS) +- size_t size = sizeof(uint32_t); +- if(sysctlbyname("hw.logicalcpu",&nproc,&size,NULL,0) != 0) { +- if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) +- nproc = 1; +- } +-#elif defined(freebsd_HOST_OS) +- size_t size = sizeof(uint32_t); +- if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) +- nproc = 1; +-#else +- nproc = 1; +-#endif +- } +- +- return nproc; +-} +- + #if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_SETAFFINITY) + // Schedules the thread to run on CPU n of m. m may be less than the + // number of physical CPUs, in which case, the thread will be allowed +@@ -353,6 +312,51 @@ + pthread_kill(id, SIGPIPE); + } + ++#endif /* defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) */ ++ ++#if defined(THREADED_RTS) ++ ++int ++forkOS_createThread ( HsStablePtr entry ) ++{ ++ pthread_t tid; ++ int result = pthread_create(&tid, NULL, ++ forkOS_createThreadWrapper, (void*)entry); ++ if(!result) ++ pthread_detach(tid); ++ return result; ++} ++ ++void freeThreadingResources (void) { /* nothing */ } ++ ++uint32_t ++getNumberOfProcessors (void) ++{ ++ static uint32_t nproc = 0; ++ ++ if (nproc == 0) { ++#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN) ++ nproc = sysconf(_SC_NPROCESSORS_ONLN); ++#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF) ++ nproc = sysconf(_SC_NPROCESSORS_CONF); ++#elif defined(darwin_HOST_OS) ++ size_t size = sizeof(uint32_t); ++ if(sysctlbyname("hw.logicalcpu",&nproc,&size,NULL,0) != 0) { ++ if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) ++ nproc = 1; ++ } ++#elif defined(freebsd_HOST_OS) ++ size_t size = sizeof(uint32_t); ++ if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) ++ nproc = 1; ++#else ++ nproc = 1; ++#endif ++ } ++ ++ return nproc; ++} ++ + #else /* !defined(THREADED_RTS) */ + + int + diff --git a/pkgs/development/compilers/ghc/D2713.patch b/pkgs/development/compilers/ghc/D2713.patch new file mode 100644 index 000000000000..80cf35a52974 --- /dev/null +++ b/pkgs/development/compilers/ghc/D2713.patch @@ -0,0 +1,17 @@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -437,7 +437,11 @@ + else + CrossCompilePrefix="" + fi +-TargetPlatformFull="${TargetPlatform}" ++# Despite its similarity in name to TargetPlatform, TargetPlatformFull is used ++# in calls to subproject configure scripts and thus must be set to the autoconf ++# triple, not the normalized GHC triple that TargetPlatform is set to. ++# It may be better to just do away with the GHC triples all together. ++TargetPlatformFull="${target}" + AC_SUBST(CrossCompiling) + AC_SUBST(CrossCompilePrefix) + AC_SUBST(TargetPlatformFull) + diff --git a/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch deleted file mode 100644 index ebbb9326a829..000000000000 --- a/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ghc/compiler/main/SysTools.hs 2016-11-09 14:03:05.304528147 -0500 -+++ ghc2/compiler/main/SysTools.hs 2016-11-09 14:00:19.712934686 -0500 -@@ -421,7 +421,7 @@ - args1 = map Option (getOpts dflags opt_c) - args2 = args0 ++ args1 ++ args - mb_env <- getGccEnv args2 -- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env -+ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env - where - -- discard some harmless warnings from gcc that we can't turn off - cc_filter = unlines . doFilter . lines -@@ -911,7 +911,7 @@ - args1 = map Option (getOpts dflags opt_l) - args2 = args0 ++ linkargs ++ args1 ++ args - mb_env <- getGccEnv args2 -- runSomethingResponseFile dflags ld_filter "Linker" p args2 mb_env -+ runSomethingFiltered dflags ld_filter "Linker" p args2 mb_env - where - ld_filter = case (platformOS (targetPlatform dflags)) of - OSSolaris2 -> sunos_ld_filter diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index d57b6e575da5..21f0eecc87f7 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,27 +1,35 @@ { stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils -, autoconf, automake, happy, alex +, autoconf, automake, happy, alex, cross ? null }: let inherit (bootPkgs) ghc; -in stdenv.mkDerivation rec { - version = "8.1.20161109"; + commonBuildInputs = [ ghc perl autoconf automake happy alex ]; + + version = "8.1.20161115"; + + commonPreConfigure = '' + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + ''; +in stdenv.mkDerivation (rec { + inherit version; name = "ghc-${version}"; - rev = "2e8463b232054b788b73e6551947a9434aa76009"; + rev = "017d11e0a36866b05ace32ece1af11adf652a619"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "12nxai5qqnw42syhd0vzl2f9f8z28rc0fsa7g771dyzpqglak90l"; + sha256 = "091zpb9vqqy4jqh4q7sz04dh1yfdczaaikbxi5ppim01gzbxwn65"; }; - patches = [ - ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 - ]; - postUnpack = '' - pushd ghc-${builtins.substring 0 7 rev} + chmod -R +w ghc + pushd ghc echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID patchShebangs . @@ -29,20 +37,14 @@ in stdenv.mkDerivation rec { popd ''; - buildInputs = [ ghc perl autoconf automake happy alex ]; + buildInputs = commonBuildInputs; enableParallelBuilding = true; - preConfigure = '' - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; + preConfigure = commonPreConfigure; configureFlags = [ - "--with-cc=${stdenv.cc}/bin/cc" + "CC=cc" "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ @@ -76,4 +78,22 @@ in stdenv.mkDerivation rec { inherit (ghc.meta) license platforms; }; -} +} // stdenv.lib.optionalAttrs (cross != null) { + name = "${cross.config}-ghc-${version}"; + + # Some fixes for cross-compilation to iOS. See https://phabricator.haskell.org/D2710 (D2711,D2712,D2713) + patches = [ ./D2710.patch ./D2711.patch ./D2712.patch ./D2713.patch ]; + + preConfigure = commonPreConfigure + '' + sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk + ''; + + configureFlags = [ + "CC=${cross.config}-cc" + "--target=${cross.config}" + ]; + + buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutilsCross ]; + + dontSetConfigureCross = true; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e376eb40d62c..3d74d74e18cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4855,7 +4855,7 @@ in # Haskell and GHC - haskell = callPackage ./haskell-packages.nix { }; + haskell = callPackage ./haskell-packages.nix { inherit crossSystem; }; haskellPackages = haskell.packages.ghc801.override { overrides = config.haskellPackageOverrides or (self: super: {}); diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f305c55dbfa5..a3867860799d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, callPackage, stdenv }: +{ pkgs, callPackage, stdenv, crossSystem }: rec { @@ -50,6 +50,10 @@ rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) alex happy; }; + # TODO: how should we support multiple versions of this? + ghcCross = compiler.ghcHEAD.override { + cross = crossSystem; + }; ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix rec { bootPkgs = packages.ghc784; inherit (bootPkgs) alex happy; @@ -121,6 +125,7 @@ rec { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; + # TODO Support for ghcCross here ghcNokinds = callPackage ../development/haskell-modules { ghc = compiler.ghcNokinds; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { }; From ef4a335be4844a593f26cdd8c2bc4a9d0ddf6e89 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 18:05:02 -0500 Subject: [PATCH 0327/1749] git: 2.10.1 -> 2.10.2 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index e432543df452..9c44d420c136 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.10.1"; + version = "2.10.2"; svn = subversionClient.override { perlBindings = true; }; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1ijd1b6szvfw0dmqa3dz1m5g5hbkl9xkb86a9qcjrz0w0vwjvhx9"; + sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; }; hardeningDisable = [ "format" ]; From 6f7593fddcc70a96d219bd7c72658e6ace8ffa9a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 15 Nov 2016 18:30:26 -0500 Subject: [PATCH 0328/1749] ghc-head: fix hash. Apparently fetchgit lies... --- pkgs/development/compilers/ghc/head.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 21f0eecc87f7..2399a44fc0d2 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -24,12 +24,11 @@ in stdenv.mkDerivation (rec { src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "091zpb9vqqy4jqh4q7sz04dh1yfdczaaikbxi5ppim01gzbxwn65"; + sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y"; }; postUnpack = '' - chmod -R +w ghc - pushd ghc + pushd ghc-${builtins.substring 0 7 rev} echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID patchShebangs . @@ -44,7 +43,7 @@ in stdenv.mkDerivation (rec { preConfigure = commonPreConfigure; configureFlags = [ - "CC=cc" + "CC=${stdenv.cc}/bin/cc" "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ From 289604273803b548605a3eca8ef44a26e7c43c7d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 18:38:48 -0500 Subject: [PATCH 0329/1749] gradle: Add variable nativeVersion --- .../tools/build-managers/gradle/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index dee5146e7307..8d9308e7fcff 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper }: rec { - gradleGen = {name, src} : stdenv.mkDerivation rec { - inherit name src; + gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation rec { + inherit name src nativeVersion; dontBuild = true; @@ -21,10 +21,10 @@ rec { let arch = if stdenv.is64bit then "amd64" else "i386"; in '' mkdir patching pushd patching - jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-0.11.jar + jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so - jar cf native-platform-linux-${arch}-0.11.jar . - mv native-platform-linux-${arch}-0.11.jar $out/lib/gradle/lib/ + jar cf native-platform-linux-${arch}-${nativeVersion}.jar . + mv native-platform-linux-${arch}-${nativeVersion}.jar $out/lib/gradle/lib/ popd # The scanner doesn't pick up the runtime dependency in the jar. @@ -53,6 +53,7 @@ rec { gradle_latest = gradleGen rec { name = "gradle-3.2"; + nativeVersion = "0.11"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; @@ -62,6 +63,7 @@ rec { gradle_2_14 = gradleGen rec { name = "gradle-2.14.1"; + nativeVersion = "0.10"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; @@ -71,6 +73,7 @@ rec { gradle_2_5 = gradleGen rec { name = "gradle-2.5"; + nativeVersion = "0.10"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; From 224331adc7d7e95c367e01f82eb63da9c799af1c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 19:03:40 -0500 Subject: [PATCH 0330/1749] liquibase: 3.4.2 -> 3.5.3 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 27c9cc7955f8..5305297a27af 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "liquibase"; - version = "3.4.2"; + version = "3.5.3"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; - sha256 = "1kvxqjz8jmqpmb1clhp2asxmgfk6ynqjir8fldc321v9a5wnqby5"; + sha256 = "04cpnfycv0ms70d70w8ijqp2yacj2svs7v3lk99z1bpq3rzx51gv"; }; buildInputs = [ jre makeWrapper ]; From d9e63424b7a81966b9fd768c37b928617f3be62f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 15 Nov 2016 19:44:21 -0500 Subject: [PATCH 0331/1749] ghc-HEAD: Run boot after patches. This allows for patches affecting configure.ac to take effect --- pkgs/development/compilers/ghc/head.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 2399a44fc0d2..aec6faed585e 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -27,13 +27,11 @@ in stdenv.mkDerivation (rec { sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y"; }; - postUnpack = '' - pushd ghc-${builtins.substring 0 7 rev} + postPatch = '' echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID patchShebangs . ./boot - popd ''; buildInputs = commonBuildInputs; From de87138b9ac14a466fe5f0b43462542308913cb0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 25 Jun 2016 23:45:55 -0500 Subject: [PATCH 0332/1749] xcbuild: add wrapper Also updates xcbuild version. This changes the raw string expressions into nix expressions that are then converted into json by builtins.toJSON. Then, converted to Plist XML by Apple's plutil. Sadly, xcbuild does not support using raw JSON but Apple's plutil does so we just convert the file from JSON to XML using Apple's plutil. The result is not ideal but it looks like all OS X systems have working plutil's. - set mac version to 10.10 - add setup hook. --- pkgs/development/tools/xcbuild/default.nix | 11 +- pkgs/development/tools/xcbuild/developer.nix | 33 + pkgs/development/tools/xcbuild/platform.nix | 604 +++++++++++++++++++ pkgs/development/tools/xcbuild/sdk.nix | 31 + pkgs/development/tools/xcbuild/setup-hook.sh | 17 + pkgs/development/tools/xcbuild/toolchain.nix | 100 +++ pkgs/development/tools/xcbuild/wrapper.nix | 64 ++ pkgs/top-level/all-packages.nix | 5 +- 8 files changed, 859 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/tools/xcbuild/developer.nix create mode 100644 pkgs/development/tools/xcbuild/platform.nix create mode 100644 pkgs/development/tools/xcbuild/sdk.nix create mode 100644 pkgs/development/tools/xcbuild/setup-hook.sh create mode 100644 pkgs/development/tools/xcbuild/toolchain.nix create mode 100644 pkgs/development/tools/xcbuild/wrapper.nix diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index e313672aea3f..1393034ff205 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng, CoreServices, CoreGraphics, ImageIO }: +{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng, CoreServices, CoreGraphics, ImageIO, ninja }: let googletest = fetchFromGitHub { @@ -16,13 +16,13 @@ let }; in stdenv.mkDerivation rec { name = "xcbuild-${stdenv.lib.substring 0 8 version}"; - version = "49f8a5923f1381f87ac03ad4c1b138d1d2b74369"; + version = "0ab861abcc11185a17d59608f96a015752a6fadc"; src = fetchFromGitHub { owner = "facebook"; repo = "xcbuild"; rev = version; - sha256 = "0l107xkh7dab2xc58dqyrrhpd1gp12cpzh0wrx0i9jbh0idbwnk0"; + sha256 = "12h0rn8v0js2vph2pwp5wvcrfkj12nz365i5qxw9miyfn4msnz26"; }; prePatch = '' @@ -39,5 +39,6 @@ in stdenv.mkDerivation rec { rmdir $out/usr ''; - buildInputs = [ cmake zlib libxml2 libpng CoreServices CoreGraphics ImageIO ]; -} \ No newline at end of file + buildInputs = [ cmake zlib libxml2 libpng ninja ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; +} diff --git a/pkgs/development/tools/xcbuild/developer.nix b/pkgs/development/tools/xcbuild/developer.nix new file mode 100644 index 000000000000..993a5fb861a2 --- /dev/null +++ b/pkgs/development/tools/xcbuild/developer.nix @@ -0,0 +1,33 @@ +{stdenv, platform, toolchain, xcbuild, writeText}: + +let + +AbstractAssetCatalog = { + Type = "FileType"; + Identifier = "folder.abstractassetcatalog"; + BasedOn = "wrapper"; + + UTI = "com.apple.dt.abstractassetcatalog"; + IsTransparent = "NO"; +}; + +in + +stdenv.mkDerivation { + name = "Xcode.app"; + buildInputs = [ xcbuild ]; + buildCommand = '' + mkdir -p $out/Contents/Developer/Library/Xcode/Specifications/ + cp ${xcbuild}/Library/Xcode/Specifications/* $out/Contents/Developer/Library/Xcode/Specifications/ + + plutil -convert xml1 ${writeText "folder.abstractassetcatalog" (builtins.toJSON AbstractAssetCatalog)} -o $out/Contents/Developer/Library/Xcode/Specifications/folder.abstractassetcatalog.xcspec + + mkdir -p $out/Contents/Developer/Platforms/ + cd $out/Contents/Developer/Platforms/ + ln -s ${platform} + + mkdir -p $out/Contents/Developer/Toolchains/ + cd $out/Contents/Developer/Toolchains/ + ln -s ${toolchain} + ''; +} diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix new file mode 100644 index 000000000000..692a673e5c9d --- /dev/null +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -0,0 +1,604 @@ +{ stdenv, sdk, writeText, platformName, xcbuild }: + +let + + Info = { + CFBundleIdentifier = platformName; + Type = "Platform"; + }; + + Version = { + ProjectName = "OSXPlatformSupport"; + }; + + PackageTypes = [ + { + Type = "PackageType"; + Identifier = "com.apple.package-type.mach-o-executable"; + Name = "Mach-O Executable"; + Description = "Mach-O executable"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ""; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.executable"; + Name = "$(EXECUTABLE_NAME)"; + IsLaunchable = "YES"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.mach-o-objfile"; + Name = "Mach-O Object File"; + Description = "Mach-O Object File"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ""; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.objfile"; + Name = "$(EXECUTABLE_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.mach-o-dylib"; + Name = "Mach-O Dynamic Library"; + Description = "Mach-O dynamic library"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ""; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.dylib"; + Name = "$(EXECUTABLE_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.static-library"; + Name = "Mach-O Static Library"; + Description = "Mach-O static library"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = "lib"; + EXECUTABLE_SUFFIX = ".a"; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "archive.ar"; + Name = "$(EXECUTABLE_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.mach-o-bundle"; + Name = "Mach-O Loadable"; + Description = "Mach-O loadable"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ".dylib"; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.bundle"; + Name = "$(EXECUTABLE_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.wrapper"; + Name = "Wrapper"; + Description = "Wrapper"; + DefaultBuildSettings = { + WRAPPER_PREFIX = ""; + WRAPPER_SUFFIX = ".bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)/Contents"; + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ""; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/MacOS"; + EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)"; + INFOPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/Info.plist"; + INFOSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings"; + PKGINFO_PATH = "$(CONTENTS_FOLDER_PATH)/PkgInfo"; + PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist"; + VERSIONPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/version.plist"; + PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; + PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; + EXECUTABLES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Executables"; FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks"; + SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks"; + SHARED_SUPPORT_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedSupport"; + UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources"; + LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj"; + DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation"; + PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns"; + SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts"; + JAVA_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Java"; + }; + ProductReference = { + FileType = "wrapper.cfbundle"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.wrapper.shallow"; + BasedOn = "com.apple.package-type.wrapper"; + Name = "Wrapper (Shallow)"; + Description = "Shallow Wrapper"; + DefaultBuildSettings = { + CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)"; + EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; + UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; + SHALLOW_BUNDLE = "YES"; + }; + ProductReference = { + FileType = "wrapper.cfbundle"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.wrapper.application"; + BasedOn = "com.apple.package-type.wrapper"; + Name = "Application Wrapper"; + Description = "Application Wrapper"; + DefaultBuildSettings = { + GENERATE_PKGINFO_FILE = "YES"; + }; + ProductReference = { + FileType = "wrapper.application"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "YES"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.wrapper.application.shallow"; + BasedOn = "com.apple.package-type.wrapper.shallow"; + Name = "Application Wrapper (Shallow)"; + Description = "Shallow Application Wrapper"; + DefaultBuildSettings = { + UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; + GENERATE_PKGINFO_FILE = "YES"; + SHALLOW_BUNDLE = "YES"; + }; + ProductReference = { + FileType = "wrapper.application"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "YES"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.wrapper.framework"; + Name = "Framework Wrapper"; + Description = "Framework wrapper"; + DefaultBuildSettings = { + WRAPPER_PREFIX = ""; + WRAPPER_SUFFIX = ".framework"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + VERSIONS_FOLDER_PATH = "$(WRAPPER_NAME)/Versions"; + CONTENTS_FOLDER_PATH = "$(VERSIONS_FOLDER_PATH)/$(FRAMEWORK_VERSION)"; + CURRENT_VERSION = "Current"; + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ""; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; + EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)"; + INFOPLIST_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Info.plist"; + INFOPLISTSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings"; + PKGINFO_PATH = "$(WRAPPER_NAME)/PkgInfo"; + PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist"; + VERSIONPLIST_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/version.plist"; + PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; + PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; + EXECUTABLES_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)"; FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks"; + SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks"; + SHARED_SUPPORT_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)"; + UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources"; + LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj"; + DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation"; + PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns"; + SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts"; + JAVA_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Java"; + CODESIGNING_FOLDER_PATH = "$(TARGET_BUILD_DIR)/$(CONTENTS_FOLDER_PATH)"; + }; + ProductReference = { + FileType = "wrapper.framework"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.wrapper.framework.static"; + Name = "Mach-O Static Framework"; + Description = "Mach-O static framework"; + BasedOn = "com.apple.package-type.wrapper.framework"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ""; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + }; + ProductReference = { + FileType = "wrapper.framework.static"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.wrapper.framework.shallow"; + Name = "Shallow Framework Wrapper"; + Description = "Shallow framework wrapper"; + BasedOn = "com.apple.package-type.wrapper.framework"; + DefaultBuildSettings = { + CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)"; + VERSIONS_FOLDER_PATH = "$(WRAPPER_NAME)"; + UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; + SHALLOW_BUNDLE = "YES"; + }; + ProductReference = { + FileType = "wrapper.framework"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.bundle.unit-test"; + BasedOn = "com.apple.package-type.wrapper"; + Name = "Unit Test Bundle"; + Description = "Unit Test Bundle"; + DefaultBuildSettings = { + WRAPPER_SUFFIX = "xctest"; + }; + ProductReference = { + FileType = "wrapper.cfbundle"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + ]; + + ProductTypes = [ + { + Type = "ProductType"; + Identifier = "com.apple.product-type.tool"; + Class = "PBXToolProductType"; + Name = "Command-line Tool"; + Description = "Standalone command-line tool"; + IconNamePrefix = "TargetExecutable"; + DefaultTargetName = "Command-line Tool"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ""; + REZ_EXECUTABLE = "YES"; + INSTALL_PATH = "/homeless-shelter"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + GCC_DYNAMIC_NO_PIC = "NO"; + GCC_SYMBOLS_PRIVATE_EXTERN = "YES"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; + STRIP_STYLE = "all"; + CODE_SIGNING_ALLOWED = "YES"; + }; + PackageTypes = [ + "com.apple.package-type.mach-o-executable" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.objfile"; + Class = "XCStandaloneExecutableProductType"; + Name = "Object File"; + Description = "Object File"; + IconNamePrefix = "TargetPlugin"; + DefaultTargetName = "Object File"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; + MACH_O_TYPE = "mh_object"; + LINK_WITH_STANDARD_LIBRARIES = "NO"; + REZ_EXECUTABLE = "YES"; + EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; + EXECUTABLE_EXTENSION = "o"; + PUBLIC_HEADERS_FOLDER_PATH = "/homeless-shelter"; + PRIVATE_HEADERS_FOLDER_PATH = "/homeless-shelter"; + INSTALL_PATH = "/homeless-shelter"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + SKIP_INSTALL = "YES"; + STRIP_STYLE = "debugging"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; + KEEP_PRIVATE_EXTERNS = "YES"; + DEAD_CODE_STRIPPING = "NO"; + }; + PackageTypes = [ + "com.apple.package-type.mach-o-objfile" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.library.dynamic"; + Class = "PBXDynamicLibraryProductType"; + Name = "Dynamic Library"; + Description = "Dynamic library"; + IconNamePrefix = "TargetLibrary"; + DefaultTargetName = "Dynamic Library"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; + MACH_O_TYPE = "mh_dylib"; + REZ_EXECUTABLE = "YES"; + EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; + EXECUTABLE_EXTENSION = "dylib"; + PUBLIC_HEADERS_FOLDER_PATH = "/homeless-shelter"; + PRIVATE_HEADERS_FOLDER_PATH = "/homeless-shelter"; + INSTALL_PATH = "/homeless-shelter"; + DYLIB_INSTALL_NAME_BASE = "$(INSTALL_PATH)"; + LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; + DYLIB_COMPATIBILITY_VERSION = "1"; + DYLIB_CURRENT_VERSION = "1"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "debugging"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; + CODE_SIGNING_ALLOWED = "YES"; + }; + PackageTypes = [ + "com.apple.package-type.mach-o-dylib" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.library.static"; + Class = "PBXStaticLibraryProductType"; + Name = "Static Library"; + Description = "Static library"; + IconNamePrefix = "TargetLibrary"; + DefaultTargetName = "Static Library"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; + MACH_O_TYPE = "staticlib"; + REZ_EXECUTABLE = "YES"; + EXECUTABLE_PREFIX = "lib"; + EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; + EXECUTABLE_EXTENSION = "a"; + PUBLIC_HEADERS_FOLDER_PATH = "/homeless-shelter"; + PRIVATE_HEADERS_FOLDER_PATH = "/homeless-shelter"; + INSTALL_PATH = "/homeless-shelter"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "debugging"; + SEPARATE_STRIP = "YES"; + }; + AlwaysPerformSeparateStrip = "YES"; + PackageTypes = [ + "com.apple.package-type.static-library" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.bundle"; + Class = "PBXBundleProductType"; + Name = "Bundle"; + Description = "Generic bundle"; + IconNamePrefix = "TargetPlugin"; + DefaultTargetName = "Bundle"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(WRAPPER_NAME)"; + MACH_O_TYPE = "mh_bundle"; + WRAPPER_PREFIX = ""; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "non-global"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; + CODE_SIGNING_ALLOWED = "YES"; + }; + PackageTypes = [ + "com.apple.package-type.wrapper" + "com.apple.package-type.wrapper.shallow" + ]; + IsWrapper = "YES"; + HasInfoPlist = "YES"; + HasInfoPlistStrings = "YES"; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.bundle.shallow"; + BasedOn = "com.apple.product-type.bundle"; + Class = "PBXBundleProductType"; + Name = "Bundle (Shallow)"; + Description = "Bundle (Shallow)"; + PackageTypes = [ + "com.apple.package-type.wrapper.shallow" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.application"; + BasedOn = "com.apple.product-type.bundle"; + Class = "PBXApplicationProductType"; + Name = "Application"; + Description = "Application"; + IconNamePrefix = "TargetApp"; + DefaultTargetName = "Application"; + DefaultBuildProperties = { + MACH_O_TYPE = "mh_execute"; + GCC_DYNAMIC_NO_PIC = "NO"; + GCC_SYMBOLS_PRIVATE_EXTERN = "YES"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "app"; + INSTALL_PATH = "$(LOCAL_APPS_DIR)"; + STRIP_STYLE = "all"; + CODE_SIGNING_ALLOWED = "YES"; + }; + PackageTypes = [ + "com.apple.package-type.wrapper.application" + ]; + CanEmbedAddressSanitizerLibraries = "YES"; + RunpathSearchPathForEmbeddedFrameworks = "@executable_path/../Frameworks"; + ValidateEmbeddedBinaries = "YES"; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.application.shallow"; + BasedOn = "com.apple.product-type.application"; + Class = "PBXApplicationProductType"; + Name = "Application (Shallow Bundle)"; + Description = "Application (Shallow Bundle)"; + PackageTypes = [ + "com.apple.package-type.wrapper.application.shallow" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.framework"; + BasedOn = "com.apple.product-type.bundle"; + Class = "PBXFrameworkProductType"; + Name = "Framework"; + Description = "Framework"; + IconNamePrefix = "TargetFramework"; + DefaultTargetName = "Framework"; + DefaultBuildProperties = { + MACH_O_TYPE = "mh_dylib"; + FRAMEWORK_VERSION = "A"; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "framework"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + DYLIB_INSTALL_NAME_BASE = "$(INSTALL_PATH)"; + LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; + STRIP_STYLE = "debugging"; + CODE_SIGNING_ALLOWED = "YES"; + }; + PackageTypes = [ + "com.apple.package-type.wrapper.framework" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.framework.shallow"; + BasedOn = "com.apple.product-type.framework"; + Class = "PBXFrameworkProductType"; + Name = "Framework (Shallow Bundle)"; + Description = "Framework (Shallow Bundle)"; + PackageTypes = [ + "com.apple.package-type.wrapper.framework.shallow" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.framework.static"; + BasedOn = "com.apple.product-type.framework"; + Class = "XCStaticFrameworkProductType"; + Name = "Static Framework"; + Description = "Static Framework"; + IconNamePrefix = "TargetFramework"; + DefaultTargetName = "Static Framework"; + DefaultBuildProperties = { + MACH_O_TYPE = "staticlib"; + FRAMEWORK_VERSION = "A"; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "framework"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + DYLIB_INSTALL_NAME_BASE = ""; + LD_DYLIB_INSTALL_NAME = ""; + SEPARATE_STRIP = "YES"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "NO"; + CODE_SIGNING_ALLOWED = "NO"; + }; + AlwaysPerformSeparateStrip = "YES"; + PackageTypes = [ + "com.apple.package-type.wrapper.framework.static" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.bundle.unit-test"; + BasedOn = "com.apple.product-type.bundle"; + Class = "PBXXCTestBundleProductType"; + Name = "Unit Test Bundle"; + Description = "Unit Test Bundle"; + DefaultBuildProperties = { + WRAPPER_EXTENSION = "xctest"; + PRODUCT_SPECIFIC_LDFLAGS = "-framework XCTest"; + PRODUCT_TYPE_FRAMEWORK_SEARCH_PATHS = "$(TEST_FRAMEWORK_SEARCH_PATHS)"; + TEST_FRAMEWORK_SEARCH_PATHS = [ + "$(inherited)" + "$(PLATFORM_DIR)/Developer/Library/Frameworks" + ]; + }; + PackageTypes = [ + "com.apple.package-type.bundle.unit-test" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.bundle.ui-testing"; + BasedOn = "com.apple.product-type.bundle.unit-test"; + Class = "PBXXCTestBundleProductType"; + Name = "UI Testing Bundle"; + Description = "UI Testing Bundle"; + DefaultBuildProperties = { + WRAPPER_EXTENSION = "xctest"; + USES_XCTRUNNER = "YES"; + PRODUCT_SPECIFIC_LDFLAGS = "-framework XCTest"; + PRODUCT_TYPE_FRAMEWORK_SEARCH_PATHS = "$(TEST_FRAMEWORK_SEARCH_PATHS)"; + TEST_FRAMEWORK_SEARCH_PATHS = [ + "$(inherited)" + "$(PLATFORM_DIR)/Developer/Library/Frameworks" + ]; + }; + PackageTypes = [ + "com.apple.package-type.bundle.unit-test" + ]; + } + ]; + +in + +stdenv.mkDerivation { + name = "nixpkgs.platform"; + buildInputs = [ xcbuild ]; + buildCommand = '' + mkdir -p $out/ + cd $out/ + + /usr/bin/plutil -convert xml1 -o Info.plist ${writeText "Info.plist" (builtins.toJSON Info)} + /usr/bin/plutil -convert xml1 -o version.plist ${writeText "version.plist" (builtins.toJSON Version)} + + mkdir -p $out/Developer/Library/Xcode/Specifications/ + /usr/bin/plutil -convert xml1 -o $out/Developer/Library/Xcode/Specifications/ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)} + /usr/bin/plutil -convert xml1 -o $out/Developer/Library/Xcode/Specifications/PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)} + + mkdir -p $out/Developer/SDKs/ + cd $out/Developer/SDKs/ + ln -s ${sdk} + ''; +} diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix new file mode 100644 index 000000000000..11131fcd9cfa --- /dev/null +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -0,0 +1,31 @@ +{ stdenv, writeText, toolchainName, sdkName, xcbuild }: + +let + + SDKSettings = { + CanonicalName = sdkName; + DisplayName = sdkName; + Toolchains = [ toolchainName ]; + Version = "10.10"; + MaximumDeploymentTarget = "10.10"; + isBaseSDK = "YES"; + }; + + SystemVersion = { + ProductName = "Mac OS X"; + ProductVersion = "10.10"; + }; + +in + +stdenv.mkDerivation { + name = "nix.nixpkgs.sdk"; + buildInputs = [ xcbuild ]; + buildCommand = '' + mkdir -p $out/ + /usr/bin/plutil -convert xml1 -o $out/SDKSettings.plist ${writeText "SDKSettings.json" (builtins.toJSON SDKSettings)} + + mkdir -p $out/System/Library/CoreServices/ + /usr/bin/plutil -convert xml1 -o $out/System/Library/CoreServices/SystemVersion.plist ${writeText "SystemVersion.plist" (builtins.toJSON SystemVersion)} + ''; +} diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh new file mode 100644 index 000000000000..4a0f74b0e6df --- /dev/null +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -0,0 +1,17 @@ +xcbuildPhase() { + runHook preConfigure + + echo "running xcodebuild" + + xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" + + runHook postConfigure +} + +if [ -z "$dontUseXcbuild" -a -z "$configurePhase" ]; then + configurePhase=xcbuildPhase +fi + +# if [ -d "*.xcodeproj" ]; then +# buildPhase=xcbuildPhase +# fi diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix new file mode 100644 index 000000000000..05fcd60c5873 --- /dev/null +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -0,0 +1,100 @@ +{stdenv, writeText, toolchainName, xcbuild +, cc, cctools, llvm, yacc, flex, m4, unifdef, bootstrap_cmds}: + +let + + ToolchainInfo = { + Identifier = toolchainName; + }; + +in + +stdenv.mkDerivation { + name = "nixpkgs.xctoolchain"; + buildInputs = [ xcbuild ]; + propagatedBuildInputs = [ cc cctools llvm ]; + buildCommand = '' + mkdir -p $out + /usr/bin/plutil -convert xml1 -o $out/ToolchainInfo.plist ${writeText "ToolchainInfo.plist" (builtins.toJSON ToolchainInfo)} + + mkdir -p $out/usr/include + mkdir -p $out/usr/lib + mkdir -p $out/usr/libexec + mkdir -p $out/usr/share + + mkdir -p $out/usr/bin + cd $out/usr/bin + ln -s ${cc}/bin/cpp + ln -s ${cc}/bin/c++ + ln -s ${cc}/bin/cc + ln -s cc clang + ln -s c++ clang++ + ln -s cc c89 + ln -s cc c99 + + ln -s ${cctools}/bin/ar + ln -s ${cctools}/bin/as + ln -s ${cctools}/bin/nm + ln -s ${cctools}/bin/nmedit + ln -s ${cctools}/bin/ld + ln -s ${cctools}/bin/libtool + ln -s ${cctools}/bin/strings + ln -s ${cctools}/bin/strip + ln -s ${cctools}/bin/install_name_tool + ln -s ${cctools}/bin/bitcode_strip + ln -s ${cctools}/bin/codesign_allocate + ln -s ${cctools}/bin/dsymutil + ln -s ${cctools}/bin/dyldinfo + ln -s ${cctools}/bin/otool + ln -s ${cctools}/bin/unwinddump + ln -s ${cctools}/bin/size + ln -s ${cctools}/bin/segedit + ln -s ${cctools}/bin/pagestuff + ln -s ${cctools}/bin/ranlib + ln -s ${cctools}/bin/redo_prebinding + + ln -s ${llvm}/bin/llvm-cov + ln -s ${llvm}/bin/llvm-dsymutil + ln -s ${llvm}/bin/llvm-dwarfdump + ln -s ${llvm}/bin/llvm-nm + ln -s ${llvm}/bin/llvm-objdump + ln -s ${llvm}/bin/llvm-otool + ln -s ${llvm}/bin/llvm-profdata + ln -s ${llvm}/bin/llvm-size + + ln -s ${yacc}/bin/yacc + ln -s ${yacc}/bin/bison + ln -s ${flex}/bin/flex + ln -s ${flex}/bin/flex++ + ln -s flex lex + ln -s ${m4}/bin/m4 + ln -s m4 gm4 + + ln -s ${unifdef}/bin/unifdef + ln -s ${unifdef}/bin/unifdefall + + ln -s ${bootstrap_cmds}/bin/mig + ''; +} + +# other commands in /bin/ +# asa +# cmpdylib +# ctags +# ctf_insert +# dwarfdump +# gcov +# gperf +# indent +# lipo +# lorder +# mkdep +# rebase +# rpcgen +# swift +# swift-compress +# swift-demangle +# swift-stdlib-tool +# swift-update +# swiftc +# what diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix new file mode 100644 index 000000000000..1b38c85ceb95 --- /dev/null +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -0,0 +1,64 @@ +{ stdenv, callPackage, makeWrapper, writeText, CoreServices, ImageIO, CoreGraphics +, cctools, bootstrap_cmds}: + +let + + toolchainName = "com.apple.dt.toolchain.XcodeDefault"; + platformName = "com.apple.platform.macosx"; + sdkName = "macosx10.9"; + + xcbuild = callPackage ./default.nix { + inherit CoreServices ImageIO CoreGraphics; + }; + + toolchain = callPackage ./toolchain.nix { + inherit cctools bootstrap_cmds toolchainName xcbuild; + cc = stdenv.cc; + }; + + sdk = callPackage ./sdk.nix { + inherit toolchainName sdkName xcbuild; + }; + + platform = callPackage ./platform.nix { + inherit sdk platformName xcbuild; + }; + + developer = callPackage ./developer.nix { + inherit platform toolchain xcbuild; + }; + + xcconfig = writeText "nix.xcconfig" '' +SDKROOT=${sdkName} + ''; + +in + +stdenv.mkDerivation { + name = "xcbuild-wrapper"; + + buildInputs = [ xcbuild makeWrapper ]; + + setupHook = ./setup-hook.sh; + + phases = [ "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/bin + cd $out/bin/ + + for file in ${xcbuild}/bin/*; do + ln -s $file + done + + wrapProgram $out/bin/xcodebuild \ + --add-flags "-xcconfig ${xcconfig}" \ + --add-flags "DERIVED_DATA_DIR=." \ + --set DEVELOPER_DIR "${developer}" + wrapProgram $out/bin/xcrun \ + --add-flags "-sdk ${sdkName}" \ + --set DEVELOPER_DIR "${developer}" + ''; + + preferLocalBuild = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bbf962a45fd..11153d889d7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6430,7 +6430,10 @@ in xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; - xcbuild = callPackage ../development/tools/xcbuild { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; + xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { + inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; + inherit (darwin) cctools bootstrap_cmds; + }; xmlindent = callPackage ../development/web/xmlindent {}; From 8e301fab5021a0b9d93934ea36183fd249b21f76 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 20 Oct 2016 03:17:24 -0500 Subject: [PATCH 0333/1749] adv_cmds: add xcode derivation --- .../apple-source-releases/adv_cmds/xcode.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix new file mode 100644 index 000000000000..ca041dfa4003 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, xcbuild, xpc }: + +stdenv.mkDerivation { + name = "adv_cmds"; + + src = fetchurl { + url = "https://opensource.apple.com/tarballs/adv_cmds/adv_cmds-163.tar.gz"; + sha256 = "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q"; + }; + + patchPhase = '' + substituteInPlace pkill/pkill.c \ + --replace '#include ' "" + ''; + + buildInputs = [ xcbuild xpc ]; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11153d889d7e..5775d9c33b30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17377,4 +17377,6 @@ in xulrunner = firefox-unwrapped; nitrokey-app = callPackage ../tools/security/nitrokey-app { }; + + adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix {}; } From 44ad052c4329a6404ad7622b32797059d1db2819 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 2 Nov 2016 00:17:58 -0500 Subject: [PATCH 0334/1749] xcbuild: Make "xcbuild.raw" for original unwrapped --- pkgs/development/tools/xcbuild/wrapper.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 1b38c85ceb95..b8e270ea1fff 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -60,5 +60,9 @@ stdenv.mkDerivation { --set DEVELOPER_DIR "${developer}" ''; + passthru = { + raw = xcbuild; + }; + preferLocalBuild = true; } From ebf963ac6cf7b5661cbca21631787211f2bc828f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 5 Nov 2016 19:51:15 -0500 Subject: [PATCH 0335/1749] xcbuild: Update toolchain - Rework spec files. - Add more tool specs. - Add ctags. --- pkgs/development/tools/xcbuild/developer.nix | 145 ++++- pkgs/development/tools/xcbuild/platform.nix | 578 +------------------ pkgs/development/tools/xcbuild/sdk.nix | 4 +- pkgs/development/tools/xcbuild/toolchain.nix | 39 +- pkgs/development/tools/xcbuild/wrapper.nix | 9 +- pkgs/top-level/all-packages.nix | 6 +- 6 files changed, 170 insertions(+), 611 deletions(-) diff --git a/pkgs/development/tools/xcbuild/developer.nix b/pkgs/development/tools/xcbuild/developer.nix index 993a5fb861a2..05e05def2ac2 100644 --- a/pkgs/development/tools/xcbuild/developer.nix +++ b/pkgs/development/tools/xcbuild/developer.nix @@ -1,15 +1,138 @@ -{stdenv, platform, toolchain, xcbuild, writeText}: +{ stdenv, platform, toolchain, xcbuild, writeText }: let -AbstractAssetCatalog = { - Type = "FileType"; - Identifier = "folder.abstractassetcatalog"; - BasedOn = "wrapper"; + Tools = [ + { + Identifier = "com.apple.build-tools.nmedit"; + Type = "Tool"; + Name = "Nmedit"; + } + { + Identifier = "com.apple.compilers.resource-copier"; + Type = "Tool"; + Name = "Resource Copier"; + } + { + Identifier = "com.apple.compilers.yacc"; + Type = "Tool"; + Name = "Yacc"; + InputFileTypes = [ "sourcecode.yacc" ]; + ExecDescription = "Yacc $(InputFile)"; + } + { + Identifier = "com.apple.compilers.lex"; + Type = "Tool"; + Name = "Lex"; + ExecDescription = "Lex $(InputFile)"; + InputFileTypes = [ "sourcecode.lex" ]; + } + ]; - UTI = "com.apple.dt.abstractassetcatalog"; - IsTransparent = "NO"; -}; + Architectures = [ + { + Identifier = "Standard"; + Type = "Architecture"; + Name = "Standard Architectures (64-bit Intel)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD"; + } + { + Identifier = "Universal"; + Type = "Architecture"; + Name = "Universal (64-bit Intel)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_32_64_BIT"; + } + { + Identifier = "Native"; + Type = "Architecture"; + Name = "Native Architecture of Build Machine"; + ArchitectureSetting = "NATIVE_ARCH_ACTUAL"; + } + { + Identifier = "Standard64bit"; + Type = "Architecture"; + Name = "64-bit Intel"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_64_BIT"; + } + { + Identifier = "x86_64"; + Type = "Architecture"; + Name = "Intel 64-bit"; + } + { + Identifier = "Standard_Including_64_bit"; + Type = "Architecture"; + Name = "Standard Architectures (including 64-bit)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_INCLUDING_64_BIT"; + } + ]; + + PackageTypes = [ + { + Identifier = "com.apple.package-type.mach-o-executable"; + Type = "PackageType"; + Name = "Mach-O Executable"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.executable"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + { + Identifier = "com.apple.package-type.mach-o-objfile"; + Type = "PackageType"; + Name = "Mach-O Object File"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.objfile"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + { + Identifier = "com.apple.package-type.mach-o-dylib"; + Type = "PackageType"; + Name = "Mach-O Dynamic Library"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.dylib"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + ]; + + ProductTypes = [ + { + Identifier = "com.apple.product-type.tool"; + Type = "ProductType"; + Name = "Command-line Tool"; + PackageTypes = [ "com.apple.package-type.mach-o-executable" ]; + } + { + Identifier = "com.apple.product-type.objfile"; + Type = "ProductType"; + Name = "Object File"; + PackageTypes = [ "com.apple.package-type.mach-o-objfile" ]; + } + { + Identifier = "com.apple.product-type.library.dynamic"; + Type = "ProductType"; + Name = "Dynamic Library"; + PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; + } + ]; in @@ -20,7 +143,11 @@ stdenv.mkDerivation { mkdir -p $out/Contents/Developer/Library/Xcode/Specifications/ cp ${xcbuild}/Library/Xcode/Specifications/* $out/Contents/Developer/Library/Xcode/Specifications/ - plutil -convert xml1 ${writeText "folder.abstractassetcatalog" (builtins.toJSON AbstractAssetCatalog)} -o $out/Contents/Developer/Library/Xcode/Specifications/folder.abstractassetcatalog.xcspec + cd $out/Contents/Developer/Library/Xcode/Specifications/ + plutil -convert xml1 -o Tools.xcspec ${writeText "Tools.xcspec" (builtins.toJSON Tools)} + plutil -convert xml1 -o Architectures.xcspec ${writeText "Architectures.xcspec" (builtins.toJSON Architectures)} + plutil -convert xml1 -o PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)} + plutil -convert xml1 -o ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)} mkdir -p $out/Contents/Developer/Platforms/ cd $out/Contents/Developer/Platforms/ diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index 692a673e5c9d..491f1d6309f8 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -11,576 +11,6 @@ let ProjectName = "OSXPlatformSupport"; }; - PackageTypes = [ - { - Type = "PackageType"; - Identifier = "com.apple.package-type.mach-o-executable"; - Name = "Mach-O Executable"; - Description = "Mach-O executable"; - DefaultBuildSettings = { - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ""; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.executable"; - Name = "$(EXECUTABLE_NAME)"; - IsLaunchable = "YES"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.mach-o-objfile"; - Name = "Mach-O Object File"; - Description = "Mach-O Object File"; - DefaultBuildSettings = { - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ""; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.objfile"; - Name = "$(EXECUTABLE_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.mach-o-dylib"; - Name = "Mach-O Dynamic Library"; - Description = "Mach-O dynamic library"; - DefaultBuildSettings = { - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ""; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.dylib"; - Name = "$(EXECUTABLE_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.static-library"; - Name = "Mach-O Static Library"; - Description = "Mach-O static library"; - DefaultBuildSettings = { - EXECUTABLE_PREFIX = "lib"; - EXECUTABLE_SUFFIX = ".a"; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "archive.ar"; - Name = "$(EXECUTABLE_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.mach-o-bundle"; - Name = "Mach-O Loadable"; - Description = "Mach-O loadable"; - DefaultBuildSettings = { - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ".dylib"; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.bundle"; - Name = "$(EXECUTABLE_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.wrapper"; - Name = "Wrapper"; - Description = "Wrapper"; - DefaultBuildSettings = { - WRAPPER_PREFIX = ""; - WRAPPER_SUFFIX = ".bundle"; - WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; - CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)/Contents"; - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ""; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/MacOS"; - EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)"; - INFOPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/Info.plist"; - INFOSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings"; - PKGINFO_PATH = "$(CONTENTS_FOLDER_PATH)/PkgInfo"; - PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist"; - VERSIONPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/version.plist"; - PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; - PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; - EXECUTABLES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Executables"; FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks"; - SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks"; - SHARED_SUPPORT_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedSupport"; - UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources"; - LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj"; - DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation"; - PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns"; - SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts"; - JAVA_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Java"; - }; - ProductReference = { - FileType = "wrapper.cfbundle"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.wrapper.shallow"; - BasedOn = "com.apple.package-type.wrapper"; - Name = "Wrapper (Shallow)"; - Description = "Shallow Wrapper"; - DefaultBuildSettings = { - CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)"; - EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; - UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; - SHALLOW_BUNDLE = "YES"; - }; - ProductReference = { - FileType = "wrapper.cfbundle"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.wrapper.application"; - BasedOn = "com.apple.package-type.wrapper"; - Name = "Application Wrapper"; - Description = "Application Wrapper"; - DefaultBuildSettings = { - GENERATE_PKGINFO_FILE = "YES"; - }; - ProductReference = { - FileType = "wrapper.application"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "YES"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.wrapper.application.shallow"; - BasedOn = "com.apple.package-type.wrapper.shallow"; - Name = "Application Wrapper (Shallow)"; - Description = "Shallow Application Wrapper"; - DefaultBuildSettings = { - UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; - GENERATE_PKGINFO_FILE = "YES"; - SHALLOW_BUNDLE = "YES"; - }; - ProductReference = { - FileType = "wrapper.application"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "YES"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.wrapper.framework"; - Name = "Framework Wrapper"; - Description = "Framework wrapper"; - DefaultBuildSettings = { - WRAPPER_PREFIX = ""; - WRAPPER_SUFFIX = ".framework"; - WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; - VERSIONS_FOLDER_PATH = "$(WRAPPER_NAME)/Versions"; - CONTENTS_FOLDER_PATH = "$(VERSIONS_FOLDER_PATH)/$(FRAMEWORK_VERSION)"; - CURRENT_VERSION = "Current"; - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ""; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; - EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)"; - INFOPLIST_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Info.plist"; - INFOPLISTSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings"; - PKGINFO_PATH = "$(WRAPPER_NAME)/PkgInfo"; - PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist"; - VERSIONPLIST_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/version.plist"; - PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; - PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; - EXECUTABLES_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)"; FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks"; - SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks"; - SHARED_SUPPORT_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)"; - UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources"; - LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj"; - DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation"; - PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns"; - SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts"; - JAVA_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Java"; - CODESIGNING_FOLDER_PATH = "$(TARGET_BUILD_DIR)/$(CONTENTS_FOLDER_PATH)"; - }; - ProductReference = { - FileType = "wrapper.framework"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.wrapper.framework.static"; - Name = "Mach-O Static Framework"; - Description = "Mach-O static framework"; - BasedOn = "com.apple.package-type.wrapper.framework"; - DefaultBuildSettings = { - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ""; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - }; - ProductReference = { - FileType = "wrapper.framework.static"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.wrapper.framework.shallow"; - Name = "Shallow Framework Wrapper"; - Description = "Shallow framework wrapper"; - BasedOn = "com.apple.package-type.wrapper.framework"; - DefaultBuildSettings = { - CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)"; - VERSIONS_FOLDER_PATH = "$(WRAPPER_NAME)"; - UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; - SHALLOW_BUNDLE = "YES"; - }; - ProductReference = { - FileType = "wrapper.framework"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.bundle.unit-test"; - BasedOn = "com.apple.package-type.wrapper"; - Name = "Unit Test Bundle"; - Description = "Unit Test Bundle"; - DefaultBuildSettings = { - WRAPPER_SUFFIX = "xctest"; - }; - ProductReference = { - FileType = "wrapper.cfbundle"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "NO"; - }; - } - ]; - - ProductTypes = [ - { - Type = "ProductType"; - Identifier = "com.apple.product-type.tool"; - Class = "PBXToolProductType"; - Name = "Command-line Tool"; - Description = "Standalone command-line tool"; - IconNamePrefix = "TargetExecutable"; - DefaultTargetName = "Command-line Tool"; - DefaultBuildProperties = { - FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ""; - REZ_EXECUTABLE = "YES"; - INSTALL_PATH = "/homeless-shelter"; - FRAMEWORK_FLAG_PREFIX = "-framework"; - LIBRARY_FLAG_PREFIX = "-l"; - LIBRARY_FLAG_NOSPACE = "YES"; - GCC_DYNAMIC_NO_PIC = "NO"; - GCC_SYMBOLS_PRIVATE_EXTERN = "YES"; - GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; - STRIP_STYLE = "all"; - CODE_SIGNING_ALLOWED = "YES"; - }; - PackageTypes = [ - "com.apple.package-type.mach-o-executable" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.objfile"; - Class = "XCStandaloneExecutableProductType"; - Name = "Object File"; - Description = "Object File"; - IconNamePrefix = "TargetPlugin"; - DefaultTargetName = "Object File"; - DefaultBuildProperties = { - FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; - MACH_O_TYPE = "mh_object"; - LINK_WITH_STANDARD_LIBRARIES = "NO"; - REZ_EXECUTABLE = "YES"; - EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; - EXECUTABLE_EXTENSION = "o"; - PUBLIC_HEADERS_FOLDER_PATH = "/homeless-shelter"; - PRIVATE_HEADERS_FOLDER_PATH = "/homeless-shelter"; - INSTALL_PATH = "/homeless-shelter"; - FRAMEWORK_FLAG_PREFIX = "-framework"; - LIBRARY_FLAG_PREFIX = "-l"; - LIBRARY_FLAG_NOSPACE = "YES"; - SKIP_INSTALL = "YES"; - STRIP_STYLE = "debugging"; - GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; - KEEP_PRIVATE_EXTERNS = "YES"; - DEAD_CODE_STRIPPING = "NO"; - }; - PackageTypes = [ - "com.apple.package-type.mach-o-objfile" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.library.dynamic"; - Class = "PBXDynamicLibraryProductType"; - Name = "Dynamic Library"; - Description = "Dynamic library"; - IconNamePrefix = "TargetLibrary"; - DefaultTargetName = "Dynamic Library"; - DefaultBuildProperties = { - FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; - MACH_O_TYPE = "mh_dylib"; - REZ_EXECUTABLE = "YES"; - EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; - EXECUTABLE_EXTENSION = "dylib"; - PUBLIC_HEADERS_FOLDER_PATH = "/homeless-shelter"; - PRIVATE_HEADERS_FOLDER_PATH = "/homeless-shelter"; - INSTALL_PATH = "/homeless-shelter"; - DYLIB_INSTALL_NAME_BASE = "$(INSTALL_PATH)"; - LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; - DYLIB_COMPATIBILITY_VERSION = "1"; - DYLIB_CURRENT_VERSION = "1"; - FRAMEWORK_FLAG_PREFIX = "-framework"; - LIBRARY_FLAG_PREFIX = "-l"; - LIBRARY_FLAG_NOSPACE = "YES"; - STRIP_STYLE = "debugging"; - GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; - CODE_SIGNING_ALLOWED = "YES"; - }; - PackageTypes = [ - "com.apple.package-type.mach-o-dylib" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.library.static"; - Class = "PBXStaticLibraryProductType"; - Name = "Static Library"; - Description = "Static library"; - IconNamePrefix = "TargetLibrary"; - DefaultTargetName = "Static Library"; - DefaultBuildProperties = { - FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; - MACH_O_TYPE = "staticlib"; - REZ_EXECUTABLE = "YES"; - EXECUTABLE_PREFIX = "lib"; - EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; - EXECUTABLE_EXTENSION = "a"; - PUBLIC_HEADERS_FOLDER_PATH = "/homeless-shelter"; - PRIVATE_HEADERS_FOLDER_PATH = "/homeless-shelter"; - INSTALL_PATH = "/homeless-shelter"; - FRAMEWORK_FLAG_PREFIX = "-framework"; - LIBRARY_FLAG_PREFIX = "-l"; - LIBRARY_FLAG_NOSPACE = "YES"; - STRIP_STYLE = "debugging"; - SEPARATE_STRIP = "YES"; - }; - AlwaysPerformSeparateStrip = "YES"; - PackageTypes = [ - "com.apple.package-type.static-library" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.bundle"; - Class = "PBXBundleProductType"; - Name = "Bundle"; - Description = "Generic bundle"; - IconNamePrefix = "TargetPlugin"; - DefaultTargetName = "Bundle"; - DefaultBuildProperties = { - FULL_PRODUCT_NAME = "$(WRAPPER_NAME)"; - MACH_O_TYPE = "mh_bundle"; - WRAPPER_PREFIX = ""; - WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; - WRAPPER_EXTENSION = "bundle"; - WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; - FRAMEWORK_FLAG_PREFIX = "-framework"; - LIBRARY_FLAG_PREFIX = "-l"; - LIBRARY_FLAG_NOSPACE = "YES"; - STRIP_STYLE = "non-global"; - GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; - CODE_SIGNING_ALLOWED = "YES"; - }; - PackageTypes = [ - "com.apple.package-type.wrapper" - "com.apple.package-type.wrapper.shallow" - ]; - IsWrapper = "YES"; - HasInfoPlist = "YES"; - HasInfoPlistStrings = "YES"; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.bundle.shallow"; - BasedOn = "com.apple.product-type.bundle"; - Class = "PBXBundleProductType"; - Name = "Bundle (Shallow)"; - Description = "Bundle (Shallow)"; - PackageTypes = [ - "com.apple.package-type.wrapper.shallow" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.application"; - BasedOn = "com.apple.product-type.bundle"; - Class = "PBXApplicationProductType"; - Name = "Application"; - Description = "Application"; - IconNamePrefix = "TargetApp"; - DefaultTargetName = "Application"; - DefaultBuildProperties = { - MACH_O_TYPE = "mh_execute"; - GCC_DYNAMIC_NO_PIC = "NO"; - GCC_SYMBOLS_PRIVATE_EXTERN = "YES"; - GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; - WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; - WRAPPER_EXTENSION = "app"; - INSTALL_PATH = "$(LOCAL_APPS_DIR)"; - STRIP_STYLE = "all"; - CODE_SIGNING_ALLOWED = "YES"; - }; - PackageTypes = [ - "com.apple.package-type.wrapper.application" - ]; - CanEmbedAddressSanitizerLibraries = "YES"; - RunpathSearchPathForEmbeddedFrameworks = "@executable_path/../Frameworks"; - ValidateEmbeddedBinaries = "YES"; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.application.shallow"; - BasedOn = "com.apple.product-type.application"; - Class = "PBXApplicationProductType"; - Name = "Application (Shallow Bundle)"; - Description = "Application (Shallow Bundle)"; - PackageTypes = [ - "com.apple.package-type.wrapper.application.shallow" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.framework"; - BasedOn = "com.apple.product-type.bundle"; - Class = "PBXFrameworkProductType"; - Name = "Framework"; - Description = "Framework"; - IconNamePrefix = "TargetFramework"; - DefaultTargetName = "Framework"; - DefaultBuildProperties = { - MACH_O_TYPE = "mh_dylib"; - FRAMEWORK_VERSION = "A"; - WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; - WRAPPER_EXTENSION = "framework"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - DYLIB_INSTALL_NAME_BASE = "$(INSTALL_PATH)"; - LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; - STRIP_STYLE = "debugging"; - CODE_SIGNING_ALLOWED = "YES"; - }; - PackageTypes = [ - "com.apple.package-type.wrapper.framework" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.framework.shallow"; - BasedOn = "com.apple.product-type.framework"; - Class = "PBXFrameworkProductType"; - Name = "Framework (Shallow Bundle)"; - Description = "Framework (Shallow Bundle)"; - PackageTypes = [ - "com.apple.package-type.wrapper.framework.shallow" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.framework.static"; - BasedOn = "com.apple.product-type.framework"; - Class = "XCStaticFrameworkProductType"; - Name = "Static Framework"; - Description = "Static Framework"; - IconNamePrefix = "TargetFramework"; - DefaultTargetName = "Static Framework"; - DefaultBuildProperties = { - MACH_O_TYPE = "staticlib"; - FRAMEWORK_VERSION = "A"; - WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; - WRAPPER_EXTENSION = "framework"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - DYLIB_INSTALL_NAME_BASE = ""; - LD_DYLIB_INSTALL_NAME = ""; - SEPARATE_STRIP = "YES"; - GCC_INLINES_ARE_PRIVATE_EXTERN = "NO"; - CODE_SIGNING_ALLOWED = "NO"; - }; - AlwaysPerformSeparateStrip = "YES"; - PackageTypes = [ - "com.apple.package-type.wrapper.framework.static" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.bundle.unit-test"; - BasedOn = "com.apple.product-type.bundle"; - Class = "PBXXCTestBundleProductType"; - Name = "Unit Test Bundle"; - Description = "Unit Test Bundle"; - DefaultBuildProperties = { - WRAPPER_EXTENSION = "xctest"; - PRODUCT_SPECIFIC_LDFLAGS = "-framework XCTest"; - PRODUCT_TYPE_FRAMEWORK_SEARCH_PATHS = "$(TEST_FRAMEWORK_SEARCH_PATHS)"; - TEST_FRAMEWORK_SEARCH_PATHS = [ - "$(inherited)" - "$(PLATFORM_DIR)/Developer/Library/Frameworks" - ]; - }; - PackageTypes = [ - "com.apple.package-type.bundle.unit-test" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.bundle.ui-testing"; - BasedOn = "com.apple.product-type.bundle.unit-test"; - Class = "PBXXCTestBundleProductType"; - Name = "UI Testing Bundle"; - Description = "UI Testing Bundle"; - DefaultBuildProperties = { - WRAPPER_EXTENSION = "xctest"; - USES_XCTRUNNER = "YES"; - PRODUCT_SPECIFIC_LDFLAGS = "-framework XCTest"; - PRODUCT_TYPE_FRAMEWORK_SEARCH_PATHS = "$(TEST_FRAMEWORK_SEARCH_PATHS)"; - TEST_FRAMEWORK_SEARCH_PATHS = [ - "$(inherited)" - "$(PLATFORM_DIR)/Developer/Library/Frameworks" - ]; - }; - PackageTypes = [ - "com.apple.package-type.bundle.unit-test" - ]; - } - ]; - in stdenv.mkDerivation { @@ -590,12 +20,8 @@ stdenv.mkDerivation { mkdir -p $out/ cd $out/ - /usr/bin/plutil -convert xml1 -o Info.plist ${writeText "Info.plist" (builtins.toJSON Info)} - /usr/bin/plutil -convert xml1 -o version.plist ${writeText "version.plist" (builtins.toJSON Version)} - - mkdir -p $out/Developer/Library/Xcode/Specifications/ - /usr/bin/plutil -convert xml1 -o $out/Developer/Library/Xcode/Specifications/ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)} - /usr/bin/plutil -convert xml1 -o $out/Developer/Library/Xcode/Specifications/PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)} + plutil -convert xml1 -o Info.plist ${writeText "Info.plist" (builtins.toJSON Info)} + plutil -convert xml1 -o version.plist ${writeText "version.plist" (builtins.toJSON Version)} mkdir -p $out/Developer/SDKs/ cd $out/Developer/SDKs/ diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix index 11131fcd9cfa..7d587249bf8e 100644 --- a/pkgs/development/tools/xcbuild/sdk.nix +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation { buildInputs = [ xcbuild ]; buildCommand = '' mkdir -p $out/ - /usr/bin/plutil -convert xml1 -o $out/SDKSettings.plist ${writeText "SDKSettings.json" (builtins.toJSON SDKSettings)} + plutil -convert xml1 -o $out/SDKSettings.plist ${writeText "SDKSettings.json" (builtins.toJSON SDKSettings)} mkdir -p $out/System/Library/CoreServices/ - /usr/bin/plutil -convert xml1 -o $out/System/Library/CoreServices/SystemVersion.plist ${writeText "SystemVersion.plist" (builtins.toJSON SystemVersion)} + plutil -convert xml1 -o $out/System/Library/CoreServices/SystemVersion.plist ${writeText "SystemVersion.plist" (builtins.toJSON SystemVersion)} ''; } diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index 05fcd60c5873..e86536c45983 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -1,5 +1,6 @@ {stdenv, writeText, toolchainName, xcbuild -, cc, cctools, llvm, yacc, flex, m4, unifdef, bootstrap_cmds}: +, cc, llvm, cctools, gcc, bootstrap_cmds, binutils +, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper}: let @@ -11,11 +12,11 @@ in stdenv.mkDerivation { name = "nixpkgs.xctoolchain"; - buildInputs = [ xcbuild ]; - propagatedBuildInputs = [ cc cctools llvm ]; + buildInputs = [ xcbuild makeWrapper ]; + propagatedBuildInputs = [ cc cctools llvm gcc bootstrap_cmds binutils yacc flex m4 unifdef gperf indent ]; buildCommand = '' mkdir -p $out - /usr/bin/plutil -convert xml1 -o $out/ToolchainInfo.plist ${writeText "ToolchainInfo.plist" (builtins.toJSON ToolchainInfo)} + plutil -convert xml1 -o $out/ToolchainInfo.plist ${writeText "ToolchainInfo.plist" (builtins.toJSON ToolchainInfo)} mkdir -p $out/usr/include mkdir -p $out/usr/lib @@ -27,10 +28,8 @@ stdenv.mkDerivation { ln -s ${cc}/bin/cpp ln -s ${cc}/bin/c++ ln -s ${cc}/bin/cc - ln -s cc clang ln -s c++ clang++ - ln -s cc c89 - ln -s cc c99 + ln -s cc clang ln -s ${cctools}/bin/ar ln -s ${cctools}/bin/as @@ -66,7 +65,9 @@ stdenv.mkDerivation { ln -s ${yacc}/bin/bison ln -s ${flex}/bin/flex ln -s ${flex}/bin/flex++ + ln -s flex lex + ln -s ${m4}/bin/m4 ln -s m4 gm4 @@ -74,27 +75,31 @@ stdenv.mkDerivation { ln -s ${unifdef}/bin/unifdefall ln -s ${bootstrap_cmds}/bin/mig + + ln -s ${gperf}/bin/gperf + ln -s ${gcc}/bin/gcov + ln -s ${gcc}/bin/mkdep + ln -s ${indent}/bin/indent + ln -s ${binutils}/bin/lipo + ln -s ${ctags}/bin/ctags ''; } # other commands in /bin/ # asa -# cmpdylib -# ctags -# ctf_insert +# cmpdylib (in cctools) +# ctf_insert (in cctools) # dwarfdump -# gcov -# gperf -# indent -# lipo # lorder -# mkdep # rebase -# rpcgen +# rpcgen (in developer_cmds) +# what + + +# swift: see #11463 # swift # swift-compress # swift-demangle # swift-stdlib-tool # swift-update # swiftc -# what diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index b8e270ea1fff..ef4ab245ec0c 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,19 +1,18 @@ { stdenv, callPackage, makeWrapper, writeText, CoreServices, ImageIO, CoreGraphics -, cctools, bootstrap_cmds}: +, cctools, bootstrap_cmds, binutils}: let toolchainName = "com.apple.dt.toolchain.XcodeDefault"; platformName = "com.apple.platform.macosx"; - sdkName = "macosx10.9"; + sdkName = "macosx10.10"; xcbuild = callPackage ./default.nix { inherit CoreServices ImageIO CoreGraphics; }; toolchain = callPackage ./toolchain.nix { - inherit cctools bootstrap_cmds toolchainName xcbuild; - cc = stdenv.cc; + inherit cctools bootstrap_cmds toolchainName xcbuild binutils; }; sdk = callPackage ./sdk.nix { @@ -29,7 +28,7 @@ let }; xcconfig = writeText "nix.xcconfig" '' -SDKROOT=${sdkName} + SDKROOT=${sdkName} ''; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5775d9c33b30..bf91489c8927 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6432,7 +6432,7 @@ in xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; - inherit (darwin) cctools bootstrap_cmds; + inherit (darwin) cctools bootstrap_cmds binutils; }; xmlindent = callPackage ../development/web/xmlindent {}; @@ -17378,5 +17378,7 @@ in nitrokey-app = callPackage ../tools/security/nitrokey-app { }; - adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix {}; + adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix { + inherit (darwin.apple_sdk.libs) xpc; + }; } From 6c1858a93dee8c28f5f7f804f4153d8f9c6c7bb8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 7 Nov 2016 16:09:10 -0600 Subject: [PATCH 0336/1749] adv_cmds: Disable pkill. pkill isn't building because of some missing headers: - xpc/xpc.h - os/base_private.h - _simple.h They are all available somewhere but not set up correctly in the Darwin stdenv. TODO: add pkill back in! --- .../darwin/apple-source-releases/adv_cmds/xcode.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index ca041dfa4003..f9e8207d8bfa 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xcbuild, xpc }: +{ stdenv, fetchurl, xcbuild, libcxx }: stdenv.mkDerivation { name = "adv_cmds"; @@ -9,11 +9,12 @@ stdenv.mkDerivation { }; patchPhase = '' - substituteInPlace pkill/pkill.c \ - --replace '#include ' "" + substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ + --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" ''; - buildInputs = [ xcbuild xpc ]; + buildInputs = [ xcbuild libcxx ]; + #NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; meta = { platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf91489c8927..ddee4d24e2b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17378,7 +17378,5 @@ in nitrokey-app = callPackage ../tools/security/nitrokey-app { }; - adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix { - inherit (darwin.apple_sdk.libs) xpc; - }; + adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix {}; } From f1897116d04d99a4491ef3a8db6acf54dd0035c6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 7 Nov 2016 17:43:20 -0600 Subject: [PATCH 0337/1749] xcbuild: temporarily fix cflags/ldflags This gets everything to build. adv_cmds: remove NIX_LDFLAGS - unneeded --- pkgs/development/tools/xcbuild/setup-hook.sh | 2 +- .../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index 4a0f74b0e6df..72ffb7b128c5 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -3,7 +3,7 @@ xcbuildPhase() { echo "running xcodebuild" - xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" + xcodebuild runHook postConfigure } diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index f9e8207d8bfa..e5600f3962da 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; buildInputs = [ xcbuild libcxx ]; - #NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; meta = { platforms = stdenv.lib.platforms.darwin; From 78c3acc2eee5510dfdebcab4e62b32a7f43930c4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 7 Nov 2016 19:57:42 -0600 Subject: [PATCH 0338/1749] xcbuild: Add install phase This phase is disabled for now but we can use it later. --- pkgs/development/tools/xcbuild/setup-hook.sh | 24 +++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index 72ffb7b128c5..0d38e2466b0d 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -1,15 +1,27 @@ -xcbuildPhase() { - runHook preConfigure +xcbuildBuildPhase() { + export DSTROOT=$out + + runHook preBuild echo "running xcodebuild" - xcodebuild + xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build - runHook postConfigure + runHook postBuild } -if [ -z "$dontUseXcbuild" -a -z "$configurePhase" ]; then - configurePhase=xcbuildPhase +xcbuildInstallPhase () { + runHook preInstall + + # not implemented + # xcodebuild install + + runHook postInstall +} + +if [ -z "$dontUseXcbuild" ]; then + buildPhase=xcbuildBuildPhase + installPhase=xcbuildInstallPhase fi # if [ -d "*.xcodeproj" ]; then From 1ee8685ee73b8867810e9a309d106019f11be0f7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 7 Nov 2016 21:55:31 -0600 Subject: [PATCH 0339/1749] adv_cmds: add custom install phase --- pkgs/development/tools/xcbuild/setup-hook.sh | 4 +++- .../darwin/apple-source-releases/adv_cmds/xcode.nix | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index 0d38e2466b0d..b0ae8dd6e8e2 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -21,7 +21,9 @@ xcbuildInstallPhase () { if [ -z "$dontUseXcbuild" ]; then buildPhase=xcbuildBuildPhase - installPhase=xcbuildInstallPhase + if [ -z "$installPhase" ]; then + installPhase=xcbuildInstallPhase + fi fi # if [ -d "*.xcodeproj" ]; then diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index e5600f3962da..7857a59161c0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -8,12 +8,25 @@ stdenv.mkDerivation { sha256 = "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q"; }; + # remove pkill from build patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" ''; + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + + for cmd in cap_mkdb finger fingerd gencat last locale lsvfs ps stty tabs tty whois + do + install adv_cmds-*/Build/Products/Release-*/$cmd $out/bin/$cmd + done + ''; + buildInputs = [ xcbuild libcxx ]; + + # temporary fix for iostream issue NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; meta = { From a35b330f30d0138ff5e4a86c7afdcc7c7e311fea Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Nov 2016 22:24:59 -0600 Subject: [PATCH 0340/1749] adv_cmds: move from all-packages Use the old way with pkgs/os-specific/darwin/apple-source-releases/defuault.nix. --- .../apple-source-releases/adv_cmds/xcode.nix | 27 ++++++++++--------- .../darwin/apple-source-releases/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index 7857a59161c0..15160e02e149 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -1,14 +1,7 @@ -{ stdenv, fetchurl, xcbuild, libcxx }: +{ stdenv, appleDerivation, fetchurl, xcbuild, libcxx }: -stdenv.mkDerivation { - name = "adv_cmds"; - - src = fetchurl { - url = "https://opensource.apple.com/tarballs/adv_cmds/adv_cmds-163.tar.gz"; - sha256 = "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q"; - }; - - # remove pkill from build +appleDerivation { + # disable pkill from build patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" @@ -17,11 +10,19 @@ stdenv.mkDerivation { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ + install adv_cmds-*/Build/Products/Release-*/* $out/bin/ - for cmd in cap_mkdb finger fingerd gencat last locale lsvfs ps stty tabs tty whois - do - install adv_cmds-*/Build/Products/Release-*/$cmd $out/bin/$cmd + for n in 1 8; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n done + + mkdir -p $out/System/Library/LaunchDaemons + install fingerd/finger.plist $out/System/Library/LaunchDaemons + + # from variant_links.sh + # ln -s $out/bin/pkill $out/bin/pgrep + # ln -s $out/share/man/man1/pkill.1 $out/share/man/man1/pgrep.1 ''; buildInputs = [ xcbuild libcxx ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 2ebb8868a2ea..2f49330ed595 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -33,6 +33,7 @@ let libutil = "43"; libunwind = "35.3"; + adv_cmds = "163"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ @@ -213,6 +214,7 @@ let removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; + adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddee4d24e2b9..b1273fc469b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17377,6 +17377,4 @@ in xulrunner = firefox-unwrapped; nitrokey-app = callPackage ../tools/security/nitrokey-app { }; - - adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix {}; } From ec409c8e9698e5be7c1d3635bc0a547e6564bc36 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Nov 2016 12:01:49 -0600 Subject: [PATCH 0341/1749] contacts: use xcbuild instead of xcodebuild --- pkgs/tools/misc/contacts/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 2bfe0eb42665..bd52f1bc0a49 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, xcbuild, Foundation, AddressBook }: stdenv.mkDerivation rec { version = "1.1a-3"; @@ -9,15 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0wdqc1ndgrdhqapvvgx5xihc750szv08lp91x4l6n0gh59cpxpg3"; }; - preBuild = '' - substituteInPlace Makefile --replace "xcodebuild" "/usr/bin/xcodebuild" - ''; + buildInputs = [ xcbuild Foundation AddressBook ]; installPhase = '' mkdir -p $out/bin - cp ./build/Deployment/contacts $out/bin + cp ./contacts-*/Build/Products/Default-*/contacts $out/bin ''; + NIX_LDFLAGS = " -F${Foundation}/Library/Frameworks/ -F${AddressBook}/Library/Frameworks/"; + meta = with stdenv.lib; { description = "Access contacts from the Mac address book from command-line"; homepage = http://www.gnufoo.org/contacts/contacts.html; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1273fc469b6..4f2a1d837952 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -760,7 +760,9 @@ in cpulimit = callPackage ../tools/misc/cpulimit { }; - contacts = callPackage ../tools/misc/contacts { }; + contacts = callPackage ../tools/misc/contacts { + inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; + }; coturn = callPackage ../servers/coturn { }; From 4a01a370514796936929d65f6497fdc0326de496 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Nov 2016 13:08:09 -0600 Subject: [PATCH 0342/1749] basic_cmds: init at 55 --- .../basic_cmds/default.nix | 22 +++++++++++++++++++ .../darwin/apple-source-releases/default.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix new file mode 100644 index 000000000000..6f0ea955cf0a --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -0,0 +1,22 @@ +{ stdenv, appleDerivation, fetchurl, xcbuild }: + +appleDerivation rec { + buildInputs = [ xcbuild ]; + + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + install basic_cmds-*/Build/Products/Release-*/* $out/bin/ + + for n in 1; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n + done + + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 2f49330ed595..8aa0a6d675f7 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -33,6 +33,7 @@ let libutil = "43"; libunwind = "35.3"; + basic_cmds = "55"; adv_cmds = "163"; }; "osx-10.11.5" = { @@ -215,6 +216,7 @@ let Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; + basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; From 823772b0569681284957177f4a442aef5f7e737a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Nov 2016 22:28:37 -0600 Subject: [PATCH 0343/1749] Librpcsvc: init at 26 --- .../Librpcsvc/default.nix | 25 +++++++++++++++++++ .../darwin/apple-source-releases/default.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix new file mode 100644 index 000000000000..b20687b41593 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix @@ -0,0 +1,25 @@ +{ stdenv, appleDerivation, developer_cmds }: + +appleDerivation rec { + phases = [ "unpackPhase" "installPhase" ]; + + buildInputs = [ developer_cmds ]; + + installPhase = '' + export DSTROOT=$out + export SRCROOT=$PWD + export OBJROOT=$PWD + + . ./xcodescripts/install_rpcsvc.sh + + mv $out/usr/* $out + rmdir $out/usr/ + ''; + + meta = with stdenv.lib; { + description = ""; + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.darwin; + license = licenses.apsl20; + }; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 8aa0a6d675f7..180a6f90283e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -33,6 +33,7 @@ let libutil = "43"; libunwind = "35.3"; + Librpcsvc = "26"; basic_cmds = "55"; adv_cmds = "163"; }; @@ -215,6 +216,7 @@ let removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; + Librpcsvc = applePackage "Librpcsvc" "osx-10.11.6" "1zwfwcl9irxl1dlnf2b4v30vdybp0p0r6n6g1pd14zbdci1jcg2k" {}; adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; From 3b17d9e35e04885859d27024c75954d212a40b8a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Nov 2016 22:29:57 -0600 Subject: [PATCH 0344/1749] developer_cmds: init at 62 --- .../darwin/apple-source-releases/default.nix | 2 ++ .../developer_cmds/default.nix | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 180a6f90283e..232c473ecb07 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -34,6 +34,7 @@ let libutil = "43"; libunwind = "35.3"; Librpcsvc = "26"; + developer_cmds= "62"; basic_cmds = "55"; adv_cmds = "163"; }; @@ -219,6 +220,7 @@ let Librpcsvc = applePackage "Librpcsvc" "osx-10.11.6" "1zwfwcl9irxl1dlnf2b4v30vdybp0p0r6n6g1pd14zbdci1jcg2k" {}; adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; + developer_cmds = applePackage "developer_cmds" "osx-10.11.6" "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix new file mode 100644 index 000000000000..b58951423fec --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, appleDerivation, xcbuild }: + +appleDerivation rec { + buildInputs = [ xcbuild ]; + + patchPhase = '' + substituteInPlace rpcgen/rpc_main.c \ + --replace "/usr/bin/cpp" "${stdenv.cc}/bin/cpp" + ''; + + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + install developer_cmds-*/Build/Products/Release-*/* $out/bin/ + + for n in 1; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n + done + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} From 9f46587841448decbb1ec8e46076e36838f82c93 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Nov 2016 22:30:32 -0600 Subject: [PATCH 0345/1749] network_cmds: init at 481.20.1 Fixes #16764 --- .../darwin/apple-source-releases/default.nix | 2 + .../network_cmds/default.nix | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 232c473ecb07..af17babac56a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -35,6 +35,7 @@ let libunwind = "35.3"; Librpcsvc = "26"; developer_cmds= "62"; + network_cmds = "481.20.1"; basic_cmds = "55"; adv_cmds = "163"; }; @@ -221,6 +222,7 @@ let adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; developer_cmds = applePackage "developer_cmds" "osx-10.11.6" "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {}; + network_cmds = applePackage "network_cmds" "osx-10.11.6" "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix new file mode 100644 index 000000000000..fe4d60e7ebe9 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -0,0 +1,39 @@ +{ stdenv, appleDerivation, xcbuild, openssl, Librpcsvc, xnu, libpcap, developer_cmds }: + +appleDerivation rec { + buildInputs = [ xcbuild openssl xnu Librpcsvc libpcap developer_cmds ]; + + NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/ -D__APPLE_USE_RFC_2292 -DIPV6_DONTFRAG=14 -DINET6"; + + patchPhase = '' + # disable spray, rtadvd + substituteInPlace network_cmds.xcodeproj/project.pbxproj \ + --replace "7294F0EA0EE8BAC80052EC88 /* PBXTargetDependency */," "" \ + --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," "" + ''; + + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + install network_cmds-*/Build/Products/Release-*/* $out/bin/ + + for n in 1 5; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n + done + + mkdir -p $out/etc/ + install rtadvd.tproj/rtadvd.conf ip6addrctl.tproj/ip6addrctl.conf $out/etc/ + + mkdir -p $out/local/OpenSourceVersions/ + install network_cmds.plist $out/local/OpenSourceVersions/ + + mkdir -p $out/System/Library/LaunchDaemons + install kdumpd.tproj/com.apple.kdumpd.plist $out/System/Library/LaunchDaemons + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} From 25485ece2a3568fd84291ce4d600199c53754619 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Nov 2016 23:07:24 -0600 Subject: [PATCH 0346/1749] xcbuild: add name to platform.nix --- pkgs/development/tools/xcbuild/platform.nix | 1 + .../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix | 2 +- .../darwin/apple-source-releases/basic_cmds/default.nix | 2 +- .../darwin/apple-source-releases/developer_cmds/default.nix | 2 +- .../darwin/apple-source-releases/network_cmds/default.nix | 2 +- pkgs/tools/misc/contacts/default.nix | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index 491f1d6309f8..eea8ea5f9ebd 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -5,6 +5,7 @@ let Info = { CFBundleIdentifier = platformName; Type = "Platform"; + Name = "macosx"; }; Version = { diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index 15160e02e149..7a8fdde69feb 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -10,7 +10,7 @@ appleDerivation { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install adv_cmds-*/Build/Products/Release-*/* $out/bin/ + install adv_cmds-*/Build/Products/Release/* $out/bin/ for n in 1 8; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index 6f0ea955cf0a..07a13966efe6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -6,7 +6,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install basic_cmds-*/Build/Products/Release-*/* $out/bin/ + install basic_cmds-*/Build/Products/Release/* $out/bin/ for n in 1; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index b58951423fec..67fbf83496ed 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -11,7 +11,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install developer_cmds-*/Build/Products/Release-*/* $out/bin/ + install developer_cmds-*/Build/Products/Release/* $out/bin/ for n in 1; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index fe4d60e7ebe9..090a9d05fb87 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -15,7 +15,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install network_cmds-*/Build/Products/Release-*/* $out/bin/ + install network_cmds-*/Build/Products/Release/* $out/bin/ for n in 1 5; do mkdir -p $out/share/man/man$n diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index bd52f1bc0a49..5c91332463f0 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp ./contacts-*/Build/Products/Default-*/contacts $out/bin + cp ./contacts-*/Build/Products/Default/contacts $out/bin ''; NIX_LDFLAGS = " -F${Foundation}/Library/Frameworks/ -F${AddressBook}/Library/Frameworks/"; From 0b6bfa49d5b6c70ee2844c292044c35a39fabf96 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 10 Nov 2016 02:20:12 -0600 Subject: [PATCH 0347/1749] xcbuild: Move extra specs to platform --- pkgs/development/tools/xcbuild/developer.nix | 142 ------------------- pkgs/development/tools/xcbuild/platform.nix | 139 ++++++++++++++++++ 2 files changed, 139 insertions(+), 142 deletions(-) diff --git a/pkgs/development/tools/xcbuild/developer.nix b/pkgs/development/tools/xcbuild/developer.nix index 05e05def2ac2..826571238de4 100644 --- a/pkgs/development/tools/xcbuild/developer.nix +++ b/pkgs/development/tools/xcbuild/developer.nix @@ -1,141 +1,5 @@ { stdenv, platform, toolchain, xcbuild, writeText }: -let - - Tools = [ - { - Identifier = "com.apple.build-tools.nmedit"; - Type = "Tool"; - Name = "Nmedit"; - } - { - Identifier = "com.apple.compilers.resource-copier"; - Type = "Tool"; - Name = "Resource Copier"; - } - { - Identifier = "com.apple.compilers.yacc"; - Type = "Tool"; - Name = "Yacc"; - InputFileTypes = [ "sourcecode.yacc" ]; - ExecDescription = "Yacc $(InputFile)"; - } - { - Identifier = "com.apple.compilers.lex"; - Type = "Tool"; - Name = "Lex"; - ExecDescription = "Lex $(InputFile)"; - InputFileTypes = [ "sourcecode.lex" ]; - } - ]; - - Architectures = [ - { - Identifier = "Standard"; - Type = "Architecture"; - Name = "Standard Architectures (64-bit Intel)"; - RealArchitectures = [ "x86_64" ]; - ArchitectureSetting = "ARCHS_STANDARD"; - } - { - Identifier = "Universal"; - Type = "Architecture"; - Name = "Universal (64-bit Intel)"; - RealArchitectures = [ "x86_64" ]; - ArchitectureSetting = "ARCHS_STANDARD_32_64_BIT"; - } - { - Identifier = "Native"; - Type = "Architecture"; - Name = "Native Architecture of Build Machine"; - ArchitectureSetting = "NATIVE_ARCH_ACTUAL"; - } - { - Identifier = "Standard64bit"; - Type = "Architecture"; - Name = "64-bit Intel"; - RealArchitectures = [ "x86_64" ]; - ArchitectureSetting = "ARCHS_STANDARD_64_BIT"; - } - { - Identifier = "x86_64"; - Type = "Architecture"; - Name = "Intel 64-bit"; - } - { - Identifier = "Standard_Including_64_bit"; - Type = "Architecture"; - Name = "Standard Architectures (including 64-bit)"; - RealArchitectures = [ "x86_64" ]; - ArchitectureSetting = "ARCHS_STANDARD_INCLUDING_64_BIT"; - } - ]; - - PackageTypes = [ - { - Identifier = "com.apple.package-type.mach-o-executable"; - Type = "PackageType"; - Name = "Mach-O Executable"; - DefaultBuildSettings = { - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.executable"; - Name = "$(EXECUTABLE_NAME)"; - }; - } - { - Identifier = "com.apple.package-type.mach-o-objfile"; - Type = "PackageType"; - Name = "Mach-O Object File"; - DefaultBuildSettings = { - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.objfile"; - Name = "$(EXECUTABLE_NAME)"; - }; - } - { - Identifier = "com.apple.package-type.mach-o-dylib"; - Type = "PackageType"; - Name = "Mach-O Dynamic Library"; - DefaultBuildSettings = { - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.dylib"; - Name = "$(EXECUTABLE_NAME)"; - }; - } - ]; - - ProductTypes = [ - { - Identifier = "com.apple.product-type.tool"; - Type = "ProductType"; - Name = "Command-line Tool"; - PackageTypes = [ "com.apple.package-type.mach-o-executable" ]; - } - { - Identifier = "com.apple.product-type.objfile"; - Type = "ProductType"; - Name = "Object File"; - PackageTypes = [ "com.apple.package-type.mach-o-objfile" ]; - } - { - Identifier = "com.apple.product-type.library.dynamic"; - Type = "ProductType"; - Name = "Dynamic Library"; - PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; - } - ]; - -in - stdenv.mkDerivation { name = "Xcode.app"; buildInputs = [ xcbuild ]; @@ -143,12 +7,6 @@ stdenv.mkDerivation { mkdir -p $out/Contents/Developer/Library/Xcode/Specifications/ cp ${xcbuild}/Library/Xcode/Specifications/* $out/Contents/Developer/Library/Xcode/Specifications/ - cd $out/Contents/Developer/Library/Xcode/Specifications/ - plutil -convert xml1 -o Tools.xcspec ${writeText "Tools.xcspec" (builtins.toJSON Tools)} - plutil -convert xml1 -o Architectures.xcspec ${writeText "Architectures.xcspec" (builtins.toJSON Architectures)} - plutil -convert xml1 -o PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)} - plutil -convert xml1 -o ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)} - mkdir -p $out/Contents/Developer/Platforms/ cd $out/Contents/Developer/Platforms/ ln -s ${platform} diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index eea8ea5f9ebd..c54f7f83e0ee 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -12,6 +12,138 @@ let ProjectName = "OSXPlatformSupport"; }; + Tools = [ + { + Identifier = "com.apple.build-tools.nmedit"; + Type = "Tool"; + Name = "Nmedit"; + } + { + Identifier = "com.apple.compilers.resource-copier"; + Type = "Tool"; + Name = "Resource Copier"; + } + { + Identifier = "com.apple.compilers.yacc"; + Type = "Tool"; + Name = "Yacc"; + InputFileTypes = [ "sourcecode.yacc" ]; + ExecDescription = "Yacc $(InputFile)"; + } + { + Identifier = "com.apple.compilers.lex"; + Type = "Tool"; + Name = "Lex"; + ExecDescription = "Lex $(InputFile)"; + InputFileTypes = [ "sourcecode.lex" ]; + } + ]; + + Architectures = [ + { + Identifier = "Standard"; + Type = "Architecture"; + Name = "Standard Architectures (64-bit Intel)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD"; + } + { + Identifier = "Universal"; + Type = "Architecture"; + Name = "Universal (64-bit Intel)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_32_64_BIT"; + } + { + Identifier = "Native"; + Type = "Architecture"; + Name = "Native Architecture of Build Machine"; + ArchitectureSetting = "NATIVE_ARCH_ACTUAL"; + } + { + Identifier = "Standard64bit"; + Type = "Architecture"; + Name = "64-bit Intel"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_64_BIT"; + } + { + Identifier = "x86_64"; + Type = "Architecture"; + Name = "Intel 64-bit"; + } + { + Identifier = "Standard_Including_64_bit"; + Type = "Architecture"; + Name = "Standard Architectures (including 64-bit)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_INCLUDING_64_BIT"; + } + ]; + + PackageTypes = [ + { + Identifier = "com.apple.package-type.mach-o-executable"; + Type = "PackageType"; + Name = "Mach-O Executable"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.executable"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + { + Identifier = "com.apple.package-type.mach-o-objfile"; + Type = "PackageType"; + Name = "Mach-O Object File"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.objfile"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + { + Identifier = "com.apple.package-type.mach-o-dylib"; + Type = "PackageType"; + Name = "Mach-O Dynamic Library"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.dylib"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + ]; + + ProductTypes = [ + { + Identifier = "com.apple.product-type.tool"; + Type = "ProductType"; + Name = "Command-line Tool"; + PackageTypes = [ "com.apple.package-type.mach-o-executable" ]; + } + { + Identifier = "com.apple.product-type.objfile"; + Type = "ProductType"; + Name = "Object File"; + PackageTypes = [ "com.apple.package-type.mach-o-objfile" ]; + } + { + Identifier = "com.apple.product-type.library.dynamic"; + Type = "ProductType"; + Name = "Dynamic Library"; + PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; + } + ]; + in stdenv.mkDerivation { @@ -24,6 +156,13 @@ stdenv.mkDerivation { plutil -convert xml1 -o Info.plist ${writeText "Info.plist" (builtins.toJSON Info)} plutil -convert xml1 -o version.plist ${writeText "version.plist" (builtins.toJSON Version)} + mkdir -p $out/Developer/Library/Xcode/Specifications/ + cd $out/Developer/Library/Xcode/Specifications/ + plutil -convert xml1 -o Tools.xcspec ${writeText "Tools.xcspec" (builtins.toJSON Tools)} + plutil -convert xml1 -o Architectures.xcspec ${writeText "Architectures.xcspec" (builtins.toJSON Architectures)} + plutil -convert xml1 -o PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)} + plutil -convert xml1 -o ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)} + mkdir -p $out/Developer/SDKs/ cd $out/Developer/SDKs/ ln -s ${sdk} From 437bdc5e4bc29baaaa3991e260e5ee40de8f3fa0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 10 Nov 2016 14:53:28 -0600 Subject: [PATCH 0348/1749] xcbuild: fix toolchain on Linux --- pkgs/development/tools/xcbuild/toolchain.nix | 62 +++++++++++--------- pkgs/development/tools/xcbuild/wrapper.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index e86536c45983..386f67a9d631 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -1,5 +1,5 @@ {stdenv, writeText, toolchainName, xcbuild -, cc, llvm, cctools, gcc, bootstrap_cmds, binutils +, llvm, cctools, gcc, bootstrap_cmds, binutils , yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper}: let @@ -13,7 +13,11 @@ in stdenv.mkDerivation { name = "nixpkgs.xctoolchain"; buildInputs = [ xcbuild makeWrapper ]; - propagatedBuildInputs = [ cc cctools llvm gcc bootstrap_cmds binutils yacc flex m4 unifdef gperf indent ]; + + propagatedBuildInputs = [ llvm gcc yacc flex m4 unifdef gperf indent ] + ++ stdenv.lib.optionals stdenv.isDarwin [ cctools bootstrap_cmds binutils ]; + ## cctools should build on Linux but it doesn't currentl + buildCommand = '' mkdir -p $out plutil -convert xml1 -o $out/ToolchainInfo.plist ${writeText "ToolchainInfo.plist" (builtins.toJSON ToolchainInfo)} @@ -25,33 +29,12 @@ stdenv.mkDerivation { mkdir -p $out/usr/bin cd $out/usr/bin - ln -s ${cc}/bin/cpp - ln -s ${cc}/bin/c++ - ln -s ${cc}/bin/cc + ln -s ${stdenv.cc}/bin/cpp + ln -s ${stdenv.cc}/bin/c++ + ln -s ${stdenv.cc}/bin/cc ln -s c++ clang++ ln -s cc clang - ln -s ${cctools}/bin/ar - ln -s ${cctools}/bin/as - ln -s ${cctools}/bin/nm - ln -s ${cctools}/bin/nmedit - ln -s ${cctools}/bin/ld - ln -s ${cctools}/bin/libtool - ln -s ${cctools}/bin/strings - ln -s ${cctools}/bin/strip - ln -s ${cctools}/bin/install_name_tool - ln -s ${cctools}/bin/bitcode_strip - ln -s ${cctools}/bin/codesign_allocate - ln -s ${cctools}/bin/dsymutil - ln -s ${cctools}/bin/dyldinfo - ln -s ${cctools}/bin/otool - ln -s ${cctools}/bin/unwinddump - ln -s ${cctools}/bin/size - ln -s ${cctools}/bin/segedit - ln -s ${cctools}/bin/pagestuff - ln -s ${cctools}/bin/ranlib - ln -s ${cctools}/bin/redo_prebinding - ln -s ${llvm}/bin/llvm-cov ln -s ${llvm}/bin/llvm-dsymutil ln -s ${llvm}/bin/llvm-dwarfdump @@ -74,14 +57,35 @@ stdenv.mkDerivation { ln -s ${unifdef}/bin/unifdef ln -s ${unifdef}/bin/unifdefall - ln -s ${bootstrap_cmds}/bin/mig - ln -s ${gperf}/bin/gperf ln -s ${gcc}/bin/gcov ln -s ${gcc}/bin/mkdep ln -s ${indent}/bin/indent - ln -s ${binutils}/bin/lipo ln -s ${ctags}/bin/ctags + '' + stdenv.lib.optionalString stdenv.isDarwin '' + ln -s ${bootstrap_cmds}/bin/mig + ln -s ${binutils}/bin/lipo + + ln -s ${cctools}/bin/ar + ln -s ${cctools}/bin/as + ln -s ${cctools}/bin/nm + ln -s ${cctools}/bin/nmedit + ln -s ${cctools}/bin/ld + ln -s ${cctools}/bin/libtool + ln -s ${cctools}/bin/strings + ln -s ${cctools}/bin/strip + ln -s ${cctools}/bin/install_name_tool + ln -s ${cctools}/bin/bitcode_strip + ln -s ${cctools}/bin/codesign_allocate + ln -s ${cctools}/bin/dsymutil + ln -s ${cctools}/bin/dyldinfo + ln -s ${cctools}/bin/otool + ln -s ${cctools}/bin/unwinddump + ln -s ${cctools}/bin/size + ln -s ${cctools}/bin/segedit + ln -s ${cctools}/bin/pagestuff + ln -s ${cctools}/bin/ranlib + ln -s ${cctools}/bin/redo_prebinding ''; } diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index ef4ab245ec0c..2b01bdbb52b2 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -12,7 +12,7 @@ let }; toolchain = callPackage ./toolchain.nix { - inherit cctools bootstrap_cmds toolchainName xcbuild binutils; + inherit cctools bootstrap_cmds toolchainName xcbuild binutils stdenv; }; sdk = callPackage ./sdk.nix { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f2a1d837952..2def672e6ad3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6435,6 +6435,7 @@ in xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; inherit (darwin) cctools bootstrap_cmds binutils; + stdenv = clangStdenv; }; xmlindent = callPackage ../development/web/xmlindent {}; From 4685bd7853c40ec970eaf722fcae993c10bb1b5d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 10 Nov 2016 14:56:58 -0600 Subject: [PATCH 0349/1749] xcbuild: update meta and comments --- .../Librpcsvc/default.nix | 1 - .../apple-source-releases/adv_cmds/xcode.nix | 8 +++++++- .../network_cmds/default.nix | 18 +++++++++++------- pkgs/tools/misc/contacts/default.nix | 1 + 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix index b20687b41593..512ec6253c78 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix @@ -17,7 +17,6 @@ appleDerivation rec { ''; meta = with stdenv.lib; { - description = ""; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.darwin; license = licenses.apsl20; diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index 7a8fdde69feb..fedd49022380 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -1,7 +1,13 @@ { stdenv, appleDerivation, fetchurl, xcbuild, libcxx }: appleDerivation { - # disable pkill from build + + # pkill requires special private headers that are unavailable in + # NixPkgs. These ones are needed: + # - xpc/xpxc.h + # - os/base_private.h + # - _simple.h + # We disable it here for now. TODO: build pkill inside adv_cmds patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 090a9d05fb87..71acb833cc3f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -5,8 +5,10 @@ appleDerivation rec { NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/ -D__APPLE_USE_RFC_2292 -DIPV6_DONTFRAG=14 -DINET6"; + # "spray" requires some files that aren't compiling correctly in xcbuild. + # "rtadvd" seems to fail with some missing constants. + # We disable spray and rtadvd here for now. patchPhase = '' - # disable spray, rtadvd substituteInPlace network_cmds.xcodeproj/project.pbxproj \ --replace "7294F0EA0EE8BAC80052EC88 /* PBXTargetDependency */," "" \ --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," "" @@ -22,14 +24,16 @@ appleDerivation rec { install */*.$n $out/share/man/man$n done - mkdir -p $out/etc/ - install rtadvd.tproj/rtadvd.conf ip6addrctl.tproj/ip6addrctl.conf $out/etc/ + # TODO: patch files to load from $out/ instead of /usr/ - mkdir -p $out/local/OpenSourceVersions/ - install network_cmds.plist $out/local/OpenSourceVersions/ + # mkdir -p $out/etc/ + # install rtadvd.tproj/rtadvd.conf ip6addrctl.tproj/ip6addrctl.conf $out/etc/ - mkdir -p $out/System/Library/LaunchDaemons - install kdumpd.tproj/com.apple.kdumpd.plist $out/System/Library/LaunchDaemons + # mkdir -p $out/local/OpenSourceVersions/ + # install network_cmds.plist $out/local/OpenSourceVersions/ + + # mkdir -p $out/System/Library/LaunchDaemons + # install kdumpd.tproj/com.apple.kdumpd.plist $out/System/Library/LaunchDaemons ''; meta = { diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 5c91332463f0..d146cd93343e 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { cp ./contacts-*/Build/Products/Default/contacts $out/bin ''; + ## FIXME: the framework setup hook isn't adding these correctly NIX_LDFLAGS = " -F${Foundation}/Library/Frameworks/ -F${AddressBook}/Library/Frameworks/"; meta = with stdenv.lib; { From fc1f6f55ea6c7eb1f98027db532683755fb7d4b9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 12 Nov 2016 15:51:25 -0600 Subject: [PATCH 0350/1749] xcbuild: Get rid of developer.nix, move to wrapper also: - add custom outputs "specs" for xcbuild - get rid of unneeded tools - update xcbuild - add more comments - fixup xcbuild derivations Affected xcbuild derivations include: - adv_cmds - network_cmds - basic_cmds --- pkgs/development/tools/xcbuild/developer.nix | 18 ---------- pkgs/development/tools/xcbuild/platform.nix | 36 +++++-------------- pkgs/development/tools/xcbuild/setup-hook.sh | 2 +- pkgs/development/tools/xcbuild/wrapper.nix | 17 +++++---- .../apple-source-releases/adv_cmds/xcode.nix | 6 +++- .../basic_cmds/default.nix | 9 ++++- .../network_cmds/default.nix | 2 +- 7 files changed, 35 insertions(+), 55 deletions(-) delete mode 100644 pkgs/development/tools/xcbuild/developer.nix diff --git a/pkgs/development/tools/xcbuild/developer.nix b/pkgs/development/tools/xcbuild/developer.nix deleted file mode 100644 index 826571238de4..000000000000 --- a/pkgs/development/tools/xcbuild/developer.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, platform, toolchain, xcbuild, writeText }: - -stdenv.mkDerivation { - name = "Xcode.app"; - buildInputs = [ xcbuild ]; - buildCommand = '' - mkdir -p $out/Contents/Developer/Library/Xcode/Specifications/ - cp ${xcbuild}/Library/Xcode/Specifications/* $out/Contents/Developer/Library/Xcode/Specifications/ - - mkdir -p $out/Contents/Developer/Platforms/ - cd $out/Contents/Developer/Platforms/ - ln -s ${platform} - - mkdir -p $out/Contents/Developer/Toolchains/ - cd $out/Contents/Developer/Toolchains/ - ln -s ${toolchain} - ''; -} diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index c54f7f83e0ee..0b03d4120e85 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -12,33 +12,11 @@ let ProjectName = "OSXPlatformSupport"; }; - Tools = [ - { - Identifier = "com.apple.build-tools.nmedit"; - Type = "Tool"; - Name = "Nmedit"; - } - { - Identifier = "com.apple.compilers.resource-copier"; - Type = "Tool"; - Name = "Resource Copier"; - } - { - Identifier = "com.apple.compilers.yacc"; - Type = "Tool"; - Name = "Yacc"; - InputFileTypes = [ "sourcecode.yacc" ]; - ExecDescription = "Yacc $(InputFile)"; - } - { - Identifier = "com.apple.compilers.lex"; - Type = "Tool"; - Name = "Lex"; - ExecDescription = "Lex $(InputFile)"; - InputFileTypes = [ "sourcecode.lex" ]; - } - ]; + # These files are all based off of Xcode spec fies found in + # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Xcode/Speciications/. + # Based off of the MacOSX Architectures.xcpsec file. All i386 stuff + # is removed because NixPkgs only supports darwin-x86_64. Architectures = [ { Identifier = "Standard"; @@ -81,6 +59,8 @@ let } ]; + # Based off of the MacOSX Package Types.xcpsec file. Only keep the + # bare minimum needed. PackageTypes = [ { Identifier = "com.apple.package-type.mach-o-executable"; @@ -123,6 +103,9 @@ let } ]; + # Based off of the MacOSX Product Types.xcpsec file. All + # bundles/wrapper are removed, because we prefer dynamic products in + # NixPkgs. ProductTypes = [ { Identifier = "com.apple.product-type.tool"; @@ -158,7 +141,6 @@ stdenv.mkDerivation { mkdir -p $out/Developer/Library/Xcode/Specifications/ cd $out/Developer/Library/Xcode/Specifications/ - plutil -convert xml1 -o Tools.xcspec ${writeText "Tools.xcspec" (builtins.toJSON Tools)} plutil -convert xml1 -o Architectures.xcspec ${writeText "Architectures.xcspec" (builtins.toJSON Architectures)} plutil -convert xml1 -o PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)} plutil -convert xml1 -o ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)} diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index b0ae8dd6e8e2..c3b26a6ac796 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -5,7 +5,7 @@ xcbuildBuildPhase() { echo "running xcodebuild" - xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build + xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build runHook postBuild } diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 2b01bdbb52b2..fc03c273fc58 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -23,10 +23,6 @@ let inherit sdk platformName xcbuild; }; - developer = callPackage ./developer.nix { - inherit platform toolchain xcbuild; - }; - xcconfig = writeText "nix.xcconfig" '' SDKROOT=${sdkName} ''; @@ -50,13 +46,22 @@ stdenv.mkDerivation { ln -s $file done + mkdir -p $out/Library/Xcode/ + ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications + + mkdir -p $out/Platforms/ + ln -s ${platform} $out/Platforms/ + + mkdir -p $out/Toolchains/ + ln -s ${toolchain} $out/Toolchains/ + wrapProgram $out/bin/xcodebuild \ --add-flags "-xcconfig ${xcconfig}" \ --add-flags "DERIVED_DATA_DIR=." \ - --set DEVELOPER_DIR "${developer}" + --set DEVELOPER_DIR "$out" wrapProgram $out/bin/xcrun \ --add-flags "-sdk ${sdkName}" \ - --set DEVELOPER_DIR "${developer}" + --set DEVELOPER_DIR "$out" ''; passthru = { diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index fedd49022380..254b4a231c22 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -8,9 +8,13 @@ appleDerivation { # - os/base_private.h # - _simple.h # We disable it here for now. TODO: build pkill inside adv_cmds + + # We also disable locale here because of some issues with a missing + # "lstdc++". patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ - --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" + --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" \ + --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" ''; # temporary install phase until xcodebuild has "install" support diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index 07a13966efe6..9e8b78e57d6c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -3,6 +3,14 @@ appleDerivation rec { buildInputs = [ xcbuild ]; + # These PBXcp calls should be patched in xcbuild to allow them to + # automatically be prefixed. + patchPhase = '' + substituteInPlace basic_cmds.xcodeproj/project.pbxproj \ + --replace "dstPath = /usr/share/man/man1;" "dstPath = $out/share/man/man1;" \ + --replace "dstPath = /usr/share/man/man5;" "dstPath = $out/share/man/man5;" + ''; + # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ @@ -12,7 +20,6 @@ appleDerivation rec { mkdir -p $out/share/man/man$n install */*.$n $out/share/man/man$n done - ''; meta = { diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 71acb833cc3f..357a87689a03 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -3,7 +3,7 @@ appleDerivation rec { buildInputs = [ xcbuild openssl xnu Librpcsvc libpcap developer_cmds ]; - NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/ -D__APPLE_USE_RFC_2292 -DIPV6_DONTFRAG=14 -DINET6"; + NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/"; # "spray" requires some files that aren't compiling correctly in xcbuild. # "rtadvd" seems to fail with some missing constants. From 2bcaa93aa7b7005b95f40ca06f19884ea1ba4d28 Mon Sep 17 00:00:00 2001 From: Tim Digel Date: Wed, 16 Nov 2016 09:25:04 +0100 Subject: [PATCH 0351/1749] erlang: 19.1 -> 19.1.6 --- pkgs/development/interpreters/erlang/R19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index ddeccb29b59d..02a84580850d 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -20,7 +20,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + "${optionalString javacSupport "-javac"}"; - version = "19.1"; + version = "19.1.6"; # Minor OTP releases are not always released as tarbals at # http://erlang.org/download/ So we have to download from @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = "otp"; rev = "OTP-${version}"; - sha256 = "0nnjj069d5pjhgcd8vvqbrkjdac3p1v4s3zb59i4h73vg7f5p736"; + sha256 = "120dqi8h2fwqfmh9g2nmkf153zlglzw9kkddz57xqvqq5arcs72y"; }; buildInputs = From fb62bc90a14021e70be2ec00f33f951186b55784 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Nov 2016 10:46:52 +0100 Subject: [PATCH 0352/1749] pythonPackages.numexpr: 2.5.2 -> 2.6.1 --- pkgs/top-level/python-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96c412551d26..9f28194d95ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15729,17 +15729,14 @@ in { numba = callPackage ../development/python-modules/numba { }; numexpr = buildPythonPackage rec { - version = "2.5.2"; + version = "2.6.1"; name = "numexpr-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/numexpr/${name}.tar.gz"; - sha256 = "0kb6549fwfxpc4qy3l5liad2mx99dys77c6w1y2rm32wyrf5k1by"; + sha256 = "db2ee72f277b23c82d204189290ea4b792f9bd5b9d67744b045f8c2a8e929a06"; }; - # Tests fail with python 3. https://github.com/pydata/numexpr/issues/177 - # doCheck = !isPy3k; - propagatedBuildInputs = with self; [ numpy ]; # Run the test suite. From 734bd22f1b019e545b7d7fe2b76c6cf3f9de5ac6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 14 Nov 2016 10:05:07 +0100 Subject: [PATCH 0353/1749] LTS Haskell 7.9 --- .../configuration-hackage2nix.yaml | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 37b050d05d4d..1ccdbecc8d81 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -32,7 +32,7 @@ core-packages: - xhtml-3000.2.1 default-package-overrides: - # LTS Haskell 7.8 + # LTS Haskell 7.9 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -146,7 +146,7 @@ default-package-overrides: - array-memoize ==0.6.0 - arrow-list ==0.7 - ascii-progress ==0.3.3.0 - - asciidiagram ==1.3.2 + - asciidiagram ==1.3.3 - asn1-encoding ==0.9.4 - asn1-parse ==0.9.4 - asn1-types ==0.3.2 @@ -214,7 +214,7 @@ default-package-overrides: - bitx-bitcoin ==0.10.0.0 - blake2 ==0.2.0 - blank-canvas ==0.6 - - BlastHTTP ==1.2.0 + - BlastHTTP ==1.2.1 - blastxml ==0.3.2 - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.0.2 @@ -272,12 +272,12 @@ default-package-overrides: - case-insensitive ==1.2.0.7 - cased ==0.1.0.0 - cases ==0.1.3.1 - - cassava ==0.4.5.0 + - cassava ==0.4.5.1 - cassava-conduit ==0.3.2 - cassava-megaparsec ==0.1.0 - cassette ==0.1.0 - cayley-client ==0.2.1.0 - - cereal ==0.5.3.0 + - cereal ==0.5.4.0 - cereal-conduit ==0.7.3 - cereal-text ==0.1.0.2 - cereal-vector ==0.2.0.1 @@ -347,7 +347,7 @@ default-package-overrides: - concurrent-supply ==0.1.8 - conduit ==1.2.8 - conduit-combinators ==1.0.8.1 - - conduit-extra ==1.1.13.3 + - conduit-extra ==1.1.15 - conduit-iconv ==0.1.1.1 - conduit-parse ==0.1.2.0 - ConfigFile ==1.1.4 @@ -462,10 +462,10 @@ default-package-overrides: - djinn-lib ==0.0.1.2 - dlist ==0.8.0.2 - dlist-instances ==0.1.1.1 - - dns ==2.0.8 + - dns ==2.0.9 - do-list ==1.0.1 - dockerfile ==0.1.0.1 - - docopt ==0.7.0.4 + - docopt ==0.7.0.5 - doctest ==0.11.0 - doctest-discover ==0.1.0.7 - doctest-prop ==0.2.0.1 @@ -616,7 +616,7 @@ default-package-overrides: - ghc-typelits-extra ==0.2.1 - ghc-typelits-knownnat ==0.2.2 - ghc-typelits-natnormalise ==0.5.1 - - ghcid ==0.6.5 + - ghcid ==0.6.6 - ghcjs-codemirror ==0.0.0.1 - ghcjs-hplay ==0.3.4.2 - ghcjs-perch ==0.3.3 @@ -649,7 +649,7 @@ default-package-overrides: - glib ==0.13.4.1 - Glob ==0.7.12 - gloss ==1.10.2.3 - - gloss-rendering ==1.10.3.3 + - gloss-rendering ==1.10.3.5 - GLURaw ==2.0.0.2 - GLUT ==2.7.0.10 - gogol ==0.1.0 @@ -878,7 +878,7 @@ default-package-overrides: - HPDF ==1.4.10 - hpio ==0.8.0.4 - hprotoc ==2.4.0 - - hquantlib ==0.0.3.2 + - hquantlib ==0.0.3.3 - hreader ==1.0.2 - hruby ==0.3.4.2 - hs-bibutils ==5.5 @@ -917,7 +917,7 @@ default-package-overrides: - hspec-wai ==0.6.6 - hspec-wai-json ==0.6.1 - hspec-webdriver ==1.2.0 - - hstatistics ==0.2.5.3 + - hstatistics ==0.2.5.4 - hstatsd ==0.1 - HStringTemplate ==0.8.5 - hsx-jmacro ==7.3.8 @@ -927,7 +927,7 @@ default-package-overrides: - HTF ==0.13.1.0 - html ==1.0.1.2 - html-conduit ==1.2.1.1 - - htoml ==1.0.0.1 + - htoml ==1.0.0.3 - HTTP ==4000.3.3 - http-api-data ==0.2.4 - http-client ==0.4.31.1 @@ -971,7 +971,7 @@ default-package-overrides: - iconv ==0.4.1.3 - identicon ==0.1.0 - idris ==0.12.3 - - ieee754 ==0.7.8 + - ieee754 ==0.7.9 - IfElse ==0.85 - ignore ==0.1.1.0 - ilist ==0.2.0.0 @@ -1006,7 +1006,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.0.1 - ip6addr ==0.5.1.4 - iproute ==1.7.1 - - IPv6Addr ==0.6.1.0 + - IPv6Addr ==0.6.2.0 - irc ==0.6.1.0 - irc-client ==0.4.4.1 - irc-conduit ==0.2.1.1 @@ -1056,7 +1056,7 @@ default-package-overrides: - language-glsl ==0.2.0 - language-haskell-extract ==0.2.4 - language-java ==0.2.8 - - language-javascript ==0.6.0.8 + - language-javascript ==0.6.0.9 - language-lua2 ==0.1.0.5 - language-nix ==2.1.0.1 - language-puppet ==1.3.1.1 @@ -1105,7 +1105,7 @@ default-package-overrides: - lrucache ==1.2.0.0 - lrucaching ==0.3.0 - ltext ==0.1.2.1 - - lucid ==2.9.6 + - lucid ==2.9.7 - lucid-svg ==0.7.0.0 - machines ==0.6.1 - magic ==1.1 @@ -1156,7 +1156,7 @@ default-package-overrides: - monad-extras ==0.5.11 - monad-http ==0.1.0.0 - monad-journal ==0.7.2 - - monad-logger ==0.3.20 + - monad-logger ==0.3.20.1 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.6 - monad-logger-syslog ==0.1.2.0 @@ -1198,7 +1198,7 @@ default-package-overrides: - murmur-hash ==0.1.0.9 - murmur3 ==1.0.3 - MusicBrainz ==0.2.4 - - mustache ==2.1 + - mustache ==2.1.2 - mutable-containers ==0.3.3 - mwc-probability ==1.2.2 - mwc-random ==0.13.4.0 @@ -1253,7 +1253,7 @@ default-package-overrides: - once ==0.2 - OneTuple ==0.2.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.5.1.1 + - opaleye ==0.5.2.1 - opaleye-trans ==0.3.3 - open-browser ==0.2.1.0 - OpenGL ==3.0.1.0 @@ -1437,7 +1437,7 @@ default-package-overrides: - readable ==0.3.1 - ReadArgs ==1.2.2 - readline ==1.0.3.0 - - rebase ==1.0.2.1 + - rebase ==1.0.3 - redis-io ==0.7.0 - redis-resp ==0.4.0 - reducers ==3.12.1 @@ -1473,7 +1473,7 @@ default-package-overrides: - reroute ==0.4.0.1 - resolve-trivial-conflicts ==0.3.2.3 - resource-pool ==0.2.3.2 - - resourcet ==1.1.8 + - resourcet ==1.1.8.1 - rest-client ==0.5.1.1 - rest-core ==0.39 - rest-gen ==0.19.0.3 @@ -1496,7 +1496,7 @@ default-package-overrides: - runmemo ==1.0.0.1 - rvar ==0.2.0.3 - s3-signer ==0.3.0.0 - - safe ==0.3.9 + - safe ==0.3.10 - safe-exceptions ==0.1.4.0 - safecopy ==0.9.2 - SafeSemaphore ==0.10.1 @@ -1582,8 +1582,8 @@ default-package-overrides: - smsaero ==0.6.1 - smtLib ==1.0.8 - smtp-mail ==0.1.4.5 - - snap-core ==1.0.0.0 - - snap-server ==1.0.1.0 + - snap-core ==1.0.1.0 + - snap-server ==1.0.1.1 - snowflake ==0.1.1.1 - soap ==0.2.3.1 - soap-openssl ==0.1.0.2 @@ -1591,7 +1591,7 @@ default-package-overrides: - socket ==0.6.1.0 - socks ==0.5.5 - solga ==0.1.0.1 - - solga-swagger ==0.1.0.1 + - solga-swagger ==0.1.0.2 - sorted-list ==0.2.0.0 - sourcemap ==0.1.6 - spdx ==0.2.1.0 @@ -1730,11 +1730,11 @@ default-package-overrides: - tf-random ==0.5 - th-data-compat ==0.0.2.2 - th-desugar ==1.6 - - th-expand-syns ==0.4.0.0 + - th-expand-syns ==0.4.1.0 - th-extras ==0.0.0.4 - th-lift ==0.7.6 - th-lift-instances ==0.1.10 - - th-orphans ==0.13.2 + - th-orphans ==0.13.3 - th-printf ==0.3.1 - th-reify-compat ==0.0.1.1 - th-reify-many ==0.1.6 @@ -1764,7 +1764,7 @@ default-package-overrides: - transformers-base ==0.4.4 - transformers-compat ==0.5.1.4 - transformers-lift ==0.1.0.1 - - transient ==0.4.4 + - transient ==0.4.4.1 - transient-universe ==0.3.5 - traverse-with-class ==0.2.0.4 - tree-fun ==0.8.1.0 @@ -1846,7 +1846,7 @@ default-package-overrides: - vcswrapper ==0.1.3 - vector ==0.11.0.0 - vector-algorithms ==0.7.0.1 - - vector-binary-instances ==0.2.3.2 + - vector-binary-instances ==0.2.3.3 - vector-buffer ==0.4.1 - vector-fftw ==0.1.3.7 - vector-instances ==3.3.1 @@ -1885,7 +1885,7 @@ default-package-overrides: - wai-transformers ==0.0.7 - wai-websockets ==3.0.1.1 - waitra ==0.0.4.0 - - warp ==3.2.8 + - warp ==3.2.9 - warp-tls ==3.2.2 - web-plugins ==0.2.9 - web-routes ==0.27.11 @@ -1918,7 +1918,7 @@ default-package-overrides: - wl-pprint-text ==1.1.0.4 - word-trie ==0.3.0 - word8 ==0.1.2 - - wordpass ==1.0.0.6 + - wordpass ==1.0.0.7 - Workflow ==0.8.3 - wrap ==0.0.0 - wreq ==0.4.1.0 @@ -1957,14 +1957,14 @@ default-package-overrides: - YampaSynth ==0.2 - yarr ==1.4.0.2 - yes-precure5-command ==5.5.3 - - yesod ==1.4.3 + - yesod ==1.4.3.1 - yesod-auth ==1.4.13.5 - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 - yesod-auth-hashdb ==1.5.1.3 - yesod-auth-oauth2 ==0.2.2 - yesod-bin ==1.4.18.7 - - yesod-core ==1.4.25 + - yesod-core ==1.4.26 - yesod-eventsource ==1.4.0.1 - yesod-fay ==0.8.0 - yesod-fb ==0.3.4 From 1e43c159e2d1459cdd8b9a62e88b11b3c71039b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 14 Nov 2016 10:34:42 +0100 Subject: [PATCH 0354/1749] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/4196e3bc37e6ac42fa51525bf7855bb447b46caf. --- .../haskell-modules/hackage-packages.nix | 1145 +++++------------ 1 file changed, 296 insertions(+), 849 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c835d85b97e4..56c84c2a7c53 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1650,25 +1650,6 @@ self: { }) {}; "BlastHTTP" = callPackage - ({ mkDerivation, base, biocore, biofasta, blastxml, bytestring - , conduit, HTTP, http-conduit, hxt, mtl, network, transformers - }: - mkDerivation { - pname = "BlastHTTP"; - version = "1.2.0"; - sha256 = "65a58d1e7f5731feabef05480032c674fc55d559d2d4c391cf3fb0aa9ee4166e"; - revision = "1"; - editedCabalFile = "7076650ad04d2c5945b96ec1a8d5db8ee680314d4dc4cff54f264316e7f69bba"; - libraryHaskellDepends = [ - base biocore biofasta blastxml bytestring conduit HTTP http-conduit - hxt mtl network transformers - ]; - homepage = "https://github.com/eggzilla/BlastHTTP"; - description = "Libary to interface with the NCBI blast REST interface"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "BlastHTTP_1_2_1" = callPackage ({ mkDerivation, base, biocore, biofasta, blastxml, bytestring , conduit, HTTP, http-conduit, hxt, mtl, network, transformers }: @@ -1683,7 +1664,6 @@ self: { homepage = "https://github.com/eggzilla/BlastHTTP"; description = "Libary to interface with the NCBI blast REST interface"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Blobs" = callPackage @@ -5690,8 +5670,8 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.9.1.0"; - sha256 = "7f66dcdd5cdaa85d9ee14cbabb856e545b97f05ceeb55ce52ba1ef79ea33d3a9"; + version = "0.9.1.1"; + sha256 = "be780905be2f45683bb7ea702ac87f7c9b30d7cfeadc0fce9d5a9d989533a38c"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -9582,25 +9562,6 @@ self: { }) {}; "IPv6Addr" = callPackage - ({ mkDerivation, attoparsec, base, HUnit, iproute, network - , network-info, random, test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "IPv6Addr"; - version = "0.6.1.0"; - sha256 = "dea0eb0a534e1df647487f120428ac7cfc54ab9c8ca75f63fe47a4020d4888c6"; - libraryHaskellDepends = [ - attoparsec base iproute network network-info random text - ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit text - ]; - homepage = "https://github.com/MichelBoucey/IPv6Addr"; - description = "Library to deal with IPv6 address text representations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "IPv6Addr_0_6_2_0" = callPackage ({ mkDerivation, attoparsec, base, HUnit, iproute, network , network-info, random, test-framework, test-framework-hunit, text }: @@ -9617,7 +9578,6 @@ self: { homepage = "https://github.com/MichelBoucey/IPv6Addr"; description = "Library to deal with IPv6 address text representations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "IcoGrid" = callPackage @@ -12096,8 +12056,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, net_snmp, process }: mkDerivation { pname = "NetSNMP"; - version = "0.3.2.2"; - sha256 = "7f29640168103c6a6194b37737a62057e7bb8cff3e8503e9dd1e46bb60552c9b"; + version = "0.3.2.4"; + sha256 = "45ee5a82f1cecc381299d1998ae194ee05348a30cfa827cd5aea277310bf5c5b"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ net_snmp ]; testHaskellDepends = [ base bytestring HUnit process ]; @@ -26743,29 +26703,6 @@ self: { }) {}; "asciidiagram" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative - , rasterific-svg, svg-tree, text, vector - }: - mkDerivation { - pname = "asciidiagram"; - version = "1.3.2"; - sha256 = "11eb37084513a6b510f88f043a10c2cdc9b039041b6e5d3ae0decd7c40de4784"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers FontyFruity JuicyPixels lens linear mtl - rasterific-svg svg-tree text vector - ]; - executableHaskellDepends = [ - base bytestring directory filepath FontyFruity JuicyPixels - optparse-applicative rasterific-svg svg-tree text - ]; - description = "Pretty rendering of Ascii diagram into svg or png"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "asciidiagram_1_3_3" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative , rasterific-svg, svg-tree, text, vector @@ -26786,7 +26723,6 @@ self: { ]; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asic" = callPackage @@ -33839,8 +33775,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.6.0.0"; - sha256 = "1b6437cda224d2c1250ff83fa9af1c4e9b7890613a6de7b658672f9dc35cee0a"; + version = "0.7.0.0"; + sha256 = "b55acc5eb137f8dc9a85a7eedc8dc2f26c22d91b8593b856b155c6cd2597a7d3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34682,12 +34618,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "btrfs_0_1_2_1" = callPackage + "btrfs_0_1_2_2" = callPackage ({ mkDerivation, base, bytestring, time, unix }: mkDerivation { pname = "btrfs"; - version = "0.1.2.1"; - sha256 = "85b28c30a369958cd86ab2d822aa874846950e2720d0b9cda5ef8cd225cf3ee0"; + version = "0.1.2.2"; + sha256 = "0a362bd0aef9c11212c095a3da17279a5c1ac490eee49822a04138503212e7b5"; libraryHaskellDepends = [ base bytestring time unix ]; homepage = "https://github.com/redneb/hs-btrfs"; description = "Bindings to the btrfs API"; @@ -37991,30 +37927,6 @@ self: { }) {}; "cassava" = callPackage - ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring - , containers, deepseq, hashable, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - , unordered-containers, vector - }: - mkDerivation { - pname = "cassava"; - version = "0.4.5.0"; - sha256 = "7320a1c764efd3baae6944b31f7fdb438ae307876dce283a242e8f1deeb371c9"; - libraryHaskellDepends = [ - array attoparsec base blaze-builder bytestring containers deepseq - hashable text unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring hashable HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 text - unordered-containers vector - ]; - homepage = "https://github.com/hvr/cassava"; - description = "A CSV parsing and encoding library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cassava_0_4_5_1" = callPackage ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring , containers, deepseq, hashable, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text @@ -38036,7 +37948,6 @@ self: { homepage = "https://github.com/hvr/cassava"; description = "A CSV parsing and encoding library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-conduit" = callPackage @@ -38057,19 +37968,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cassava-conduit_0_3_4" = callPackage + "cassava-conduit_0_3_5" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava , conduit, conduit-extra, containers, mtl, QuickCheck, text }: mkDerivation { pname = "cassava-conduit"; - version = "0.3.4"; - sha256 = "cebd36d3b7cd575f2ccf38860d3f89ba0872cd196d25f5f5d1cefb579a111849"; + version = "0.3.5"; + sha256 = "0162887a9ca16d8828ac31f7c5aa409129de4e1cd3e199cd158302d3775f9e89"; libraryHaskellDepends = [ array base bifunctors bytestring cassava conduit conduit-extra containers mtl text ]; - testHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ + base bytestring cassava conduit conduit-extra QuickCheck text + ]; homepage = "https://github.com/domdere/cassava-conduit"; description = "Conduit interface for cassava package"; license = stdenv.lib.licenses.bsd3; @@ -38519,26 +38432,6 @@ self: { }) {}; "cereal" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "cereal"; - version = "0.5.3.0"; - sha256 = "c316e07cde7559684b71d345890e8f16eb5f6cc1cdd29f96e8c4296bcf8a8af4"; - libraryHaskellDepends = [ - array base bytestring containers ghc-prim - ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - homepage = "https://github.com/GaloisInc/cereal"; - description = "A binary serialization library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cereal_0_5_4_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, ghc-prim , QuickCheck, test-framework, test-framework-quickcheck2 }: @@ -38556,7 +38449,6 @@ self: { homepage = "https://github.com/GaloisInc/cereal"; description = "A binary serialization library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-conduit" = callPackage @@ -38857,6 +38749,26 @@ self: { 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 + }: + mkDerivation { + pname = "cgi"; + version = "3001.3.0.2"; + sha256 = "92111387216c4941271a833a1214d61ad21aaf3337ae48ea6d99d4a035bd77c1"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cgi-undecidable" = callPackage ({ mkDerivation, base, cgi, mtl }: mkDerivation { @@ -40163,8 +40075,8 @@ self: { }: mkDerivation { pname = "clang-pure"; - version = "0.2.0.1"; - sha256 = "27c81214e72d9a4c6e701fc05d2adc5cb0732cc07c4fb715a6bf2f9d904058ee"; + version = "0.2.0.2"; + sha256 = "fad48f3ba3fad6a99d73923a6034a3d2a6610812404b39c05e6dc3dd20e0604c"; libraryHaskellDepends = [ base bytestring containers contravariant inline-c microlens microlens-contra singletons stm template-haskell vector @@ -43548,32 +43460,6 @@ self: { }) {}; "conduit-extra" = callPackage - ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring - , bytestring-builder, conduit, directory, exceptions, filepath - , hspec, monad-control, network, primitive, process, QuickCheck - , resourcet, stm, streaming-commons, text, transformers - , transformers-base - }: - mkDerivation { - pname = "conduit-extra"; - version = "1.1.13.3"; - sha256 = "c2efc890925ca9adcff7006b6155804b4a3712940f70b3e3be8b1e9be7c56c48"; - libraryHaskellDepends = [ - async attoparsec base blaze-builder bytestring conduit directory - exceptions filepath monad-control network primitive process - resourcet stm streaming-commons text transformers transformers-base - ]; - testHaskellDepends = [ - async attoparsec base blaze-builder bytestring bytestring-builder - conduit exceptions hspec process QuickCheck resourcet stm - streaming-commons text transformers transformers-base - ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Batteries included conduit: adapters for common libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-extra_1_1_15" = callPackage ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring , bytestring-builder, conduit, directory, exceptions, filepath , hspec, monad-control, network, primitive, process, QuickCheck @@ -43597,7 +43483,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Batteries included conduit: adapters for common libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-find" = callPackage @@ -47899,8 +47784,8 @@ self: { }: mkDerivation { pname = "d-bus"; - version = "0.1.4"; - sha256 = "e194ab6f0447adf7954b1b94b1533ded8c79af99a7c8976e316934a22452f5b3"; + version = "0.1.5"; + sha256 = "79a28c075e0eac6f3bb50fedd88d8454ed5f8b6737cd484e2f26fd13361b7d06"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54626,6 +54511,30 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "diversity_0_8_0_2" = callPackage + ({ mkDerivation, base, containers, data-ordlist, fasta + , math-functions, MonadRandom, optparse-applicative, parsec, pipes + , random-shuffle, scientific, semigroups, split + }: + mkDerivation { + pname = "diversity"; + version = "0.8.0.2"; + sha256 = "f8bea710958aff9169f150efc112ec871230eccf464315b956dccdd8460c7324"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-ordlist fasta math-functions MonadRandom + parsec random-shuffle scientific split + ]; + executableHaskellDepends = [ + base containers fasta optparse-applicative pipes semigroups + ]; + homepage = "https://github.com/GregorySchwartz/diversity"; + description = "Quantify the diversity of a population"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dixi" = callPackage ({ mkDerivation, acid-state, aeson, aeson-pretty, attoparsec, base , base-orphans, blaze-html, blaze-markup, bytestring @@ -54767,29 +54676,6 @@ self: { }) {}; "dns" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring - , bytestring-builder, conduit, conduit-extra, containers, doctest - , hspec, iproute, mtl, network, random, resourcet, safe, word8 - }: - mkDerivation { - pname = "dns"; - version = "2.0.8"; - sha256 = "ca9ba04f3fdc277033a9b16bf39d290e2b2fdc4d79c9c0c9b9aa5b8cf21bd5c9"; - libraryHaskellDepends = [ - attoparsec base binary bytestring bytestring-builder conduit - conduit-extra containers iproute mtl network random resourcet safe - ]; - testHaskellDepends = [ - attoparsec base binary bytestring bytestring-builder conduit - conduit-extra containers doctest hspec iproute mtl network random - resourcet safe word8 - ]; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dns_2_0_9" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-builder, conduit, conduit-extra, containers, doctest , hspec, iproute, mtl, network, random, resourcet, safe, word8 @@ -54810,7 +54696,6 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnscache" = callPackage @@ -55011,26 +54896,6 @@ self: { }) {}; "docopt" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , HUnit, parsec, split, template-haskell, th-lift - }: - mkDerivation { - pname = "docopt"; - version = "0.7.0.4"; - sha256 = "3470cd9de7b1731a0b2c0a3fe8b9ea1bfdcfbebeffa5ed77831572f50f01e480"; - libraryHaskellDepends = [ - base containers parsec template-haskell th-lift - ]; - testHaskellDepends = [ - aeson ansi-terminal base bytestring containers HUnit parsec split - template-haskell th-lift - ]; - homepage = "https://github.com/docopt/docopt.hs"; - description = "A command-line interface parser that will make you smile"; - license = stdenv.lib.licenses.mit; - }) {}; - - "docopt_0_7_0_5" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , HUnit, parsec, split, template-haskell, text, th-lift }: @@ -55048,7 +54913,6 @@ self: { homepage = "https://github.com/docopt/docopt.hs"; description = "A command-line interface parser that will make you smile"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctemplates" = callPackage @@ -57293,8 +57157,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "3.6.1"; - sha256 = "937ab976c09bf6c4b4376d9cb30504055814ad4079f15319c9126abf74cdbac9"; + version = "3.6.3"; + sha256 = "178eebc1798fb6d1c2fceeb8f68c2b7cd87a25ff35db9274c2115e6b5100e6d5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57338,8 +57202,8 @@ self: { }: mkDerivation { pname = "egison-tutorial"; - version = "3.5.9"; - sha256 = "9540ca3bcf92594a9b203df1f1b862264ebfe0e36eb49bb04fe10bbae2a9c9ab"; + version = "3.6.2"; + sha256 = "b1dc21a80daacb240ad339bfcd895ee7e10f41560b14566766e168ab4606a2c0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -62569,12 +62433,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "filepath_1_4_1_0" = callPackage + "filepath_1_4_1_1" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "filepath"; - version = "1.4.1.0"; - sha256 = "bd6dbfd1ecba2322ef166b4805d4276cbde1e551bd5c61fbee396782b9923d00"; + version = "1.4.1.1"; + sha256 = "52fdbde3bc3a44d920544b8d184bd7241bac3f92d1fc6e299d716e06e99f12b4"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/haskell/filepath#readme"; @@ -64741,8 +64605,8 @@ self: { }: mkDerivation { pname = "foundation"; - version = "0.0.1"; - sha256 = "d2db56431c37247352d2497e1a782197434f02269767584cfebbb740fde69730"; + version = "0.0.2"; + sha256 = "d879240154104273197249b4fbd2bd6d6ad9739166a8a75e9484bf87b6d9388f"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -67375,8 +67239,8 @@ self: { ({ mkDerivation, base, containers, mtl, template-haskell }: mkDerivation { pname = "genifunctors"; - version = "0.3"; - sha256 = "2520632580921ea35be3f5bfb94562abb935f8cc577e0bc8b41886eb5bf15a9a"; + version = "0.4"; + sha256 = "2df0f1cfa6861afa3eb5ecb1c87c405e30c07a843f588474902fa1531b848045"; libraryHaskellDepends = [ base containers mtl template-haskell ]; testHaskellDepends = [ base containers mtl template-haskell ]; homepage = "https://github.com/danr/genifunctors"; @@ -68700,34 +68564,6 @@ self: { }) {}; "ghcid" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; - version = "0.6.5"; - sha256 = "67f9f5c89d35f0d56d4d26bf72f25dd2f8794a67949449ef61739e84a316923c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base cmdargs directory extra filepath process terminal-size time - unix - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - homepage = "https://github.com/ndmitchell/ghcid#readme"; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghcid_0_6_6" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit , terminal-size, time, unix @@ -68753,7 +68589,6 @@ self: { homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-ajax" = callPackage @@ -71151,6 +70986,8 @@ self: { pname = "glirc"; version = "2.20.1.1"; sha256 = "63f0f8d82ea8d2f90103faf9ccd9fa301275b9400bbf1c3db62f8c51cbfa40fe"; + revision = "1"; + editedCabalFile = "883328945d2ac7c7e02b70aaeb3afbe1a23032d3ba073227a56411966d3afb0b"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -71466,19 +71303,6 @@ self: { }) {}; "gloss-rendering" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: - mkDerivation { - pname = "gloss-rendering"; - version = "1.10.3.3"; - sha256 = "ca559268107524c8ac73f7bd4ea164e26fe5426bff49b457276ff04fce872567"; - libraryHaskellDepends = [ - base bmp bytestring containers GLUT OpenGL - ]; - description = "Gloss picture data types and rendering functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss-rendering_1_10_3_5" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: mkDerivation { pname = "gloss-rendering"; @@ -71489,7 +71313,6 @@ self: { ]; description = "Gloss picture data types and rendering functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-sodium" = callPackage @@ -71749,8 +71572,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.1.18"; - sha256 = "4c86a04bef399c6d73217b6ea4953d8c90224d844b65453b8a18e3749ee1f86a"; + version = "0.1.19"; + sha256 = "4cf869138bb7a748ccfb0d084ed53ddb19930793da39c0a45065d14e5251013b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76295,6 +76118,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gssapi" = callPackage + ({ mkDerivation, base, bytestring, gssapi_krb5, krb5, resourcet + , transformers + }: + mkDerivation { + pname = "gssapi"; + version = "0.1.0.0"; + sha256 = "72b7c687414bb370ff6a857ddbcfe00a804d3f2e4ca563c0783a68f6f875b0fd"; + libraryHaskellDepends = [ base bytestring resourcet transformers ]; + librarySystemDepends = [ gssapi_krb5 krb5 ]; + homepage = "https://github.com/ondrap/gssapi"; + description = "libgssapi and libkrb5 bindings for haskell"; + license = stdenv.lib.licenses.bsd3; + }) {gssapi_krb5 = null; krb5 = null;}; + + "gssapi-wai" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring + , case-insensitive, gssapi, http-types, vault, wai, wai-extra + }: + mkDerivation { + pname = "gssapi-wai"; + version = "0.1.0.0"; + sha256 = "1a2b844a611f4615d948baa7253099f5acab01529005d522b46db839833f371f"; + libraryHaskellDepends = [ + base base64-bytestring bytestring case-insensitive gssapi + http-types vault wai wai-extra + ]; + homepage = "https://github.com/ondrap/gssapi-wai"; + description = "WAI Middleware for SPNEGO authentiaction"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gstreamer" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, directory, glib , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl @@ -83747,8 +83602,8 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.1.1"; - sha256 = "8d0e6601a5353d4cd5bd6fd7f713d79ecf8bfbe3458163c0b0e0f10a90ed80fd"; + version = "0.2"; + sha256 = "c006e033547c82b4986e8bbc09997f73bb5bb75a7e08e10fb29ba06117aaa42b"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -85977,10 +85832,8 @@ self: { }: mkDerivation { pname = "heredocs"; - version = "0.1.3.1"; - sha256 = "51c7b375ef2e5d34da7533a2b919e7908e94c89fcbc087fb559fa89dd5e0ddb6"; - revision = "2"; - editedCabalFile = "f46b25d4890df9e9da69c0a491580c32d2b9519903e795efe6385b0d11c3a796"; + version = "0.1.4"; + sha256 = "3f879b0e2f34d98f670e6a210f1bc61d9c4a9505c147c7ec93576f54fe69c56f"; libraryHaskellDepends = [ base bytestring doctest parsec template-haskell text ]; @@ -86218,6 +86071,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heterocephalus" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, containers + , doctest, Glob, parsec, shakespeare, template-haskell, text + }: + mkDerivation { + pname = "heterocephalus"; + version = "0.1.0.0"; + sha256 = "fd9a5caaea40092400f6952e53cd0cda701e963732f434e14025daf683b8c4fd"; + 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"; + license = stdenv.lib.licenses.mit; + }) {}; + "hetris" = callPackage ({ mkDerivation, array, base, hscurses, ncurses, old-time, random }: @@ -91285,15 +91156,18 @@ self: { }) {}; "hpp" = callPackage - ({ mkDerivation, base, directory, filepath, time, transformers }: + ({ mkDerivation, base, bytestring, bytestring-trie, directory + , filepath, ghc-prim, time, transformers + }: mkDerivation { pname = "hpp"; - version = "0.3.1.0"; - sha256 = "1ec268eee4adc227768a22e601fe8ca1f90170705b44186e9522f791172842ee"; + version = "0.4.0"; + sha256 = "05923e6dacc0549f50ff342a3eb2b6782fe3cdc4c6190eea0e4cabc17f429f5d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory filepath time transformers + base bytestring bytestring-trie directory filepath ghc-prim time + transformers ]; executableHaskellDepends = [ base directory filepath time ]; homepage = "https://github.com/acowley/hpp"; @@ -91511,35 +91385,6 @@ self: { }) {}; "hquantlib" = callPackage - ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl - , hmatrix-special, HUnit, mersenne-random, parallel, QuickCheck - , statistics, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, vector, vector-algorithms - }: - mkDerivation { - pname = "hquantlib"; - version = "0.0.3.2"; - sha256 = "b26666d1d95a4895ff3e0773d8234e67c692c7f2fe740466b653face4bfb9af3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers hmatrix hmatrix-gsl hmatrix-special mersenne-random - parallel statistics time vector vector-algorithms - ]; - executableHaskellDepends = [ - base containers mersenne-random parallel - ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - homepage = "http://github.com/paulrzcz/hquantlib.git"; - description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; - license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hquantlib_0_0_3_3" = callPackage ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl , hmatrix-special, HUnit, mersenne-random, parallel, QuickCheck , statistics, test-framework, test-framework-hunit @@ -92817,8 +92662,8 @@ self: { }: mkDerivation { pname = "hscaffold"; - version = "0.4.4.0"; - sha256 = "f56776610c0a64fe5bf396a3d0d1fff5e2e22ad8996f1f95fa1336d7d25285df"; + version = "0.4.5.0"; + sha256 = "8f94525878efbe2f6c8ce80717027596d9e004a5b3ca86f1c3db8bcb2cbd365e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95098,22 +94943,6 @@ self: { }) {}; "hstatistics" = callPackage - ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random - , vector - }: - mkDerivation { - pname = "hstatistics"; - version = "0.2.5.3"; - sha256 = "d8a8bf9dcf6bd25ac5ca695ec1c4fc198310411cc87ab2a23ffe1d9116812a2d"; - libraryHaskellDepends = [ - array base hmatrix hmatrix-gsl-stats random vector - ]; - homepage = "http://code.haskell.org/hstatistics"; - description = "Statistics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hstatistics_0_2_5_4" = callPackage ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random , vector }: @@ -95127,7 +94956,6 @@ self: { homepage = "http://code.haskell.org/hstatistics"; description = "Statistics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hstats" = callPackage @@ -95805,34 +95633,6 @@ self: { }) {}; "htoml" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, file-embed - , old-locale, parsec, tasty, tasty-hspec, tasty-hunit, text, time - , unordered-containers, vector - }: - mkDerivation { - pname = "htoml"; - version = "1.0.0.1"; - sha256 = "11145f645768abaa51c6ffda70f1c6fe7bb99163877efb13058a16d2d0bd592b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base containers old-locale parsec text time - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers file-embed parsec tasty - tasty-hspec tasty-hunit text time unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed parsec tasty - tasty-hspec tasty-hunit text time unordered-containers vector - ]; - homepage = "https://github.com/cies/htoml"; - description = "Parser for TOML files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "htoml_1_0_0_3" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, file-embed , old-locale, parsec, tasty, tasty-hspec, tasty-hunit, text, time , unordered-containers, vector @@ -95852,7 +95652,6 @@ self: { homepage = "https://github.com/cies/htoml"; description = "Parser for TOML files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "htrace" = callPackage @@ -95977,7 +95776,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-api-data_0_3_2" = callPackage + "http-api-data_0_3_3" = callPackage ({ mkDerivation, base, bytestring, containers, directory, doctest , filepath, hashable, hspec, HUnit, QuickCheck , quickcheck-instances, text, time, time-locale-compat @@ -95985,8 +95784,8 @@ self: { }: mkDerivation { pname = "http-api-data"; - version = "0.3.2"; - sha256 = "015fb4167f807c31af465cd8991454c3ed72ad5935ff0839993f4fcb038958f2"; + version = "0.3.3"; + sha256 = "cb3d7ef8a924a6b03481b7c5e26a580df72cbf89f2e8247e825f43f4b3ba8449"; libraryHaskellDepends = [ base bytestring containers hashable text time time-locale-compat unordered-containers uri-bytestring uuid-types @@ -96515,6 +96314,28 @@ self: { 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 + }: + mkDerivation { + pname = "http-link-header"; + version = "1.0.3"; + sha256 = "59bd2db4e7d14b6f7ce86848af5e38b4bd2e9963e9ffe5068c7b1a710dbdd7fe"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-conversion errors + http-api-data 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-listen" = callPackage ({ mkDerivation, base, bytestring, exceptions, HTTP, network , transformers @@ -99636,18 +99457,6 @@ self: { }) {}; "ieee754" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "ieee754"; - version = "0.7.8"; - sha256 = "de4aefce42d903a3016cba4c7ebfc70d4fa0a76f8c04014c7eb3545b9ab56eff"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/patperry/hs-ieee754"; - description = "Utilities for dealing with IEEE floating point numbers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ieee754_0_7_9" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ieee754"; @@ -99657,7 +99466,6 @@ self: { homepage = "http://github.com/patperry/hs-ieee754"; description = "Utilities for dealing with IEEE floating point numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ieee754-parser" = callPackage @@ -108324,28 +108132,6 @@ self: { }) {}; "language-javascript" = callPackage - ({ mkDerivation, alex, array, base, blaze-builder, bytestring - , Cabal, containers, happy, hspec, mtl, QuickCheck, text - , utf8-light, utf8-string - }: - mkDerivation { - pname = "language-javascript"; - version = "0.6.0.8"; - sha256 = "98a48760012d7b9eb7625532ea1d18ee0127a18dc11ccd679717ea53151c2ab9"; - libraryHaskellDepends = [ - array base blaze-builder bytestring containers mtl text utf8-string - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - array base blaze-builder bytestring Cabal containers hspec mtl - QuickCheck utf8-light utf8-string - ]; - homepage = "http://github.com/erikd/language-javascript"; - description = "Parser for JavaScript"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "language-javascript_0_6_0_9" = callPackage ({ mkDerivation, alex, array, base, blaze-builder, bytestring , Cabal, containers, happy, hspec, mtl, QuickCheck, text , utf8-light, utf8-string @@ -108365,7 +108151,6 @@ self: { homepage = "https://github.com/erikd/language-javascript"; description = "Parser for JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-kort" = callPackage @@ -113159,8 +112944,8 @@ self: { }: mkDerivation { pname = "log"; - version = "0.5.4"; - sha256 = "54dbe118a7bb4cc54b9a894859bb9b0e411f9b8f5f5205fe8bd2c0d079ef1962"; + version = "0.5.5"; + sha256 = "9a1b6443e83b249bb20feed413f47fe8b33b1d36b3e6982cae70cdcf158137fc"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring cond deepseq exceptions hpqtypes http-client lifted-base @@ -114206,27 +113991,6 @@ self: { }) {}; "lucid" = callPackage - ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text - , transformers, unordered-containers - }: - mkDerivation { - pname = "lucid"; - version = "2.9.6"; - sha256 = "a8435c73bacc3dc60efd89c21b29c9fbca9a10676ec158d4e810ab751849a8c9"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers hashable mmorph mtl text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bifunctors hspec HUnit mtl parsec text - ]; - homepage = "https://github.com/chrisdone/lucid"; - description = "Clear to write, read and edit DSL for HTML"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lucid_2_9_7" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text , transformers, unordered-containers @@ -114245,7 +114009,6 @@ self: { homepage = "https://github.com/chrisdone/lucid"; description = "Clear to write, read and edit DSL for HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucid-foundation" = callPackage @@ -118725,13 +118488,15 @@ self: { }) {}; "modbus-tcp" = callPackage - ({ mkDerivation, base, bytestring, cereal, network, transformers }: + ({ mkDerivation, base, bytestring, cereal, mtl, network + , transformers + }: mkDerivation { pname = "modbus-tcp"; - version = "0.2.1.1"; - sha256 = "60cf7f9956387abd5b24e760d281b7a3423432d271502745df59b398d499de86"; + version = "0.3"; + sha256 = "539d030348f403431f763bcc822bc5e8dd946ed28e353e2a877427409b3d7737"; libraryHaskellDepends = [ - base bytestring cereal network transformers + base bytestring cereal mtl network transformers ]; homepage = "https://github.com/roelvandijk/modbus-tcp"; description = "Communicate with Modbus devices over TCP"; @@ -119385,28 +119150,6 @@ self: { }) {}; "monad-logger" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, conduit - , conduit-extra, exceptions, fast-logger, lifted-base - , monad-control, monad-loops, mtl, resourcet, stm, stm-chans - , template-haskell, text, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "monad-logger"; - version = "0.3.20"; - sha256 = "58be0b1e04d1cce4a40e9502448de8ae2c72eff98a6c173539653bacbb3c9fe9"; - libraryHaskellDepends = [ - base blaze-builder bytestring conduit conduit-extra exceptions - fast-logger lifted-base monad-control monad-loops mtl resourcet stm - stm-chans template-haskell text transformers transformers-base - transformers-compat - ]; - homepage = "https://github.com/kazu-yamamoto/logger"; - description = "A class of monads which can log messages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-logger_0_3_20_1" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, conduit , conduit-extra, exceptions, fast-logger, lifted-base , monad-control, monad-loops, mtl, resourcet, stm, stm-chans @@ -119426,7 +119169,6 @@ self: { homepage = "https://github.com/kazu-yamamoto/logger"; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger-json" = callPackage @@ -122300,37 +122042,6 @@ self: { }) {}; "mustache" = callPackage - ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring - , cmdargs, containers, directory, either, filepath, hspec, lens - , mtl, parsec, process, scientific, tar, template-haskell - , temporary, text, th-lift, unordered-containers, vector, wreq - , yaml, zlib - }: - mkDerivation { - pname = "mustache"; - version = "2.1"; - sha256 = "159241066d7e78bb40436391113f319ccb9753e6e00a72c604ccba493e7d42d6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory either filepath mtl - parsec scientific template-haskell text th-lift - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring cmdargs filepath text yaml - ]; - testHaskellDepends = [ - aeson base base-unicode-symbols bytestring directory filepath hspec - lens process tar temporary text unordered-containers wreq yaml zlib - ]; - homepage = "https://github.com/JustusAdam/mustache"; - description = "A mustache template parser library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "mustache_2_1_2" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring , cmdargs, containers, directory, either, filepath, hspec, lens , mtl, parsec, process, scientific, tar, template-haskell @@ -123340,6 +123051,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "natural-transformation_0_4" = callPackage + ({ mkDerivation, base, containers, quickcheck-instances, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "natural-transformation"; + version = "0.4"; + sha256 = "aac28e2c1147ed77c1ec0f0eb607a577fa26d0fd67474293ba860ec124efc8af"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers quickcheck-instances tasty tasty-quickcheck + ]; + homepage = "https://github.com/ku-fpg/natural-transformation"; + description = "A natural transformation package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "naturalcomp" = callPackage ({ mkDerivation, base, text, utf8-string }: mkDerivation { @@ -126585,6 +126314,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "oauth10a" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , cryptohash, entropy, http-types, time, transformers + }: + mkDerivation { + pname = "oauth10a"; + version = "0.1.0.0"; + sha256 = "a923cb04195ed275990623b821933bc52e00a7311ee485e803d272185c11aacc"; + revision = "1"; + editedCabalFile = "5ee8aca8d824721a86d2ecb7cc094baffa6591059e49e6f7da5682851c30b7a1"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptohash entropy + http-types time transformers + ]; + testHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/gatlin/oauth10a#readme"; + description = "Fully Automatic Luxury OAuth 1.0a headers"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "oauthenticated" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, case-insensitive, crypto-random, cryptohash, either @@ -127314,34 +127063,6 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, case-insensitive, containers, contravariant, multiset - , postgresql-simple, pretty, product-profunctors, profunctors - , QuickCheck, semigroups, text, time, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.5.1.1"; - sha256 = "4a931cbed10a9eb2c20abb1cfa7a70ead7c5b0464ec516a0dd437fef7b3dc02e"; - revision = "1"; - editedCabalFile = "134244b5b0a2b0d253dfd9021e6522938a138ed68631af787c0d7f3d673e6e39"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors semigroups text time time-locale-compat transformers - uuid void - ]; - testHaskellDepends = [ - aeson base containers contravariant multiset postgresql-simple - product-profunctors profunctors QuickCheck semigroups text time - ]; - homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye_0_5_2_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, case-insensitive, containers, contravariant, multiset , postgresql-simple, pretty, product-profunctors, profunctors @@ -127365,7 +127086,6 @@ self: { homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -128111,6 +127831,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "opentype" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, ghc + , pretty-hex, time, vector + }: + mkDerivation { + pname = "opentype"; + version = "0.0.1"; + sha256 = "21c574b4af3c99607e1e647b52bd32a2ae644135ab55e3dc3041f6dd6f4f1340"; + libraryHaskellDepends = [ + base binary bytestring containers ghc pretty-hex time vector + ]; + description = "Opentype loading and writing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "operate-do" = callPackage ({ mkDerivation, base, charset, doctest, filemanip , haskell-src-meta, hspec, QuickCheck, template-haskell @@ -130857,8 +130592,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.3.3.0"; - sha256 = "63e9aa04425cada935fa4959b7e474c2d9c8b857a3ca84e6499e376c69729132"; + version = "0.4.0.0"; + sha256 = "1368b963c500cd2945ef7de890d337066ed99efab8565b1f8825febf4b5ee1b4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142663,28 +142398,6 @@ self: { }) {}; "rebase" = callPackage - ({ mkDerivation, base, base-prelude, bifunctors, bytestring - , containers, contravariant, contravariant-extras, deepseq, dlist - , either, fail, hashable, mtl, profunctors, scientific - , semigroupoids, semigroups, text, time, transformers - , unordered-containers, uuid, vector, void - }: - mkDerivation { - pname = "rebase"; - version = "1.0.2.1"; - sha256 = "beae3eb88c71e817ebfde0b16ce17875f33cefc1371c3e4c72f5a5feb1c2a69e"; - libraryHaskellDepends = [ - base base-prelude bifunctors bytestring containers contravariant - contravariant-extras deepseq dlist either fail hashable mtl - profunctors scientific semigroupoids semigroups text time - transformers unordered-containers uuid vector void - ]; - homepage = "https://github.com/nikita-volkov/rebase"; - description = "A more progressive alternative to the \"base\" package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rebase_1_0_3" = callPackage ({ mkDerivation, base, base-prelude, bifunctors, bytestring , containers, contravariant, contravariant-extras, deepseq, dlist , either, fail, hashable, mtl, profunctors, scientific @@ -142704,7 +142417,6 @@ self: { homepage = "https://github.com/nikita-volkov/rebase"; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "recaptcha" = callPackage @@ -143715,18 +143427,18 @@ self: { }) {}; "regex-do" = callPackage - ({ mkDerivation, array, base, bytestring, hspec, QuickCheck + ({ mkDerivation, array, base, bytestring, hspec, mtl, QuickCheck , regex-base, regex-pcre, stringsearch, text }: mkDerivation { pname = "regex-do"; - version = "2.6.1"; - sha256 = "bb10301f247b92037562e7fe263e0f443c7076ca03044fe7e938e20136d6533e"; + version = "2.6.2"; + sha256 = "041396ec83639de987378825bf576dce7c52beded82801cc49af43b0a54dc76a"; libraryHaskellDepends = [ - array base bytestring regex-base regex-pcre stringsearch text + array base bytestring mtl regex-base regex-pcre stringsearch text ]; testHaskellDepends = [ - array base bytestring hspec QuickCheck regex-base regex-pcre + array base bytestring hspec mtl QuickCheck regex-base regex-pcre stringsearch text ]; homepage = "https://github.com/ciez/regex-do"; @@ -145516,25 +145228,6 @@ self: { }) {}; "resourcet" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, monad-control, mtl, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "resourcet"; - version = "1.1.8"; - sha256 = "b36c9900ef4d330281b413684bcf13b53036303187dc3ca0f0d83b56152c5c4b"; - libraryHaskellDepends = [ - base containers exceptions lifted-base mmorph monad-control mtl - transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ base hspec lifted-base transformers ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Deterministic allocation and freeing of scarce resources"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "resourcet_1_1_8_1" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, monad-control, mtl, transformers, transformers-base , transformers-compat @@ -145551,7 +145244,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "respond" = callPackage @@ -147867,18 +147559,6 @@ self: { }) {}; "safe" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "safe"; - version = "0.3.9"; - sha256 = "d0319ea7b55947e70092f0256aa9f9d2496a93b0e2a0887c0f8eaa0d7fb9b6c9"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/ndmitchell/safe#readme"; - description = "Library of safe (exception free) functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "safe_0_3_10" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "safe"; @@ -147888,7 +147568,6 @@ self: { homepage = "https://github.com/ndmitchell/safe#readme"; description = "Library of safe (exception free) functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-access" = callPackage @@ -148689,8 +148368,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "1.2.8"; - sha256 = "b7e68ecae34b6437ece2f340f1260123fa384828e362371a1035620ab8c1ae09"; + version = "2.0.0"; + sha256 = "7babbe1f9716ee17874f2c661285d5a384b8399e279288c6d1237b5f26d061b1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151320,27 +150999,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-auth-cookie_0_4" = callPackage + "servant-auth-cookie_0_4_1" = callPackage ({ mkDerivation, base, base-compat, base64-bytestring - , blaze-builder, blaze-html, blaze-markup, bytestring, cereal - , cookie, cryptonite, data-default, deepseq, exceptions, hspec - , http-api-data, http-media, http-types, memory, mtl, QuickCheck - , servant, servant-blaze, servant-server, tagged, text, time - , transformers, wai, warp + , blaze-builder, blaze-html, blaze-markup, bytestring + , bytestring-conversion, cereal, cookie, cryptonite, data-default + , deepseq, exceptions, hspec, http-media, http-types, memory, mtl + , QuickCheck, servant, servant-blaze, servant-server, tagged, text + , time, transformers, wai, warp }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.4"; - sha256 = "2b5144612cbf8835b5f069f885d9f32483a63884d5d008c7110dd9273756eef1"; + version = "0.4.1"; + sha256 = "d9d59d1204c372068e2de7ccf352982ba17f2dc610f9b1f0bb21048dcf346222"; libraryHaskellDepends = [ - base base64-bytestring blaze-builder bytestring cereal cookie - cryptonite data-default exceptions http-api-data http-types memory - mtl servant servant-server tagged time transformers wai + base base64-bytestring blaze-builder bytestring + bytestring-conversion cereal cookie cryptonite data-default + exceptions http-types memory mtl servant servant-server tagged time + transformers wai ]; testHaskellDepends = [ - base base-compat blaze-html blaze-markup bytestring cereal - cryptonite data-default deepseq hspec http-api-data http-media mtl - QuickCheck servant servant-blaze servant-server text time wai warp + base base-compat blaze-html blaze-markup bytestring + bytestring-conversion cereal cryptonite data-default deepseq hspec + http-media mtl QuickCheck servant servant-blaze servant-server text + time wai warp ]; description = "Authentication via encrypted cookies"; license = stdenv.lib.licenses.bsd3; @@ -153884,8 +153565,8 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }: mkDerivation { pname = "show-prettyprint"; - version = "0.1.0.2"; - sha256 = "212012543071bd0d983b003c107dbf551f44331d94ff3429cd53a51815c58c22"; + version = "0.1.2"; + sha256 = "5b9e93c48e91f1c91d3b2fcf214ea085f08292ee36916c324709532a7446e7a6"; libraryHaskellDepends = [ ansi-wl-pprint base trifecta ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/quchen/show-prettyprint#readme"; @@ -156294,39 +155975,6 @@ self: { }) {}; "snap-core" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder - , case-insensitive, containers, deepseq, directory, filepath - , hashable, HUnit, io-streams, lifted-base, monad-control, mtl - , old-locale, parallel, QuickCheck, random, readable, regex-posix - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, transformers, transformers-base, unix-compat - , unordered-containers, vector, zlib - }: - mkDerivation { - pname = "snap-core"; - version = "1.0.0.0"; - sha256 = "9c35a657fc0debbe9df605d7528ce4645c0b4bc4b94b0134116f6746fe980adb"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-builder case-insensitive - containers directory filepath HUnit io-streams lifted-base - monad-control mtl old-locale random readable regex-posix text time - transformers transformers-base unix-compat unordered-containers - vector - ]; - testHaskellDepends = [ - attoparsec base bytestring bytestring-builder case-insensitive - containers deepseq directory filepath hashable HUnit io-streams - lifted-base monad-control mtl old-locale parallel QuickCheck random - readable regex-posix test-framework test-framework-hunit - test-framework-quickcheck2 text time transformers transformers-base - unix-compat unordered-containers vector zlib - ]; - homepage = "http://snapframework.com/"; - description = "Snap: A Haskell Web Framework (core interfaces and types)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "snap-core_1_0_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , case-insensitive, containers, deepseq, directory, filepath , hashable, HUnit, io-streams, lifted-base, monad-control, mtl @@ -156357,7 +156005,6 @@ self: { homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-cors" = callPackage @@ -156532,42 +156179,6 @@ self: { }) {}; "snap-server" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , bytestring, bytestring-builder, case-insensitive, clock - , containers, deepseq, directory, filepath, HsOpenSSL, http-common - , http-streams, HUnit, io-streams, io-streams-haproxy, lifted-base - , monad-control, mtl, network, old-locale, openssl-streams - , parallel, QuickCheck, random, snap-core, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, threads - , time, transformers, unix, unix-compat, vector - }: - mkDerivation { - pname = "snap-server"; - version = "1.0.1.0"; - sha256 = "a398b15e90d2d6bc77af3edf6f5926df7863073a4774c71a46c0adb43c837488"; - configureFlags = [ "-fopenssl" ]; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring bytestring-builder - case-insensitive clock containers filepath HsOpenSSL io-streams - io-streams-haproxy lifted-base mtl network old-locale - openssl-streams snap-core text time unix unix-compat vector - ]; - testHaskellDepends = [ - attoparsec base base16-bytestring blaze-builder bytestring - bytestring-builder case-insensitive clock containers deepseq - directory filepath HsOpenSSL http-common http-streams HUnit - io-streams io-streams-haproxy lifted-base monad-control mtl network - old-locale openssl-streams parallel QuickCheck random snap-core - test-framework test-framework-hunit test-framework-quickcheck2 text - threads time transformers unix unix-compat vector - ]; - homepage = "http://snapframework.com/"; - description = "A web server for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "snap-server_1_0_1_1" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , bytestring, bytestring-builder, case-insensitive, clock , containers, deepseq, directory, filepath, HsOpenSSL, http-common @@ -158032,25 +157643,6 @@ self: { }) {}; "solga-swagger" = callPackage - ({ mkDerivation, base, bytestring, dlist, http-types - , insert-ordered-containers, lens, mtl, solga, swagger2, text - , unordered-containers - }: - mkDerivation { - pname = "solga-swagger"; - version = "0.1.0.1"; - sha256 = "ceac56b2de41102e739301b5edf60af546e6178f139313681cb46bfb693f765f"; - libraryHaskellDepends = [ - base bytestring dlist http-types insert-ordered-containers lens mtl - solga swagger2 text unordered-containers - ]; - homepage = "https://github.com/chpatrick/solga"; - description = "Swagger generation for Solga"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "solga-swagger_0_1_0_2" = callPackage ({ mkDerivation, base, bytestring, dlist, http-types , insert-ordered-containers, lens, mtl, solga, swagger2, text , unordered-containers @@ -158496,8 +158088,8 @@ self: { }: mkDerivation { pname = "sparse-linear-algebra"; - version = "0.2.1.1"; - sha256 = "7a5c11c8cf52b79e141388583731ec35b74958c681eef57300e82ef507278253"; + version = "0.2.2.0"; + sha256 = "7ef54d3351bd03dadd73797a48aaa629d71deff5a47f2c0e4ea780cdf47b3568"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166822,6 +166414,25 @@ self: { 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 + }: + mkDerivation { + pname = "test-fixture"; + version = "0.4.2.0"; + sha256 = "4c07ffa83b70dd44cd5b4824629fa021e9971360e29ed05baa8708eb7954981a"; + libraryHaskellDepends = [ base data-default mtl template-haskell ]; + testHaskellDepends = [ + base hspec hspec-discover mtl template-haskell th-to-exp + transformers + ]; + 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 ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers , hostname, old-locale, random, regex-posix, time, xml @@ -167185,6 +166796,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "test-simple_0_1_9" = callPackage + ({ mkDerivation, base, executable-path, mtl, process, QuickCheck + , state-plus, template-haskell + }: + mkDerivation { + pname = "test-simple"; + version = "0.1.9"; + sha256 = "eaee79bf997272fe0c97a0cfb80347c760ca5de8ffb0d639ddbf00ba6f6ef51d"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "testPkg" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -168302,18 +167932,6 @@ self: { }) {}; "th-expand-syns" = callPackage - ({ mkDerivation, base, containers, syb, template-haskell }: - mkDerivation { - pname = "th-expand-syns"; - version = "0.4.0.0"; - sha256 = "59349f1999d72e4d0158de95c1ede5e8787d4c8c743ec4e6a2dbf37f823a5eea"; - libraryHaskellDepends = [ base containers syb template-haskell ]; - testHaskellDepends = [ base template-haskell ]; - description = "Expands type synonyms in Template Haskell ASTs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-expand-syns_0_4_1_0" = callPackage ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "th-expand-syns"; @@ -168323,7 +167941,6 @@ self: { testHaskellDepends = [ base template-haskell ]; description = "Expands type synonyms in Template Haskell ASTs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-extras" = callPackage @@ -168470,22 +168087,6 @@ self: { }) {}; "th-orphans" = callPackage - ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift - , th-lift-instances, th-reify-many - }: - mkDerivation { - pname = "th-orphans"; - version = "0.13.2"; - sha256 = "ac863234791b0860f7a33adc8656f0026698e1247c5fa4bd13d7befbfddc0204"; - libraryHaskellDepends = [ - base mtl template-haskell th-lift th-lift-instances th-reify-many - ]; - testHaskellDepends = [ base hspec template-haskell ]; - description = "Orphan instances for TH datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-orphans_0_13_3" = callPackage ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift , th-lift-instances, th-reify-many }: @@ -168499,7 +168100,6 @@ self: { testHaskellDepends = [ base hspec template-haskell ]; description = "Orphan instances for TH datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-printf" = callPackage @@ -169149,8 +168749,8 @@ self: { }: mkDerivation { pname = "tianbar"; - version = "1.2.1.0"; - sha256 = "0ac03b869479eb576caa20bcfd76e2cf61a2cf9fbec61bc2cccbd4f4507e6c61"; + version = "1.2.3.0"; + sha256 = "d6f81bb178bf6a0f836269b13659b068c60c912f5a4d76e86be3228ca15168b3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171259,22 +170859,6 @@ self: { }) {}; "transient" = callPackage - ({ mkDerivation, base, containers, directory, mtl, random, stm - , time, transformers - }: - mkDerivation { - pname = "transient"; - version = "0.4.4"; - sha256 = "da8d580e5fab1d43d791dbcc193fbe028925efdfb1b4bbcd017bccddff4dc382"; - libraryHaskellDepends = [ - base containers directory mtl random stm time transformers - ]; - homepage = "http://www.fpcomplete.com/user/agocorona"; - description = "Making composable programs with multithreading, events and distributed computing"; - license = stdenv.lib.licenses.mit; - }) {}; - - "transient_0_4_4_1" = callPackage ({ mkDerivation, base, containers, directory, mtl, random, stm , time, transformers }: @@ -171288,7 +170872,6 @@ self: { homepage = "http://www.fpcomplete.com/user/agocorona"; description = "Making composable programs with multithreading, events and distributed computing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transient-universe" = callPackage @@ -177186,19 +176769,6 @@ self: { }) {}; "vector-binary-instances" = callPackage - ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }: - mkDerivation { - pname = "vector-binary-instances"; - version = "0.2.3.2"; - sha256 = "e42cf4c80a69c6d661c6be152d43b39291fe22e7e55f4694709266692b50e049"; - libraryHaskellDepends = [ base binary vector ]; - testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; - homepage = "https://github.com/bos/vector-binary-instances"; - description = "Instances of Data.Binary and Data.Serialize for vector"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-binary-instances_0_2_3_3" = callPackage ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "vector-binary-instances"; @@ -177209,7 +176779,6 @@ self: { homepage = "https://github.com/bos/vector-binary-instances"; description = "Instances of Data.Binary and Data.Serialize for vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-buffer" = callPackage @@ -179925,37 +179494,6 @@ self: { }) {}; "warp" = callPackage - ({ mkDerivation, array, async, auto-update, base, blaze-builder - , bytestring, bytestring-builder, case-insensitive, containers - , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date - , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, silently, simple-sendfile, stm, streaming-commons - , text, time, transformers, unix, unix-compat, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.2.8"; - sha256 = "09de2d19cf0d1af8afe9f96e916aa7dafda82ddab3258fdec31963db81c2cf3c"; - libraryHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers ghc-prim hashable - http-date http-types http2 iproute network simple-sendfile stm - streaming-commons text unix unix-compat vault wai word8 - ]; - testHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers directory doctest - ghc-prim hashable hspec HTTP http-date http-types http2 HUnit - iproute lifted-base network process QuickCheck silently - simple-sendfile stm streaming-commons text time transformers unix - unix-compat vault wai word8 - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp_3_2_9" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, bytestring-builder, case-insensitive, containers , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date @@ -179984,7 +179522,6 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -181883,29 +181420,6 @@ self: { }) {}; "wordpass" = callPackage - ({ mkDerivation, base, containers, deepseq, directory, filepath - , hflags, random-fu, random-source, text, unix-compat, vector - }: - mkDerivation { - pname = "wordpass"; - version = "1.0.0.6"; - sha256 = "ef8888709fe0f0146b6cf3739191b4ca1c5df10f77a70da15d88deed1e925a37"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers deepseq directory filepath random-fu random-source - text unix-compat vector - ]; - executableHaskellDepends = [ - base containers deepseq directory filepath hflags random-fu - random-source text unix-compat vector - ]; - homepage = "https://github.com/mgajda/wordpass"; - description = "Dictionary-based password generator"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wordpass_1_0_0_7" = callPackage ({ mkDerivation, base, containers, deepseq, directory, filepath , hflags, random-fu, random-source, text, unix-compat, vector }: @@ -181926,7 +181440,6 @@ self: { homepage = "https://github.com/mgajda/wordpass"; description = "Dictionary-based password generator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "words" = callPackage @@ -185222,30 +184735,6 @@ self: { }) {}; "yesod" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , conduit-extra, data-default, directory, fast-logger - , monad-control, monad-logger, safe, semigroups, shakespeare - , streaming-commons, template-haskell, text, transformers, unix - , unordered-containers, wai, wai-extra, wai-logger, warp, yaml - , yesod-auth, yesod-core, yesod-form, yesod-persistent - }: - mkDerivation { - pname = "yesod"; - version = "1.4.3"; - sha256 = "13655ed28102b30f32a34fb1b30cf20c1d9bbd9f6f1c89f96643ea6d7bba74a3"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring conduit-extra - data-default directory fast-logger monad-control monad-logger safe - semigroups shakespeare streaming-commons template-haskell text - transformers unix unordered-containers wai wai-extra wai-logger - warp yaml yesod-auth yesod-core yesod-form yesod-persistent - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod_1_4_3_1" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , conduit, conduit-extra, data-default, directory, fast-logger , monad-control, monad-logger, resourcet, safe, semigroups @@ -185269,7 +184758,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-angular" = callPackage @@ -185808,46 +185296,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , blaze-html, blaze-markup, byteable, bytestring, case-insensitive - , cereal, clientsession, conduit, conduit-extra, containers, cookie - , data-default, deepseq, deepseq-generics, directory, exceptions - , fast-logger, hspec, hspec-expectations, http-types, HUnit - , lifted-base, monad-control, monad-logger, mtl, mwc-random - , network, old-locale, parsec, path-pieces, primitive, QuickCheck - , random, resourcet, safe, semigroups, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , transformers-base, unix-compat, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.4.25"; - sha256 = "929b881c3bddf7f868ba44d8aed72e36163affb6f455dd0f4669c8451fe6c46b"; - libraryHaskellDepends = [ - aeson auto-update base blaze-builder blaze-html blaze-markup - byteable bytestring case-insensitive cereal clientsession conduit - conduit-extra containers cookie data-default deepseq - deepseq-generics directory exceptions fast-logger http-types - lifted-base monad-control monad-logger mtl mwc-random old-locale - parsec path-pieces primitive random resourcet safe semigroups - shakespeare template-haskell text time transformers - transformers-base unix-compat unordered-containers vector wai - wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base blaze-builder bytestring clientsession conduit - conduit-extra containers cookie hspec hspec-expectations http-types - HUnit lifted-base mwc-random network path-pieces QuickCheck random - resourcet shakespeare streaming-commons template-haskell text - transformers wai wai-extra - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_4_26" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive , cereal, clientsession, conduit, conduit-extra, containers, cookie @@ -185885,7 +185333,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage From fcb6a18f374387498e7f892ade444527ae93e5ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Nov 2016 09:50:43 +0100 Subject: [PATCH 0355/1749] haskell-http-api-data: fix reference in configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 37bc19a2b21e..095555bfec40 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1018,14 +1018,14 @@ self: super: { # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version # is hard because of transitive dependencies, so we just disable tests. - http-api-data_0_3_2 = dontCheck super.http-api-data_0_3_2; + http-api-data_0_3_3 = dontCheck super.http-api-data_0_3_3; # Fix build for latest versions of servant and servant-client. servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: { - http-api-data = self.http-api-data_0_3_2; + http-api-data = self.http-api-data_0_3_3; }); servant-client_0_9_1_1 = super.servant-client_0_9_1_1.overrideScope (self: super: { - http-api-data = self.http-api-data_0_3_2; + http-api-data = self.http-api-data_0_3_3; servant-server = self.servant-server_0_9_1_1; servant = self.servant_0_9_1_1; }); From 0f51eb58ee53c25f469ffa37532e943b67ff91b5 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 16 Nov 2016 13:25:19 +0200 Subject: [PATCH 0356/1749] rustc, cargo: 1.12.1 -> 1.13.0, 0.13.0 -> 0.14.0 --- pkgs/development/compilers/rust/bootstrap.nix | 12 ++++++------ pkgs/development/compilers/rust/default.nix | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 454b67b8151b..b912a9d7933c 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -14,16 +14,16 @@ let then "x86_64-apple-darwin" else abort "missing boostrap url for platform ${stdenv.system}"; - # fetch hashes by running `print-hashes.sh 1.9.0` + # fetch hashes by running `print-hashes.sh 1.12.1` bootstrapHash = if stdenv.system == "i686-linux" - then "f5a3f5d53defe827a71447b1a0e7a656394b87ee23e009d7bf73a0277c1b5ac2" + then "ede9b9d14d1ddbc29975d1ead73fcf2758719b4b371363afe1c32eb8d6e96bb3" else if stdenv.system == "x86_64-linux" - then "f4ebbd6d9494cb8fa6c410cb58954e1913546c2bca8963faebc424591547d83f" + then "9e546aec13e389429ba2d86c8f4e67eba5af146c979e4faa16ffb40ddaf9984c" else if stdenv.system == "i686-darwin" - then "bf07182bc362985fcdd48af905cdb559e20c68518cd71dabec3c30b78ca8a94a" + then "2648645c4fe1ecf36beb7de63501dd99e9547a7a6d5683acf2693b919a550b69" else if stdenv.system == "x86_64-darwin" - then "2cdbc47438dc86ecaf35298317b77d735956eb160862e3f6d0fda0da656ecc35" + then "0ac5e58dba3d24bf09dcc90eaac02d2df053122b0def945ec4cfe36ac6d4d011" else throw "missing boostrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; @@ -33,7 +33,7 @@ let sha256 = bootstrapHash; }; - version = "1.11.0"; + version = "1.12.1"; in rec { diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 7e29435b7d59..dd2d47e940d1 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,12 +7,12 @@ in rec { rustc = callPackage ./rustc.nix { - shortVersion = "1.12.1"; + shortVersion = "1.13"; isRelease = true; forceBundledLLVM = false; configureFlags = [ "--release-channel=stable" ]; - srcRev = "d4f39402a0c2c2b94ec0375cd7f7f6d7918113cd"; - srcSha = "1lpykjy96rwz4jy28rf7ijca0q9lvckgnbzvcdsrspd5rs2ywfwr"; + srcRev = "2c6933acc05c61e041be764cb1331f6281993f3f"; + srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp"; patches = [ ./patches/disable-lockfile-check.patch @@ -25,10 +25,10 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.13.0"; - srcRev = "109cb7c33d426044d141457049bd0fffaca1327c"; - srcSha = "0p79m7hpzjh36l4fc6a59h6r8yz6qafjcdg5v1yb7bac9m2wi7vs"; - depsSha256 = "1cwp4p8b985fj8j2qmgsi2mpp51rdpwzm9qa60760nrry1fy624z"; + version = "0.14.0"; + srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55"; + srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s"; + depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo From 24065c91c01c843cabb45401e8b0e5fcba2f53fe Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 16 Nov 2016 13:26:36 +0200 Subject: [PATCH 0357/1749] rustRegistry: 2016-10-29 -> 2016-11-15 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 332fe71f64fa..bea2cb41a69f 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-10-29"; - rev = "623cc0d9328bfb949b54209443f2b4f06c41961e"; - sha256 = "1jyb0ixnrxb7m0c18p6yfi6x8rsy3yz5yc3nyz9f462fr4g6azcs"; + version = "2016-11-15"; + rev = "4ed749b5a45d596e59c454e6ffc27177bd93a221"; + sha256 = "09vw8lbwm34qp9amxzb4a2nvxzz0aaw4sas0qkay7gh4ryy5wflk"; src = fetchFromGitHub { inherit rev; From 535f26a9e9e9854c9f1502acc770b0d3dd73a133 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 16 Nov 2016 13:26:59 +0200 Subject: [PATCH 0358/1749] rustfmt: 0.6.0 -> 0.6.2 --- pkgs/development/tools/rust/rustfmt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 32a4eafc02c7..335c469e0c1d 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -4,20 +4,20 @@ with rustPlatform; buildRustPackage rec { name = "rustfmt-${version}"; - version = "0.6"; + version = "0.6.2"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustfmt"; - rev = "d022f05f340b9aa4956ca315f5e424a6d3ab3248"; - sha256 = "1w6ll3802061wbggqhk31pmzws423qm7jc4hyxk8a6pf9ksp0nk5"; + rev = "4418fab4f24e6497aa2a1f71bb4cf963c2971a28"; + sha256 = "0x2kg2sqpj4lsqqskcy5p0w3264f0by1irkjj369ch89xax7l52l"; }; - depsSha256 = "13rrhgzxxx5gwpwvyxw03m5xng9c1xyaycmqpi123ma3ps5822jf"; + depsSha256 = "022mwggmy6p9n8dh22y6m3sadrwvwlbpj9w9ki9avmgsm3cj2mhs"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; - homepage = https://github.com/nrc/rustfmt; + homepage = https://github.com/rust-lang-nursery/rustfmt; license = with licenses; [ mit asl20 ]; maintainers = [ maintainers.globin ]; platforms = platforms.all; From e2eec8f43608e88403558f48ad650b3def11ac94 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 16 Nov 2016 13:27:12 +0200 Subject: [PATCH 0359/1749] exa: mark as broken --- pkgs/tools/misc/exa/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 0e3922d2928a..d26eb8f45aea 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -36,5 +36,6 @@ buildRustPackage rec { homepage = http://bsago.me/exa; license = licenses.mit; maintainer = [ maintainers.ehegnes ]; + broken = true; }; } From 87e07a3098e90730e6e1267d3da735c517c0f1aa Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 16 Nov 2016 13:27:24 +0200 Subject: [PATCH 0360/1749] tokei: mark as broken --- pkgs/development/tools/misc/tokei/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 212ebd9c967d..9059d4ba718a 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -23,5 +23,6 @@ buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ gebner ]; platforms = platforms.all; + broken = true; }; } From 2034ffdc07ca93549a38cfba2e8cbd79c30d511c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 16 Nov 2016 13:02:37 +0100 Subject: [PATCH 0361/1749] dpkg: 1.18.14 -> 1.18.15 --- pkgs/tools/package-management/dpkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index c1d4cd319b8f..103ef8d77765 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.18.14"; + version = "1.18.15"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "0njd8pdq1vx70sjlgymi79lijg05fmd8vxnqndzhjjb0a8cf920p"; + sha256 = "0wd3rl1wi2d22jyavxg1ljzkymilg7p338y0c0ql0fcw7djkdsdf"; }; configureFlags = [ From e3a7fc3905bc7c9596b4d866f58684cdeb6e92ce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 16 Nov 2016 13:32:25 +0100 Subject: [PATCH 0362/1749] eid-mw: 4.1.18 -> 4.1.19 --- pkgs/tools/security/eid-mw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 5ee630539b69..f26b2d3308b7 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.1.18"; + version = "4.1.19"; src = fetchFromGitHub { - sha256 = "049rxrlcwcb9yir8q2inmqlslp49alpgm4pccl138xl34cg1hyhl"; + sha256 = "191c74kxfrfb894v8y4vi2iygyffjy9jjq5fj7cnnddgwai5n3c5"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; From 77cdbb9e3af9fcdd6edafa74695f6b00bdd89748 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Nov 2016 14:18:21 +0100 Subject: [PATCH 0363/1749] pythonPackages.cryptography: 1.5.1 -> 1.5.3 --- 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 9f28194d95ed..93913bbf54d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4307,11 +4307,11 @@ in { cryptography = buildPythonPackage rec { # also bump cryptography_vectors name = "cryptography-${version}"; - version = "1.5.1"; + version = "1.5.3"; src = pkgs.fetchurl { url = "mirror://pypi/c/cryptography/${name}.tar.gz"; - sha256 = "1d8da8xbx51m4dqpy51crvcmjakmfcxpx14hh2izppifrh1fs35d"; + sha256 = "cf82ddac919b587f5e44247579b433224cc2e03332d2ea4d89aa70d7e6b64ae5"; }; buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors @@ -4328,11 +4328,11 @@ in { cryptography_vectors = buildPythonPackage rec { # also bump cryptography name = "cryptography_vectors-${version}"; - version = "1.5.1"; + version = "1.5.3"; src = pkgs.fetchurl { url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz"; - sha256 = "1z74mqwlvxlxz6b1xlflphqhgby1k77shl94zw5ncw3x3cqwbccl"; + sha256 = "e513fecd146a844da19022abd1b4dfbf3335c1941464988f501d7a16f30acdae"; }; }; From 61efe92e689d0feb1033ef049de5516711cfc881 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 16 Nov 2016 22:35:46 +0900 Subject: [PATCH 0364/1749] fontconfig module: use enum --- nixos/modules/config/fonts/fontconfig.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 770c3a03f9d8..52ad1e714fb9 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -301,9 +301,7 @@ in }; style = mkOption { - type = types.str // { - check = flip elem ["none" "slight" "medium" "full"]; - }; + type = types.enum ["none" "slight" "medium" "full"]; default = "full"; description = '' TrueType hinting style, one of none, @@ -329,9 +327,7 @@ in default = "rgb"; type = types.enum ["rgb" "bgr" "vrgb" "vbgr" "none"]; description = '' - Subpixel order, one of none, - rgb, bgr, - vrgb, or vbgr. + Subpixel order. ''; }; @@ -339,9 +335,7 @@ in default = "default"; type = types.enum ["none" "default" "light" "legacy"]; description = '' - FreeType LCD filter, one of none, - default, light, or - legacy. + FreeType LCD filter. ''; }; From 9513ab45aa6fb06423df1968150bbee9eb821214 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 16 Nov 2016 22:36:05 +0900 Subject: [PATCH 0365/1749] duosec module: use enum --- nixos/modules/security/duosec.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index 0e3a54325cad..97e2d39dc076 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -73,7 +73,7 @@ in }; failmode = mkOption { - type = types.str; + type = types.enum [ "safe" "enum" ]; default = "safe"; description = '' On service or configuration errors that prevent Duo @@ -115,7 +115,7 @@ in }; prompts = mkOption { - type = types.int; + type = types.enum [ 1 2 3 ]; default = 3; description = '' If a user fails to authenticate with a second factor, Duo @@ -181,13 +181,7 @@ in config = mkIf (cfg.ssh.enable || cfg.pam.enable) { assertions = - [ { assertion = cfg.failmode == "safe" || cfg.failmode == "secure"; - message = "Invalid value for failmode (must be safe or secure)."; - } - { assertion = cfg.prompts == 1 || cfg.prompts == 2 || cfg.prompts == 3; - message = "Invalid value for prompts (must be 1, 2, or 3)."; - } - { assertion = !cfg.pam.enable; + [ { assertion = !cfg.pam.enable; message = "PAM support is currently not implemented."; } ]; From fb26d561ed47be24d1288599f4579a4f5c0f360d Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 16 Nov 2016 22:36:26 +0900 Subject: [PATCH 0366/1749] hostapd module: use enum --- nixos/modules/services/networking/hostapd.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 51f95af48029..fd4545e88e2d 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -86,7 +86,7 @@ in hwMode = mkOption { default = "g"; - type = types.string; + type = types.enum [ "a" "b" "g" ]; description = '' Operation mode. (a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE 802.11g). @@ -152,9 +152,6 @@ in config = mkIf cfg.enable { assertions = [ - { assertion = (cfg.hwMode == "a" || cfg.hwMode == "b" || cfg.hwMode == "g"); - message = "hwMode must be a/b/g"; - } { assertion = (cfg.channel >= 1 && cfg.channel <= 13); message = "channel must be between 1 and 13"; }]; From 5259fb218103cd3111e2534e941362b80d48043f Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 16 Nov 2016 22:36:53 +0900 Subject: [PATCH 0367/1749] nntp-proxy module: use enum --- nixos/modules/services/networking/nntp-proxy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix index dca8ccac7627..7eebecb23b00 100644 --- a/nixos/modules/services/networking/nntp-proxy.nix +++ b/nixos/modules/services/networking/nntp-proxy.nix @@ -148,11 +148,11 @@ in }; verbosity = mkOption { - type = types.str; + type = types.enum [ "error" "warning" "notice" "info" "debug" ]; default = "info"; example = "error"; description = '' - Verbosity level (error, warning, notice, info, debug) + Verbosity level ''; }; From 15d25df6987bdc781f3fd67a00995d6cca86936d Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 16 Nov 2016 22:37:14 +0900 Subject: [PATCH 0368/1749] nsd module: use enum --- nixos/modules/services/networking/nsd.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index ccfd219620cf..481e267f6c38 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -345,12 +345,10 @@ let }; rrlWhitelist = mkOption { - type = types.listOf types.str; + type = with types; listOf (enum [ "nxdomain" "error" "referral" "any" "rrsig" "wildcard" "nodata" "dnskey" "positive" "all" ]); default = []; description = '' Whitelists the given rrl-types. - The RRL classification types are: nxdomain, error, referral, any, - rrsig, wildcard, nodata, dnskey, positive, all ''; }; From 4a600b0437ab3933d189fdc99208cd1b88db9575 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 16 Nov 2016 22:37:36 +0900 Subject: [PATCH 0369/1749] raspberrypi module: use enum --- .../modules/system/boot/loader/raspberrypi/raspberrypi.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index b7400e333e21..eb8ea6130972 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -33,7 +33,7 @@ in boot.loader.raspberryPi.version = mkOption { default = 2; - type = types.int; + type = types.enum [ 1 2 ]; description = '' ''; }; @@ -44,10 +44,5 @@ in system.build.installBootLoader = builder; system.boot.loader.id = "raspberrypi"; system.boot.loader.kernelFile = platform.kernelTarget; - assertions = [ - { assertion = (cfg.version == 1 || cfg.version == 2); - message = "loader.raspberryPi.version should be 1 or 2"; - } - ]; }; } From 0ebc5ec7cb2172063c2e9274327a9a7051641c13 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 16 Nov 2016 22:37:57 +0900 Subject: [PATCH 0370/1749] network-interfaces: use enum --- nixos/modules/tasks/network-interfaces.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 1faa8abd5f7f..aaa78daeb3a3 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -782,13 +782,12 @@ in }; type = mkOption { - type = types.string; + type = types.enum [ "managed" "ibss" "monitor" "mesh" "wds" ]; default = "managed"; example = "ibss"; description = '' - The type of the WLAN interface. The type has to be either managed, - ibss, monitor, mesh or wds. - Also, the type has to be supported by the underlying hardware of the device. + The type of the WLAN interface. + The type has to be supported by the underlying hardware of the device. ''; }; @@ -799,17 +798,11 @@ in }; flags = mkOption { - type = types.nullOr types.string; + type = with types; nullOr (enum [ "none" "fcsfail" "control" "otherbss" "cook" "active" ]); default = null; example = "control"; description = '' - Flags for interface of type monitor. The valid flags are: - none: no special flags - fcsfail: show frames with FCS errors - control: show control frames - otherbss: show frames from other BSSes - cook: use cooked mode - active: use active mode (ACK incoming unicast packets) + Flags for interface of type monitor. ''; }; From a45315500e7a1897d24767581184d448d54d1f83 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 16 Nov 2016 14:56:09 +0100 Subject: [PATCH 0371/1749] pythonPackages.slixmpp: 1.1 -> 1.2.1 --- pkgs/top-level/python-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f28194d95ed..c86e554b3597 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15197,15 +15197,20 @@ in { slixmpp = buildPythonPackage rec { name = "slixmpp-${version}"; - version = "1.1"; + version = "1.2.1"; disabled = pythonOlder "3.4"; src = pkgs.fetchurl { url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; - sha256 = "030ca7e71cbb7e17fb48f83db97779fdbac0b4424cef01245f3276a110b30a6c"; + sha256 = "0fwngxf2pnmpk8vhv4pfxvl1ya3nxr4kc2z6jrh2imynbry3xfj9"; }; + patchPhase = '' + substituteInPlace slixmpp/thirdparty/gnupg.py \ + --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg1}/bin/gpg'" + ''; + propagatedBuildInputs = with self ; [ aiodns pyasn1 pkgs.gnupg1 pyasn1-modules]; meta = { From f7558d07dfaf1fe9f89126902a1fcbba27383b58 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 16 Nov 2016 14:57:15 +0100 Subject: [PATCH 0372/1749] poezio: 0.9 -> 0.10 --- .../poezio/fix_gnupg_import.patch | 12 +++ .../poezio/fix_plugins_imports.patch | 80 +++++++++++++++++++ .../poezio/make_default_config_writable.patch | 25 ------ pkgs/top-level/python-packages.nix | 28 +++---- 4 files changed, 106 insertions(+), 39 deletions(-) create mode 100644 pkgs/development/python-modules/poezio/fix_gnupg_import.patch create mode 100644 pkgs/development/python-modules/poezio/fix_plugins_imports.patch delete mode 100644 pkgs/development/python-modules/poezio/make_default_config_writable.patch diff --git a/pkgs/development/python-modules/poezio/fix_gnupg_import.patch b/pkgs/development/python-modules/poezio/fix_gnupg_import.patch new file mode 100644 index 000000000000..d75e09b722bf --- /dev/null +++ b/pkgs/development/python-modules/poezio/fix_gnupg_import.patch @@ -0,0 +1,12 @@ +diff -Nur poezio-0.10.orig/plugins/gpg/__init__.py poezio-0.10/plugins/gpg/__init__.py +--- poezio-0.10.orig/plugins/gpg/__init__.py 2016-07-27 19:02:41.000000000 +0200 ++++ poezio-0.10/plugins/gpg/__init__.py 2016-11-16 14:17:06.011128631 +0100 +@@ -105,7 +105,7 @@ + .. _XEP-0027: http://xmpp.org/extensions/xep-0027.html + + """ +-from gpg import gnupg ++import slixmpp.thirdparty.gnupg as gnupg + from slixmpp.xmlstream.stanzabase import JID + + from xml.etree import cElementTree as ET diff --git a/pkgs/development/python-modules/poezio/fix_plugins_imports.patch b/pkgs/development/python-modules/poezio/fix_plugins_imports.patch new file mode 100644 index 000000000000..821b9c41588a --- /dev/null +++ b/pkgs/development/python-modules/poezio/fix_plugins_imports.patch @@ -0,0 +1,80 @@ +diff -Nur poezio-0.10.orig/plugins/canat.py poezio-0.10/plugins/canat.py +--- poezio-0.10.orig/plugins/canat.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/canat.py 2016-11-16 14:32:21.565445266 +0100 +@@ -34,9 +34,9 @@ + + + """ +-from plugin import BasePlugin +-import tabs +-from decorators import command_args_parser ++from poezio.plugin import BasePlugin ++import poezio.tabs ++from poezio.decorators import command_args_parser + + def move(text, step, spacing): + new_text = text + (" " * spacing) +diff -Nur poezio-0.10.orig/plugins/corrections_diff.py poezio-0.10/plugins/corrections_diff.py +--- poezio-0.10.orig/plugins/corrections_diff.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/corrections_diff.py 2016-11-16 14:30:53.992684959 +0100 +@@ -22,11 +22,11 @@ + + + """ +-from plugin import BasePlugin ++from poezio.plugin import BasePlugin + import difflib ++import collections + from functools import wraps +-import tabs +-from config import config ++from poezio.config import config + + shim_message_fields = ('txt nick_color time str_time nickname user identifier' + ' highlight me old_message revisions jid ack') +@@ -61,10 +61,6 @@ + rev -= 1 + return ''.join(acc) + +-Message.__repr__ = repr_message +-Message.__str__ = repr_message +- +- + + def corrections_enabled(func): + @wraps(func) +diff -Nur poezio-0.10.orig/plugins/coucou.py poezio-0.10/plugins/coucou.py +--- poezio-0.10.orig/plugins/coucou.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/coucou.py 2016-11-16 14:25:37.101337668 +0100 +@@ -1,4 +1,4 @@ +-from plugin import BasePlugin ++from poezio.plugin import BasePlugin + import tracemalloc + import cProfile, pstats, io + +diff -Nur poezio-0.10.orig/plugins/flood.py poezio-0.10/plugins/flood.py +--- poezio-0.10.orig/plugins/flood.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/flood.py 2016-11-16 14:32:56.452155220 +0100 +@@ -1,6 +1,6 @@ +-from plugin import BasePlugin +-import tabs +-import multiuserchat as muc ++from poezio.plugin import BasePlugin ++import poezio.tabs ++import poezio.multiuserchat as muc + + class Plugin(BasePlugin): + def init(self): +diff -Nur poezio-0.10.orig/plugins/invisible.py poezio-0.10/plugins/invisible.py +--- poezio-0.10.orig/plugins/invisible.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/invisible.py 2016-11-16 14:31:31.743288152 +0100 +@@ -20,8 +20,7 @@ + .. _XEP-0186: https://xmpp.org/extensions/xep-0186.html + """ + +-from plugin import BasePlugin +-import tabs ++from poezio.plugin import BasePlugin + + class Plugin(BasePlugin): + def init(self): diff --git a/pkgs/development/python-modules/poezio/make_default_config_writable.patch b/pkgs/development/python-modules/poezio/make_default_config_writable.patch deleted file mode 100644 index 03d732e256c4..000000000000 --- a/pkgs/development/python-modules/poezio/make_default_config_writable.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN a/src/config.py b/src/config.py ---- a/src/config.py 2015-07-31 19:35:37.000000000 +0000 -+++ b/src/config.py 2015-08-03 09:23:34.322098081 +0000 -@@ -14,6 +14,7 @@ - - import logging.config - import os -+import stat - import sys - import pkg_resources - -@@ -563,6 +564,13 @@ - copy2(default, options.filename) - elif path.isfile(other): - copy2(other, options.filename) -+ -+ # Inside the nixstore, the reference file is readonly, so is the copy. -+ # Make it writable by the user who just created it. -+ if os.path.exists(options.filename): -+ os.chmod(options.filename, -+ os.stat(options.filename).st_mode | stat.S_IWUSR) -+ - global firstrun - firstrun = True - diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c86e554b3597..bb2188508645 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -29371,29 +29371,29 @@ in { }; }; - poezio = buildPythonPackage rec { + poezio = buildPythonApplication rec { name = "poezio-${version}"; - version = "0.9"; + version = "0.10"; - namePrefix = ""; disabled = pythonOlder "3.4"; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr ]; - - checkPhase = '' - PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}/poezio" make test - ''; - - patches = - let patch_base = ../development/python-modules/poezio; - in [ "${patch_base}/make_default_config_writable.patch" ]; + propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 ]; src = pkgs.fetchurl { - url = "http://dev.louiz.org/attachments/download/91/${name}.tar.xz"; - sha256 = "1vc7zn4rp0ds0cdh1xcmbwx6w2qh4pnpzi5mdnj3rpl7xdr6jqzi"; + url = "http://dev.louiz.org/attachments/download/102/${name}.tar.gz"; + sha256 = "1mm0c3250p0kh7lmmjlp05hbc7byn9lknafgb906xmp4vx1p4kjn"; }; + patches = [ + ../development/python-modules/poezio/fix_gnupg_import.patch + ../development/python-modules/poezio/fix_plugins_imports.patch + ]; + + checkPhase = '' + py.test + ''; + meta = { description = "Free console XMPP client"; homepage = http://poez.io; From 45f579b9e71a9e0b0ec9f1e0fba52d9d3e0c0f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 16 Nov 2016 15:14:08 +0100 Subject: [PATCH 0373/1749] allowUnfree: mention the solution that works for nix-shell as well --- pkgs/stdenv/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index edd5c2785dcf..bd35970e0d12 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -139,7 +139,7 @@ let { nixpkgs.config.allow${up reason} = true; } in configuration.nix to override this. - b) For `nix-env`, `nix-build` or any other Nix command you can add + b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add { allow${up reason} = true; } to ~/.nixpkgs/config.nix. '')); From 7ad01f5f0c570e754c471db1d9d1c697f1292eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 16 Nov 2016 14:17:42 +0000 Subject: [PATCH 0374/1749] initrd-ssh: fix authorized_key generation with multiple keys multiple entries should be separated by newline --- nixos/modules/system/boot/initrd-ssh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index a8c7d4b3ee5e..59ecaf8d5a6d 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -122,7 +122,7 @@ in mkdir -p /root/.ssh ${concatStrings (map (key: '' - echo -n ${escapeShellArg key} >> /root/.ssh/authorized_keys + echo ${escapeShellArg key} >> /root/.ssh/authorized_keys '') cfg.authorizedKeys)} dropbear -s -j -k -E -m -p ${toString cfg.port} From 2a3d552c55bff401625ff30c521c1221182db5a8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Nov 2016 16:15:59 +0100 Subject: [PATCH 0375/1749] pythonPackages.ipykernel: 4.5.0 -> 4.5.1 --- 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 93913bbf54d4..16cf17d6b625 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12731,12 +12731,12 @@ in { }; ipykernel = buildPythonPackage rec { - version = "4.5.0"; + version = "4.5.1"; name = "ipykernel-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipykernel/${name}.tar.gz"; - sha256 = "245a798edb8fd751b95750d8645d736dd739a020e7fc7d5627dac4d1c35d8295"; + sha256 = "520c855c6652651c6796a3dd8bc89d533023ac65c5ccf812908187d6f0e461da"; }; buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; From efaf3358dbf1e7baf9737ba1c90054dfb349c9e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Nov 2016 16:16:15 +0100 Subject: [PATCH 0376/1749] pythonPackages.traitlets: 4.2.2 -> 4.3.1 --- 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 16cf17d6b625..5962bba407f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24935,12 +24935,12 @@ in { }; traitlets = buildPythonPackage rec { - version = "4.2.2"; + version = "4.3.1"; name = "traitlets-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/t/traitlets/${name}.tar.gz"; - sha256 = "7d7e3070484b2fe490fa55e0acf7023afc5ed9ddabec57405f25c355158e152a"; + sha256 = "ba8c94323ccbe8fd792e45d8efe8c95d3e0744cc8c085295b607552ab573724c"; }; buildInputs = with self; [ nose mock ]; From e237791fd498779ffbe28ff54ddf83c2506db9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 16 Nov 2016 16:23:54 +0100 Subject: [PATCH 0377/1749] pythonPackages.qrcode: 5.1 -> 5.3 works with python3 now --- pkgs/top-level/python-packages.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4537e1222a8..0494df1989e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25126,17 +25126,13 @@ in { qrcode = buildPythonPackage rec { name = "qrcode-${version}"; - version = "5.1"; + version = "5.3"; src = pkgs.fetchurl { url = "mirror://pypi/q/qrcode/${name}.tar.gz"; - sha256 = "0skzrvhjnnacrz52jml4i050vdx5lfcd3np172srxjaghdgfxg9k"; + sha256 = "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1"; }; - # Errors in several tests: - # TypeError: must be str, not bytes - disabled = isPy3k; - propagatedBuildInputs = with self; [ six pillow ]; meta = { From 67f3e2853b9ea07d6a0cc98344b98d0dc0fcec47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 16 Nov 2016 16:49:24 +0100 Subject: [PATCH 0378/1749] create-amis.sh: use nix-shell for convenience --- nixos/maintainers/scripts/ec2/create-amis.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index e26caa191643..8b7db7b30a64 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -1,4 +1,8 @@ -#! /bin/sh -e +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p qemu awscli ec2_ami_tools jq + +# To start with do: nix-shell -p awscli --run "aws configure" + set -o pipefail #set -x From a60a584cb6ebcc9da2ae74e672dd537117849f10 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 16 Nov 2016 15:37:57 +0000 Subject: [PATCH 0379/1749] terraform: 0.7.10 -> 0.7.11 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 1c5f13ad8973..1c481adcf1ea 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.10"; + version = "0.7.11"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "187hcnrjdysqzjlkj73fpvhi90zmkfkz1fy7g4fx78i1zxqiabz8"; + sha256 = "0rmzhf2rwxci57ll5nv2vvmic9cn64dbbg1fb5g78njljzpsc5qw"; }; postInstall = '' From 3d2e46e7ad093ae62a89852a17f8946e0810b00f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 16 Nov 2016 16:55:36 +0100 Subject: [PATCH 0380/1749] pythonPackages.pymaging: init at 2016-11-16 --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0494df1989e1..454d9448c480 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1067,7 +1067,7 @@ in { license = licenses.free; }; } else null; - + funcsigs = buildPythonPackage rec { name = "funcsigs-1.0.2"; @@ -14410,7 +14410,7 @@ in { broken = true; }; }; - + mock = buildPythonPackage (rec { name = "mock-2.0.0"; @@ -20953,6 +20953,24 @@ in { }; }; + pymaging = buildPythonPackage rec { + name = "pymaging-unstable-2016-11-16"; + + src = pkgs.fetchFromGitHub { + owner = "ojii"; + repo = "pymaging"; + rev = "596a08fce5664e58d6e8c96847393fbe987783f2"; + sha256 = "18g3n7kfrark30l4vzykh0gdbnfv5wb1zvvjbs17sj6yampypn38"; + }; + + meta = { + description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; + homepage = http://pymaging.rtfd.org; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + }; + }; + pyPdf = buildPythonPackage rec { name = "pyPdf-1.13"; From ac8b3165b6bfe10bf246efe2d1a4bb24e3f863b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 16 Nov 2016 16:56:11 +0100 Subject: [PATCH 0381/1749] pythonPackages.pymaging_png: init at 2016-11-16 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 454d9448c480..0728ed47b1ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20971,6 +20971,26 @@ in { }; }; + pymaging_png = buildPythonPackage rec { + name = "pymaging-png-unstable-2016-11-16"; + + src = pkgs.fetchFromGitHub { + owner = "ojii"; + repo = "pymaging-png"; + rev = "83d85c44e4b2342818e6c068065e031a9f81bb9f"; + sha256 = "1mknxvsq0lr1ffm8amzm3w2prn043c6ghqgpxlkw83r988p5fn57"; + }; + + propagatedBuildInputs = with self; [ pymaging ]; + + meta = { + description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; + homepage = https://github.com/ojii/pymaging-png/; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + }; + }; + pyPdf = buildPythonPackage rec { name = "pyPdf-1.13"; From 2b31fecfd8b8f5ac0747915acd2c6ff308f22750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 16 Nov 2016 16:56:50 +0100 Subject: [PATCH 0382/1749] pythonPackages.qrcode: fix dependencies this also fix tests for python3 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0728ed47b1ea..9837eecd737e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25171,7 +25171,7 @@ in { sha256 = "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1"; }; - propagatedBuildInputs = with self; [ six pillow ]; + propagatedBuildInputs = with self; [ six pillow pymaging_png ]; meta = { description = "Quick Response code generation for Python"; From 0bf515c97311a12251d1a33788d31c86cd338e96 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 16 Nov 2016 08:53:45 -0800 Subject: [PATCH 0383/1749] emacs: Depend on libselinux only for Linux --- pkgs/applications/editors/emacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 4f62d0963c03..7ba52dd34c43 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { ++ lib.optionals srcRepo [ autoconf automake texinfo ]; buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext libselinux ] - ++ lib.optional stdenv.isLinux dbus + [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] + ++ lib.optional stdenv.isLinux [ dbus libselinux ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] From c4d2d56f22ea4ada899cd26141b774112b6bfdf7 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 16 Nov 2016 08:54:30 -0800 Subject: [PATCH 0384/1749] emacs: Missed a pluralization... --- pkgs/applications/editors/emacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 7ba52dd34c43..aacc3f9e7927 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] - ++ lib.optional stdenv.isLinux [ dbus libselinux ] + ++ lib.optionals stdenv.isLinux [ dbus libselinux ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] From 0736bd2c539f4295bad38517ec389748a5635edd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 16 Nov 2016 12:04:41 -0500 Subject: [PATCH 0385/1749] mariadb: 10.1.18 -> 10.1.19 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 422715925b88..f50a97afd20d 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.1.18"; + version = "10.1.19"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "0wrvhyck95czhz553834i9im7ljvn8k2byakcinlji7zx43njcyp"; + sha256 = "108s4mimdbmgmmn5pcr9a405j70cyny9adzv49s75lg22krp74sv"; }; prePatch = '' From 9c3eae488ef6f70da8b2fcf6d2f800bdba7d2d11 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 16 Nov 2016 12:14:27 -0500 Subject: [PATCH 0386/1749] opera: 40.0.2308.90 -> 41.0.2353.56 --- pkgs/applications/networking/browsers/opera/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 0c6d36b3818d..0edd982f0f75 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -36,7 +36,7 @@ let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "40.0.2308.90"; + version = "41.0.2353.56"; rpath = stdenv.lib.makeLibraryPath [ @@ -89,12 +89,12 @@ in stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb"; - sha256 = "1fqbxbn4531yv9figgg8xxr63swimrgpamqrphcg8jq5q3smrk4k"; + sha256 = "0qjkhadlpn5c20wm66hm7rn12kdk4bh2plfgpfkzp85jmsjdxri5"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "12imzjxwip9r7bjyfnrpdsxyxb0cjn92s3b7ajdlbqccxxmc6k6g"; + sha256 = "1f3slbydxkk15banjbm7d8602l3vxy834ijsdqpyj0ckc5mw0g9y"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; From 58d580764e88e39362dbbd45af78f641346fc94a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20G=C3=B6tz?= Date: Wed, 16 Nov 2016 18:48:10 +0100 Subject: [PATCH 0387/1749] webstorm: 2016.2.4 -> 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 1ce86e96c4da..4a3e8b4c6805 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.2.4"; + version = "2016.3"; 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 = "1h61l44xnbcdb26q8ylb25sj3rs43nxki203i2jra2i6j5jzxrvg"; + sha256 = "12jv8x7rq0cpvrbrb2l2x1p7is8511fx6ia79z5v3fnwxf17i3w5"; }; wmClass = "jetbrains-webstorm"; }; From 6f2b2daccf2735a72b51c9ac46fab7008bbb3f1c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 16 Nov 2016 12:52:07 -0500 Subject: [PATCH 0388/1749] libgit2: 0.24.2 -> 0.24.3 --- pkgs/development/libraries/git2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index c4487dca5977..2bd500b9efbc 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }: stdenv.mkDerivation (rec { - version = "0.24.2"; + version = "0.24.3"; name = "libgit2-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "0avijw83vfx64cn23vx2j1h14zmkx8silgjnq6q2qw2z3sh73hs1"; + sha256 = "01jdp0i0nxhx8w2gjd75mwfy1d4z2c5xzz7q5jfypa6pkdi86dmh"; }; # TODO: `cargo` (rust's package manager) surfaced a serious bug in From d3e54d71c1c4e73dfb2b767068d32c3f44717c7f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 16 Nov 2016 18:42:33 +0100 Subject: [PATCH 0389/1749] debian_devscripts: 2.16.6 -> 2.16.8 --- pkgs/tools/misc/debian-devscripts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index ece9c5ed3824..2fe9ec2fbe79 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -8,12 +8,12 @@ let inherit (python3Packages) python setuptools; in stdenv.mkDerivation rec { - version = "2.16.6"; + version = "2.16.8"; name = "debian-devscripts-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "0lkhilwb1gsnk8q14wkrl78s0w3l8aghsaz00vprmkmcc3j1x14h"; + sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1"; }; buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile From 16e511fe2d7871efd56fd39e2d3e34355b61b629 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Nov 2016 19:31:49 +0100 Subject: [PATCH 0390/1749] pythonPackages.traitlets: fix tests --- pkgs/top-level/python-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3dda442d206c..13b5f0a91053 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24948,11 +24948,13 @@ in { sha256 = "ba8c94323ccbe8fd792e45d8efe8c95d3e0744cc8c085295b607552ab573724c"; }; - buildInputs = with self; [ nose mock ]; - propagatedBuildInputs = with self; [ipython_genutils decorator]; + LC_ALL = "en_US.UTF-8"; + + buildInputs = with self; [ pkgs.glibcLocales pytest mock ]; + propagatedBuildInputs = with self; [ipython_genutils decorator enum34]; checkPhase = '' - nosetests -v + py.test $out ''; meta = { From f3dbb0892c7f3bc4e9605e428b4292a451de0501 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 5 Nov 2016 20:13:04 +0100 Subject: [PATCH 0391/1749] freeglut: Use multiple outputs --- pkgs/development/libraries/freeglut/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 4135c451eebc..6737e059b212 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, xlibsWrapper, cmake }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa_noglu, mesa_glu, xlibsWrapper, cmake }: let version = "3.0.0"; in stdenv.mkDerivation { @@ -9,16 +9,20 @@ in stdenv.mkDerivation { sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra"; }; - buildInputs = [ libXi libXrandr libXxf86vm mesa xlibsWrapper cmake ]; + outputs = [ "out" "dev" ]; + + buildInputs = [ libXi libXrandr libXxf86vm mesa_noglu mesa_glu xlibsWrapper cmake ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ - "-DOPENGL_INCLUDE_DIR=${mesa}/include" - "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa}/lib/libGL.dylib" - "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa}/lib/libGLU.dylib" + "-DOPENGL_INCLUDE_DIR=${mesa_noglu}/include" + "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa_noglu}/lib/libGL.dylib" + "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa_glu}/lib/libGLU.dylib" "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Create and manage windows containing OpenGL contexts"; longDescription = '' From f66271238eeaa740f02615579d33eab96073fe0a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 5 Nov 2016 20:17:42 +0100 Subject: [PATCH 0392/1749] libdevil: Use multiple outputs --- pkgs/development/libraries/libdevil/default.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 3b63ba98f572..68bd72f3e0f5 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,12 +1,10 @@ -{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa -, libX11, pkgconfig - -, OpenGL +{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa_noglu +, libX11, pkgconfig, OpenGL }: stdenv.mkDerivation rec { - name ="libdevil-${version}"; + name = "libdevil-${version}"; version = "1.7.8"; src = fetchurl { @@ -14,7 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; }; - buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa libX11 ] + outputs = [ "out" "dev" ]; + + buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa_noglu libX11 ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; nativeBuildInputs = [ pkgconfig ]; @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { ./il_endian.h.patch ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://openil.sourceforge.net/; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c498628cb7b..35eee630c28a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7685,7 +7685,7 @@ in libdevil-nox = libdevil.override { libX11 = null; - mesa = null; + mesa_noglu = null; }; libdigidoc = callPackage ../development/libraries/libdigidoc { }; From 69bea26ea9a6ec97927f45bea78f2148325c2cd9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Nov 2016 23:34:51 +0100 Subject: [PATCH 0393/1749] sddm: Enable user switching It was lacking the dbus configuration to bind to org.freedesktop.DisplayManager, and it was passing fixed TTY/display numbers to the X server (see 9be012f0d4d9b6bca35416ec89d5a40be4556896). --- nixos/modules/services/x11/display-managers/sddm.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 36daf55a36a5..dda8d0f7629e 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -27,7 +27,6 @@ let ${cfg.stopScript} ''; - cfgFile = pkgs.writeText "sddm.conf" '' [General] HaltCommand=${pkgs.systemd}/bin/systemctl poweroff @@ -47,7 +46,7 @@ let HideShells=/run/current-system/sw/bin/nologin [X11] - MinimumVT=${toString xcfg.tty} + MinimumVT=${toString (if xcfg.tty != null then xcfg.tty else 7)} ServerPath=${xserverWrapper} XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr SessionCommand=${dmcfg.session.script} @@ -254,5 +253,10 @@ in users.extraGroups.sddm.gid = config.ids.gids.sddm; + services.dbus.packages = [ sddm.unwrapped ]; + + # To enable user switching, allow sddm to allocate TTYs/displays dynamically. + services.xserver.tty = null; + services.xserver.display = null; }; } From 72d410fc74dd1d78af074a045859166c52dc8fad Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Nov 2016 23:15:50 +0100 Subject: [PATCH 0394/1749] pecita: 5.3 -> 5.4 --- pkgs/data/fonts/pecita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index c8f7717103bc..7650c13961ee 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pecita-${version}"; - version = "5.3"; + version = "5.4"; src = fetchurl { url = "http://archive.rycee.net/pecita/${name}.tar.xz"; - sha256 = "1glr21gi1b9db17ln8qn4zk9gwpxs0frm76i4hp3anlpivbwiis8"; + sha256 = "1cqzj558ldzzsbfbvlwp5fjh2gxa03l16dki0n8z5lmrdq8hrkws"; }; phases = ["unpackPhase" "installPhase"]; From b25f9ff20eb9fc24716fdff15944ec289a0af9a4 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Nov 2016 23:45:45 +0100 Subject: [PATCH 0395/1749] mimeo: 2016.2 -> 2016.11 --- pkgs/tools/misc/mimeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 66e91ed14240..aff329e04b69 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "mimeo-${version}"; - version = "2016.2"; + version = "2016.11"; src = fetchurl { url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; - sha256 = "1y3a60983ind2cakjwxq3cgc76xhcdqz5lcpnyii34s6wviybkn1"; + sha256 = "1yygdxqnkh506fknxsp9xa3rnxn0901dzqc7c7qjjj80lk6xnfxb"; }; buildInputs = [ file desktop_file_utils ]; From 38de6ed18e879c01324299f39c28b54725d0fb9c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Nov 2016 23:50:44 +0100 Subject: [PATCH 0396/1749] gmic: 1.7.7 -> 1.7.8 --- pkgs/tools/graphics/gmic/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 606e049703df..ccee4f213141 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, fftw, zlib, libjpeg, libtiff, libpng }: +{ stdenv, fetchurl, fftw, zlib, libjpeg, libtiff, libpng, pkgconfig }: stdenv.mkDerivation rec { name = "gmic-${version}"; - version = "1.7.7"; + version = "1.7.8"; src = fetchurl { url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "0shcxgq8nc391c0y0zh3l87g3p7fvsmgshi1x1jvvwwq1b9nf6vp"; + sha256 = "1921s0n2frj8q95l8lm8was64cypnychgcgcavx9q8qljzbk4brs"; }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fftw zlib libjpeg libtiff libpng ]; sourceRoot = "${name}/src"; From 4b6770d0c0bcf839747307b49258dc9e5f54653e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Nov 2016 23:51:46 +0100 Subject: [PATCH 0397/1749] pythonPackages.PyICU: 1.9.3 -> 1.9.5 --- pkgs/top-level/python-packages.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b14463a5230e..bdc56bc65d4c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20218,23 +20218,15 @@ in { }; PyICU = buildPythonPackage rec { - name = "PyICU-1.9.3"; + name = "PyICU-1.9.5"; src = pkgs.fetchurl { url = "mirror://pypi/P/PyICU/${name}.tar.gz"; - sha256 = "0hps2314w7ddiwhqgw249m3hgqnny7qn542vz26jxr5k5hhrcyhs"; + sha256 = "16rmxy9y0qhqqna2v49i7nzwm09as699rbyvh4raw7w602w55c3k"; }; buildInputs = [ pkgs.icu ]; - patches = [ - # Fixes a bug in the test suite. - (pkgs.fetchpatch { - url = "https://github.com/ovalhub/pyicu/commit/6ab20d48d85638acb3a811c8676f713bd26f0df9.patch"; - sha256 = "0z4585r6bi0xxvrr93n450ka43vixx9zd063qna078vck0i3bkjg"; - }) - ]; - meta = { homepage = https://pypi.python.org/pypi/PyICU/; description = "Python extension wrapping the ICU C++ API"; From add010f69425075a5d4c73e2fe961e65b92e1d01 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Nov 2016 23:56:11 +0100 Subject: [PATCH 0398/1749] eclipse-plugin-testng: 6.9.12 -> 6.9.13 --- pkgs/applications/editors/eclipse/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 42396b72e7cb..61b4e6617edd 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -403,16 +403,16 @@ rec { testng = buildEclipsePlugin rec { name = "testng-${version}"; - version = "6.9.12.201607091356"; + version = "6.9.13.201609291640"; srcFeature = fetchurl { url = "http://beust.com/eclipse-old/eclipse_${version}/features/org.testng.eclipse_${version}.jar"; - sha256 = "06c6885d3ggg1i085zhfwayj06jn4v1jip9zz40921vpq0iand54"; + sha256 = "02wzcysl7ga3wnvnwp6asl8d77wgc547c5qqawixw94lw6fn1a15"; }; srcPlugin = fetchurl { url = "http://beust.com/eclipse-old/eclipse_${version}/plugins/org.testng.eclipse_${version}.jar"; - sha256 = "0bpyb9bnh8kglajmdzb7pr21i1sly73kwdjbygg75ad7z37l58br"; + sha256 = "1j4zw6392q3q6z3pcy803k3g0p220gk1x19fs99p0rmmdz83lc8d"; }; meta = with stdenv.lib; { From 58811df2725be69daffd0c74aa11c3cf04443b2d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Nov 2016 07:22:06 -0600 Subject: [PATCH 0399/1749] kdeWrapper: reduce closure size --- .../libraries/kde-frameworks/default.nix | 1 - .../libraries/kde-frameworks/kde-wrapper.nix | 41 +++++++++++++------ 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 4b214c37a698..b69e79fd0004 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -63,7 +63,6 @@ let kdeWrapper = import ./kde-wrapper.nix { inherit (pkgs) stdenv lib makeWrapper; - inherit kdeEnv; }; attica = callPackage ./attica.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix index 153ca31fd625..2dc5cc91128b 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix @@ -1,17 +1,14 @@ -{ stdenv, lib, makeWrapper, kdeEnv }: +{ stdenv, lib, makeWrapper }: drv: { targets, paths ? [] }: -let - env = kdeEnv drv paths; -in stdenv.mkDerivation { inherit (drv) name; - drv = lib.getBin drv; - inherit env targets; + paths = builtins.map lib.getBin ([drv] ++ paths); + inherit drv targets; passthru = { unwrapped = drv; }; nativeBuildInputs = [ makeWrapper ]; @@ -21,16 +18,36 @@ stdenv.mkDerivation { buildPhase = "true"; installPhase = '' + propagated= + for p in $drv $paths; do + findInputs $p propagated propagated-user-env-packages + done + + wrap_PATH="$out/bin" + wrap_XDG_DATA_DIRS= + wrap_XDG_CONFIG_DIRS= + wrap_QML_IMPORT_PATH= + wrap_QML2_IMPORT_PATH= + wrap_QT_PLUGIN_PATH= + for p in $propagated; do + addToSearchPath wrap_PATH "$p/bin" + addToSearchPath wrap_XDG_DATA_DIRS "$p/share" + addToSearchPath wrap_XDG_CONFIG_DIRS "$p/etc/xdg" + addToSearchPath wrap_QML_IMPORT_PATH "$p/lib/qt5/imports" + addToSearchPath wrap_QML2_IMPORT_PATH "$p/lib/qt5/qml" + addToSearchPath wrap_QT_PLUGIN_PATH "$p/lib/qt5/plugins" + done + for t in $targets; do if [ -a "$drv/$t" ]; then makeWrapper "$drv/$t" "$out/$t" \ --argv0 '"$0"' \ - --suffix PATH : "$out/bin:$env/bin" \ - --prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \ - --prefix XDG_DATA_DIRS : "$env/share" \ - --set QML_IMPORT_PATH "$env/lib/qt5/imports" \ - --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \ - --set QT_PLUGIN_PATH "$env/lib/qt5/plugins" + --suffix PATH : "$wrap_PATH" \ + --prefix XDG_CONFIG_DIRS : "$wrap_XDG_CONFIG_DIRS" \ + --prefix XDG_DATA_DIRS : "$wrap_XDG_DATA_DIRS" \ + --set QML_IMPORT_PATH "$wrap_QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH "$wrap_QML2_IMPORT_PATH" \ + --set QT_PLUGIN_PATH "$wrap_QT_PLUGIN_PATH" else echo "no such file or directory: $drv/$t" exit 1 From 5da372c36edb1e36db7ef392d4642b935a591d9a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Nov 2016 07:25:51 -0600 Subject: [PATCH 0400/1749] remove kdeEnv --- .../libraries/kde-frameworks/default.nix | 5 --- .../libraries/kde-frameworks/kde-env.nix | 31 ------------------- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks/kde-env.nix diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index b69e79fd0004..1ef8207e50a0 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -56,11 +56,6 @@ let } // (args.meta or {}); }); - kdeEnv = import ./kde-env.nix { - inherit (pkgs) stdenv lib; - inherit (pkgs.xorg) lndir; - }; - kdeWrapper = import ./kde-wrapper.nix { inherit (pkgs) stdenv lib makeWrapper; }; diff --git a/pkgs/development/libraries/kde-frameworks/kde-env.nix b/pkgs/development/libraries/kde-frameworks/kde-env.nix deleted file mode 100644 index 5ddf89a0129f..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kde-env.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, lndir }: - -drv: pkgs: - -stdenv.mkDerivation { - name = "kde-env-${drv.name}"; - nativeBuildInputs = [ lndir ]; - envPkgs = builtins.map lib.getBin ([drv] ++ pkgs); - unpackPhase = "true"; - configurePhase = "runHook preConfigure; runHook postConfigure"; - buildPhase = "true"; - installPhase = '' - runHook preInstall - - propagated="" - for i in $envPkgs; do - findInputs $i propagated propagated-user-env-packages - done - - for tgt in bin etc/xdg lib/libexec lib/qt5 share; do - mkdir -p "$out/$tgt" - for p in $propagated; do - if [ -d "$p/$tgt" ]; then - lndir -silent "$p/$tgt" "$out/$tgt" >/dev/null 2>&1 - fi - done - done - - runHook postInstall - ''; -} From 6c9cc6339fed835c3817616f37f476414b08ad8e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 16 Nov 2016 16:32:13 -0700 Subject: [PATCH 0401/1749] gromit-mpx: init at 1.2 --- pkgs/tools/graphics/gromit-mpx/default.nix | 37 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/graphics/gromit-mpx/default.nix diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix new file mode 100644 index 000000000000..376d1bc134df --- /dev/null +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig +, gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp +, libxkbcommon, epoxy, at_spi2_core, dbus, libdbusmenu-glib +}: + +stdenv.mkDerivation rec { + name = "gromit-mpx-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "bk138"; + repo = "gromit-mpx"; + rev = "${version}"; + sha256 = "1dkmp5rhzp56sz9cfxill2pkdz2anwb8kkxkypvk2xhqi64cvkrs"; + }; + + buildInputs = [ + autoconf automake autoreconfHook pkgconfig + gtk glib pcre libappindicator libpthreadstubs + libXdmcp libxkbcommon epoxy at_spi2_core + dbus libdbusmenu-glib + ]; + + meta = with stdenv.lib; { + description = "Desktop annotation tool"; + + longDescription = '' + Gromit-MPX (GRaphics Over MIscellaneous Things) is a small tool + to make annotations on the screen. + ''; + + homepage = https://github.com/bk138/gromit-mpx; + maintainers = with maintainers; [ pjones ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35eee630c28a..6032d0c78796 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1963,6 +1963,12 @@ in netpbm = null; }; + gromit-mpx = callPackage ../tools/graphics/gromit-mpx { + gtk = gtk3; + libappindicator = libappindicator-gtk3; + inherit (xorg) libXdmcp; + }; + groonga = callPackage ../servers/search/groonga { }; grub = callPackage_i686 ../tools/misc/grub { From 5bc7ae7adb66639dbff676db51454ed2e5f8ad87 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 16 Nov 2016 16:29:35 +0100 Subject: [PATCH 0402/1749] 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 1eb545df059ef6830c518920fb6bc77d0a895120 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 16 Nov 2016 08:36:51 -0500 Subject: [PATCH 0403/1749] jasper: 1.900.21 -> 1.900.28 --- pkgs/development/libraries/jasper/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 895d72dd7a0a..9568d9bbb3bc 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, fetchpatch, libjpeg, autoreconfHook }: stdenv.mkDerivation rec { - name = "jasper-1.900.21"; + name = "jasper-1.900.28"; src = fetchurl { + # You can find this code on Github at https://github.com/mdadams/jasper + # however note at https://www.ece.uvic.ca/~frodo/jasper/#download + # not all tagged releases are for distribution. url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz"; - sha256 = "1cypmlzq5vmbacsn8n3ls9p7g64scv3fzx88qf8c270dz10s5j79"; + sha256 = "0nsiblsfpfa0dahsk6hw9cd18fp9c8sk1z5hdp19m33c0bf92ip9"; }; # newer reconf to recognize a multiout flag From 7ed55dc9e47443276f48908065101d1e9380929e Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 16 Nov 2016 13:31:20 -0500 Subject: [PATCH 0404/1749] xinetd: patch for CVE-2013-4342 --- pkgs/servers/xinetd/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index 34e67e171f4a..445c6c57bbf1 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, fetchpatch, stdenv }: stdenv.mkDerivation rec { name = "xinetd-2.3.15"; @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz"; }; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch?id=426002bfe2789fb6213fba832c8bfee634d68d02"; + name = "CVE-2013-4342.patch"; + sha256 = "1iqcrqzgisz4b6vamprzg2y6chai7qpifqcihisrwbjwbc4wzj8v"; + }) + ]; + meta = { description = "Secure replacement for inetd"; platforms = stdenv.lib.platforms.linux; From d0d3330866eb74befa24d1cfbead4a22f28fae87 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 16 Nov 2016 13:57:45 -0500 Subject: [PATCH 0405/1749] shutter: add patch for CVE-2015-0854 with remote code --- pkgs/applications/graphics/shutter/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 0d52e563c9de..3d4e8c592abb 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg }: +{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg }: let perlModules = with perlPackages; @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "09cn3scwy98wqxkrjhnmxhpfnnynlbb41856yn5m3zwzqrxiyvak"; }; + patches = [ + (fetchpatch { + url = "http://svnweb.mageia.org/packages/cauldron/shutter/current/SOURCES/CVE-2015-0854.patch?revision=880308&view=co"; + name = "CVE-2015-0854.patch"; + sha256 = "14r18sxz3ylf39cn9b85snjhjxdk6ngq4vnpljwghw2q5430nb12"; + }) + ]; + buildInputs = [ perl makeWrapper gdk_pixbuf librsvg ] ++ perlModules; installPhase = '' From da547f79617617b3008e6453f58b784993340417 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 17 Nov 2016 01:05:21 -0500 Subject: [PATCH 0406/1749] ghcHEAD: Add back response files patch --- ...pass-linker-flags-via-response-files.patch | 20 +++++++++++++++++++ pkgs/development/compilers/ghc/head.nix | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch diff --git a/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch new file mode 100644 index 000000000000..ebbb9326a829 --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch @@ -0,0 +1,20 @@ +--- ghc/compiler/main/SysTools.hs 2016-11-09 14:03:05.304528147 -0500 ++++ ghc2/compiler/main/SysTools.hs 2016-11-09 14:00:19.712934686 -0500 +@@ -421,7 +421,7 @@ + args1 = map Option (getOpts dflags opt_c) + args2 = args0 ++ args1 ++ args + mb_env <- getGccEnv args2 +- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env ++ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env + where + -- discard some harmless warnings from gcc that we can't turn off + cc_filter = unlines . doFilter . lines +@@ -911,7 +911,7 @@ + args1 = map Option (getOpts dflags opt_l) + args2 = args0 ++ linkargs ++ args1 ++ args + mb_env <- getGccEnv args2 +- runSomethingResponseFile dflags ld_filter "Linker" p args2 mb_env ++ runSomethingFiltered dflags ld_filter "Linker" p args2 mb_env + where + ld_filter = case (platformOS (targetPlatform dflags)) of + OSSolaris2 -> sunos_ld_filter diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index aec6faed585e..d95791353ae3 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -27,6 +27,10 @@ in stdenv.mkDerivation (rec { sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y"; }; + # This shouldn't be necessary since 1ad1edbb32ce01ba8b47d8e8dad357b0edd6a4dc, but + # see http://hydra.cryp.to/build/2061608/nixlog/1/raw + patches = [ ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch ]; + postPatch = '' echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID From ba73dbbda61b14ec8e2ca0ab526d3b35ba1db74c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Nov 2016 02:09:43 +0100 Subject: [PATCH 0407/1749] batman-adv: 2016.3 -> 2016.4 --- pkgs/os-specific/linux/batman-adv/alfred.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 885aec52dc79..6a5dced454c0 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2016.3"; + ver = "2016.4"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0a92n570hrsh58ivr29c0lkjs7y6zxi1hk0l5mvaqs7k3w7z691l"; + sha256 = "0p8x8m1bdk560d64v010ck7dgm301cy7panxijczcf4p74clh835"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 279261745fbf..4fd022a418bb 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2016.3"; + ver = "2016.4"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0ckh11dw9l6kljwa953384y295jd36x4kwzcw5wpplnx7rkg42cj"; + sha256 = "1ybn2akwj29hsjps6qgvg1ncf238002d3r7fik627ig8cgmx0wi4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 3170569d5634..ce0ef1ad1055 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -2,14 +2,14 @@ #assert stdenv.lib.versionOlder kernel.version "3.17"; -let base = "batman-adv-2016.3"; in +let base = "batman-adv-2016.4"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "0rzhgj0g2hwlrzr8l9ymj6s60vk2zpk1a8x1lm4lhnhsqs9qj4kf"; + sha256 = "1sshl700gwfnqih95q1kp7sya71svp8px2rn14dbb790hgfkc4mw"; }; hardeningDisable = [ "pic" ]; From ea292da4c253893dc8b2ac44faeaaa21255ccdbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 17 Nov 2016 11:21:18 +0100 Subject: [PATCH 0408/1749] libdrm: 2.4.71 -> 2.4.73 Also: - remove udev remains except explanation; - remove maintainers.urkud, as he's been inactive for years. --- pkgs/development/libraries/libdrm/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index f2174470becf..a0923a15d4ad 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }: +{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }: stdenv.mkDerivation rec { - name = "libdrm-2.4.71"; + name = "libdrm-2.4.73"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "c66287ddeee5f46ea8f8880b94b80acb3bbc33ba6321d17767eef145046df9b8"; + sha256 = "0kayvwqqrjm45y6dk9q2b4gmjdasci0y28jzv4bq05py8a9d7gwn"; }; outputs = [ "out" "dev" ]; @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpthreadstubs libpciaccess ]; # libdrm as of 2.4.70 does not actually do anything with udev. - #++ stdenv.lib.optional stdenv.isLinux udev; patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch; @@ -21,7 +20,6 @@ stdenv.mkDerivation rec { "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; configureFlags = [ "--enable-freedreno" "--disable-valgrind" ] - ++ stdenv.lib.optional stdenv.isLinux "--enable-udev" ++ stdenv.lib.optional stdenv.isDarwin "-C"; crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; @@ -30,7 +28,6 @@ stdenv.mkDerivation rec { homepage = http://dri.freedesktop.org/libdrm/; description = "Library for accessing the kernel's Direct Rendering Manager"; license = "bsd"; - maintainers = [ stdenv.lib.maintainers.urkud ]; platforms = stdenv.lib.platforms.unix; }; } From 94396a579e38d9c4294f7c2d653b4dbe771666d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 17 Nov 2016 11:31:10 +0100 Subject: [PATCH 0409/1749] libinput: maintenance 1.5.0 -> 1.5.1 --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index a3b011629141..f0257ed8a44b 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -17,11 +17,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0708259k2qpdyi8z8n74d2pprjdvivmqkskjkq7s7ypchn9mb5js"; + sha256 = "d4f63933b0967bd691735af5e3919e2d29c2121d4e05867cc4e10ff3ae8e2dd8"; }; outputs = [ "out" "dev" ]; From 380bb207b66d559f66b34909a75bd1b588a52d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 17 Nov 2016 11:53:16 +0100 Subject: [PATCH 0410/1749] libpng: 1.6.23 -> 1.6.26 --- pkgs/development/libraries/libpng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index ea6e1e50035d..a20bc7e5f3c5 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; let - version = "1.6.23"; - sha256 = "1wb2j8sba6g2h4vmv4pwsp93q74qw4gyqqs4b7vfjmpcv9xix4kd"; + version = "1.6.26"; + sha256 = "1ybkgcqqsd4iiiyv60pxjfi1csszb50bd2cxxsy3sv4q4sil6rr6"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; - sha256 = "1lvsn1kmarzpn269zgykjfmxq16zrdhpd1a75nzgclx97436x408"; + sha256 = "0b6p2k4afvhk1svargpllcvhxb4g3p857wkqk85cks0yv42ckph1"; }; whenPatched = stdenv.lib.optionalString apngSupport; From 8f765490e4e22d29165e0538f7081827ffa18345 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Thu, 17 Nov 2016 12:25:04 +0100 Subject: [PATCH 0411/1749] erlang_basho: Init at R16B03 erlang_basho_R16B03: added package file erlang_basho_R16B03: added to top-level/all-packages.nix file erlang_basho_R16B03_odbc: added to top-level/all-packages.nix file erlang_basho_R16B03: Added the Carbon and Cocoa fields erlang_basho_R16B03: Removed faulty maintainer erlang_basho_R16B03: Added license as APL20 erlang_basho_R16B03: Made long and short description more informative erlang_basho: added myself as a maintainer erlang_basho: made configureFlags into an array erlang_basho: added gcc as a dependency erlang_basho: added escript replacement erlang_basho: removed debugging cat statement erlang_basho: changed subsitituteInPlace command to sed command erlang_basho: added package erlang_basho: Init at mesa != null && wxGTK != null && xorg != null; +assert odbcSupport -> unixODBC != null; + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "erlang-basho-" + version + "${optionalString odbcSupport "-odbc"}"; + version = "16B03-1"; + + src = fetchgit { + url = "https://github.com/basho/otp"; + rev = "cb3a485894e493ad172db2749129e613fe52713a"; + sha256 = "0xn28cxlq0ya1aww9q14rg8jf3x2flwxrz6wdnpb0l2h2dasr655"; + }; + + debugInfo = enableDebugInfo; + + buildInputs = + [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc + ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] + ++ optional odbcSupport [ unixODBC ]; + + patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in ''; + + preConfigure = '' + export HOME=$PWD/../ + export LANG=C + export ERL_TOP=$(pwd) + sed -e s@/bin/pwd@pwd@g -i otp_build + sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc + ''; + + configureFlags= [ + "--with-ssl=${openssl.dev}" + "--enable-smp-support" + "--enable-threads" + "--enable-kernel-poll" + "--disable-hipe" + "${optionalString odbcSupport "--with-odbc=${unixODBC}"}" + "${optionalString stdenv.isDarwin "--enable-darwin-64bit"}" + "${optionalString stdenv.isLinux "--enable-m64-build"}" + ]; + + buildPhase = '' + ./otp_build autoconf + ./otp_build setup -a --prefix=$out $configureFlags + ''; + + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; + sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g"; + }; + in '' + ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + tar xf "${manpages}" -C "$out/lib/erlang" + for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do + prefix="''${i%/*}" + ensureDir "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done + ''; + + # Some erlang bin/ scripts run sed and awk + postFixup = '' + wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" + ''; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = "https://github.com/basho/otp/"; + description = "Programming language used for massively scalable soft real-time systems, Basho fork"; + + longDescription = '' + Erlang is a programming language used to build massively scalable + soft real-time systems with requirements on high availability. + Some of its uses are in telecoms, banking, e-commerce, computer + telephony and instant messaging. Erlang's runtime system has + built-in support for concurrency, distribution and fault + tolerance. + This version of Erlang is Basho's version, forked from Ericsson's + repository. + ''; + + platforms = platforms.unix; + license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35eee630c28a..33dd7572e4c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5345,6 +5345,13 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; odbcSupport = true; }; + erlang_basho_R16B03 = callPackage ../development/interpreters/erlang/R16B03-1-basho.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + erlang_basho_R16B03_odbc = callPackage ../development/interpreters/erlang/R16B03-1-basho.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + odbcSupport = true; + }; erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; From f4780da125289c7e847f5b9efbd63fe049eaf5e3 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 5 Nov 2016 10:32:13 +0100 Subject: [PATCH 0412/1749] vimPlugins/vim-jsdoc: init at 0kr4p01p --- pkgs/misc/vim-plugins/default.nix | 9 +++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 10 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 2cd10593aeb4..25033107b43d 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2085,5 +2085,14 @@ rec { }; + vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-jsdoc-2016-11-05"; + src = fetchgit { + url = "git://github.com/heavenshell/vim-jsdoc"; + rev = "45c7c7cef440a29f7bf24436640413e3d5d578ff"; + sha256 = "0kr4p01pyrz9w7yfh50gsz6n60qvnqxsr1055hvsyx36nzw6l3za"; + }; + dependencies = []; + }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b7e33a71ff83..e14304982fcd 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -169,3 +169,4 @@ "vundle" "github:jiangmiao/auto-pairs" "github:editorconfig/editorconfig-vim" +"github:heavenshell/vim-jsdoc" From 3995655d2c2cc7d9804172cd393cf673a21c5832 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 17 Nov 2016 07:25:42 -0500 Subject: [PATCH 0413/1749] Revert "Merge pull request #17145 from kalhauge/haskell_darwin_dyld" This fix doesn't actually fix the cabal bug (see #16357), but it does cause other bugs (see #20476) Fixes #20476 This reverts commit b89fa5fd5cc3e7d27fb87bc792fe0d6553aec28d, reversing changes made to e4b146b0417762c461c7f90f587dc82e8524f796. --- pkgs/development/haskell-modules/generic-builder.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2b597532b44d..f9da4757696b 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -194,9 +194,6 @@ stdenv.mkDerivation ({ fi if [ -d "$p/lib" ]; then configureFlags+=" --extra-lib-dirs=$p/lib" - ${ stdenv.lib.optionalString stdenv.isDarwin - "export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$p/lib" - } fi done ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache From 106349a02fa83d7b24337a0ed88dd82697392517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Thu, 17 Nov 2016 13:57:18 +0100 Subject: [PATCH 0414/1749] faust2ladspa: init (at 2.0.a51 like other faust2... plugins) --- pkgs/applications/audio/faust/faust2ladspa.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/applications/audio/faust/faust2ladspa.nix diff --git a/pkgs/applications/audio/faust/faust2ladspa.nix b/pkgs/applications/audio/faust/faust2ladspa.nix new file mode 100644 index 000000000000..67de98cab9a2 --- /dev/null +++ b/pkgs/applications/audio/faust/faust2ladspa.nix @@ -0,0 +1,12 @@ +{ boost +, faust +, ladspaH +}: + +faust.wrapWithBuildEnv { + + baseName = "faust2ladspa"; + + propagatedBuildInputs = [ boost ladspaH ]; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35eee630c28a..60aa3d971ae1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16999,6 +16999,8 @@ in faust2jaqt = callPackage ../applications/audio/faust/faust2jaqt.nix { }; + faust2ladspa = callPackage ../applications/audio/faust/faust2ladspa.nix { }; + faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { }; fceux = callPackage ../misc/emulators/fceux { }; From 9e92237ed7a03fb0d0fbb49ca48c6b9ec8d38df0 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 17 Nov 2016 14:15:47 +0100 Subject: [PATCH 0415/1749] gocryptfs: init at 1.1.1 --- pkgs/tools/filesystems/gocrypfs/default.nix | 43 +++++++++++++++++++++ pkgs/tools/filesystems/gocrypfs/deps.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 84 insertions(+) create mode 100644 pkgs/tools/filesystems/gocrypfs/default.nix create mode 100644 pkgs/tools/filesystems/gocrypfs/deps.nix diff --git a/pkgs/tools/filesystems/gocrypfs/default.nix b/pkgs/tools/filesystems/gocrypfs/default.nix new file mode 100644 index 000000000000..c156cd13244a --- /dev/null +++ b/pkgs/tools/filesystems/gocrypfs/default.nix @@ -0,0 +1,43 @@ +# This file was generated by go2nix. +{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgconfig, openssl }: + +with lib; + +let + goFuseVersion = substring 0 7 (head (filter ( + d: d.goPackagePath == "github.com/hanwen/go-fuse" + ) (import ./deps.nix))).fetch.rev; +in buildGoPackage rec { + name = "gocryptfs-${version}"; + version = "1.1.1"; + rev = "v${version}"; + + goPackagePath = "github.com/rfjakob/gocryptfs"; + + src = fetchFromGitHub { + inherit rev; + owner = "rfjakob"; + repo = "gocryptfs"; + sha256 = "0p173x2s0km7a43h6ihir5p19fdlkkb9lc9120k9hccr33iws25z"; + }; + + buildInputs = [pkgconfig openssl]; + + goDeps = ./deps.nix; + + postPatch = "rm -r tests"; + + buildFlagsArray = '' + -ldflags= + -X main.GitVersion=${rev} + -X main.GitVersionFuse=${goFuseVersion} + ''; + + meta = { + description = "Encrypted overlay filesystem written in Go"; + license = licenses.mit; + homepage = https://nuetzlich.net/gocryptfs/; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/filesystems/gocrypfs/deps.nix b/pkgs/tools/filesystems/gocrypfs/deps.nix new file mode 100644 index 000000000000..08a4afb52653 --- /dev/null +++ b/pkgs/tools/filesystems/gocrypfs/deps.nix @@ -0,0 +1,39 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/hanwen/go-fuse"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/go-fuse"; + rev = "6c2b7d8f22c99776f8bfe17cd26d5f744a5b4cdc"; + sha256 = "1mb73vyqfy92830qif83zdlng0zycmm5fgmm9bwihqh92y8inw3h"; + }; + } + { + goPackagePath = "github.com/jacobsa/crypto"; + fetch = { + type = "git"; + url = "https://github.com/jacobsa/crypto"; + rev = "293ce0c192fb4f59cd879b46544922b9ed09a13a"; + sha256 = "12nm5h5dqqk8yrzlkmcqm0aam8l6l1s6rah48mrmz1z5bgm9h5rs"; + }; + } + { + goPackagePath = "github.com/rfjakob/eme"; + fetch = { + type = "git"; + url = "https://github.com/rfjakob/eme"; + rev = "601d0e278ceda9aa2085a61c9265f6e690ef5255"; + sha256 = "1ryh5f2a42psrqcpjh73shk3p0mva2vcyyfav4nhxmfqall77k5z"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "88d0005bf4c3ec17306ecaca4281a8d8efd73e91"; + sha256 = "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6629bf9146c..428249b7e920 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1878,6 +1878,8 @@ in goaccess = callPackage ../tools/misc/goaccess { }; + gocryptfs = callPackage ../tools/filesystems/gocrypfs { }; + go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; go-pup = callPackage ../development/tools/pup { }; From 1376aeba42e405d61fd72b2382d005bc4e553ea2 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 17 Nov 2016 08:45:56 -0500 Subject: [PATCH 0416/1749] monit: 5.19.0 -> 5.20.0 for CVE-2016-7067 --- pkgs/tools/system/monit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index eed5c06552b2..055a480f92ad 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }: +{stdenv, fetchurl, openssl, bison, flex, pam, zlib, usePAM ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "monit-5.19.0"; + name = "monit-5.20.0"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "1f32dz7zzp575d35m8xkgjgrqs2vbls0q6vdzm7wwashcm1xbz5y"; + sha256 = "13drg4k9r9drn7bpj3n04kkf1l29q05jdccdar6yc6hcqmg3kb7b"; }; nativeBuildInputs = [ bison flex ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals usePAM [ pam ]; + buildInputs = [ openssl zlib.dev ] ++ stdenv.lib.optionals usePAM [ pam ]; configureFlags = [ "--with-ssl-incl-dir=${openssl.dev}/include" From 2326c8de4dd53a2829d40a7dbdf16f4dc0ebf6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 17 Nov 2016 15:14:52 +0100 Subject: [PATCH 0417/1749] cloud-utils: 0.27 -> 0.29 We keep the existing hacks for growpart to work inside the initrd Fixes #15736 #17015 --- nixos/modules/virtualisation/grow-partition.nix | 2 +- pkgs/tools/misc/cloud-utils/default.nix | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix index abc2e766959e..5039118d78ee 100644 --- a/nixos/modules/virtualisation/grow-partition.nix +++ b/nixos/modules/virtualisation/grow-partition.nix @@ -24,7 +24,7 @@ with lib; copy_bin_and_libs ${pkgs.gnused}/bin/sed copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk - cp -v ${pkgs.cloud-utils}/bin/growpart $out/bin/growpart + cp -v ${pkgs.cloud-utils}/bin/.growpart-wrapped $out/bin/growpart ln -s sed $out/bin/gnused ''; diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index 8bba00b564d9..af518e7efa98 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, gawk, gnused, utillinux }: stdenv.mkDerivation { - name = "cloud-utils-0.27"; + # NOTICE: if you bump this, make sure to run + # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops + name = "cloud-utils-0.29"; src = fetchurl { - url = "https://launchpad.net/cloud-utils/trunk/0.27/+download/cloud-utils-0.27.tar.gz"; - sha256 = "16shlmg36lidp614km41y6qk3xccil02f5n3r4wf6d1zr5n4v8vd"; + url = "https://launchpad.net/cloud-utils/trunk/0.29/+download/cloud-utils-0.29.tar.gz"; + sha256 = "0z15gs8gmpy5gqxl7yiyjj7a6s8iw44djj6axvbci627b9pvd8cy"; }; - patches = [ ./growpart-util-linux-2.26.patch ]; + buildInputs = [ makeWrapper ]; buildPhase = '' mkdir -p $out/bin cp bin/growpart $out/bin/growpart sed -i 's|awk|gawk|' $out/bin/growpart sed -i 's|sed|gnused|' $out/bin/growpart + ln -s sed $out/bin/gnused + wrapProgram $out/bin/growpart --prefix PATH : "${stdenv.lib.makeBinPath [ gnused gawk utillinux ]}:$out/bin" ''; dontInstall = true; dontPatchShebangs = true; + dontStrip = true; meta = { platforms = stdenv.lib.platforms.unix; From d26ca0c6cf31f212f551ac9fc05dc6c6e2d063d8 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 17 Nov 2016 09:25:44 -0500 Subject: [PATCH 0418/1749] tokei: 3.0.0 -> 4.0.0 --- pkgs/development/tools/misc/tokei/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 9059d4ba718a..d88a06c64048 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -4,13 +4,13 @@ with rustPlatform; buildRustPackage rec { name = "tokei-${version}"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { url = "https://github.com/Aaronepower/tokei/archive/${version}.tar.gz"; - sha256 = "0xymz52gpasihzhxglzx4wh0312zkraxy4yrpxz694zalf2s5vj5"; + sha256 = "1c7z3dgxr76dq6cvan3hgqlkcv61gmg6fkv6b98viymh4fy9if68"; }; - depsSha256 = "1syx8qzjn357dk2bf4ndmgc4zvrglmw88qiw117h6s511qyz8z0z"; + depsSha256 = "0v4gplk7mkkik9vr1lqsr0yl1kqkqh14ncw95yb9iv7hcxvmcqn3"; installPhase = '' mkdir -p $out/bin @@ -23,6 +23,5 @@ buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ gebner ]; platforms = platforms.all; - broken = true; }; } From 1f0a12ee8d59e6de3309f36b669997757e8dd54d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 17 Nov 2016 16:06:51 +0100 Subject: [PATCH 0419/1749] lz4: 131 -> 1.7.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ‘make install’ now supports FreeBSD out of the box (untested). --- pkgs/tools/compression/lz4/default.nix | 8 ++- .../compression/lz4/install-on-freebsd.patch | 54 ------------------- 2 files changed, 3 insertions(+), 59 deletions(-) delete mode 100644 pkgs/tools/compression/lz4/install-on-freebsd.patch diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 4b2f0276d78c..cff220950e2d 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lz4-${version}"; - version = "131"; + version = "1.7.3"; src = fetchFromGitHub { - sha256 = "1bhvcq8fxxsqnpg5qa6k3nsyhq0nl0iarh08sqzclww27hlpyay2"; - rev = "r${version}"; + sha256 = "0b9yhgiqsdaqgq03vkgalrpbbw7p9a8n8j1nqipra5vw182jrvl0"; + rev = "v${version}"; repo = "lz4"; owner = "Cyan4973"; }; @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { doCheck = false; # tests take a very long time checkTarget = "test"; - patches = [ ./install-on-freebsd.patch ] ; - postInstall = "rm $out/lib/*.a"; meta = with stdenv.lib; { diff --git a/pkgs/tools/compression/lz4/install-on-freebsd.patch b/pkgs/tools/compression/lz4/install-on-freebsd.patch deleted file mode 100644 index 12a2bf72f4ed..000000000000 --- a/pkgs/tools/compression/lz4/install-on-freebsd.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/Makefile b/Makefile -index d1b0d0c..f8d6a2d 100644 ---- a/Makefile -+++ b/Makefile -@@ -80,8 +80,6 @@ clean: - - - #------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) - - install: - @cd $(LZ4DIR); $(MAKE) -e install -@@ -129,4 +127,3 @@ examples: - prg-travis: - @cd $(PRGDIR); $(MAKE) -e test-travis - --endif -diff --git a/lib/Makefile b/lib/Makefile -index 02ddd3b..26ed18f 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -80,8 +80,6 @@ clean: - - - #------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) - - liblz4.pc: liblz4.pc.in Makefile - @echo creating pkgconfig -@@ -114,4 +112,3 @@ uninstall: - @[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h - @echo lz4 libraries successfully uninstalled - --endif -diff --git a/programs/Makefile b/programs/Makefile -index f422902..6943363 100644 ---- a/programs/Makefile -+++ b/programs/Makefile -@@ -113,8 +113,6 @@ clean: - - - #------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) - - install: lz4 lz4c - @echo Installing binaries -@@ -307,4 +305,3 @@ test-mem: lz4 datagen fuzzer frametest fullbench - test-mem32: lz4c32 datagen - # unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system... - --endif From 499e4e6393020443f7b3c485a67f0ba8e0205ea3 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 16 Nov 2016 13:45:59 +0100 Subject: [PATCH 0420/1749] ghc.withPackages: amend the derviation name Provide a clear difference between the compiler itself and link farms containing additional packages. --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 66e151aefe3c..7929d99de153 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -47,7 +47,10 @@ let in if paths == [] && !withLLVM then ghc else buildEnv { - inherit (ghc) name; + # this makes computing paths from the name attribute impossible; + # if such a feature is needed, the real compiler name should be saved + # as a dedicated drv attribute, like `compiler-name` + name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; inherit ignoreCollisions; postBuild = '' From 6cfb3b636418526d1c49d14316a127133cf09c9d Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 17 Nov 2016 17:06:17 +0100 Subject: [PATCH 0421/1749] nixos/tests: Use a patched QEMU for testing The reason to patch QEMU is that with latest Nix, tests like "printing" or "misc" fail because they expect the store paths to be owned by uid 0 and gid 0. Starting with NixOS/nix@5e51ffb1c265e16486fcdd888ce4a04db9e5552b, Nix builds inside of a new user namespace. Unfortunately this also means that bind-mounted store paths that are part of the derivation's inputs are no longer owned by uid 0 and gid 0 but by uid 65534 and gid 65534. This in turn causes things like sudo or cups to fail with errors about insecure file permissions. So in order to avoid that, let's make sure the VM always gets files owned by uid 0 and gid 0 and does a no-op when doing a chmod on a store path. In addition, this adds a virtualisation.qemu.program option so that we can make sure that we only use the patched version if we're *really* running NixOS VM tests (that is, whenever we have imported test-instrumentation.nix). Tested against the "misc" and "printing" tests. Signed-off-by: aszlig --- .../modules/testing/test-instrumentation.nix | 3 ++ nixos/modules/virtualisation/qemu-vm.nix | 10 +++- .../virtualization/qemu/default.nix | 3 +- .../qemu/force-uid0-on-9p.patch | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 5 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index e216351b4347..373bf7665240 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -110,6 +110,9 @@ let kernel = config.boot.kernelPackages.kernel; in networking.usePredictableInterfaceNames = false; + # Make sure we use a patched QEMU that ignores file ownership. + virtualisation.qemu.program = "${pkgs.qemu_test}/bin/qemu-kvm"; + # Make it easy to log in as root when running the test interactively. users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 777ee31e4dcc..263bbf785833 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -70,7 +70,7 @@ let '')} # Start QEMU. - exec ${pkgs.qemu_kvm}/bin/qemu-kvm \ + exec ${cfg.qemu.program} \ -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ @@ -299,6 +299,14 @@ in }; virtualisation.qemu = { + program = mkOption { + type = types.path; + default = "${pkgs.qemu_kvm}/bin/qemu-kvm"; + defaultText = "\${pkgs.qemu_kvm}/bin/qemu-kvm"; + example = literalExample "\${pkgs.qemu_test}/bin/qemu-kvm"; + description = "The QEMU variant used to start the VM."; + }; + options = mkOption { type = types.listOf types.unspecified; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f81781987ccc..513eedc3438e 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -11,6 +11,7 @@ , vncSupport ? true, libjpeg, libpng , spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir , x86Only ? false +, nixosTestRunner ? false }: with stdenv.lib; @@ -118,7 +119,7 @@ stdenv.mkDerivation rec { # from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06 ./CVE-2016-9102.patch - ]; + ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch; hardeningDisable = [ "stackprotector" ]; configureFlags = diff --git a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch new file mode 100644 index 000000000000..90269961fdf3 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch @@ -0,0 +1,48 @@ +diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c +index 845675e..43fa036 100644 +--- a/hw/9pfs/9p-local.c ++++ b/hw/9pfs/9p-local.c +@@ -128,6 +128,8 @@ static int local_lstat(FsContext *fs_ctx, V9fsPath *fs_path, struct stat *stbuf) + if (err) { + goto err_out; + } ++ stbuf->st_uid = 0; ++ stbuf->st_gid = 0; + if (fs_ctx->export_flags & V9FS_SM_MAPPED) { + /* Actual credentials are part of extended attrs */ + uid_t tmp_uid; +@@ -462,6 +464,16 @@ static ssize_t local_pwritev(FsContext *ctx, V9fsFidOpenState *fs, + return ret; + } + ++static int maybe_chmod(const char *path, mode_t mode) ++{ ++ static char *store_path = NULL; ++ if (store_path == NULL) ++ store_path = getenv("NIX_STORE"); ++ if (strncmp(path, store_path, strlen(store_path)) != 0) ++ return chmod(path, mode); ++ return 0; ++} ++ + static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp) + { + char *buffer; +@@ -477,7 +489,7 @@ static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp) + } else if ((fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) || + (fs_ctx->export_flags & V9FS_SM_NONE)) { + buffer = rpath(fs_ctx, path); +- ret = chmod(buffer, credp->fc_mode); ++ ret = maybe_chmod(buffer, credp->fc_mode); + g_free(buffer); + } + return ret; +@@ -621,6 +633,8 @@ static int local_fstat(FsContext *fs_ctx, int fid_type, + if (err) { + return err; + } ++ stbuf->st_uid = 0; ++ stbuf->st_gid = 0; + if (fs_ctx->export_flags & V9FS_SM_MAPPED) { + /* Actual credentials are part of extended attrs */ + uid_t tmp_uid; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33dd7572e4c8..6b98d78e4555 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11358,6 +11358,7 @@ in watch = callPackage ../os-specific/linux/procps/watch.nix { }; qemu_kvm = lowPrio (qemu.override { x86Only = true; }); + qemu_test = lowPrio (qemu.override { x86Only = true; nixosTestRunner = true; }); firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; From 6f1308ba95bc627aa77893995570764c352ea22a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Nov 2016 17:47:18 +0100 Subject: [PATCH 0422/1749] Revert "btrfs-progs: 4.8.2 -> 4.8.3" This reverts commit e82c325bff0295ed4bbbd308fd4f99cdfd9ab515. This package update breaks the `update-grub.pl` script: updating GRUB 2 menu... Btrfs did not return a path for the subvolume at / error: unable to activate new configuration This backwards-incompatible change is the culprit: $ /nix/store/np25r3yzv2r41ji7v73j110inpj8lhn2-btrfs-progs-4.8.2/bin/btrfs subvol show / / is toplevel subvolume vs. $ /nix/store/h53vs13nqvjwahpl26a4s7ygqk9xw1mw-btrfs-progs-4.8.3/bin/btrfs subvol show / / Name: UUID: - Parent UUID: - Received UUID: - Creation time: - Subvolume ID: 5 Generation: 6004631 Gen at creation: 0 Parent ID: 0 Top level ID: 0 Flags: - Snapshot(s): --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 0e7e6fbcdec2..525aa2fec28a 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.8.3"; in +let version = "4.8.2"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1wlflrygnpndppil9g12pk184f75g9qx1lkr0x1gijigglqhr9n1"; + sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41"; }; buildInputs = [ From 5b59e91f7351559b62b354744f3028264ebb1cb9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 17 Nov 2016 18:07:12 +0100 Subject: [PATCH 0423/1749] ocamlPackages.menhir: 20160526 -> 20161115 --- pkgs/development/ocaml-modules/menhir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 839a49615cd8..9592e9a68d81 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20160526" else "20140422" +, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20161115" else "20140422" }@args: let sha256 = if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d" - else if version == "20160526" then "1i6yqxhs29n6qcvi6c5qbg5mh8752ywsyv1dr6x1qcv0ncqpxhns" + else if version == "20161115" then "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k" else throw ("menhir: unknown version " ++ version); in From da239706605c6672738eaeca8b8e77f1be979596 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 16 Nov 2016 21:47:27 +0100 Subject: [PATCH 0424/1749] vim-plugins/deoplete-go: init at 2016-11-12 --- pkgs/misc/vim-plugins/default.nix | 18 ++++++++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + .../vim2nix/additional-nix-code/deoplete-go | 7 +++++++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index f9ea101d3eb0..95179ddc1e6b 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2,6 +2,7 @@ { fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip , which, fetchgit, llvmPackages , xkb_switch, rustracerd, fzf +, python3 , Cocoa ? null }: @@ -1493,6 +1494,23 @@ rec { }; + deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "deoplete-go-2016-11-12"; + src = fetchgit { + url = "git://github.com/zchee/deoplete-go"; + rev = "807b5536e7cebd06d0ce7b7d54c021a82774aee2"; + sha256 = "1ragxnlzpf17f1wdy512hkz6bd673gzl16f14v78873rcyxpiw53"; + }; + dependencies = []; + buildInputs = [ python3 ]; + buildPhase = '' + pushd ./rplugin/python3/deoplete/ujson + python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build + popd + find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \; + ''; + }; + deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "deoplete-jedi-2016-10-22"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 263970be386a..2e417d1f4e4a 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -117,6 +117,7 @@ "github:wincent/command-t" "github:xolox/vim-easytags" "github:zchee/deoplete-jedi" +"github:zchee/deoplete-go" "goyo" "matchit.zip" "pathogen" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go new file mode 100644 index 000000000000..80cfd9af6538 --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go @@ -0,0 +1,7 @@ + buildInputs = [ python3 ]; + buildPhase = '' + pushd ./rplugin/python3/deoplete/ujson + python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build + popd + find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \; + ''; From 61311665cb0f11c4688fc0013d732d85bbd66fca Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 6 Nov 2016 01:51:13 +0100 Subject: [PATCH 0425/1749] lib: add ini configuration generator Many configurations are INI-style files. Attribute sets can be mapped rather painlessly to the INI format. This adds a function toINI inside a new generators library section. Also, unit tests for the default values are provided. --- lib/default.nix | 3 ++- lib/generators.nix | 53 ++++++++++++++++++++++++++++++++++++++++++++++ lib/tests.nix | 51 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 lib/generators.nix diff --git a/lib/default.nix b/lib/default.nix index cb9a9b0bd4d0..c0d7899b882a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -27,6 +27,7 @@ let # misc debug = import ./debug.nix; + generators = import ./generators.nix; misc = import ./deprecated.nix; # domain-specific @@ -39,7 +40,7 @@ in customisation maintainers meta sources modules options types licenses platforms systems - debug misc + debug generators misc sandbox fetchers; } # !!! don't include everything at top-level; perhaps only the most diff --git a/lib/generators.nix b/lib/generators.nix new file mode 100644 index 000000000000..90dd33714544 --- /dev/null +++ b/lib/generators.nix @@ -0,0 +1,53 @@ +/* Functions that generate widespread config file + * formats from nix data structures. + * Tests can be found in ./tests.nix + */ +with import ./trivial.nix; +let + libStr = import ./strings.nix; + libAttr = import ./attrsets.nix; + + flipMapAttrs = flip libAttr.mapAttrs; +in + +{ + + /* Generates an INI-style config file from an + * attrset of sections to an attrset of key-value pairs. + * + * generators.toINI {} { + * foo = { hi = "${pkgs.hello}"; ciao = "bar"; }; + * baz = { "also, integers" = 42; }; + * } + * + *> [baz] + *> also, integers=42 + *> + *> [foo] + *> ciao=bar + *> hi=/nix/store/y93qql1p5ggfnaqjjqhxcw0vqw95rlz0-hello-2.10 + * + * The mk* configuration attributes can generically change + * the way sections and key-value strings are generated. + * + * For more examples see the test cases in ./tests.nix. + */ + toINI = { + # apply transformations (e.g. escapes) to section names + mkSectionName ? (name: libStr.escape [ "[" "]" ] name), + # format a setting line from key and value + mkKeyValue ? (k: v: "${libStr.escape ["="] k}=${toString v}") + }: attrsOfAttrs: + let + # map function to string for each key val + mapAttrsToStringsSep = sep: mapFn: attrs: + libStr.concatStringsSep sep + (libAttr.mapAttrsToList mapFn attrs); + mkLine = k: v: mkKeyValue k v + "\n"; + mkSection = sectName: sectValues: '' + [${mkSectionName sectName}] + '' + libStr.concatStrings (libAttr.mapAttrsToList mkLine sectValues); + in + # map input to ini sections + mapAttrsToStringsSep "\n" mkSection attrsOfAttrs; +} diff --git a/lib/tests.nix b/lib/tests.nix index c3b8839fda95..b5513dcb5ff4 100644 --- a/lib/tests.nix +++ b/lib/tests.nix @@ -130,4 +130,55 @@ runTests { expected = false; }; + + /* Generator tests */ + # these tests assume attributes are converted to lists + # in alphabetical order + + testToINIEmpty = { + expr = generators.toINI {} {}; + expected = ""; + }; + + testToINIEmptySection = { + expr = generators.toINI {} { foo = {}; bar = {}; }; + expected = '' + [bar] + + [foo] + ''; + }; + + testToINIDefaultEscapes = { + expr = generators.toINI {} { + "no [ and ] allowed unescaped" = { + "and also no = in keys" = 42; + }; + }; + expected = '' + [no \[ and \] allowed unescaped] + and also no \= in keys=42 + ''; + }; + + testToINIDefaultFull = { + expr = generators.toINI {} { + "section 1" = { + attribute1 = 5; + x = "Me-se JarJar Binx"; + }; + "foo[]" = { + "he\\h=he" = "this is okay"; + }; + }; + expected = '' + [foo\[\]] + he\h\=he=this is okay + + [section 1] + attribute1=5 + x=Me-se JarJar Binx + ''; + }; + } From 5e95e8e2815229ec6f12e38ab0540befabbc22ef Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 17 Nov 2016 16:52:33 -0200 Subject: [PATCH 0426/1749] supertux: 0.5.0 -> 0.5.1 --- pkgs/games/supertux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index 043861b6166b..bb297c1af4ee 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "supertux-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"; - sha256 = "0fx7c7m6mfanqy7kln7yf6abb5l3r68picf32js2yls11jj0vbng"; + sha256 = "1i8avad7w7ikj870z519j383ldy29r6f956bs38cbr8wk513pp69"; }; nativeBuildInputs = [ pkgconfig cmake ]; From f4fd8ace13dd38060649ea5319626484ef8d2d90 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 17 Nov 2016 17:05:47 -0200 Subject: [PATCH 0427/1749] menu-cache: 1.0.1 -> 1.0.2 --- pkgs/development/libraries/menu-cache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index b6d187e7a0ed..9b2fd805c319 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glib, pkgconfig, libfm-extra }: -let name = "menu-cache-1.0.1"; +let name = "menu-cache-1.0.2"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/lxde/${name}.tar.xz"; - sha256 = "0ngxvwfj9drabqi3lyzgpi0d0za6431sy2ijb010filrj54jdiqa"; + sha256 = "1m8j40npykfcfqs43kc0fmksal2jfmfi8lnb3mq3xy1lvvrfv0vg"; }; nativeBuildInputs = [ pkgconfig ]; From e53b9025591a419c22ffc18d6362490486ccf9de Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Nov 2016 21:14:55 +0100 Subject: [PATCH 0428/1749] php56: 5.6.27 -> 5.6.28 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 96c85704f5ef..543951adf527 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -302,8 +302,8 @@ let in { php56 = generic { - version = "5.6.27"; - sha256 = "0g1adx231c738694gc4bh8x65c7fwsqdbm42n9xwrsdncyhd6xrv"; + version = "5.6.28"; + sha256 = "13sl8z5inwyzmi1d5z4g42nq3n8gjdl4876h65bbd86mmbsa6pn5"; }; php70 = generic { From 7c65e225dda6335c49783b0cb56508c3422e2377 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Nov 2016 21:15:38 +0100 Subject: [PATCH 0429/1749] php70: 7.0.12 -> 7.0.13 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 543951adf527..3b1b288fd5d5 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -307,7 +307,7 @@ in { }; php70 = generic { - version = "7.0.12"; - sha256 = "09va788b9zk5igzmsfxr593ly174qf9kmihd4fq3kclgzsa75i1q"; + version = "7.0.13"; + sha256 = "1hc8zry3mrggfh1yxvm255xal5h6bxf0p3wdq307w48j719bp46h"; }; } From cdd84545109bc6043c71b714071967c91aca205e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 17 Nov 2016 21:35:05 +0100 Subject: [PATCH 0430/1749] moc: 2.5.0 -> 2.5.1 --- pkgs/applications/audio/moc/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 4cb7668a43f5..50996b71c643 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -5,16 +5,18 @@ stdenv.mkDerivation rec { name = "moc-${version}"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = "http://ftp.daper.net/pub/soft/moc/stable/moc-${version}.tar.bz2"; - sha256 = "14b0g9jn12jzxsf292g64dc6frlxv99kaagsasmc8xmg80iab7nj"; + sha256 = "1wn4za08z64bhsgfhr9c0crfyvy8c3b6a337wx7gz19am5srqh8v"; }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ - ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis - libmpc libsndfile libjack2 db libmodplug timidity libid3tag libtool + ncurses alsaLib flac libmad speex ffmpeg libvorbis libmpc libsndfile libjack2 + db libmodplug timidity libid3tag libtool ]; meta = with stdenv.lib; { From cbfc766ad4203bf0b858084377ad91fc6c5219b1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 17 Nov 2016 21:37:56 +0100 Subject: [PATCH 0431/1749] ocaml-cstruct: remove camlp4 support This change solves dependency issues related to camlp4, async_p4 and sexplib_p4 --- pkgs/development/ocaml-modules/cstruct/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index dd6cffb979c5..8c1aac4d83b2 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,5 +1,5 @@ -{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib_p4, findlib, ppx_tools -, async_p4 ? null, lwt ? null, camlp4 +{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib, findlib, ppx_tools +, async ? null, lwt ? null }: assert stdenv.lib.versionAtLeast ocaml.version "4.01"; @@ -22,10 +22,10 @@ stdenv.mkDerivation { inherit (param) sha256; }; - configureFlags = [ "${opt lwt}-lwt" "${opt async_p4}-async" "${opt ppx_tools}-ppx" ]; + configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ]; - buildInputs = [ ocaml findlib ppx_tools camlp4 lwt async_p4 ]; - propagatedBuildInputs = [ ocplib-endian sexplib_p4 ]; + buildInputs = [ ocaml findlib ppx_tools lwt async ]; + propagatedBuildInputs = [ ocplib-endian sexplib ]; createFindlibDestdir = true; dontStrip = true; From 86c45fc2d3a2cf2d99fa96e6d6e759535c9de0c4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 01:09:54 +0100 Subject: [PATCH 0432/1749] ocaml-nocrypto: 0.5.1 -> 0.5.3 --- .../ocaml-modules/nocrypto/default.nix | 33 ++++++++++++------- pkgs/top-level/ocaml-packages.nix | 4 ++- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index fab048a9a9f8..d7f7ae0e3655 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,20 +1,30 @@ -{ stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ocaml_lwt, ounit }: +{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib +, cstruct, zarith, ounit, ocaml_oasis, ppx_sexp_conv, sexplib +, lwt ? null}: -assert stdenv.lib.versionAtLeast ocaml.version "4.01"; +with stdenv.lib; +let withLwt = lwt != null; in -stdenv.mkDerivation rec { - name = "ocaml-nocrypto-${version}"; - version = "0.5.1"; +buildOcaml rec { + name = "nocrypto"; + version = "0.5.3"; - src = fetchzip { - url = "https://github.com/mirleft/ocaml-nocrypto/archive/${version}.tar.gz"; - sha256 = "15gffvixk12ghsfra9amfszd473c8h188zfj03ngvblbdm0d80m0"; + minimumSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "mirleft"; + repo = "ocaml-nocrypto"; + rev = "v${version}"; + sha256 = "0m3yvqpgfffqp15mcl08b78cv8zw25rnp6z1pkj5aimz6xg3gqbl"; }; - buildInputs = [ ocaml findlib type_conv ocaml_lwt ounit ]; - propagatedBuildInputs = [ cstruct zarith ]; + buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ]; + propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt lwt; + + configureFlags = [ "--enable-tests" ] ++ optional withLwt ["--enable-lwt"]; + + configurePhase = "./configure --prefix $out $configureFlags"; - configureFlags = "--enable-tests"; doCheck = true; checkTarget = "test"; createFindlibDestdir = true; @@ -22,7 +32,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/mirleft/ocaml-nocrypto; description = "Simplest possible crypto to support TLS"; - platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5e694f188e9c..c7422bdaba4a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -259,7 +259,9 @@ let mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; - nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; + nocrypto = callPackage ../development/ocaml-modules/nocrypto { + lwt = ocaml_lwt; + }; ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; From e68d8e05aafe20f729ad5029f6e1e40280ae53f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 17 Nov 2016 21:51:34 +0100 Subject: [PATCH 0433/1749] Revert "lz4: 131 -> 1.7.3" This reverts commit 1f0a12ee8d59e6de3309f36b669997757e8dd54d. Systemd build was broken and such change should probably go through staging anyway. --- pkgs/tools/compression/lz4/default.nix | 8 +-- .../compression/lz4/install-on-freebsd.patch | 54 +++++++++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/compression/lz4/install-on-freebsd.patch diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index cff220950e2d..4b2f0276d78c 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lz4-${version}"; - version = "1.7.3"; + version = "131"; src = fetchFromGitHub { - sha256 = "0b9yhgiqsdaqgq03vkgalrpbbw7p9a8n8j1nqipra5vw182jrvl0"; - rev = "v${version}"; + sha256 = "1bhvcq8fxxsqnpg5qa6k3nsyhq0nl0iarh08sqzclww27hlpyay2"; + rev = "r${version}"; repo = "lz4"; owner = "Cyan4973"; }; @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { doCheck = false; # tests take a very long time checkTarget = "test"; + patches = [ ./install-on-freebsd.patch ] ; + postInstall = "rm $out/lib/*.a"; meta = with stdenv.lib; { diff --git a/pkgs/tools/compression/lz4/install-on-freebsd.patch b/pkgs/tools/compression/lz4/install-on-freebsd.patch new file mode 100644 index 000000000000..12a2bf72f4ed --- /dev/null +++ b/pkgs/tools/compression/lz4/install-on-freebsd.patch @@ -0,0 +1,54 @@ +diff --git a/Makefile b/Makefile +index d1b0d0c..f8d6a2d 100644 +--- a/Makefile ++++ b/Makefile +@@ -80,8 +80,6 @@ clean: + + + #------------------------------------------------------------------------ +-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) + + install: + @cd $(LZ4DIR); $(MAKE) -e install +@@ -129,4 +127,3 @@ examples: + prg-travis: + @cd $(PRGDIR); $(MAKE) -e test-travis + +-endif +diff --git a/lib/Makefile b/lib/Makefile +index 02ddd3b..26ed18f 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -80,8 +80,6 @@ clean: + + + #------------------------------------------------------------------------ +-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) + + liblz4.pc: liblz4.pc.in Makefile + @echo creating pkgconfig +@@ -114,4 +112,3 @@ uninstall: + @[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h + @echo lz4 libraries successfully uninstalled + +-endif +diff --git a/programs/Makefile b/programs/Makefile +index f422902..6943363 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -113,8 +113,6 @@ clean: + + + #------------------------------------------------------------------------ +-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) + + install: lz4 lz4c + @echo Installing binaries +@@ -307,4 +305,3 @@ test-mem: lz4 datagen fuzzer frametest fullbench + test-mem32: lz4c32 datagen + # unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system... + +-endif From f4a318b528cacdd5c960bf66662131ecbdb2536f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Nov 2016 21:38:56 +0100 Subject: [PATCH 0434/1749] qemu: add patches for CVE-2016-7994 & CVE-2016-8668 --- pkgs/applications/virtualization/qemu/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f81781987ccc..ad8f94b52af2 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -113,6 +113,16 @@ stdenv.mkDerivation rec { url = "http://git.qemu.org/?p=qemu.git;a=patch;h=fdfcc9aeea1492f4b819a24c94dfb678145b1bf9"; sha256 = "0npi3fag52icq7xr799h5zi11xscbakdhqmdab0kyl6q331cc32z"; }) + (fetchpatch { + name = "qemu-CVE-2016-7994.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=cb3a0522b694cc5bb6424497b3f828ccd28fd1dd"; + sha256 = "1zhmbqlj0hc69ia4s6h59pi1z3nmijkryxwmf4bzp9gahx8x4xm3"; + }) + (fetchpatch { + name = "qemu-CVE-2016-8668.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=8caed3d564672e8bc6d2e4c6a35228afd01f4723"; + sha256 = "19sq6fh7nh8wrk52skky4vwm80029lhm093g11f539krmzjgipik"; + }) # FIXME: Fix for CVE-2016-9101 not yet ready: https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03024.html From fe91dd36d0de34f0868e251762c173acf9c0c6ac Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 17 Nov 2016 15:07:05 -0600 Subject: [PATCH 0435/1749] wireshark: add darwin support --- .../networking/sniffers/wireshark/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 99df01afa6a4..af4c1da4b355 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -3,6 +3,7 @@ , zlib , withGtk ? false, gtk2 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null , withQt ? false, qt4 ? null +, ApplicationServices, SystemConfiguration, gmp }: assert withGtk -> !withQt && gtk2 != null; @@ -25,9 +26,11 @@ stdenv.mkDerivation { buildInputs = [ bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls - geoip libnl c-ares python libcap glib zlib + geoip c-ares python glib zlib ] ++ optional withQt qt4 - ++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf]); + ++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf]) + ++ optionals stdenv.isLinux [ libcap libnl ] + ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; @@ -68,7 +71,7 @@ stdenv.mkDerivation { experts. It runs on UNIX, OS X and Windows. ''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ bjornfor fpletz ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3a881fc9ad2..10da74e1d53b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12887,6 +12887,7 @@ in wireshark-cli = callPackage ../applications/networking/sniffers/wireshark { withQt = false; withGtk = false; + inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; wireshark-gtk = wireshark-cli.override { withGtk = true; }; wireshark-qt = wireshark-cli.override { withQt = true; }; From 69d35368526a294ffa2653723be95d6c5bba8391 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 17 Nov 2016 21:38:20 +0100 Subject: [PATCH 0436/1749] ncdu: 1.11 -> 1.12 --- pkgs/tools/misc/ncdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 6ea9d71bddc7..c309c8229747 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ncdu-${version}"; - version = "1.11"; + version = "1.12"; src = fetchurl { url = "http://dev.yorhel.nl/download/${name}.tar.gz"; - sha256 = "0yxv87hpal05p6nii6rlnai5a8958689l9vz020w4qvlwiragbnh"; + sha256 = "16j9fyw73y1lk05a35i4q9i66laklgsx41lz5rxfr8m28x3lw3l2"; }; buildInputs = [ ncurses ]; From 5ed5b2278b6502b4072734f01c9ff7f8015f3d78 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 17 Nov 2016 21:46:24 +0100 Subject: [PATCH 0437/1749] colm: 0.13.0.3 -> 0.13.0.4 --- pkgs/development/compilers/colm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index b7773a91d983..8cf8a04f4eb5 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "colm-${version}"; - version = "0.13.0.3"; + version = "0.13.0.4"; src = fetchurl { url = "http://www.colm.net/files/colm/${name}.tar.gz"; - sha256 = "0dadfsnkbxcrf5kihvncbprb6w64jz2myylfmj952gdmcsim4zj2"; + sha256 = "04xcb7w82x9i4ygxqla9n39y646n3jw626khdp5297z1dkxx1czx"; }; buildInputs = [ makeWrapper ]; From 564f9dc55d5bd0b49a3490e0febf5b4b8e7ea04e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 17 Nov 2016 21:50:25 +0100 Subject: [PATCH 0438/1749] ragel: 7.0.0.6 -> 7.0.0.9 --- pkgs/development/tools/parsing/ragel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 753c91aa6880..e54d4c540fe2 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "ragel-${version}"; - version = "7.0.0.6"; + version = "7.0.0.9"; src = fetchurl { url = "http://www.colm.net/files/ragel/${name}.tar.gz"; - sha256 = "1ns3kbcvhinn4rwm54ajg49d1la8filxskl3rgbwws0irzw507vs"; + sha256 = "1w2jhfg3fxl15gcmm7z3jbi6splgc83mmwcfbp08lfc8sg2wmrmr"; }; buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ]; From ec6e4689ea0014e381abc573d3f64766a54fa0b7 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 17 Nov 2016 22:23:55 +0100 Subject: [PATCH 0439/1749] xlockmore: 5.47 -> 5.49 --- pkgs/misc/screensavers/xlockmore/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index a278b059d481..eb0209e3502b 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,10 +3,11 @@ stdenv.mkDerivation rec { - name = "xlockmore-5.47"; + name = "xlockmore-5.49"; src = fetchurl { - url = "http://www.tux.org/~bagleyd/xlock/${name}.tar.xz"; - sha256 = "138d79b8zc2hambbr9fnxp3fhihlcljgqns04zf0kv2f53pavqwl"; + url = "http://sillycycle.com/xlock/${name}.tar.xz"; + sha256 = "0n2pxm1qxg39h3qkqhbck312cmq7gbpj7hpv210y40kx9fj6biq3"; + curlOpts = "--user-agent 'Mozilla/5.0'"; }; # Optionally, it can use GTK+. From 7516b7ca31f99fcb8e3d90385a56102d65d1d2bb Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 17 Nov 2016 22:50:33 +0100 Subject: [PATCH 0440/1749] pdfpc: 4.0.2 -> 4.0.3 --- pkgs/applications/misc/pdfpc/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 96ad943ad57c..812c7ec61145 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala_0_26, gtk3, libgee +{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee , poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg }: stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "0151i9msagcqcfaddgd1vkmman0qgqy6s3714sqas568r4r9ngdk"; + sha256 = "1fcwxvik3nnn0g37xvb30vxaxwrd881fw07fyfb9c6ami9bnva3p"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ gstreamer gst-plugins-base vala_0_26 gtk3 libgee poppler - libpthreadstubs makeWrapper librsvg ]; + buildInputs = [ gstreamer gst-plugins-base vala gtk3 libgee poppler + libpthreadstubs makeWrapper librsvg ]; postInstall = '' wrapProgram $out/bin/pdfpc \ From 711a42e03aa44439142bb820319c0d61a6faa7ae Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Thu, 17 Nov 2016 22:55:00 +0100 Subject: [PATCH 0441/1749] keybase: update 1.0.17 -> 1.0.18 --- pkgs/tools/security/keybase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index c4d0f20d6c2d..fbed233b090d 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.17"; + version = "1.0.18"; rev = "v${version}"; goPackagePath = "github.com/keybase/client"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; inherit rev; - sha256 = "14cj0npsvnc3whw7gashgd7lhj3lvjdkivsnvsjg7dp3hifvqxnx"; + sha256 = "16n9fwx8v3jradp1l2564872akq6npib794jadfl5d122cll0n7h"; }; buildFlags = [ "-tags production" ]; From 26eb10e771c2e7abdfe79d7f3db472af2e56a9fd Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 6 Nov 2016 14:14:24 +0100 Subject: [PATCH 0442/1749] lib: add generator functions for toJSON & toYAML They both reference the toJSON builtin, so we get semantic identifiers that express the intent of the generation. Both should be able to map each nix value (minus functions) to the destination config files. Includes two invocation unit tests. --- lib/generators.nix | 16 +++++++++++++++- lib/tests.nix | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/lib/generators.nix b/lib/generators.nix index 90dd33714544..a13968736957 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -10,7 +10,7 @@ let flipMapAttrs = flip libAttr.mapAttrs; in -{ +rec { /* Generates an INI-style config file from an * attrset of sections to an attrset of key-value pairs. @@ -50,4 +50,18 @@ in in # map input to ini sections mapAttrsToStringsSep "\n" mkSection attrsOfAttrs; + + + /* Generates JSON from an arbitrary (non-function) value. + * For more information see the documentation of the builtin. + */ + toJSON = {}: builtins.toJSON; + + + /* YAML has been a strict superset of JSON since 1.2, so we + * use toJSON. Before it only had a few differences referring + * to implicit typing rules, so it should work with older + * parsers as well. + */ + toYAML = {}@args: toJSON args; } diff --git a/lib/tests.nix b/lib/tests.nix index b5513dcb5ff4..d59814987ed6 100644 --- a/lib/tests.nix +++ b/lib/tests.nix @@ -181,4 +181,27 @@ runTests { ''; }; + /* right now only invocation check */ + testToJSONSimple = + let val = { + foobar = [ "baz" 1 2 3 ]; + }; + in { + expr = generators.toJSON {} val; + # trival implementation + expected = builtins.toJSON val; + }; + + /* right now only invocation check */ + testToYAMLSimple = + let val = { + list = [ { one = 1; } { two = 2; } ]; + all = 42; + }; + in { + expr = generators.toYAML {} val; + # trival implementation + expected = builtins.toJSON val; + }; + } From 53fc7b8272cf762c57dd3e113863aa99feb35e5d Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 17 Nov 2016 22:29:32 +0100 Subject: [PATCH 0443/1749] lib/generators: add manual documentation Restructures the functions reference a bit. --- doc/functions.xml | 801 ++++++++++++++++++++++++--------------------- lib/generators.nix | 7 +- 2 files changed, 428 insertions(+), 380 deletions(-) diff --git a/doc/functions.xml b/doc/functions.xml index 3850e58c0168..70326936a570 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -8,252 +8,295 @@ The nixpkgs repository has several utility functions to manipulate Nix expressions. -
- pkgs.overridePackages +
+ Overriding - This function inside the nixpkgs expression (pkgs) - can be used to override the set of packages itself. - - - Warning: this function is expensive and must not be used from within - the nixpkgs repository. - - - Example usage: - - let - pkgs = import <nixpkgs> {}; - newpkgs = pkgs.overridePackages (self: super: { - foo = super.foo.override { ... }; - }; -in ... + Sometimes one wants to override parts of + nixpkgs, e.g. derivation attributes, the results of + derivations or even the whole package set. - - The resulting newpkgs will have the new foo - expression, and all other expressions depending on foo will also - use the new foo expression. - +
+ pkgs.overridePackages - - The behavior of this function is similar to config.packageOverrides. - - - - The self parameter refers to the final package set with the - applied overrides. Using this parameter may lead to infinite recursion if not - used consciously. - - - - The super parameter refers to the old package set. - It's equivalent to pkgs in the above example. - - - - Note that in previous versions of nixpkgs, this method replaced any changes from config.packageOverrides, - along with that from previous calls if this function was called repeatedly. - Now those previous changes will be preserved so this function can be "chained" meaningfully. - To recover the old behavior, make sure config.packageOverrides is unset, - and call this only once off a "freshly" imported nixpkgs: - - let - pkgs = import <nixpkgs> { config: {}; }; - newpkgs = pkgs.overridePackages ...; -in ... - - -
- -
- <pkg>.override - - - The function override is usually available for all the - derivations in the nixpkgs expression (pkgs). - - - It is used to override the arguments passed to a function. - - - Example usages: - - pkgs.foo.override { arg1 = val1; arg2 = val2; ... } - pkgs.overridePackages (self: super: { - foo = super.foo.override { barSupport = true ; }; -}) - mypkg = pkgs.callPackage ./mypkg.nix { - mydep = pkgs.mydep.override { ... }; -}) - - - - In the first example, pkgs.foo is the result of a function call - with some default arguments, usually a derivation. - Using pkgs.foo.override will call the same function with - the given new arguments. - - -
- -
- <pkg>.overrideAttrs - - - The function overrideAttrs allows overriding the - attribute set passed to a stdenv.mkDerivation call, - producing a new derivation based on the original one. - This function is available on all derivations produced by the - stdenv.mkDerivation function, which is most packages - in the nixpkgs expression pkgs. - - - - Example usage: - - helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { - separateDebugInfo = true; -}); - - - - In the above example, the separateDebugInfo attribute is - overriden to be true, thus building debug info for - helloWithDebug, while all other attributes will be - retained from the original hello package. - - - - The argument oldAttrs is conventionally used to refer to - the attr set originally passed to stdenv.mkDerivation. - - - - Note that separateDebugInfo is processed only by the - stdenv.mkDerivation function, not the generated, raw - Nix derivation. Thus, using overrideDerivation will - not work in this case, as it overrides only the attributes of the final - derivation. It is for this reason that overrideAttrs - should be preferred in (almost) all cases to - overrideDerivation, i.e. to allow using - sdenv.mkDerivation to process input arguments, as well - as the fact that it is easier to use (you can use the same attribute - names you see in your Nix code, instead of the ones generated (e.g. - buildInputs vs nativeBuildInputs, - and involves less typing. + This function inside the nixpkgs expression (pkgs) + can be used to override the set of packages itself. - - -
- - -
- <pkg>.overrideDerivation - - - You should prefer overrideAttrs in almost all - cases, see its documentation for the reasons why. - overrideDerivation is not deprecated and will continue - to work, but is less nice to use and does not have as many abilities as - overrideAttrs. - - - - - Do not use this function in Nixpkgs as it evaluates a Derivation - before modifying it, which breaks package abstraction and removes - error-checking of function arguments. In addition, this - evaluation-per-function application incurs a performance penalty, - which can become a problem if many overrides are used. - It is only intended for ad-hoc customisation, such as in - ~/.nixpkgs/config.nix. - - - - - The function overrideDerivation creates a new derivation - based on an existing one by overriding the original's attributes with - the attribute set produced by the specified function. - This function is available on all - derivations defined using the makeOverridable function. - Most standard derivation-producing functions, such as - stdenv.mkDerivation, are defined using this - function, which means most packages in the nixpkgs expression, - pkgs, have this function. - - - - Example usage: - - mySed = pkgs.gnused.overrideDerivation (oldAttrs: { - name = "sed-4.2.2-pre"; - src = fetchurl { - url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2; - sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k"; - }; - patches = []; -}); - - - - In the above example, the name, src, - and patches of the derivation will be overridden, while - all other attributes will be retained from the original derivation. - - - - The argument oldAttrs is used to refer to the attribute set of - the original derivation. - - - - A package's attributes are evaluated *before* being modified by - the overrideDerivation function. - For example, the name attribute reference - in url = "mirror://gnu/hello/${name}.tar.gz"; - is filled-in *before* the overrideDerivation function - modifies the attribute set. This means that overriding the - name attribute, in this example, *will not* change the - value of the url attribute. Instead, we need to override - both the name *and* url attributes. + Warning: this function is expensive and must not be used from within + the nixpkgs repository. - + + Example usage: + + let + pkgs = import <nixpkgs> {}; + newpkgs = pkgs.overridePackages (self: super: { + foo = super.foo.override { ... }; + }; + in ... + + + + The resulting newpkgs will have the new foo + expression, and all other expressions depending on foo will also + use the new foo expression. + + + + The behavior of this function is similar to config.packageOverrides. + + + + The self parameter refers to the final package set with the + applied overrides. Using this parameter may lead to infinite recursion if not + used consciously. + + + + The super parameter refers to the old package set. + It's equivalent to pkgs in the above example. + + + + Note that in previous versions of nixpkgs, this method replaced any changes from config.packageOverrides, + along with that from previous calls if this function was called repeatedly. + Now those previous changes will be preserved so this function can be "chained" meaningfully. + To recover the old behavior, make sure config.packageOverrides is unset, + and call this only once off a "freshly" imported nixpkgs: + + let + pkgs = import <nixpkgs> { config: {}; }; + newpkgs = pkgs.overridePackages ...; + in ... + + +
+ +
+ <pkg>.override + + + The function override is usually available for all the + derivations in the nixpkgs expression (pkgs). + + + It is used to override the arguments passed to a function. + + + Example usages: + + pkgs.foo.override { arg1 = val1; arg2 = val2; ... } + pkgs.overridePackages (self: super: { + foo = super.foo.override { barSupport = true ; }; + }) + mypkg = pkgs.callPackage ./mypkg.nix { + mydep = pkgs.mydep.override { ... }; + }) + + + + In the first example, pkgs.foo is the result of a function call + with some default arguments, usually a derivation. + Using pkgs.foo.override will call the same function with + the given new arguments. + + +
+ +
+ <pkg>.overrideAttrs + + + The function overrideAttrs allows overriding the + attribute set passed to a stdenv.mkDerivation call, + producing a new derivation based on the original one. + This function is available on all derivations produced by the + stdenv.mkDerivation function, which is most packages + in the nixpkgs expression pkgs. + + + + Example usage: + + helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec { + separateDebugInfo = true; + }); + + + + In the above example, the separateDebugInfo attribute is + overriden to be true, thus building debug info for + helloWithDebug, while all other attributes will be + retained from the original hello package. + + + + The argument oldAttrs is conventionally used to refer to + the attr set originally passed to stdenv.mkDerivation. + + + + + Note that separateDebugInfo is processed only by the + stdenv.mkDerivation function, not the generated, raw + Nix derivation. Thus, using overrideDerivation will + not work in this case, as it overrides only the attributes of the final + derivation. It is for this reason that overrideAttrs + should be preferred in (almost) all cases to + overrideDerivation, i.e. to allow using + sdenv.mkDerivation to process input arguments, as well + as the fact that it is easier to use (you can use the same attribute + names you see in your Nix code, instead of the ones generated (e.g. + buildInputs vs nativeBuildInputs, + and involves less typing. + + + +
+ + +
+ <pkg>.overrideDerivation + + + You should prefer overrideAttrs in almost all + cases, see its documentation for the reasons why. + overrideDerivation is not deprecated and will continue + to work, but is less nice to use and does not have as many abilities as + overrideAttrs. + + + + + Do not use this function in Nixpkgs as it evaluates a Derivation + before modifying it, which breaks package abstraction and removes + error-checking of function arguments. In addition, this + evaluation-per-function application incurs a performance penalty, + which can become a problem if many overrides are used. + It is only intended for ad-hoc customisation, such as in + ~/.nixpkgs/config.nix. + + + + + The function overrideDerivation creates a new derivation + based on an existing one by overriding the original's attributes with + the attribute set produced by the specified function. + This function is available on all + derivations defined using the makeOverridable function. + Most standard derivation-producing functions, such as + stdenv.mkDerivation, are defined using this + function, which means most packages in the nixpkgs expression, + pkgs, have this function. + + + + Example usage: + + mySed = pkgs.gnused.overrideDerivation (oldAttrs: { + name = "sed-4.2.2-pre"; + src = fetchurl { + url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2; + sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k"; + }; + patches = []; + }); + + + + In the above example, the name, src, + and patches of the derivation will be overridden, while + all other attributes will be retained from the original derivation. + + + + The argument oldAttrs is used to refer to the attribute set of + the original derivation. + + + + + A package's attributes are evaluated *before* being modified by + the overrideDerivation function. + For example, the name attribute reference + in url = "mirror://gnu/hello/${name}.tar.gz"; + is filled-in *before* the overrideDerivation function + modifies the attribute set. This means that overriding the + name attribute, in this example, *will not* change the + value of the url attribute. Instead, we need to override + both the name *and* url attributes. + + + +
+ +
+ lib.makeOverridable + + + The function lib.makeOverridable is used to make the result + of a function easily customizable. This utility only makes sense for functions + that accept an argument set and return an attribute set. + + + + Example usage: + + f = { a, b }: { result = a+b; } + c = lib.makeOverridable f { a = 1; b = 2; } + + + + + The variable c is the value of the f function + applied with some default arguments. Hence the value of c.result + is 3, in this example. + + + + The variable c however also has some additional functions, like + c.override which can be used to + override the default arguments. In this example the value of + (c.override { a = 4; }).result is 6. + + +
-
- lib.makeOverridable +
+ Generators - The function lib.makeOverridable is used to make the result - of a function easily customizable. This utility only makes sense for functions - that accept an argument set and return an attribute set. + Generators are functions that create file formats from nix + data structures, e. g. for configuration files. + There are generators available for: INI, + JSON and YAML - Example usage: - - f = { a, b }: { result = a+b; } -c = lib.makeOverridable f { a = 1; b = 2; } - + All generators follow a similar call interface: generatorName + configFunctions data, where configFunctions is a + set of user-defined functions that format variable parts of the content. + They each have common defaults, so often they do not need to be set + manually. An example is mkSectionName ? (name: libStr.escape [ "[" "]" + ] name) from the INI generator. It gets the name + of a section and returns a sanitized name. The default + mkSectionName escapes [ and + ] with a backslash. - - The variable c is the value of the f function - applied with some default arguments. Hence the value of c.result - is 3, in this example. - + Nix store paths can be converted to strings by enclosing a + derivation attribute like so: "${drv}". - The variable c however also has some additional functions, like - c.override which can be used to - override the default arguments. In this example the value of - (c.override { a = 4; }).result is 6. + Detailed documentation for each generator can be found in + lib/generators.nix.
@@ -370,37 +413,37 @@ c = lib.makeOverridable f { a = 1; b = 2; }
- pkgs.dockerTools +pkgs.dockerTools - + pkgs.dockerTools is a set of functions for creating and manipulating Docker images according to the - Docker Image Specification v1.0.0 + Docker Image Specification v1.0.0 . Docker itself is not used to perform any of the operations done by these functions. - + - + - The dockerTools API is unstable and may be subject to - backwards-incompatible changes in the future. + The dockerTools API is unstable and may be subject to + backwards-incompatible changes in the future. - + -
+
buildImage - This function is analogous to the docker build command, - in that can used to build a Docker-compatible repository tarball containing - a single image with one or multiple layers. As such, the result - is suitable for being loaded in Docker with docker load. + This function is analogous to the docker build command, + in that can used to build a Docker-compatible repository tarball containing + a single image with one or multiple layers. As such, the result + is suitable for being loaded in Docker with docker load. - The parameters of buildImage with relative example values are - described below: + The parameters of buildImage with relative example values are + described below: Docker build @@ -408,11 +451,11 @@ c = lib.makeOverridable f { a = 1; b = 2; } buildImage { name = "redis"; tag = "latest"; - + fromImage = someBaseImage; fromImageName = null; fromImageTag = "latest"; - + contents = pkgs.redis; runAsRoot = '' #!${stdenv.shell} @@ -431,131 +474,131 @@ c = lib.makeOverridable f { a = 1; b = 2; } The above example will build a Docker image redis/latest - from the given base image. Loading and running this image in Docker results in - redis-server being started automatically. + from the given base image. Loading and running this image in Docker results in + redis-server being started automatically. - + - name specifies the name of the resulting image. - This is the only required argument for buildImage. + name specifies the name of the resulting image. + This is the only required argument for buildImage. - + - + - tag specifies the tag of the resulting image. - By default it's latest. + tag specifies the tag of the resulting image. + By default it's latest. - + - + - fromImage is the repository tarball containing the base image. - It must be a valid Docker image, such as exported by docker save. - By default it's null, which can be seen as equivalent - to FROM scratch of a Dockerfile. + fromImage is the repository tarball containing the base image. + It must be a valid Docker image, such as exported by docker save. + By default it's null, which can be seen as equivalent + to FROM scratch of a Dockerfile. - - - - - fromImageName can be used to further specify - the base image within the repository, in case it contains multiple images. - By default it's null, in which case - buildImage will peek the first image available - in the repository. - - + - + - fromImageTag can be used to further specify the tag - of the base image within the repository, in case an image contains multiple tags. - By default it's null, in which case - buildImage will peek the first tag available for the base image. + fromImageName can be used to further specify + the base image within the repository, in case it contains multiple images. + By default it's null, in which case + buildImage will peek the first image available + in the repository. - + - + - contents is a derivation that will be copied in the new - layer of the resulting image. This can be similarly seen as - ADD contents/ / in a Dockerfile. - By default it's null. + fromImageTag can be used to further specify the tag + of the base image within the repository, in case an image contains multiple tags. + By default it's null, in which case + buildImage will peek the first tag available for the base image. - + - + - runAsRoot is a bash script that will run as root - in an environment that overlays the existing layers of the base image with - the new resulting layer, including the previously copied - contents derivation. - This can be similarly seen as - RUN ... in a Dockerfile. - - + contents is a derivation that will be copied in the new + layer of the resulting image. This can be similarly seen as + ADD contents/ / in a Dockerfile. + By default it's null. + + + + + + runAsRoot is a bash script that will run as root + in an environment that overlays the existing layers of the base image with + the new resulting layer, including the previously copied + contents derivation. + This can be similarly seen as + RUN ... in a Dockerfile. + + - Using this parameter requires the kvm - device to be available. + Using this parameter requires the kvm + device to be available. - + - + - + - config is used to specify the configuration of the - containers that will be started off the built image in Docker. - The available options are listed in the - + config is used to specify the configuration of the + containers that will be started off the built image in Docker. + The available options are listed in the + Docker Image Specification v1.0.0 - . + . - + - After the new layer has been created, its closure - (to which contents, config and - runAsRoot contribute) will be copied in the layer itself. - Only new dependencies that are not already in the existing layers will be copied. + After the new layer has been created, its closure + (to which contents, config and + runAsRoot contribute) will be copied in the layer itself. + Only new dependencies that are not already in the existing layers will be copied. - At the end of the process, only one new single layer will be produced and - added to the resulting image. + At the end of the process, only one new single layer will be produced and + added to the resulting image. - The resulting repository will only list the single image - image/tag. In the case of - it would be redis/latest. + The resulting repository will only list the single image + image/tag. In the case of + it would be redis/latest. - It is possible to inspect the arguments with which an image was built - using its buildArgs attribute. + It is possible to inspect the arguments with which an image was built + using its buildArgs attribute. -
+
-
+
pullImage - This function is analogous to the docker pull command, - in that can be used to fetch a Docker image from a Docker registry. - Currently only registry v1 is supported. - By default Docker Hub - is used to pull images. + This function is analogous to the docker pull command, + in that can be used to fetch a Docker image from a Docker registry. + Currently only registry v1 is supported. + By default Docker Hub + is used to pull images. - Its parameters are described in the example below: + Its parameters are described in the example below: Docker pull @@ -573,73 +616,73 @@ c = lib.makeOverridable f { a = 1; b = 2; } - + - imageName specifies the name of the image to be downloaded, - which can also include the registry namespace (e.g. library/debian). - This argument is required. + imageName specifies the name of the image to be downloaded, + which can also include the registry namespace (e.g. library/debian). + This argument is required. - - - - - imageTag specifies the tag of the image to be downloaded. - By default it's latest. - - + - + - imageId, if specified this exact image will be fetched, instead - of imageName/imageTag. However, the resulting repository - will still be named imageName/imageTag. - By default it's null. + imageTag specifies the tag of the image to be downloaded. + By default it's latest. - + - + - sha256 is the checksum of the whole fetched image. - This argument is required. + imageId, if specified this exact image will be fetched, instead + of imageName/imageTag. However, the resulting repository + will still be named imageName/imageTag. + By default it's null. + + + + + + sha256 is the checksum of the whole fetched image. + This argument is required. - The checksum is computed on the unpacked directory, not on the final tarball. + The checksum is computed on the unpacked directory, not on the final tarball. - + - + - In the above example the default values are shown for the variables - indexUrl and registryVersion. - Hence by default the Docker.io registry is used to pull the images. + In the above example the default values are shown for the variables + indexUrl and registryVersion. + Hence by default the Docker.io registry is used to pull the images. - + - -
- -
+ +
+ +
exportImage - This function is analogous to the docker export command, - in that can used to flatten a Docker image that contains multiple layers. - It is in fact the result of the merge of all the layers of the image. - As such, the result is suitable for being imported in Docker - with docker import. + This function is analogous to the docker export command, + in that can used to flatten a Docker image that contains multiple layers. + It is in fact the result of the merge of all the layers of the image. + As such, the result is suitable for being imported in Docker + with docker import. - + Using this function requires the kvm device to be available. - + - The parameters of exportImage are the following: + The parameters of exportImage are the following: Docker export @@ -648,35 +691,35 @@ c = lib.makeOverridable f { a = 1; b = 2; } fromImage = someLayeredImage; fromImageName = null; fromImageTag = null; - + name = someLayeredImage.name; } - The parameters relative to the base image have the same synopsis as - described in , except that - fromImage is the only required argument in this case. + The parameters relative to the base image have the same synopsis as + described in , except that + fromImage is the only required argument in this case. - The name argument is the name of the derivation output, - which defaults to fromImage.name. + The name argument is the name of the derivation output, + which defaults to fromImage.name. -
+
-
+
shadowSetup - This constant string is a helper for setting up the base files for managing - users and groups, only if such files don't exist already. - It is suitable for being used in a - runAsRoot script for cases like - in the example below: + This constant string is a helper for setting up the base files for managing + users and groups, only if such files don't exist already. + It is suitable for being used in a + runAsRoot script for cases like + in the example below: - + Shadow base files buildImage { @@ -695,13 +738,13 @@ c = lib.makeOverridable f { a = 1; b = 2; } - Creating base files like /etc/passwd or - /etc/login.defs are necessary for shadow-utils to - manipulate users and groups. + Creating base files like /etc/passwd or + /etc/login.defs are necessary for shadow-utils to + manipulate users and groups. - -
- + +
+
diff --git a/lib/generators.nix b/lib/generators.nix index a13968736957..27d4142e8d9a 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -1,6 +1,11 @@ -/* Functions that generate widespread config file +/* Functions that generate widespread file * formats from nix data structures. + * + * They all follow a similar interface: + * generator { config-attrs } data + * * Tests can be found in ./tests.nix + * Documentation in the manual, #sec-generators */ with import ./trivial.nix; let From 561518e9ff430942578b6467393a5b5a4de21be2 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 17 Nov 2016 23:32:21 +0100 Subject: [PATCH 0444/1749] doctl: 1.3.1 -> 1.5.0 Signed-off-by: Vincent Demeester --- pkgs/development/tools/doctl/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 4a7d1bf87e31..37517f306e82 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,15 +2,26 @@ buildGoPackage rec { name = "doctl-${version}"; - version = "1.3.1"; - rev = "a57555c195d06bc7aa5037af77fde0665ad1231f"; + version = "${major}.${minor}.${patch}"; + major = "1"; + minor = "5"; + patch = "0"; goPackagePath = "github.com/digitalocean/doctl"; + excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)''; + buildFlagsArray = let t = "${goPackagePath}"; in '' + -ldflags= + -X ${t}.Major=${major} + -X ${t}.Minor=${minor} + -X ${t}.Patch=${patch} + -X ${t}.Label=release + ''; + src = fetchFromGitHub { owner = "digitalocean"; repo = "doctl"; - rev = "${rev}"; - sha256 = "03z652fw0a628gv666w8vpi05a4sdilvs1j5scjhcbi82zsbkvma"; + rev = "v${version}"; + sha256 = "0dk7l4b0ngqkwdlx8qgr99jzipyzazvkv7dybi75dnp725lwxkl2"; }; meta = { From c92aa1ba6de17bc095166f575475fed11fa15d09 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 17 Nov 2016 22:28:22 +0100 Subject: [PATCH 0445/1749] eclipse-plugin-checkstyle: 6.19.1 -> 7.2.0 --- pkgs/applications/editors/eclipse/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 61b4e6617edd..1ad97a0f7649 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -171,12 +171,12 @@ rec { checkstyle = buildEclipseUpdateSite rec { name = "checkstyle-${version}"; - version = "6.19.1.201607051943"; + version = "7.2.0.201611082205"; src = fetchzip { stripRoot = false; - url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.19.1/net.sf.eclipsecs-updatesite_${version}.zip"; - sha256 = "03aah57g0cgxym95p1wcj2h69xy3r9c0vv7js3gpmw1hx8w9sjsf"; + url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.2.0/net.sf.eclipsecs-updatesite_${version}.zip"; + sha256 = "1zngyrh5ckgli0xxm52vm6mzbbvrjslwqcymggfqjhzplpcgwqk1"; }; meta = with stdenv.lib; { From 6f4d4cd93be882727169233d41a70b925b8ef158 Mon Sep 17 00:00:00 2001 From: romildo Date: Tue, 1 Nov 2016 17:23:20 -0200 Subject: [PATCH 0446/1749] xdgmenumaker: 0.9 -> 1.1 --- pkgs/applications/misc/xdgmenumaker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index cf8bcb7a51b9..0d89510644ad 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xdgmenumaker-${version}"; - version = "0.9"; + version = "1.1"; src = fetchFromGitHub { - rev = version; owner = "gapan"; repo = "xdgmenumaker"; - sha256 = "1n29syadsgj0vpnkc8nji4k1c8gminr1xdriz5ck2bcygsgxkdrd"; + rev = version; + sha256 = "11mqafpgfnz0h0d6fxd1xsfsjxzg1abvwqgwy9jmm5xhcjx3c3l7"; }; nativeBuildInputs = [ From 1cddab9447f97a025fcec9c248963cb46c8f3be0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 17 Nov 2016 22:28:50 +0100 Subject: [PATCH 0447/1749] perl-Math-BigRat: 0.260804 -> 0.260805 --- 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 4ef49116bee5..d9625a49f738 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7803,10 +7803,10 @@ let self = _self // overrides; _self = with self; { }; MathBigRat = buildPerlPackage rec { - name = "Math-BigRat-0.260804"; + name = "Math-BigRat-0.260805"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "f9bf5c007c0f141df7c7887d3482d47033cf7deab094a01e2863f31bacd7ef8a"; + sha256 = "9e41be24272e262fadc1921c7f51ff218384c92e5628cb53bf62b3026710fd41"; }; propagatedBuildInputs = [ MathBigInt ]; meta = { From e9fa10d6096b38eaa9515cae9ec67f2511292bf7 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 17 Nov 2016 22:29:04 +0100 Subject: [PATCH 0448/1749] perl-Math-BigInt: 1.999727 -> 1.999800 --- 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 d9625a49f738..30a997cff0b7 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.999727"; + name = "Math-BigInt-1.999800"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "4539b8e55f828a9f370b46cd6ef6618c95cb15302384a8f84c2a1fec66d4e33e"; + sha256 = "216096d1f937252bfc449b1de01b760ffaab46e753e150cc2a685f4935bd030d"; }; meta = { description = "Arbitrary size integer/float math package"; From 00e6b9033a71372b248106674a5011aea8237892 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 17 Nov 2016 22:47:32 +0100 Subject: [PATCH 0449/1749] perl-Log-Any: 1.042 -> 1.045 --- 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 30a997cff0b7..a8c3035f7892 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7413,10 +7413,10 @@ let self = _self // overrides; _self = with self; { }; LogAny = buildPerlPackage rec { - name = "Log-Any-1.042"; + name = "Log-Any-1.045"; src = fetchurl { url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz"; - sha256 = "b2cadb25a147bd49afdab1092a4a37268f307fcb6524a679623647a22501de84"; + sha256 = "d95180c0c2d50d7d3a541e0c79d83ee6b4ad5787e1785b361fed450c2dec8400"; }; meta = { homepage = https://github.com/preaction/Log-Any; From 1d5c193ba311bccf9cc5d34003d1768bdccd0853 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 17 Nov 2016 22:47:45 +0100 Subject: [PATCH 0450/1749] perl-Log-Log4perl: 1.47 -> 1.48 --- 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 a8c3035f7892..92eba09281ce 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7494,10 +7494,10 @@ let self = _self // overrides; _self = with self; { }; LogLog4perl = buildPerlPackage rec { - name = "Log-Log4perl-1.47"; + name = "Log-Log4perl-1.48"; src = fetchurl { url = "mirror://cpan/authors/id/M/MS/MSCHILLI/${name}.tar.gz"; - sha256 = "9001dded011226538b9a50c7856815bb0dba72a1e6218fdcaba56f651356b96f"; + sha256 = "cf6e9fc1f9183fabbe540d84f603c6541458034092b7c53e41008093db62dc98"; }; meta = { homepage = https://mschilli.github.io/log4perl/; From 4142e756caa1f6999afbe500669bdf0ece6dfd04 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 17 Nov 2016 22:48:05 +0100 Subject: [PATCH 0451/1749] svtplay-dl: 1.7 -> 1.8 --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 7eba2d2f939c..c5f017564af5 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -5,13 +5,13 @@ let inherit (pythonPackages) python nose pycrypto requests2 mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "15vadnyah51pk4d0lx11bymxhfq47l5ijn72pjqr9yjx3pkgpd7w"; + sha256 = "1cn79kbz9fhhbajxg1fqd8xlab9jz4x1n9w7n42w0j8c627q0rlv"; }; pythonPaths = [ pycrypto requests2 ]; From 6dfd4f5b08199f7c23f63318f6f7a928906a1859 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 18 Nov 2016 00:26:33 +0100 Subject: [PATCH 0452/1749] pepperflash: 23.0.0.205 -> 23.0.0.207 --- pkgs/applications/networking/browsers/chromium/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 9b779ab98928..bad888bff52e 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "23.0.0.205"; + version = "23.0.0.207"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0gj5d8475qcplm3iqs3hkq0i6qkmbhci1zp3ljnhafc6xz0avyhj"; + sha256 = "1spwv06rynaw45pdll6hzsq6zbz1q10bf7dx4zz25gh8x3sl9l6a"; stripRoot = false; }; From a0b7ce3ac6cf2fac4ba7ccde068058ec75583b73 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 8 Nov 2016 14:13:50 -0600 Subject: [PATCH 0453/1749] bloaty: init at 2016.11.07 --- lib/maintainers.nix | 1 + pkgs/development/tools/bloaty/default.nix | 31 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/bloaty/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 2ad631cb19aa..96d5f7c3dae9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -129,6 +129,7 @@ doublec = "Chris Double "; drets = "Dmytro Rets "; drewkett = "Andrew Burkett "; + dtzWill = "Will Dietz "; ebzzry = "Rommel Martinez "; ederoyd46 = "Matthew Brown "; eduarrrd = "Eduard Bachmakov "; diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix new file mode 100644 index 000000000000..c8e667722c50 --- /dev/null +++ b/pkgs/development/tools/bloaty/default.nix @@ -0,0 +1,31 @@ +{ stdenv, binutils, fetchgit }: + +stdenv.mkDerivation rec { + version = "2016.11.16"; + name = "bloaty-${version}"; + + src = fetchgit { + url = "https://github.com/google/bloaty.git"; + rev = "d040e4821ace478f9b43360acd6801aefdd323f7"; + sha256 = "1qk2wgd7vzr5zy0332y9h69cwkqmy8x7qz97xpgwwnk54amm8i3k"; + fetchSubmodules = true; + }; + + enableParallelBuilding = true; + + configurePhase = '' + sed -i 's,c++filt,${binutils}/bin/c++filt,' src/bloaty.cc + ''; + + installPhase = '' + install -Dm755 {.,$out/bin}/bloaty + ''; + + meta = with stdenv.lib; { + description = "a size profiler for binaries"; + homepage = https://github.com/google/bloaty; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c48c05895f7..135f6f850a2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5864,6 +5864,8 @@ in bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; bison = bison3; + bloaty = callPackage ../development/tools/bloaty { }; + bossa = callPackage ../development/tools/misc/bossa { wxGTK = wxGTK30; }; From 8458d6b72094a9990e9d7a272465bc9f7f65cec0 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 17 Nov 2016 18:13:58 -0600 Subject: [PATCH 0454/1749] plex: 1.0.0 -> 1.2.7; fix some more binaries (#20137) This bumps the version of Plex to the new 1.2.x branch, available to the public. During the 1.1.x branch, there were several more critical binaries that were added to the distribution; we also have to patch these new executables as well with the version bump, to ensure things keep working. Part of this patch was authored by Michael Francis - I simply bumped the version. Closes #20137. Authored-by: Austin Seipp Authored-by: Michael Francis Signed-off-by: Austin Seipp --- pkgs/servers/plex/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 28d6295938a2..467f3ffb1d48 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.0.0.2261"; - vsnHash = "a17e99e"; - sha256 = "14li33ni6aaa1qwvc02a066k52s1qwhpv55prvlmq3m5jm3iv0lr"; + version = "1.2.7.2987"; + vsnHash = "1bef33a"; + sha256 = "17d1yisbikcp25mgn71rf8w76zhy015f33hxjj93swfm1qrq55hq"; }; in stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { # Now we need to patch up the executables and libraries to work on Nix. # Side note: PLEASE don't put spaces in your binary names. This is stupid. - for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner"; do + for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner" "Plex Script Host" "Plex Transcoder" "Plex Relay"; do patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin" patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin" done From fe0d46d05b3e959d38621d3879b2d4b34947578f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 17 Nov 2016 19:43:52 -0500 Subject: [PATCH 0455/1749] atom: 1.12.2 -> 1.12.4 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 96b26e6bee1b..a90d05cadcb3 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.12.2"; + version = "1.12.4"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "03kznbxfxyjq9fqq1jvq3gvvy50dz3wqvn098n9k9gv8x3595mw4"; + sha256 = "1q6damahkh8y4mq9ipzav3np41l7h8mbd974pp299df3jsli8a05"; name = "${name}.deb"; }; From 84280ff96d56df24f61fc498e724df56f2c1bb78 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 18 Nov 2016 02:55:42 +0100 Subject: [PATCH 0456/1749] elm: 0.17.1 -> 0.18 --- .../compilers/elm/packages/elm-compiler.nix | 9 ++++++--- .../compilers/elm/packages/elm-format.nix | 16 +++------------ .../compilers/elm/packages/elm-make.nix | 6 +++--- .../compilers/elm/packages/elm-package.nix | 6 +++--- .../elm/packages/elm-reactor-elm.nix | 20 +++++++++---------- .../compilers/elm/packages/elm-reactor.nix | 6 +++--- .../compilers/elm/packages/elm-repl.nix | 6 +++--- .../compilers/elm/packages/release.nix | 2 +- pkgs/development/compilers/elm/update-elm.rb | 12 +++++------ 9 files changed, 38 insertions(+), 45 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix index f6a92b64f6d7..b0943f1ece35 100644 --- a/pkgs/development/compilers/elm/packages/elm-compiler.nix +++ b/pkgs/development/compilers/elm/packages/elm-compiler.nix @@ -7,11 +7,11 @@ }: mkDerivation { pname = "elm-compiler"; - version = "0.17.1"; + version = "0.18"; src = fetchgit { url = "https://github.com/elm-lang/elm-compiler"; - sha256 = "17y0jlii81mnjywknblcv1nfja51slmwrhz9x8w144b0sblcj0if"; - rev = "e44deafaf9cbf3749484070f267f03a368711adb"; + sha256 = "09fmrbfpc1kzc3p9h79w57b9qjhajdswc4jfm9gyjw95vsiwasgh"; + rev = "eb97f2a5dd5421c708a91b71442e69d02453cc80"; }; isLibrary = true; isExecutable = true; @@ -35,4 +35,7 @@ mkDerivation { homepage = "http://elm-lang.org"; description = "Values to help with elm-package, elm-make, and elm-lang.org."; license = stdenv.lib.licenses.bsd3; + # added manually since tests are not passing + # https://travis-ci.org/elm-lang/elm-compiler/builds/176845852 + doCheck = false; } diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index 4d30c697abd4..48eafff6f724 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -7,11 +7,11 @@ }: mkDerivation { pname = "elm-format"; - version = "0.4.0"; + version = "0.5.2"; src = fetchgit { url = "http://github.com/avh4/elm-format"; - sha256 = "199xh2w5cwcf79a8fv6j8dpk9h8a4cygrf8cfr9p7bvp2wvczibm"; - rev = "d9cbe65c5f01d21b5a02c2f963aa4c9d3f0539d0"; + sha256 = "0lman7h6wr75y90javcc4y1scvwgv125gqqaqvfrd5xrfmm43gg8"; + rev = "e452ed9342620e7bb0bc822983b96411d57143ef"; }; isLibrary = false; isExecutable = true; @@ -32,14 +32,4 @@ mkDerivation { homepage = "http://elm-lang.org"; description = "A source code formatter for Elm"; license = stdenv.lib.licenses.bsd3; - - # XXX: I've manually disabled tests, only the following test is failing - # ... - # ElmFormat.Cli - # format a single file in place: OK - # usage instructions: FAIL - # ... - # 1 out of 266 tests failed (0.50s) - # Test suite elm-format-tests: FAIL - doCheck = false; } diff --git a/pkgs/development/compilers/elm/packages/elm-make.nix b/pkgs/development/compilers/elm/packages/elm-make.nix index bed7698cfe42..dc1760e2958b 100644 --- a/pkgs/development/compilers/elm/packages/elm-make.nix +++ b/pkgs/development/compilers/elm/packages/elm-make.nix @@ -5,11 +5,11 @@ }: mkDerivation { pname = "elm-make"; - version = "0.17.1"; + version = "0.18"; src = fetchgit { url = "https://github.com/elm-lang/elm-make"; - sha256 = "0k9w5gl48lhhr3n2iflf0vkb3w6al0xcbglgiw4fq1ssz3aa7ijw"; - rev = "0a0a1f52ab04e2d68d60a5798722e1de30b47335"; + sha256 = "1yq4w4yqignlc2si5ns53pmz0a99gix5d2qgi6x7finf7i6sxyw2"; + rev = "1a554833a70694ab142b9179bfac996143f68d9e"; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix index faf46e859c94..f93432dc0a30 100644 --- a/pkgs/development/compilers/elm/packages/elm-package.nix +++ b/pkgs/development/compilers/elm/packages/elm-package.nix @@ -7,11 +7,11 @@ }: mkDerivation { pname = "elm-package"; - version = "0.17.1"; + version = "0.18"; src = fetchgit { url = "https://github.com/elm-lang/elm-package"; - sha256 = "0dnn871py0pvzxsjjggy5ww2zj9g71c2dcnp38rcr4nbj8yxik85"; - rev = "9011ccdbced1d06aa60de0e3096e609ef44d26dd"; + sha256 = "19krnkjvfk02gmmic5h5i1i0lw7s30927bnd5g57cj8nqbigysv7"; + rev = "8bd150314bacab5b6fc451927aa01deec2276fbf"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix index 790430125901..90c8956323b5 100644 --- a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix +++ b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix @@ -1,22 +1,22 @@ { "elm-lang/virtual-dom" = { - version = "1.1.0"; - sha256 = "16g66cvvh85ddciq0ymaqfyq2bcz11pxn0g0dc1wx7bmlqx7q1jz"; + version = "2.0.1"; + sha256 = "19nfjx072m7a7bx8flc50vbmiww172jmscyq9x91cr2kby5hvbw3"; }; "evancz/elm-markdown" = { - version = "3.0.0"; - sha256 = "0r3hcim4mpn46ahv1q6sjp6i2viyp7jik6i71xgwmvfb9drns2p6"; + version = "3.0.1"; + sha256 = "144lzpcapf2mhqiz90mkllmm4skrcs0iha1daps42qn3xps7hvmj"; }; "elm-lang/html" = { - version = "1.1.0"; - sha256 = "1v7pwxxd81qrfywb4rr199p2i9z77vjkbwjwm5gy1nxdpi8mb50y"; + version = "2.0.0"; + sha256 = "05sqjd5n8jnq4lv5v0ipcg98b8im1isnnl4wns1zzn4w5nbrjjzi"; }; "elm-lang/svg" = { - version = "1.1.1"; - sha256 = "0xzc0fq2kg797km0nq2f52w6xdffrl9l0y5zbkpa72w163zpxkkn"; + version = "2.0.0"; + sha256 = "1c7p967n1yhynravqwgh80vprwz7r2r1n0x3icn5wzk9iaqs069l"; }; "elm-lang/core" = { - version = "4.0.2"; - sha256 = "1qjhfr3gd1qmfvna7iddspmk26v2nmgmgw9m6yyz10ygy3i9mla6"; + version = "5.0.0"; + sha256 = "0gqyc09bh43pi7r2cizyjm5y0zpgarv3is17dl325qvxb9s1y2gn"; }; } diff --git a/pkgs/development/compilers/elm/packages/elm-reactor.nix b/pkgs/development/compilers/elm/packages/elm-reactor.nix index cf6d33a5acb4..08bf5779b74a 100644 --- a/pkgs/development/compilers/elm/packages/elm-reactor.nix +++ b/pkgs/development/compilers/elm/packages/elm-reactor.nix @@ -6,11 +6,11 @@ }: mkDerivation { pname = "elm-reactor"; - version = "0.17.1"; + version = "0.18"; src = fetchgit { url = "https://github.com/elm-lang/elm-reactor"; - sha256 = "14kkqskvhkfznpl8cmjlvv3rp6ciqmdbxrmq6f20p3aznvkrdvf8"; - rev = "7522d7ef379c5a4ffbba11b1be09ed04add08a63"; + sha256 = "0lpidsckyfcr8d6bln735d98dx7ga7j1vyssw0qsv8ijj18gxx65"; + rev = "c519d4ec0aaf2f043a416fe858346b0181eca516"; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/compilers/elm/packages/elm-repl.nix b/pkgs/development/compilers/elm/packages/elm-repl.nix index e08c295f294c..64e29596099c 100644 --- a/pkgs/development/compilers/elm/packages/elm-repl.nix +++ b/pkgs/development/compilers/elm/packages/elm-repl.nix @@ -6,11 +6,11 @@ }: mkDerivation { pname = "elm-repl"; - version = "0.17.1"; + version = "0.18"; src = fetchgit { url = "https://github.com/elm-lang/elm-repl"; - sha256 = "0nh2yfr0bi4rg1kak1gjaczpq56y1nii05b5y7hn6n4w651jkm28"; - rev = "413ac0d4ee43c8542afd3041bbb7b8c903cd3d30"; + sha256 = "112fzykils4lqz4pc44q4mwvxg0px0zfwx511bfvblrxkwwqlfb5"; + rev = "85f0bcfc28ea6c8a99a360d55c21ff25a556f9fe"; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/compilers/elm/packages/release.nix b/pkgs/development/compilers/elm/packages/release.nix index 6817d8e297f4..fd4e08fff09c 100644 --- a/pkgs/development/compilers/elm/packages/release.nix +++ b/pkgs/development/compilers/elm/packages/release.nix @@ -2,7 +2,7 @@ # Please, do not modify it by hand! { callPackage }: { - version = "0.17.1"; + version = "0.18.0"; packages = { elm-compiler = callPackage ./elm-compiler.nix { }; elm-package = callPackage ./elm-package.nix { }; diff --git a/pkgs/development/compilers/elm/update-elm.rb b/pkgs/development/compilers/elm/update-elm.rb index a1f76945cd2c..5169ff3fd29a 100755 --- a/pkgs/development/compilers/elm/update-elm.rb +++ b/pkgs/development/compilers/elm/update-elm.rb @@ -1,12 +1,12 @@ #!/usr/bin/env ruby # Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs -$elm_version = "0.17.1" -$elm_packages = { "elm-compiler" => "0.17.1", - "elm-package" => "0.17.1", - "elm-make" => "0.17.1", - "elm-reactor" => "0.17.1", - "elm-repl" => "0.17.1" +$elm_version = "0.18.0" +$elm_packages = { "elm-compiler" => "0.18.0", + "elm-package" => "0.18.0", + "elm-make" => "0.18.0", + "elm-reactor" => "0.18.0", + "elm-repl" => "0.18.0" } for pkg, ver in $elm_packages From 402c07c5636c426d7a257e0f71e6794246ee24e0 Mon Sep 17 00:00:00 2001 From: Elliot Cameron <3noch@users.noreply.github.com> Date: Thu, 17 Nov 2016 22:21:18 -0500 Subject: [PATCH 0457/1749] Expose guts of `cleanSource` Ref #20511 --- lib/sources.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/sources.nix b/lib/sources.nix index 156afaae5c98..f41abe1e1eae 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -12,19 +12,19 @@ rec { # Bring in a path as a source, filtering out all Subversion and CVS # directories, as well as backup files (*~). - cleanSource = - let filter = name: type: let baseName = baseNameOf (toString name); in ! ( - # Filter out Subversion and CVS directories. - (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) || - # Filter out backup files. - lib.hasSuffix "~" baseName || - # Filter out generates files. - lib.hasSuffix ".o" baseName || - lib.hasSuffix ".so" baseName || - # Filter out nix-build result symlinks - (type == "symlink" && lib.hasPrefix "result" baseName) - ); - in src: builtins.filterSource filter src; + cleanSourceFilter = name: type: let baseName = baseNameOf (toString name); in ! ( + # Filter out Subversion and CVS directories. + (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) || + # Filter out backup files. + lib.hasSuffix "~" baseName || + # Filter out generates files. + lib.hasSuffix ".o" baseName || + lib.hasSuffix ".so" baseName || + # Filter out nix-build result symlinks + (type == "symlink" && lib.hasPrefix "result" baseName) + ); + + cleanSource = builtins.filterSource cleanSourceFilter; # Get all files ending with the specified suffices from the given From 29662304df817e5f0bfaff35a3814a24ccba5263 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Nov 2016 11:19:56 +0100 Subject: [PATCH 0458/1749] configuration-hackage2nix.yaml: disable broken builds Ping @abbradar because of broken lambdabot. --- .../configuration-hackage2nix.yaml | 46 +++++++++++++++++-- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1ccdbecc8d81..550ac1b918af 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2071,7 +2071,6 @@ package-maintainers: - shakespeare abbradar: - Agda - - lambdabot dont-distribute-packages: # hard restrictions that really belong into meta.platforms @@ -2584,6 +2583,7 @@ dont-distribute-packages: breakout: [ i686-linux, x86_64-linux, x86_64-darwin ] breve: [ i686-linux, x86_64-linux, x86_64-darwin ] brians-brain: [ i686-linux, x86_64-linux, x86_64-darwin ] + brick: [ i686-linux, x86_64-linux, x86_64-darwin ] brillig: [ i686-linux, x86_64-linux, x86_64-darwin ] broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ] broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2672,6 +2672,7 @@ dont-distribute-packages: car-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] carettah: [ i686-linux, x86_64-linux, x86_64-darwin ] + carte: [ i686-linux, x86_64-linux, x86_64-darwin ] Cartesian: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-control: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2945,6 +2946,7 @@ dont-distribute-packages: Control-Monad-ST2: [ i686-linux, x86_64-linux, x86_64-darwin ] contstuff-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] contstuff-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + convert-annotation: [ i686-linux, x86_64-linux, x86_64-darwin ] convert: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3206,11 +3208,9 @@ dont-distribute-packages: dicom: [ i686-linux, x86_64-linux, x86_64-darwin ] dictionaries: [ i686-linux, x86_64-linux, x86_64-darwin ] dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - diff-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] diffcabal: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferenceLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferentialEvolution: [ i686-linux, x86_64-linux, x86_64-darwin ] - difftodo: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-foundation-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3843,6 +3843,14 @@ dont-distribute-packages: goal-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-simulation: [ i686-linux, x86_64-linux, x86_64-darwin ] gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-containerbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-firebase-dynamiclinks: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-iam: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-ml: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-runtimeconfig: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-safebrowsing: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-servicecontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-servicemanagement: [ i686-linux, x86_64-linux, x86_64-darwin ] gooey: [ i686-linux, x86_64-linux, x86_64-darwin ] google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3929,6 +3937,8 @@ dont-distribute-packages: gsl-random-fu: [ i686-linux, x86_64-linux, x86_64-darwin ] gsl-random: [ i686-linux, x86_64-linux, x86_64-darwin ] gsmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] + gssapi-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + gssapi: [ i686-linux, x86_64-linux, x86_64-darwin ] GTALib: [ i686-linux, x86_64-linux, x86_64-darwin ] gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4138,10 +4148,12 @@ dont-distribute-packages: haskell-tools-ast-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-backend-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-prettyprint: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-refactor: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4357,6 +4369,7 @@ dont-distribute-packages: HGamer3D-Wire: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D: [ i686-linux, x86_64-linux, x86_64-darwin ] hgdbmi: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGE2D: [ i686-linux, x86_64-linux, x86_64-darwin ] hgearman: [ i686-linux, x86_64-linux, x86_64-darwin ] hgen: [ i686-linux, x86_64-linux, x86_64-darwin ] hgeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4420,6 +4433,10 @@ dont-distribute-packages: HLearn-classification: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4432,6 +4449,7 @@ dont-distribute-packages: hmark: [ i686-linux, x86_64-linux, x86_64-darwin ] hmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-banded: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-glpk: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4439,6 +4457,7 @@ dont-distribute-packages: hmatrix-special: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4637,6 +4656,7 @@ dont-distribute-packages: hsparklines: [ i686-linux, x86_64-linux, x86_64-darwin ] hsparql: [ i686-linux, x86_64-linux, x86_64-darwin ] hspear: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-expectations-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-expectations-pretty-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-expectations-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4669,6 +4689,7 @@ dont-distribute-packages: hstyle: [ i686-linux, x86_64-linux, x86_64-darwin ] hstzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] hsubconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] HSvm: [ i686-linux, x86_64-linux, x86_64-darwin ] hswip: [ i686-linux, x86_64-linux, x86_64-darwin ] hsx-xhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4692,6 +4713,7 @@ dont-distribute-packages: http-client-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] http-conduit-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] http-conduit-downloader: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] http-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] http-kinder: [ i686-linux, x86_64-linux, x86_64-darwin ] http-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4901,6 +4923,7 @@ dont-distribute-packages: ismtp: [ i686-linux, x86_64-linux, x86_64-darwin ] IsNull: [ i686-linux, x86_64-linux, x86_64-darwin ] iso8583-bitmaps: [ i686-linux, x86_64-linux, x86_64-darwin ] + isobmff-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] isohunt: [ i686-linux, x86_64-linux, x86_64-darwin ] isotope: [ i686-linux, x86_64-linux, x86_64-darwin ] iter-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4935,6 +4958,7 @@ dont-distribute-packages: jalaali: [ i686-linux, x86_64-linux, x86_64-darwin ] jalla: [ i686-linux, x86_64-linux, x86_64-darwin ] jarfind: [ i686-linux, x86_64-linux, x86_64-darwin ] + jason: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] java-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4955,6 +4979,8 @@ dont-distribute-packages: js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsaddle-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsaddle-wkwebview: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] jsc: [ i686-linux, x86_64-linux, x86_64-darwin ] JsContracts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5074,7 +5100,9 @@ dont-distribute-packages: lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-haskell-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacat: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-core: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-media: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5277,6 +5305,7 @@ dont-distribute-packages: loch: [ i686-linux, x86_64-linux, x86_64-darwin ] locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] log: [ i686-linux, x86_64-linux, x86_64-darwin ] logentries: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5401,6 +5430,7 @@ dont-distribute-packages: MaybeT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] MaybeT: [ i686-linux, x86_64-linux, x86_64-darwin ] MazesOfMonad: [ i686-linux, x86_64-linux, x86_64-darwin ] + MBot: [ i686-linux, x86_64-linux, x86_64-darwin ] mbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] MC-Fold-DP: [ i686-linux, x86_64-linux, x86_64-darwin ] mcmaster-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5622,6 +5652,7 @@ dont-distribute-packages: mysnapsession-example: [ i686-linux, x86_64-linux, x86_64-darwin ] mysnapsession: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + mysql-haskell-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5823,6 +5854,7 @@ dont-distribute-packages: openssl-createkey: [ i686-linux, x86_64-linux, x86_64-darwin ] openssl-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] opentheory-char: [ i686-linux, x86_64-linux, x86_64-darwin ] + opentype: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVG: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6294,6 +6326,7 @@ dont-distribute-packages: recursion-schemes: [ i686-linux, x86_64-linux, x86_64-darwin ] redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] Redmine: [ i686-linux, x86_64-linux, x86_64-darwin ] + reduce-equations: [ i686-linux, x86_64-linux, x86_64-darwin ] reedsolomon: [ i686-linux, x86_64-linux, x86_64-darwin ] ref-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] Ref: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6375,6 +6408,8 @@ dont-distribute-packages: repr: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] + req-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + req: [ i686-linux, x86_64-linux, x86_64-darwin ] reqcatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] request-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] resistor-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6460,6 +6495,7 @@ dont-distribute-packages: ruler-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ruler: [ i686-linux, x86_64-linux, x86_64-darwin ] rungekutta: [ i686-linux, x86_64-linux, x86_64-darwin ] + runtime-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] rws: [ i686-linux, x86_64-linux, x86_64-darwin ] RxHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] s-cargot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6666,6 +6702,7 @@ dont-distribute-packages: simple-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-config: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-css: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-effects: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-firewire: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-form: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7027,6 +7064,7 @@ dont-distribute-packages: target: [ i686-linux, x86_64-linux, x86_64-darwin ] task-distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] task: [ i686-linux, x86_64-linux, x86_64-darwin ] + tasty-discover: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-fail-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-integrate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7038,6 +7076,7 @@ dont-distribute-packages: TBit: [ i686-linux, x86_64-linux, x86_64-darwin ] tbox: [ i686-linux, x86_64-linux, x86_64-darwin ] tccli: [ i686-linux, x86_64-linux, x86_64-darwin ] + tcp-streams-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] tcp-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] tdd-util: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7151,6 +7190,7 @@ dont-distribute-packages: time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ] time-series: [ i686-linux, x86_64-linux, x86_64-darwin ] time-w3c: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] timecalc: [ i686-linux, x86_64-linux, x86_64-darwin ] timeconsole: [ i686-linux, x86_64-linux, x86_64-darwin ] timeout: [ i686-linux, x86_64-linux, x86_64-darwin ] From 4306a5375663e9a92f27b7bfe8fae13af9bcb8c0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Nov 2016 13:42:54 +0100 Subject: [PATCH 0459/1749] Declare "ghcjs-base" as a compiler-provided core package. This change fixes several GHCJS-related packages in our Hackage database. Cc: @Profpatsch --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ .../haskell-modules/configuration-hackage2nix.yaml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 095555bfec40..661af0dd261b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -4,6 +4,11 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Some Hackage packages reference this attribute, which exists only in the + # GHCJS package set. We provide a dummy version here to fix potential + # evaluation errors. + ghcjs-base = null; + # Some packages need a non-core version of Cabal. cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 550ac1b918af..1958c7cc4f72 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -31,6 +31,11 @@ core-packages: - unix-2.7.2.0 - xhtml-3000.2.1 + # Hack: The following package is a core package of GHCJS. If we don't declare + # it, then hackage2nix will generate a Hackage database where all dependants + # if this library are maked as "broken". + - ghcjs-base-0 + default-package-overrides: # LTS Haskell 7.9 - abstract-deque ==0.3 From 80daa953c406b06ac715d732e1f119883f582800 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Nov 2016 11:37:26 +0100 Subject: [PATCH 0460/1749] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/75f785093ebb5ea89e7e17794a06dc6721c5d5d7. --- .../haskell-modules/hackage-packages.nix | 512 ++++++++++++++---- 1 file changed, 392 insertions(+), 120 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 56c84c2a7c53..dca97cf0ec2f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6062,17 +6062,20 @@ self: { }) {}; "Gifcurry" = callPackage - ({ mkDerivation, base, cmdargs, directory, gtk3, process, temporary + ({ mkDerivation, base, cmdargs, directory, filepath, gtk3, process + , temporary, text }: mkDerivation { pname = "Gifcurry"; - version = "2.0.0.2"; - sha256 = "1a7f269eda348fa34fe57f9a35cc810b304acc646f5146c4db2d72eb738c8b32"; + version = "2.1.0.0"; + sha256 = "51cf0949e4ea0ae9503887c0c8613d4bfee0b4bdce1d641cf0b2fd016124170c"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base directory process temporary ]; + libraryHaskellDepends = [ + base directory filepath process temporary text + ]; executableHaskellDepends = [ - base cmdargs directory gtk3 process temporary + base cmdargs directory filepath gtk3 process temporary text ]; homepage = "https://github.com/lettier/gifcurry"; description = "Create animated GIFs, overlaid with optional text, from video files"; @@ -6886,6 +6889,7 @@ self: { homepage = "https://github.com/I3ck/HGE2D"; description = "2D game engine written in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HGL" = callPackage @@ -10967,6 +10971,7 @@ self: { libraryHaskellDepends = [ base bytestring hidapi mtl ]; description = "Haskell interface for controlling the mBot educational robot"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MC-Fold-DP" = callPackage @@ -15741,8 +15746,7 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {ghcjs-base = null;}; + }) {}; "Spock-api-server" = callPackage ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }: @@ -20129,8 +20133,8 @@ self: { ({ mkDerivation, aeson, base, json-ast }: mkDerivation { pname = "aeson-json-ast"; - version = "0.1"; - sha256 = "fac988efb621e4ac75269138df140dc1e1e8287c206416f2a81cd3d3b3716d9a"; + version = "0.1.1"; + sha256 = "ff45897bfecd8cd29c7464a60c97829361569285300bb5d30a01c97519512d5d"; libraryHaskellDepends = [ aeson base json-ast ]; homepage = "https://github.com/sannsyn/aeson-json-ast"; description = "Integration layer for \"json-ast\" and \"aeson\""; @@ -20406,8 +20410,8 @@ self: { }: mkDerivation { pname = "aeson-value-parser"; - version = "0.11.3.1"; - sha256 = "8d7555500b9b267eee568b04e7d1ffd58dbfd4033256347d4cc82f3a8f50a116"; + version = "0.11.4"; + sha256 = "f5a31e1aa81eaf7eed3b1a5ad3e793478f51043792435e537ff6649f4cad3c8e"; libraryHaskellDepends = [ aeson base-prelude mtl-prelude scientific success text unordered-containers vector @@ -24400,6 +24404,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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 + }: + mkDerivation { + pname = "amby"; + version = "0.2.1"; + sha256 = "2430c8d5657af53a4bcc6d7856882375f0ffbcb7c360a2b8fd23cda6e2d33ffa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Chart Chart-cairo Chart-diagrams colour data-default + data-default-class either exceptions microlens mtl pretty-display + process safe scientific statistics vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/jsermeno/amby#readme"; + description = "Statistical data visualization"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ampersand" = callPackage ({ mkDerivation, base, bytestring, conduit, containers, csv , directory, filepath, graphviz, hashable, HStringTemplate, lens @@ -30329,8 +30357,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, time }: mkDerivation { pname = "bgmax"; - version = "0.1.0.1"; - sha256 = "ba68978e53d15d069ac31064069d641a89bfee1d5133c05670848112076ce271"; + version = "0.2.0.0"; + sha256 = "439458c5caab3657ce8ba8dc075097a905b4cb83f07c4a6846a248f9432ff7b8"; libraryHaskellDepends = [ attoparsec base bytestring time ]; homepage = "http://github.com/jonpetterbergman/bgmax"; description = "Parse BgMax-files"; @@ -34406,6 +34434,7 @@ self: { homepage = "https://github.com/jtdaugherty/brick/"; description = "A declarative terminal user interface library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brillig" = callPackage @@ -37429,6 +37458,7 @@ self: { homepage = "https://github.com/m1dnight/carte"; description = "Carte: A commandline pastebin server"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cartel" = callPackage @@ -37486,13 +37516,13 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "3.0.0.5"; - sha256 = "338690af83dd423a118f00fdf7dba3b6a4b49875f7e9e685bc2a68f5284853a9"; + version = "3.1.0.1"; + sha256 = "d1ea0a6ebb07b3bdc7ac50ccf3300888b0c4d48d53640593e2748e3e1433ead4"; libraryHaskellDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear spatial-math vector vector-binary-instances ]; - libraryPkgconfigDepends = [ casadi ]; + librarySystemDepends = [ casadi ]; testHaskellDepends = [ base containers doctest HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 vector @@ -37526,12 +37556,12 @@ self: { }: mkDerivation { pname = "casadi-bindings-core"; - version = "3.0.0.0"; - sha256 = "8cd59ae975cc1de7db78ac59f6212f2523bdf723a782a9ce0c0b47922fdf31be"; + version = "3.1.0.0"; + sha256 = "360f2cd21f2cb418b56b9a487333b1d18dbc86def6ab659a3061080b1194e623"; libraryHaskellDepends = [ base casadi-bindings-internal containers vector ]; - libraryPkgconfigDepends = [ casadi ]; + librarySystemDepends = [ casadi ]; description = "autogenerated low level bindings to casadi"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -37541,10 +37571,10 @@ self: { ({ mkDerivation, base, casadi, containers, vector }: mkDerivation { pname = "casadi-bindings-internal"; - version = "0.1.4.0"; - sha256 = "c5a48653c1f893618287adad1979ee684064daeb9b060294d65a0bea6e378976"; + version = "0.1.5.0"; + sha256 = "c24100f6de46d5a6ba21af67fca017ac67a7da2c945863b5d2879012c05bf35c"; libraryHaskellDepends = [ base containers vector ]; - libraryPkgconfigDepends = [ casadi ]; + librarySystemDepends = [ casadi ]; homepage = "http://github.com/ghorn/casadi-bindings"; description = "low level bindings to CasADi"; license = stdenv.lib.licenses.lgpl3; @@ -37968,14 +37998,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cassava-conduit_0_3_5" = callPackage + "cassava-conduit_0_3_5_1" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava , conduit, conduit-extra, containers, mtl, QuickCheck, text }: mkDerivation { pname = "cassava-conduit"; - version = "0.3.5"; - sha256 = "0162887a9ca16d8828ac31f7c5aa409129de4e1cd3e199cd158302d3775f9e89"; + version = "0.3.5.1"; + sha256 = "45853e32dbac212d41d800c539c7d9184e05d0b7b48df458a7963138449a75d5"; libraryHaskellDepends = [ array base bifunctors bytestring cassava conduit conduit-extra containers mtl text @@ -39622,6 +39652,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cielo" = callPackage + ({ mkDerivation, aeson, base, bytestring, convertible, data-default + , hspec, http-client, http-types, lens, mtl, pretty-show + , QuickCheck, template-haskell, text, uuid, wreq + }: + mkDerivation { + pname = "cielo"; + version = "0.1.2.0"; + sha256 = "9c7df3e4d019a625c143f6ace77e282389651197b5d7b5fd9d502dec0ca24020"; + libraryHaskellDepends = [ + aeson base bytestring convertible data-default http-client + http-types lens mtl template-haskell text uuid wreq + ]; + testHaskellDepends = [ + aeson base bytestring convertible data-default hspec http-client + http-types lens mtl pretty-show QuickCheck template-haskell text + uuid wreq + ]; + homepage = "https://github.com/beijaflor-io/haskell-cielo"; + description = "Cielo API v3 Bindings for Haskell"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "cil" = callPackage ({ mkDerivation, base, bytestring, language-c }: mkDerivation { @@ -43999,13 +44052,13 @@ self: { }: mkDerivation { pname = "console-program"; - version = "0.4.1.0"; - sha256 = "688cbecb6288c5e12c48c2bafaf27f470fe1b9d61c293b529581799cf95c7146"; + version = "0.4.2.0"; + sha256 = "a5476673bb36c25d7103aacffb9748dacf03f4cbafe94e3f16bc8950eececb7a"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers directory haskeline parsec parsec-extra split transformers unix utility-ht ]; - description = "Interpret the command line and settings in a config file as commands and options"; + description = "Interpret the command line and a config file as commands and options"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -44779,6 +44832,7 @@ self: { homepage = "http://github.com/GregorySchwartz/convert-annotation#readme"; description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "convertible" = callPackage @@ -46231,6 +46285,8 @@ self: { pname = "criterion"; version = "1.1.4.0"; sha256 = "53a243fc759ed3100e71f96a5f6649658d076d91d52ce2853a6f8587aa3cfa76"; + revision = "1"; + editedCabalFile = "61a5386463efe3da9c0bc5d14f6074e500dc76fc62e2dda40eaf81955716fe41"; libraryHaskellDepends = [ aeson ansi-wl-pprint base binary bytestring cassava code-page containers deepseq directory filepath Glob hastache js-flot @@ -53012,7 +53068,6 @@ self: { testHaskellDepends = [ attoparsec base hspec text ]; description = "A parser for diff file formats"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diff3" = callPackage @@ -53106,7 +53161,6 @@ self: { homepage = "https://github.com/jml/difftodo#readme"; description = "Generate todo lists from source code"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digamma" = callPackage @@ -57428,6 +57482,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-influxdb" = callPackage + ({ mkDerivation, base, clock, containers, ekg-core, libinfluxdb + , text, time, unordered-containers, vector + }: + mkDerivation { + pname = "ekg-influxdb"; + version = "0.1.0.0"; + sha256 = "8512eb20523c3b21811a3f61ab53ff91bfefdc8edea223bb9d9969a59c3935a4"; + libraryHaskellDepends = [ + base clock containers ekg-core libinfluxdb text time + unordered-containers vector + ]; + homepage = "https://github.com/angerman/ekg-influxdb"; + description = "An EKG backend to send statistics to influxdb"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ekg-json" = callPackage ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers }: @@ -65414,8 +65485,8 @@ self: { ({ mkDerivation, base, doctest, Glob, mtl }: mkDerivation { pname = "from-sum"; - version = "0.2.0.0"; - sha256 = "9ab7657f3da6ccc4d22a1ebf7ad2b35f6040d9a5013ed47a4e56d71a52008aa4"; + version = "0.2.1.0"; + sha256 = "a1ed8a433b98df8a70be2f9199abae3e5ed7fb4c2f2b3fb1268b6b588f326667"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/cdepillabout/from-sum"; @@ -66299,8 +66370,7 @@ self: { homepage = "https://github.com/ziocroc/FWGL"; description = "FWGL GHCJS backend"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {ghcjs-base = null;}; + }) {}; "g-npm" = callPackage ({ mkDerivation, base, HTTP, json }: @@ -68723,11 +68793,11 @@ self: { homepage = "https://github.com/vwwv/ghcjs-promise"; description = "Bidirectional bidings to javascript's promise"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {ghcjs-base = null;}; + }) {}; "ghcjs-websockets" = callPackage - ({ mkDerivation, base, base64-bytestring, binary, bytestring, text + ({ mkDerivation, base, base64-bytestring, binary, bytestring + , ghcjs-base, text }: mkDerivation { pname = "ghcjs-websockets"; @@ -68736,7 +68806,7 @@ self: { revision = "1"; editedCabalFile = "1901cc0693c96bc77c6484ac202ce8e6302c2eb2eb6b986a054aaaad9901b2ff"; libraryHaskellDepends = [ - base base64-bytestring binary bytestring text + base base64-bytestring binary bytestring ghcjs-base text ]; homepage = "http://github.com/mstksg/ghcjs-websockets"; description = "Deprecated: use ghcjs-base's native websockets"; @@ -69717,8 +69787,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.3.7.1"; - sha256 = "6e30c1fff6bd5ebc5bea71307e3cc6e726d96487d1b66894e754dc90afe76831"; + version = "0.3.7.2"; + sha256 = "53b18bf7146c4d46347eb74a64add43167220377d75fb572afe5bb1e0ac173dd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72604,6 +72674,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Container Builder SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-core" = callPackage @@ -72965,6 +73036,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Dynamic Links SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-firebase-rules" = callPackage @@ -73277,6 +73349,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity and Access Management (IAM) SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-identity-toolkit" = callPackage @@ -73464,6 +73537,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Machine Learning SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-monitoring" = callPackage @@ -73876,6 +73950,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud RuntimeConfig SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-safebrowsing" = callPackage @@ -73888,6 +73963,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Safe Browsing APIs SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-script" = callPackage @@ -73925,6 +74001,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Service Control SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-servicemanagement" = callPackage @@ -73937,6 +74014,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Service Management SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-sheets" = callPackage @@ -76131,6 +76209,7 @@ self: { homepage = "https://github.com/ondrap/gssapi"; description = "libgssapi and libkrb5 bindings for haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {gssapi_krb5 = null; krb5 = null;}; "gssapi-wai" = callPackage @@ -76148,6 +76227,7 @@ self: { homepage = "https://github.com/ondrap/gssapi-wai"; description = "WAI Middleware for SPNEGO authentiaction"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gstreamer" = callPackage @@ -81073,6 +81153,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskelisp" = callPackage + ({ mkDerivation, base, clock, containers, formatting + , logging-effect, mtl, protolude, text, turtle + }: + mkDerivation { + pname = "haskelisp"; + version = "0.1.0.0"; + sha256 = "b1fee69e1862d115fc7f2755972e1b9c9e9ccc974b2447deb53b7550fa6bed1c"; + libraryHaskellDepends = [ + base clock containers formatting logging-effect mtl protolude text + turtle + ]; + homepage = "http://github.com/githubuser/haskelisp#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "haskell-aliyun" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, basic-prelude , blaze-builder, bytestring, case-insensitive, conduit, Crypto @@ -82168,6 +82265,7 @@ self: { homepage = "https://github.com/nboldi/haskell-tools"; description = "Creating the Haskell-Tools AST from GHC's representations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-cli" = callPackage @@ -82281,6 +82379,7 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Facilities for generating new parts of the Haskell-Tools AST"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tor" = callPackage @@ -88296,6 +88395,7 @@ self: { homepage = "http://hledger.org"; description = "Web API server for the hledger accounting tool"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-chart" = callPackage @@ -88315,6 +88415,7 @@ self: { homepage = "http://hledger.org"; description = "A pie chart image generator for the hledger accounting tool"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-diff" = callPackage @@ -88418,6 +88519,7 @@ self: { homepage = "http://hledger.org"; description = "Curses-style user interface for the hledger accounting tool"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-vty" = callPackage @@ -88436,6 +88538,7 @@ self: { homepage = "http://hledger.org"; description = "A curses-style console interface for the hledger accounting tool"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-web" = callPackage @@ -88781,6 +88884,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Linear Programming based on GLPK"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glpk;}; "hmatrix-gsl" = callPackage @@ -88978,6 +89082,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Tests for hmatrix"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmeap" = callPackage @@ -94002,6 +94107,7 @@ self: { libraryHaskellDepends = [ base hspec-expectations transformers ]; description = "A version of hspec-expectations generalized to MonadIO"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-expectations-pretty" = callPackage @@ -95174,6 +95280,7 @@ self: { ]; description = "Synthesizable Verilog DSL supporting for multiple clock and reset"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hswip" = callPackage @@ -96207,6 +96314,7 @@ self: { homepage = "http://github.com/owainlewis/http-dispatch#readme"; description = "High level HTTP client for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-encodings" = callPackage @@ -96477,8 +96585,8 @@ self: { }: mkDerivation { pname = "http-proxy"; - version = "0.1.0.4"; - sha256 = "e5e582a106ead5c3a4a96fa96f95891f67714483e83154a6a3228bba41e756f4"; + version = "0.1.0.5"; + sha256 = "4406e4f19ae08d4d281d15a76c19c0661fcb7c5b9bf93c0f279001ac761894d8"; libraryHaskellDepends = [ async base blaze-builder bytestring bytestring-lexing case-insensitive conduit conduit-extra http-client http-conduit @@ -99478,6 +99586,18 @@ self: { license = "GPL"; }) {}; + "if" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "if"; + version = "0.1.0.0"; + sha256 = "28f673e867dbe0f51324d97fcb7884673a34912593746520a470116b167a141d"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/winterland1989/if"; + description = "(?) and (?>) conditional operator"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ifcxt" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck , template-haskell @@ -102812,24 +102932,26 @@ self: { }) {}; "isobmff-builder" = callPackage - ({ mkDerivation, base, binary, bytestring, data-default, hspec - , singletons, tagged, text, time, type-list, type-spec - , vector-sized + ({ mkDerivation, base, binary, bytestring, data-default, hspec, mtl + , pretty-types, QuickCheck, singletons, tagged, template-haskell + , text, time, type-list, type-spec, vector }: mkDerivation { pname = "isobmff-builder"; - version = "0.10.5.0"; - sha256 = "b7dfa97397a823beb2d327fd97ed57cc9cec6c615659eaaa238c86b9bd4c2bf1"; + version = "0.11.2.0"; + sha256 = "062397e266687379d99ebe4acb7dd21b6289df1fdad079c3fef7d9ec45b1d220"; libraryHaskellDepends = [ - base bytestring data-default singletons tagged text time type-list - type-spec vector-sized + base bytestring data-default mtl pretty-types singletons tagged + template-haskell text time type-list type-spec vector ]; testHaskellDepends = [ - base binary bytestring hspec text type-spec + base binary bytestring hspec mtl pretty-types QuickCheck tagged + text type-spec ]; homepage = "https://github.com/sheyll/isobmff-builder#readme"; description = "A (bytestring-) builder for the ISO-14496-12 base media file format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "isohunt" = callPackage @@ -103622,6 +103744,7 @@ self: { homepage = "https://github.com/Lupino/jason#readme"; description = "A fast JASONETTE-iOS JSON combinator library for haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "java-bridge" = callPackage @@ -104214,6 +104337,7 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-wkwebview" = callPackage @@ -104225,6 +104349,7 @@ self: { libraryHaskellDepends = [ aeson base bytestring jsaddle ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsc" = callPackage @@ -104586,8 +104711,8 @@ self: { }: mkDerivation { pname = "json-pointer-aeson"; - version = "0.1"; - sha256 = "b291114509843bae81251ee517d1dad5d7c904809417b35e17cc47eec04764d4"; + version = "0.1.1"; + sha256 = "009a92279d7965bea1a8d57751cf27de1f1a30d5afb1e8f80a813b866eba03d1"; libraryHaskellDepends = [ aeson base-prelude json-pointer unordered-containers vector ]; @@ -107171,7 +107296,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ abbradar ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-core" = callPackage @@ -107224,6 +107349,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot Haskell plugins"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-irc-plugins" = callPackage @@ -107446,29 +107572,23 @@ self: { }) {}; "lambdacube-compiler" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , containers, deepseq, directory, exceptions, filepath, JuicyPixels - , lambdacube-ir, megaparsec, monad-control, mtl - , optparse-applicative, patience, pretty-show, process, QuickCheck - , tasty, tasty-quickcheck, text, time, vect, vector, websockets - , wl-pprint + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring + , containers, directory, exceptions, filepath, lambdacube-ir + , megaparsec, mtl, optparse-applicative, pretty-show, semigroups + , text, vector }: mkDerivation { pname = "lambdacube-compiler"; - version = "0.5.0.1"; - sha256 = "d84cefdf1d21e12e6d9ca92f314e35881e5b911630709e36971337dda32ad564"; + version = "0.6.0.0"; + sha256 = "4fae3343d4bc733a759e97324d260a10f0b07d144664b29855c37f2ea1012423"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base containers deepseq directory exceptions filepath - lambdacube-ir megaparsec mtl pretty-show text vector wl-pprint + aeson ansi-wl-pprint base containers directory exceptions filepath + lambdacube-ir megaparsec mtl pretty-show semigroups text vector ]; executableHaskellDepends = [ - aeson async base base64-bytestring bytestring containers deepseq - directory exceptions filepath JuicyPixels lambdacube-ir megaparsec - monad-control mtl optparse-applicative patience pretty-show process - QuickCheck tasty tasty-quickcheck text time vect vector websockets - wl-pprint + aeson base bytestring filepath optparse-applicative ]; homepage = "http://lambdacube3d.com"; description = "LambdaCube 3D is a DSL to program GPUs"; @@ -107555,8 +107675,8 @@ self: { }: mkDerivation { pname = "lambdacube-gl"; - version = "0.5.1.1"; - sha256 = "44fcd8abfd86607a65702caac4894114632590473bc1701f8e082966b79c63c3"; + version = "0.5.1.2"; + sha256 = "2b71bfd829096f8ac59f4e37ebdf6d8bdc4c84bdfaa6cd2c83d5e41fd05ef9fe"; libraryHaskellDepends = [ base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw vector vector-algorithms @@ -107571,8 +107691,8 @@ self: { ({ mkDerivation, aeson, base, containers, mtl, text, vector }: mkDerivation { pname = "lambdacube-ir"; - version = "0.3.0.0"; - sha256 = "4a9c3f2193984bf36eb06d13db92de541c619502a89e956e1e3a2750a4b68dbc"; + version = "0.3.0.1"; + sha256 = "1f28588141a7f2b5ac9847f2f35c8129e68273a3804748a71f06cd728fa001f7"; libraryHaskellDepends = [ aeson base containers mtl text vector ]; description = "LambdaCube 3D intermediate representation of 3D graphics pipelines"; license = stdenv.lib.licenses.bsd3; @@ -112219,13 +112339,14 @@ self: { , concurrent-split, containers, data-accessor , data-accessor-transformers, directory, event-list , explicit-exception, filepath, html, httpd-shed, midi, midi-alsa - , network, non-empty, non-negative, parsec, pretty, process, stm - , stm-split, strict, transformers, unix, utility-ht, wx, wxcore + , network, network-uri, non-empty, non-negative, parsec, pretty + , process, stm, stm-split, strict, transformers, unix, utility-ht + , wx, wxcore }: mkDerivation { pname = "live-sequencer"; - version = "0.0.5.1"; - sha256 = "d4453e597c7804b14554b873b1b2d40c043d79b488868e7c1879e50346927ac1"; + version = "0.0.5.2"; + sha256 = "848f38148ffbe61b0799aa471db89ade287fb06061a9b3dfbec248574dd192e1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base event-list non-negative ]; @@ -112233,8 +112354,8 @@ self: { alsa-core alsa-seq base bytestring cgi concurrent-split containers data-accessor data-accessor-transformers directory explicit-exception filepath html httpd-shed midi midi-alsa network - non-empty parsec pretty process stm stm-split strict transformers - unix utility-ht wx wxcore + network-uri non-empty parsec pretty process stm stm-split strict + transformers unix utility-ht wx wxcore ]; homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer"; description = "Live coding of MIDI music"; @@ -113026,6 +113147,7 @@ self: { homepage = "https://github.com/scrive/log-utils"; description = "Utils for working with logs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log2json" = callPackage @@ -122437,6 +122559,7 @@ self: { homepage = "https://github.com/winterland1989/mysql-haskell"; description = "TLS support for mysql-haskell package using openssl"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-simple" = callPackage @@ -123806,8 +123929,7 @@ self: { homepage = "https://github.com/ziocroc/netwire-input-javascript"; description = "JavaScript instance of netwire-input"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {ghcjs-base = null;}; + }) {}; "netwire-vinylglfw-examples" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory @@ -126517,6 +126639,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "octane_0_17_0" = callPackage + ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers + , data-default-class, file-embed, http-client, http-client-tls + , overloaded-records, rattletrap, text + }: + mkDerivation { + pname = "octane"; + version = "0.17.0"; + sha256 = "deeb94a970a88397c37e00b9f3540a98984351cd81b03477339d4747d53c0288"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bimap binary bytestring containers data-default-class + file-embed overloaded-records rattletrap text + ]; + executableHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls + ]; + homepage = "https://github.com/tfausak/octane#readme"; + description = "Parse Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "octohat" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptohash, dotenv @@ -127844,6 +127990,7 @@ self: { ]; description = "Opentype loading and writing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "operate-do" = callPackage @@ -130057,12 +130204,12 @@ self: { }) {}; "parsec-extra" = callPackage - ({ mkDerivation, base, monads-tf, parsec, transformers }: + ({ mkDerivation, base, monads-tf, parsec }: mkDerivation { pname = "parsec-extra"; - version = "0.1.0.5"; - sha256 = "c463e37a18a5f661a51e5b1b67b7b025bafa969fada109eef3467ce4e9bcb474"; - libraryHaskellDepends = [ base monads-tf parsec transformers ]; + version = "0.2.0.0"; + sha256 = "4936ab0b529d041524917304c45a140901482ba1d672d8a96c169c36e7dfc702"; + libraryHaskellDepends = [ base monads-tf parsec ]; description = "Some miscellaneous basic string parsers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -131957,8 +132104,8 @@ self: { ({ mkDerivation, attoparsec, base, hspec, text }: mkDerivation { pname = "persistent-parser"; - version = "0.1.0.1"; - sha256 = "9ec9dda9721c20aab99ff0414c08b552c4b8893ee896460c99ae7ef960017c27"; + version = "0.1.0.2"; + sha256 = "124eb0c33845a823f5196f895201fceb8a99e52abc5f6197fc76b5981ff6bf77"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec text ]; description = "Parse persistent model files"; @@ -136863,6 +137010,24 @@ self: { license = "GPL"; }) {}; + "pretty-display" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, pretty-show, text }: + mkDerivation { + pname = "pretty-display"; + version = "0.1.8"; + sha256 = "51f0e12426755bddc82ed723ac53533138feb8a2455bbc4cc534cea21fe92eae"; + revision = "1"; + editedCabalFile = "f5a862770c5db22d591a92ecf1f5e9c2ed7da73312e1b69410160fab3040892f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base pretty-show text ]; + executableHaskellDepends = [ ansi-wl-pprint base pretty-show ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/jsermeno/pretty-display#readme"; + description = "Typeclass for human-readable display"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pretty-error" = callPackage ({ mkDerivation, base, basic-prelude, bytestring, pretty-show }: mkDerivation { @@ -138092,10 +138257,8 @@ self: { ({ mkDerivation, alsaLib, base, c2hs }: mkDerivation { pname = "proteaaudio"; - version = "0.6.4"; - sha256 = "a0343bff81c0920c75cd24b8a5ff2d16ad0e3fdd4b285f65e611dcac0ced4f32"; - revision = "1"; - editedCabalFile = "44188158887c112fc181793db917e4ca4ffdb8f6889f25e36cc262aeba7877a3"; + version = "0.6.5"; + sha256 = "37c7d4272502afe08736bdbab192c95da578a71a6c1ae3ae7beea1fa797b342e"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ alsaLib ]; libraryToolDepends = [ c2hs ]; @@ -138607,12 +138770,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "publicsuffix_0_20161104" = callPackage + "publicsuffix_0_20161116" = callPackage ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20161104"; - sha256 = "b80360a305ae44f92548195e699751a00df1c812546453c1b415058ac00e24f4"; + version = "0.20161116"; + sha256 = "615ad3cb9a0489403595c79979c3cc9820d03e02fc2a9481d646188f16f64ce8"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -142780,6 +142943,7 @@ self: { homepage = "http://chriswarbo.net/projects/repos/reduce-equations.html"; description = "Simplify a set of equations by removing redundancies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reducers" = callPackage @@ -144992,6 +145156,7 @@ self: { homepage = "https://github.com/mrkkrp/req"; description = "Easy-to-use, type-safe, expandable, high-level HTTP library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "req-conduit" = callPackage @@ -145012,6 +145177,7 @@ self: { homepage = "https://github.com/mrkkrp/req-conduit"; description = "Conduit helpers for the req HTTP client library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reqcatcher" = callPackage @@ -147477,6 +147643,7 @@ self: { homepage = "http://chriswarbo.net/projects/repos/runtime-arbitrary.html"; description = "Runtime generation of Arbitrary values"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rvar" = callPackage @@ -148358,6 +148525,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "say" = callPackage + ({ mkDerivation, base, bytestring, hspec, temporary, text + , transformers + }: + mkDerivation { + pname = "say"; + version = "0.1.0.0"; + sha256 = "f26fdb94ed81a2ae503beca0dcea74da7ee37408ba2e41ab3fdcaa9a7622fc40"; + libraryHaskellDepends = [ base bytestring text transformers ]; + testHaskellDepends = [ base bytestring hspec temporary text ]; + homepage = "https://github.com/fpco/say#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.mit; + }) {}; + "sbp" = callPackage ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit @@ -150747,6 +150929,8 @@ self: { pname = "serokell-util"; version = "0.1.1.1"; sha256 = "8411ea10fcff87ce1d2fbe177cf2b3d6d254dc66cded2f49867daeed8334e427"; + revision = "1"; + editedCabalFile = "34fcc8e8cd473bab43aec11ed13d068aebb6f22298268f038798a6c7fd7f2b85"; libraryHaskellDepends = [ acid-state aeson aeson-extra base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal @@ -150999,29 +151183,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-auth-cookie_0_4_1" = callPackage + "servant-auth-cookie_0_4" = callPackage ({ mkDerivation, base, base-compat, base64-bytestring - , blaze-builder, blaze-html, blaze-markup, bytestring - , bytestring-conversion, cereal, cookie, cryptonite, data-default - , deepseq, exceptions, hspec, http-media, http-types, memory, mtl - , QuickCheck, servant, servant-blaze, servant-server, tagged, text - , time, transformers, wai, warp + , blaze-builder, blaze-html, blaze-markup, bytestring, cereal + , cookie, cryptonite, data-default, deepseq, exceptions, hspec + , http-api-data, http-media, http-types, memory, mtl, QuickCheck + , servant, servant-blaze, servant-server, tagged, text, time + , transformers, wai, warp }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.4.1"; - sha256 = "d9d59d1204c372068e2de7ccf352982ba17f2dc610f9b1f0bb21048dcf346222"; + version = "0.4"; + sha256 = "2b5144612cbf8835b5f069f885d9f32483a63884d5d008c7110dd9273756eef1"; libraryHaskellDepends = [ - base base64-bytestring blaze-builder bytestring - bytestring-conversion cereal cookie cryptonite data-default - exceptions http-types memory mtl servant servant-server tagged time - transformers wai + base base64-bytestring blaze-builder bytestring cereal cookie + cryptonite data-default exceptions http-api-data http-types memory + mtl servant servant-server tagged time transformers wai ]; testHaskellDepends = [ - base base-compat blaze-html blaze-markup bytestring - bytestring-conversion cereal cryptonite data-default deepseq hspec - http-media mtl QuickCheck servant servant-blaze servant-server text - time wai warp + base base-compat blaze-html blaze-markup bytestring cereal + cryptonite data-default deepseq hspec http-api-data http-media mtl + QuickCheck servant servant-blaze servant-server text time wai warp ]; description = "Authentication via encrypted cookies"; license = stdenv.lib.licenses.bsd3; @@ -152979,6 +153161,33 @@ self: { 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 + , unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.11.2"; + sha256 = "536327335c60f144aa372e4e0f163097bb0b435e28438bf7c54f1f22271f71d4"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -153434,6 +153643,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shikensu" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath, flow + , Glob, tasty, tasty-hunit, text, unordered-containers + }: + mkDerivation { + pname = "shikensu"; + version = "0.1.2"; + sha256 = "ad596f07202898eff28471720a7784f4b70bce4eeea0b8b7a4c47390a4f4f817"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath flow Glob + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath flow tasty tasty-hunit + text unordered-containers + ]; + homepage = "https://github.com/icidasset/shikensu#README"; + description = "A small toolset for building static websites"; + license = stdenv.lib.licenses.mit; + }) {}; + "shine" = callPackage ({ mkDerivation, base, ghcjs-dom, ghcjs-prim, keycode, mtl, time , transformers @@ -154094,6 +154324,7 @@ self: { homepage = "https://gitlab.com/LukaHorvat/simple-effects"; description = "A simple effect system that integrates with MTL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-eval" = callPackage @@ -158972,6 +159203,28 @@ self: { 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 + }: + mkDerivation { + pname = "sqlite-simple"; + version = "0.4.10.0"; + sha256 = "634a7c5728da62899b5b72c372e0da7571a7d26a1162f9490e44d79a2ff04df2"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sqlite-simple-errors" = callPackage ({ mkDerivation, base, mtl, parsec, sqlite-simple, text }: mkDerivation { @@ -159298,8 +159551,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "stable-marriage"; - version = "0.1.1.0"; - sha256 = "12da2128ef67c7f30e9bf1fef0ccffc323bbdfc0699126945c422a52a25d09b2"; + version = "0.1.2.0"; + sha256 = "bf6e85899194446dc86b40cbfe9363dd5798a204d45f6911f98ab6ffda4fa9f6"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "http://github.com/cutsea110/stable-marriage"; description = "algorithms around stable marriage"; @@ -160759,6 +161012,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stm-supply" = callPackage + ({ mkDerivation, async, base, concurrent-supply, QuickCheck, random + , Unique + }: + mkDerivation { + pname = "stm-supply"; + version = "0.1.0.0"; + sha256 = "ae8b2daff827522bb466a5d68bc91dc39d4632441c8b8b43540b8204c2997e2b"; + libraryHaskellDepends = [ base concurrent-supply ]; + testHaskellDepends = [ async base QuickCheck random Unique ]; + homepage = "https://github.com/caneroj1/stm-supply#readme"; + description = "STM wrapper around Control.Concurrent.Supply."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stm-tlist" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -165136,6 +165404,7 @@ self: { homepage = "https://github.com/lwm/tasty-discover/"; description = "Test discovery for the tasty framework"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-expected-failure" = callPackage @@ -165656,6 +165925,7 @@ self: { homepage = "https://github.com/winterland1989/tcp-streams"; description = "Tcp streams using openssl for tls support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tdd-util" = callPackage @@ -168745,12 +169015,13 @@ self: { , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens , mime-types, mtl, network, process, random, scientific, split , tasty, tasty-quickcheck, text, transformers, unordered-containers - , utf8-string, vector, xdg-basedir, xmonad, xmonad-contrib + , utf8-string, vector, webkit2gtk, xdg-basedir, xmonad + , xmonad-contrib }: mkDerivation { pname = "tianbar"; - version = "1.2.3.0"; - sha256 = "d6f81bb178bf6a0f836269b13659b068c60c912f5a4d76e86be3228ca15168b3"; + version = "1.2.4"; + sha256 = "f0b09681dcdad8ba282d8572227401008175b326998b20a1391b720a3087db00"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168762,7 +169033,7 @@ self: { mime-types mtl network process random scientific split text transformers unordered-containers utf8-string vector xdg-basedir ]; - executablePkgconfigDepends = [ gtk3 ]; + executablePkgconfigDepends = [ gtk3 webkit2gtk ]; testHaskellDepends = [ aeson base bytestring containers dbus directory filepath gi-gdk gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens @@ -168774,7 +169045,7 @@ self: { description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gnome3.gtk; webkit2gtk = null;}; "tic-tac-toe" = callPackage ({ mkDerivation, base, glade, gtk, haskell98 }: @@ -169307,8 +169578,8 @@ self: { }: mkDerivation { pname = "time-warp"; - version = "0.1.1.1"; - sha256 = "52bdeb1608ee7a5688ffec46fda64437a8bbb8d9648ce4f0a523a15405c9ea18"; + version = "0.1.1.2"; + sha256 = "8a919958cbef95ff3960046f5854801b649b60c8e1fbd187ce1ae298c3c11187"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169331,6 +169602,7 @@ self: { homepage = "https://github.com/serokell/time-warp"; description = "Distributed systems execution emulation"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timecalc" = callPackage @@ -181491,8 +181763,8 @@ self: { ({ mkDerivation, base, containers, doctest, hspec, time }: mkDerivation { pname = "workdays"; - version = "0.1.0"; - sha256 = "61c41d0b6257630ed2e9b484264a8f0c19595e6f0bf1c30dd35129951bd4a4de"; + version = "0.1.1"; + sha256 = "871cf67b17ca57f91ce73295311e4ffa5f6c8301908cbd182d6b7c50d48289e7"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers doctest hspec ]; homepage = "https://github.com/stackbuilders/workdays"; From a80cacd3ec8582bf3236fcd5031b0715358b3c82 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Fri, 18 Nov 2016 12:56:08 +0200 Subject: [PATCH 0461/1749] fetchFromGitHub: add fetchSubmodules option This commit extends fetchFromGitHub with ability to fetch GitHub repositories with submodules, so we can use the function consistently with all GitHub repositories. Note it doesn't change the previous behavior. --- pkgs/build-support/fetchgit/default.nix | 2 +- pkgs/top-level/all-packages.nix | 23 ++++++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 59e06c95ebba..982229cf8a5f 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -26,7 +26,7 @@ in Cloning branches will make the hash check fail when there is an update. But not all patches we want can be accessed by tags. - The workaround is getting the last n commits so that it's likly that they + The workaround is getting the last n commits so that it's likely that they still contain the hash we want. for now : increase depth iteratively (TODO) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 135f6f850a2e..49ea32f7085e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -203,12 +203,25 @@ in fetchFromGitHub = { owner, repo, rev, name ? "${repo}-${rev}-src", + fetchSubmodules ? false, ... # For hash agility - }@args: fetchzip ({ - inherit name; - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; - meta.homepage = "https://github.com/${owner}/${repo}/"; - } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; }; + }@args: + let + baseUrl = "https://github.com/${owner}/${repo}"; + passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" ]; + in if fetchSubmodules then + fetchgit ({ + inherit name rev fetchSubmodules; + url = "${baseUrl}.git"; + } // passthruAttrs) + else + # We prefer fetchzip in cases we don't need submodules as the hash + # is more stable in that case. + fetchzip ({ + inherit name; + url = "${baseUrl}/archive/${rev}.tar.gz"; + meta.homepage = "${baseUrl}/"; + } // passthruAttrs) // { inherit rev; }; fetchFromBitbucket = { owner, repo, rev, name ? "${repo}-${rev}-src", From 82aa52f01d1b22d1ce16422b9ad2b80b09e7da55 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Wed, 16 Nov 2016 14:27:23 +0100 Subject: [PATCH 0462/1749] jsduck: init version --- lib/maintainers.nix | 1 + pkgs/development/tools/jsduck/Gemfile | 3 ++ pkgs/development/tools/jsduck/Gemfile.lock | 23 ++++++++++ pkgs/development/tools/jsduck/default.nix | 31 +++++++++++++ pkgs/development/tools/jsduck/gemset.nix | 51 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 6 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/jsduck/Gemfile create mode 100644 pkgs/development/tools/jsduck/Gemfile.lock create mode 100644 pkgs/development/tools/jsduck/default.nix create mode 100644 pkgs/development/tools/jsduck/gemset.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 96d5f7c3dae9..115f09f119fa 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -334,6 +334,7 @@ palo = "Ingolf Wanger "; pashev = "Igor Pashev "; pawelpacana = "Paweł Pacana "; + periklis = "theopompos@gmail.com"; pesterhazy = "Paulus Esterhazy "; peterhoeg = "Peter Hoeg "; peti = "Peter Simons "; diff --git a/pkgs/development/tools/jsduck/Gemfile b/pkgs/development/tools/jsduck/Gemfile new file mode 100644 index 000000000000..483fc40ff799 --- /dev/null +++ b/pkgs/development/tools/jsduck/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "jsduck" diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/development/tools/jsduck/Gemfile.lock new file mode 100644 index 000000000000..d3e1556a7b39 --- /dev/null +++ b/pkgs/development/tools/jsduck/Gemfile.lock @@ -0,0 +1,23 @@ +GEM + remote: https://rubygems.org/ + specs: + dimensions (1.2.0) + jsduck (5.3.4) + dimensions (~> 1.2.0) + json (~> 1.8.0) + parallel (~> 0.7.1) + rdiscount (~> 2.1.6) + rkelly-remix (~> 0.0.4) + json (1.8.3) + parallel (0.7.1) + rdiscount (2.1.8) + rkelly-remix (0.0.7) + +PLATFORMS + ruby + +DEPENDENCIES + jsduck + +BUNDLED WITH + 1.13.6 diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix new file mode 100644 index 000000000000..ef89517966d7 --- /dev/null +++ b/pkgs/development/tools/jsduck/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, bundlerEnv, makeWrapper, }: + +stdenv.mkDerivation rec { + pname = "jsduck"; + name = "${pname}-${version}"; + version = "5.3.4"; + + env = bundlerEnv { + name = "${pname}"; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; + + phases = [ "installPhase" ]; + + buildInputs = [ env makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/jsduck $out/bin/jsduck + ''; + + meta = with lib; { + description = "Simple JavaScript Duckumentation generator."; + homepage = https://github.com/senchalabs/jsduck; + license = with licenses; gpl3; + maintainers = with stdenv.lib.maintainers; [ periklis ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/jsduck/gemset.nix b/pkgs/development/tools/jsduck/gemset.nix new file mode 100644 index 000000000000..d80bd70dd728 --- /dev/null +++ b/pkgs/development/tools/jsduck/gemset.nix @@ -0,0 +1,51 @@ +{ + dimensions = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0"; + type = "gem"; + }; + version = "1.2.0"; + }; + jsduck = { + dependencies = ["dimensions" "json" "parallel" "rdiscount" "rkelly-remix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hac7g9g6gg10bigbm8dskwwbv1dfch8ca353gh2bkwf244qq2xr"; + type = "gem"; + }; + version = "5.3.4"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + type = "gem"; + }; + version = "1.8.3"; + }; + parallel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq"; + type = "gem"; + }; + version = "0.7.1"; + }; + rdiscount = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v"; + type = "gem"; + }; + version = "2.1.8"; + }; + rkelly-remix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g7hjl9nx7f953y7lncmfgp0xgxfxvgfm367q6da9niik6rp1y3j"; + type = "gem"; + }; + version = "0.0.7"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 135f6f850a2e..efd9f0c3f434 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2285,6 +2285,8 @@ in jscoverage = callPackage ../development/tools/misc/jscoverage { }; + jsduck = callPackage ../development/tools/jsduck { }; + jwhois = callPackage ../tools/networking/jwhois { }; k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; @@ -16391,7 +16393,7 @@ in paml = callPackage ../applications/science/biology/paml { }; plink = callPackage ../applications/science/biology/plink/default.nix { }; - + plink-ng = callPackage ../applications/science/biology/plink-ng/default.nix { }; samtools = callPackage ../applications/science/biology/samtools/default.nix { }; From edcfa0f3fa5017537ca961b027c343a66bc2c8aa Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 18 Nov 2016 13:14:36 +0200 Subject: [PATCH 0463/1749] wine-unstable: 1.9.22 -> 1.9.23 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index f3b12dc48f82..f583fbff231e 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -30,9 +30,9 @@ in rec { }; unstable = fetchurl rec { - version = "1.9.22"; + version = "1.9.23"; url = "https://dl.winehq.org/wine/source/1.9/wine-${version}.tar.bz2"; - sha256 = "0hgc85d695mi1z4hyk561q2s9pblhdy6h5a23rh459y7qwd8xgx3"; + sha256 = "131nqkwlss24r8la84s3v1qx376wq0016d2i2767bpxkyqkagvz3"; inherit (stable) mono; gecko32 = fetchurl rec { version = "2.47"; @@ -48,7 +48,7 @@ in rec { staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "1yqrxx4zaxc8khnnqfgz53apfa9mc315114psq3kvai01lz4a7p8"; + sha256 = "188svpmaba2x5a7g8rk68cl2mqrv1vhf1si2g5j5lps9r6pgq1c0"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; From 5f5f0614b03b1414372b7aa5113ed4ec784b00c8 Mon Sep 17 00:00:00 2001 From: Falco Peijnenburg Date: Fri, 18 Nov 2016 12:44:49 +0100 Subject: [PATCH 0464/1749] Support for ARM in openblas Attempting to build openblas on ARM resulted in the error "unsopported system: armv7l_linux". This PR resolves that issue and some other issues that pop up when trying to build openblas for ARM. --- .../libraries/science/math/openblas/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 3893875a2347..e0e8c2686296 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -11,11 +11,12 @@ let blas64_ = blas64; in let local = config.openblas.preferLocalBuild or false; binary = { i686-linux = "32"; + armv7l-linux = "32"; x86_64-linux = "64"; x86_64-darwin = "64"; }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); genericFlags = - [ "DYNAMIC_ARCH=1" + [ "DYNAMIC_ARCH=${if stdenv.system == "armv7l-linux" then "0" else "1"}" "NUM_THREADS=64" ]; localFlags = config.openblas.flags or @@ -65,7 +66,9 @@ stdenv.mkDerivation { "BINARY=${binary}" "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}" "INTERFACE64=${if blas64 then "1" else "0"}" - ]; + ] + ++ + optionals (stdenv.system == "armv7l-linux") ["TARGET=ARMV7"]; doCheck = true; checkTarget = "tests"; From 1a486c47afd4c521b95ea0db2f8b23d24fbad654 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 18 Nov 2016 09:49:27 -0200 Subject: [PATCH 0465/1749] nitrogen: 1.5.2 -> 1.6.0 --- pkgs/tools/X11/nitrogen/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index 070152427f29..06a7630c7bc0 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -1,20 +1,25 @@ { stdenv, fetchurl, pkgconfig, glib, gtkmm2 }: -let version = "1.5.2"; +let version = "1.6.0"; in stdenv.mkDerivation rec { name = "nitrogen-${version}"; src = fetchurl { - url = "http://projects.l3ib.org/nitrogen/files/nitrogen-${version}.tar.gz"; - sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2"; + url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz"; + sha256 = "1pil2qa3v7x56zh9xvba8v96abnf9qgglbsdlrlv0kfjlhzl4jhr"; }; - buildInputs = [ glib gtkmm2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; - NIX_LDFLAGS = "-lX11"; + buildInputs = [ glib gtkmm2 ]; - patchPhase = "patchShebangs data/icon-theme-installer"; + NIX_CXXFLAGS_COMPILE = "-std=c++11"; + + patchPhase = '' + substituteInPlace data/Makefile.in --replace /usr/share $out/share + patchShebangs data/icon-theme-installer + ''; meta = { description = "A wallpaper browser and setter for X11"; From 20b136f7d35da05a2564c2fb060e16ed7b7af832 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Fri, 18 Nov 2016 13:10:11 +0100 Subject: [PATCH 0466/1749] scalafmt: 0.4.2 -> 0.4.10 --- pkgs/development/tools/scalafmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index a53cb4bc0bd0..534f358e5319 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation rec { - version = "0.4.2"; + version = "0.4.10"; baseName = "scalafmt"; name = "${baseName}-${version}"; src = fetchurl { url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz"; - sha256 = "087zj30jnd2zic9glfk7kl8r97bzv34y2qz56iyh75a69dcs6gnk"; + sha256 = "0igz95zy69pasvj4vya71akhwlc0233m7kwrn66rali1wxs2kcsz"; }; unpackPhase = "tar xvzf $src"; From 5cc3f16f3959bb89b2a2987a1d74db6b6e8871c8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 18 Nov 2016 14:14:15 +0100 Subject: [PATCH 0467/1749] ocaml-x509: set mininimum supported ocaml version --- pkgs/development/ocaml-modules/x509/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index bca266d5fee1..ab82f6abdcbb 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -4,6 +4,8 @@ buildOcaml rec { name = "x509"; version = "0.5.3"; + mininimumSupportedOcamlVersion = "4.02"; + src = fetchFromGitHub { owner = "mirleft"; repo = "ocaml-x509"; From ffa225336c5428d7ddc12ac5e31fc4ec9c45355d Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Fri, 18 Nov 2016 21:23:50 +1000 Subject: [PATCH 0468/1749] bro: 2.4.1 -> 2.5 --- pkgs/applications/networking/ids/bro/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index 10cf9874ff1e..946d0dedba0c 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl -, geoip, gperftools }: +, geoip, gperftools, python }: stdenv.mkDerivation rec { - name = "bro-2.4.1"; + name = "bro-2.5"; src = fetchurl { - url = "http://www.bro.org/downloads/release/${name}.tar.gz"; - sha256 = "1xn8qwgnxihlr4lmg7kz2vqjk46aqgwc8878pbv30ih2lmrrdffq"; + url = "http://www.bro.org/downloads/${name}.tar.gz"; + sha256 = "10603lwhwsmh08m5rgknbspbhd4lis71qv7z8ixacgv6sf8a40hm"; }; - buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools ]; + buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools python ]; enableParallelBuilding = true; From d98a770ec41ef4da5fc935ffcaabb60e5c8c8a98 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 01:23:53 +0100 Subject: [PATCH 0469/1749] ocaml-tls: init at 0.7.1 --- .../development/ocaml-modules/tls/default.nix | 41 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/ocaml-modules/tls/default.nix diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix new file mode 100644 index 000000000000..b38138c55731 --- /dev/null +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -0,0 +1,41 @@ +{ stdenv, buildOcaml, fetchFromGitHub, findlib, ocamlbuild, ocaml_oasis +, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ounit +, lwt ? null}: + +with stdenv.lib; + +let withLwt = lwt != null; in + +buildOcaml rec { + version = "0.7.1"; + name = "tls"; + + minimunSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "mirleft"; + repo = "ocaml-tls"; + rev = "${version}"; + sha256 = "19q2hzxiasz9pzczgb63kikg0mc9mw98dfvch5falf2rincycj24"; + }; + + buildInputs = [ ocamlbuild findlib ocaml_oasis ppx_sexp_conv ounit ]; + propagatedBuildInputs = [ cstruct nocrypto result x509 ] ++ + optional withLwt lwt; + + configureFlags = [ "--disable-mirage" "--enable-tests" ] ++ + optional withLwt ["--enable-lwt"]; + + configurePhase = "./configure --prefix $out $configureFlags"; + + doCheck = true; + checkTarget = "test"; + createFindlibDestdir = true; + + meta = with stdenv.lib; { + homepage = https://github.com/mirleft/ocaml-tls; + description = "TLS in pure OCaml"; + license = licenses.bsd2; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c7422bdaba4a..4b6c678fd808 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -366,6 +366,10 @@ let textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; + tls = callPackage ../development/ocaml-modules/tls { + lwt = ocaml_lwt; + }; + type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; From c7dc06655aab39216ecccb1266e56aa2ded9739f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 10:39:14 +0100 Subject: [PATCH 0470/1749] ocaml-otr: init at 0.3.3 --- .../development/ocaml-modules/otr/default.nix | 43 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/ocaml-modules/otr/default.nix diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix new file mode 100644 index 000000000000..dfee365cd750 --- /dev/null +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -0,0 +1,43 @@ +{stdenv, buildOcaml, fetchFromGitHub, ocamlbuild, findlib, topkg, ocaml, opam, + ppx_tools, ppx_sexp_conv, cstruct, sexplib, result, nocrypto, astring}: + +let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in + +buildOcaml rec { + name = "otr"; + version = "0.3.3"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "hannesm"; + repo = "ocaml-otr"; + rev = "${version}"; + sha256 = "07zzix5mfsasqpqdx811m0x04gp8mq1ayf4b64998k98027v01rr"; + }; + + buildInputs = [ ocamlbuild findlib topkg ppx_tools ppx_sexp_conv opam ]; + propagatedBuildInputs = [ cstruct sexplib result nocrypto astring ]; + + buildPhase = '' + ocaml ${ocamlFlags} pkg/pkg.ml build \ + --tests true + ''; + + installPhase = '' + opam-installer --prefix=$out --script | sh + ln -s $out/lib/otr $out/lib/ocaml/${ocaml.version}/site-lib + ''; + + doCheck = true; + checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test"; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + homepage = https://github.com/hannesm/ocaml-otr; + description = "Off-the-record messaging protocol, purely in OCaml"; + license = licenses.bsd2; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c7422bdaba4a..c337102f010d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -339,6 +339,8 @@ let otfm = callPackage ../development/ocaml-modules/otfm { }; + otr = callPackage ../development/ocaml-modules/otr { }; + ounit = callPackage ../development/ocaml-modules/ounit { }; piqi = callPackage ../development/ocaml-modules/piqi { }; @@ -641,7 +643,7 @@ let then { tools = pkgs.pkgsi686Linux.stdenv.cc; } else {} ); - + glsurf = callPackage ../applications/science/math/glsurf { libpng = pkgs.libpng12; giflib = pkgs.giflib_4_1; From ae13a18c6a464ed700af116ee7efc4aa988d51a6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 11:36:40 +0100 Subject: [PATCH 0471/1749] ocaml-erm_xmpp_0_3: init at 0.3 --- .../ocaml-modules/erm_xmpp/0.3.nix | 29 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/ocaml-modules/erm_xmpp/0.3.nix diff --git a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix new file mode 100644 index 000000000000..a7290c8bb98f --- /dev/null +++ b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix @@ -0,0 +1,29 @@ +{ stdenv, buildOcaml, fetchFromGitHub, fetchurl, ocaml, findlib, erm_xml, nocrypto }: + +buildOcaml rec { + version = "0.3"; + name = "erm_xmpp"; + + src = fetchFromGitHub { + owner = "hannesm"; + repo = "xmpp"; + rev = "eee18bd3dd343550169969c0b45548eafd51cfe1"; + sha256 = "0hzs528lrx1ayalv6fh555pjn0b4l8xch1f72hd3b07g1xahdas5"; + }; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ erm_xml nocrypto ]; + + configurePhase = "ocaml setup.ml -configure --prefix $out"; + buildPhase = "ocaml setup.ml -build"; + installPhase = "ocaml setup.ml -install"; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/hannesm/xmpp; + description = "OCaml based XMPP implementation (fork)"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c7422bdaba4a..acd10e19a6c0 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -158,6 +158,8 @@ let erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; + erm_xmpp_0_3 = callPackage ../development/ocaml-modules/erm_xmpp/0.3.nix { }; + estring = callPackage ../development/ocaml-modules/estring { }; ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { From 4feaf8c4ac3c5e871249365d7ccc07d5dcc207aa Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Fri, 18 Nov 2016 17:21:15 +0300 Subject: [PATCH 0472/1749] rambox: 0.4.4 -> 0.4.5 --- .../networking/instant-messengers/rambox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index e1cfb2fceddb..3408bc923b6c 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -6,7 +6,7 @@ let bits = if stdenv.system == "x86_64-linux" then "x64" else "ia32"; - version = "0.4.4"; + version = "0.4.5"; myIcon = fetchurl { url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png"; @@ -26,8 +26,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz"; sha256 = if bits == "x64" then - "05xwabwij7fyifrypahcplymz46k01rzrwgp5gn79hh023w259i0" else - "16j17rc8mld96mq1rxnwmxwfa2q5b44s40c56mwh34plqyn546l2"; + "0z2rmfiwhb6v2hkzgrbkd4nhdvm1rssh0mbfbdmdwxq91qzp6558" else + "0gq0ywk1jr0apl39dnm0vwdwg1inr7fari3cmfz3fvaym7gc8fki"; }; phases = [ "unpackPhase" "installPhase" ]; From b399de297054509f6e8065cbc9895ec12746149a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 18 Nov 2016 16:13:56 +0100 Subject: [PATCH 0473/1749] =?UTF-8?q?ghcjsHEAD:=20don=E2=80=99t=20just=20c?= =?UTF-8?q?opy=20&=20replace,=20reuse=20same=20code=20(#20493)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ghcjsHEAD: don’t just copy & replace, reuse same code The HEAD file was just copied over and a few hashes replaced. Most of these hashes were already function arguments anyway, so no reason to not abstract over that. * ghcjs/base: factor out stage1Packages & regenerate for HEAD The stage1Packages have changed on ghcjs head, this adds the new list. --- pkgs/development/compilers/ghcjs/base.nix | 184 ++++++++++++++++ pkgs/development/compilers/ghcjs/default.nix | 180 +--------------- pkgs/development/compilers/ghcjs/head.nix | 208 ++++--------------- 3 files changed, 226 insertions(+), 346 deletions(-) create mode 100644 pkgs/development/compilers/ghcjs/base.nix diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix new file mode 100644 index 000000000000..f342fffd63b5 --- /dev/null +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -0,0 +1,184 @@ +{ mkDerivation +, test-framework +, test-framework-hunit +, test-framework-quickcheck2 +, data-default +, ghc-paths +, haskell-src-exts +, haskell-src-meta +, optparse-applicative +, system-fileio +, system-filepath +, text-binary +, unordered-containers +, cabal-install +, wl-pprint-text +, base16-bytestring +, executable-path +, transformers-compat +, haddock-api +, ghcjs-prim +, regex-posix +, callPackage + +, bootPkgs, gmp +, jailbreak-cabal + +, runCommand +, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm +, time +, zlib, aeson, attoparsec, bzlib, hashable +, lens +, parallel, safe, shelly, split, stringsearch, syb +, tar, terminfo +, vector, yaml, fetchgit, fetchFromGitHub, Cabal +, alex, happy, git, gnumake, autoconf, patch +, automake, libtool +, cryptohash +, haddock, hspec, xhtml, primitive, cacert, pkgs +, coreutils +, libiconv + +, version ? "0.2.0" +, ghcjsSrc ? fetchFromGitHub { + owner = "ghcjs"; + repo = "ghcjs"; + rev = "689c7753f50353dd05606ed79c51cd5a94d3922a"; + sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4"; + } +, ghcjsBootSrc ? fetchgit { + url = git://github.com/ghcjs/ghcjs-boot.git; + rev = "8c549931da27ba9e607f77195208ec156c840c8a"; + sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv"; + fetchSubmodules = true; + } +, ghcjsBoot ? import ./ghcjs-boot.nix { + inherit runCommand; + src = ghcjsBootSrc; + } +, shims ? import ./shims.nix { inherit fetchFromGitHub; } + +# This is the list of the Stage 1 packages that are built into a booted ghcjs installation +# It can be generated with the command: +# nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'" +, stage1Packages ? [ + "array" + "base" + "binary" + "bytestring" + "containers" + "deepseq" + "directory" + "filepath" + "ghc-boot" + "ghc-boot-th" + "ghc-prim" + "ghci" + "ghcjs-prim" + "ghcjs-th" + "integer-gmp" + "pretty" + "primitive" + "process" + "rts" + "template-haskell" + "time" + "transformers" + "unix" + ] +}: +let + inherit (bootPkgs) ghc; + +in mkDerivation (rec { + pname = "ghcjs"; + inherit version; + src = ghcjsSrc; + isLibrary = true; + isExecutable = true; + jailbreak = true; + doHaddock = false; + doCheck = false; + buildDepends = [ + filepath HTTP mtl network random stm time zlib aeson attoparsec + bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta + lens optparse-applicative parallel safe shelly split + stringsearch syb system-fileio system-filepath tar terminfo text-binary + unordered-containers vector wl-pprint-text yaml + alex happy git gnumake autoconf automake libtool patch gmp + base16-bytestring cryptohash executable-path haddock-api + transformers-compat QuickCheck haddock hspec xhtml + ghcjs-prim regex-posix libiconv + ]; + buildTools = [ nodejs git ]; + testDepends = [ + HUnit test-framework test-framework-hunit + ]; + patches = [ ./ghcjs.patch ]; + postPatch = '' + substituteInPlace Setup.hs \ + --replace "/usr/bin/env" "${coreutils}/bin/env" + + substituteInPlace src/Compiler/Info.hs \ + --replace "@PREFIX@" "$out" \ + --replace "@VERSION@" "${version}" + + substituteInPlace src-bin/Boot.hs \ + --replace "@PREFIX@" "$out" \ + --replace "@CC@" "${stdenv.cc}/bin/cc" + ''; + preBuild = '' + export HOME="$TMP" + + local topDir=$out/lib/ghcjs-${version} + mkdir -p $topDir + + cp -r ${ghcjsBoot} $topDir/ghcjs-boot + chmod -R u+w $topDir/ghcjs-boot + + cp -r ${shims} $topDir/shims + chmod -R u+w $topDir/shims + + # Make the patches be relative their corresponding package's directory. + # See: https://github.com/ghcjs/ghcjs-boot/pull/12 + for patch in "$topDir/ghcjs-boot/patches/"*.patch; do + echo "fixing patch: $patch" + sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch + done + ''; + # We build with --quick so we can build stage 2 packages separately. + # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a + # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw + postInstall = '' + PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \ + env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \ + --dev \ + --quick \ + --with-cabal ${cabal-install}/bin/cabal \ + --with-gmp-includes ${gmp.dev}/include \ + --with-gmp-libraries ${gmp.out}/lib + ''; + passthru = let + ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix { + generated = ./node-packages-generated.nix; + self = ghcjsNodePkgs; + }; + in { + inherit bootPkgs; + isCross = true; + isGhcjs = true; + inherit nodejs ghcjsBoot; + inherit (ghcjsNodePkgs) "socket.io"; + + inherit stage1Packages; + mkStage2 = import ./stage2.nix { + inherit ghcjsBoot; + }; + }; + + homepage = "https://github.com/ghcjs/ghcjs"; + description = "A Haskell to JavaScript compiler that uses the GHC API"; + license = stdenv.lib.licenses.bsd3; + platforms = ghc.meta.platforms; + maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; +}) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 565215f474ea..7400057b128f 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -1,179 +1,3 @@ -{ mkDerivation -, test-framework -, test-framework-hunit -, test-framework-quickcheck2 -, data-default -, ghc-paths -, haskell-src-exts -, haskell-src-meta -, optparse-applicative -, system-fileio -, system-filepath -, text-binary -, unordered-containers -, cabal-install -, wl-pprint-text -, base16-bytestring -, executable-path -, transformers-compat -, haddock-api -, ghcjs-prim -, regex-posix -, callPackage +{ bootPkgs }: -, bootPkgs, gmp -, jailbreak-cabal - -, runCommand -, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm -, time -, zlib, aeson, attoparsec, bzlib, hashable -, lens -, parallel, safe, shelly, split, stringsearch, syb -, tar, terminfo -, vector, yaml, fetchgit, fetchFromGitHub, Cabal -, alex, happy, git, gnumake, autoconf, patch -, automake, libtool -, cryptohash -, haddock, hspec, xhtml, primitive, cacert, pkgs -, coreutils -, libiconv - -, ghcjsBootSrc ? fetchgit { - url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "8c549931da27ba9e607f77195208ec156c840c8a"; - sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv"; - fetchSubmodules = true; - } -, ghcjsBoot ? import ./ghcjs-boot.nix { - inherit runCommand; - src = ghcjsBootSrc; - } -, shims ? import ./shims.nix { inherit fetchFromGitHub; } -}: -let - inherit (bootPkgs) ghc; - version = "0.2.0"; - -in mkDerivation (rec { - pname = "ghcjs"; - inherit version; - src = fetchFromGitHub { - owner = "ghcjs"; - repo = "ghcjs"; - rev = "689c7753f50353dd05606ed79c51cd5a94d3922a"; - sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4"; - }; - isLibrary = true; - isExecutable = true; - jailbreak = true; - doHaddock = false; - doCheck = false; - buildDepends = [ - filepath HTTP mtl network random stm time zlib aeson attoparsec - bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta - lens optparse-applicative parallel safe shelly split - stringsearch syb system-fileio system-filepath tar terminfo text-binary - unordered-containers vector wl-pprint-text yaml - alex happy git gnumake autoconf automake libtool patch gmp - base16-bytestring cryptohash executable-path haddock-api - transformers-compat QuickCheck haddock hspec xhtml - ghcjs-prim regex-posix libiconv - ]; - buildTools = [ nodejs git ]; - testDepends = [ - HUnit test-framework test-framework-hunit - ]; - patches = [ ./ghcjs.patch ]; - postPatch = '' - substituteInPlace Setup.hs \ - --replace "/usr/bin/env" "${coreutils}/bin/env" - - substituteInPlace src/Compiler/Info.hs \ - --replace "@PREFIX@" "$out" \ - --replace "@VERSION@" "${version}" - - substituteInPlace src-bin/Boot.hs \ - --replace "@PREFIX@" "$out" \ - --replace "@CC@" "${stdenv.cc}/bin/cc" - ''; - preBuild = '' - export HOME="$TMP" - - local topDir=$out/lib/ghcjs-${version} - mkdir -p $topDir - - cp -r ${ghcjsBoot} $topDir/ghcjs-boot - chmod -R u+w $topDir/ghcjs-boot - - cp -r ${shims} $topDir/shims - chmod -R u+w $topDir/shims - - # Make the patches be relative their corresponding package's directory. - # See: https://github.com/ghcjs/ghcjs-boot/pull/12 - for patch in "$topDir/ghcjs-boot/patches/"*.patch; do - echo "fixing patch: $patch" - sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch - done - ''; - # We build with --quick so we can build stage 2 packages separately. - # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a - # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw - postInstall = '' - PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \ - env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \ - --dev \ - --quick \ - --with-cabal ${cabal-install}/bin/cabal \ - --with-gmp-includes ${gmp.dev}/include \ - --with-gmp-libraries ${gmp.out}/lib - ''; - passthru = let - ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix { - generated = ./node-packages-generated.nix; - self = ghcjsNodePkgs; - }; - in { - inherit bootPkgs; - isCross = true; - isGhcjs = true; - inherit nodejs ghcjsBoot; - inherit (ghcjsNodePkgs) "socket.io"; - - # This is the list of the Stage 1 packages that are built into a booted ghcjs installation - # It can be generated with the command: - # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'" - stage1Packages = [ - "array" - "base" - "binary" - "rts" - "bytestring" - "containers" - "deepseq" - "directory" - "filepath" - "ghc-prim" - "ghcjs-prim" - "integer-gmp" - "old-locale" - "pretty" - "primitive" - "process" - "template-haskell" - "time" - "transformers" - "unix" - ]; - - mkStage2 = import ./stage2.nix { - inherit ghcjsBoot; - }; - }; - - homepage = "https://github.com/ghcjs/ghcjs"; - description = "A Haskell to JavaScript compiler that uses the GHC API"; - license = stdenv.lib.licenses.bsd3; - platforms = ghc.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; -}) +bootPkgs.callPackage ./base.nix { inherit bootPkgs; } diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index 2bf13cb895f5..96d2ee05f5a5 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -1,178 +1,50 @@ -{ mkDerivation -, test-framework -, test-framework-hunit -, test-framework-quickcheck2 -, data-default -, ghc-paths -, haskell-src-exts -, haskell-src-meta -, optparse-applicative -, system-fileio -, system-filepath -, text-binary -, unordered-containers -, cabal-install -, wl-pprint-text -, base16-bytestring -, executable-path -, transformers-compat -, haddock-api -, regex-posix -, callPackage +{ fetchgit, fetchFromGitHub, bootPkgs }: -, bootPkgs, gmp -, jailbreak-cabal - -, runCommand -, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm -, time -, zlib, aeson, attoparsec, bzlib, hashable -, lens -, parallel, safe, shelly, split, stringsearch, syb -, tar, terminfo -, vector, yaml, fetchgit, fetchFromGitHub, Cabal -, alex, happy, git, gnumake, autoconf, patch -, automake, libtool -, cryptohash -, haddock, hspec, xhtml, primitive, cacert, pkgs -, coreutils -, libiconv - -, ghcjsBootSrc ? fetchgit { - url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8"; - sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq"; - fetchSubmodules = true; - } -, ghcjsBoot ? import ./ghcjs-boot.nix { - inherit runCommand; - src = ghcjsBootSrc; - } -, shims ? import ./head_shims.nix { inherit fetchFromGitHub; } -}: -let - inherit (bootPkgs) ghc; +bootPkgs.callPackage ./base.nix { version = "0.2.020161101"; -in mkDerivation (rec { - pname = "ghcjs"; - inherit version; - src = fetchFromGitHub { + # deprecated on HEAD, directly included in the distribution + ghcjs-prim = null; + inherit bootPkgs; + + ghcjsSrc = fetchFromGitHub { owner = "ghcjs"; repo = "ghcjs"; rev = "899c834a36692bbbde9b9d16fe5b92ce55a623c4"; sha256 = "024yj4k0dxy7nvyq19n3xbhh4b4csdrgj19a3l4bmm1zn84gmpl6"; }; - isLibrary = true; - isExecutable = true; - jailbreak = true; - doHaddock = false; - doCheck = false; - buildDepends = [ - filepath HTTP mtl network random stm time zlib aeson attoparsec - bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta - lens optparse-applicative parallel safe shelly split - stringsearch syb system-fileio system-filepath tar terminfo text-binary - unordered-containers vector wl-pprint-text yaml - alex happy git gnumake autoconf automake libtool patch gmp - base16-bytestring cryptohash executable-path haddock-api - transformers-compat QuickCheck haddock hspec xhtml - regex-posix libiconv - ]; - buildTools = [ nodejs git ]; - testDepends = [ - HUnit test-framework test-framework-hunit - ]; - patches = [ ./ghcjs.patch ]; - postPatch = '' - substituteInPlace Setup.hs \ - --replace "/usr/bin/env" "${coreutils}/bin/env" - - substituteInPlace src/Compiler/Info.hs \ - --replace "@PREFIX@" "$out" \ - --replace "@VERSION@" "${version}" - - substituteInPlace src-bin/Boot.hs \ - --replace "@PREFIX@" "$out" \ - --replace "@CC@" "${stdenv.cc}/bin/cc" - ''; - preBuild = '' - export HOME="$TMP" - - local topDir=$out/lib/ghcjs-${version} - mkdir -p $topDir - - cp -r ${ghcjsBoot} $topDir/ghcjs-boot - chmod -R u+w $topDir/ghcjs-boot - - cp -r ${shims} $topDir/shims - chmod -R u+w $topDir/shims - - # Make the patches be relative their corresponding package's directory. - # See: https://github.com/ghcjs/ghcjs-boot/pull/12 - for patch in "$topDir/ghcjs-boot/patches/"*.patch; do - echo "fixing patch: $patch" - sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch - done - ''; - # We build with --quick so we can build stage 2 packages separately. - # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a - # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw - postInstall = '' - PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \ - env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \ - --dev \ - --quick \ - --with-cabal ${cabal-install}/bin/cabal \ - --with-gmp-includes ${gmp.dev}/include \ - --with-gmp-libraries ${gmp.out}/lib - ''; - passthru = let - ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix { - generated = ./node-packages-generated.nix; - self = ghcjsNodePkgs; - }; - in { - inherit bootPkgs; - isCross = true; - isGhcjs = true; - inherit nodejs ghcjsBoot; - inherit (ghcjsNodePkgs) "socket.io"; - - # This is the list of the Stage 1 packages that are built into a booted ghcjs installation - # It can be generated with the command: - # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'" - stage1Packages = [ - "array" - "base" - "binary" - "rts" - "bytestring" - "containers" - "deepseq" - "directory" - "filepath" - "ghc-prim" - "ghcjs-prim" - "integer-gmp" - "old-locale" - "pretty" - "primitive" - "process" - "template-haskell" - "time" - "transformers" - "unix" - ]; - - mkStage2 = import ./stage2.nix { - inherit ghcjsBoot; - }; + ghcjsBootSrc = fetchgit { + url = git://github.com/ghcjs/ghcjs-boot.git; + rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8"; + sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq"; + fetchSubmodules = true; }; - homepage = "https://github.com/ghcjs/ghcjs"; - description = "A Haskell to JavaScript compiler that uses the GHC API"; - license = stdenv.lib.licenses.bsd3; - platforms = ghc.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; -}) + shims = import ./head_shims.nix { inherit fetchFromGitHub; }; + stage1Packages = [ + "array" + "base" + "binary" + "bytestring" + "containers" + "deepseq" + "directory" + "filepath" + "ghc-boot" + "ghc-boot-th" + "ghc-prim" + "ghci" + "ghcjs-prim" + "ghcjs-th" + "integer-gmp" + "pretty" + "primitive" + "process" + "rts" + "template-haskell" + "time" + "transformers" + "unix" + ]; +} + From e38b74ba89d3d03e01ee751131d2a6dc316ac33a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 18 Nov 2016 15:04:39 +0100 Subject: [PATCH 0474/1749] grsecurity: work around for #20490 In `scripts/Makefile.modinst`, the code that generates the list of modules to install passes file names via the command line. When installing a grsecurity kernel, this list appears to exceed the shell's argument list limit, as in make[2]: execvp: /nix/store/[...]-bash-4.3-p46/bin/bash: Argument list too long The build does not fail, however, but the list of modules to be installed ends up being empty. Thus, the resulting kernel package output contains no modules, rendering it useless. We work around this by patching the makefile to use `find -exec` to process files. Why this would occur for grsecurity and not other kernels is unknown, most likely there's something *else* that is actually causing this behaviour, so this is a temporary fix until that cause is found. Fixes https://github.com/NixOS/nixpkgs/issues/20490 --- .../linux/kernel/grsecurity-modinst.patch | 12 ++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/grsecurity-modinst.patch diff --git a/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch b/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch new file mode 100644 index 000000000000..275d96fbb29b --- /dev/null +++ b/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch @@ -0,0 +1,12 @@ +diff -ruN a/scripts/Makefile.modinst b/scripts/Makefile.modinst +--- a/scripts/Makefile.modinst 2016-11-15 07:49:06.000000000 +0100 ++++ b/scripts/Makefile.modinst 2016-11-18 13:45:07.977270500 +0100 +@@ -9,7 +9,7 @@ + + # + +-__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod))) ++__modules := $(shell find $(MODVERDIR) -name '*.mod' -exec grep -h '\.ko$$' '{}' \; | sort) + modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o))) + + PHONY += $(modules) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 3c6058c407a5..db1ce8c38013 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -99,6 +99,14 @@ rec { patch = ./grsecurity-nixos-kmod.patch; }; + # A temporary work-around for execvp: arglist too long error during + # module_install. Without this, no modules are installed into the + # resulting output. + grsecurity_modinst = + { name = "grsecurity-modinst"; + patch = ./grsecurity-modinst.patch; + }; + crc_regression = { name = "crc-backport-regression"; patch = ./crc-regression.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 135f6f850a2e..186fa10a6aff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11154,7 +11154,7 @@ in ]; }; grsecPatch = self.kernelPatches.grsecurity_testing; - kernelPatches = [ self.kernelPatches.grsecurity_nixos_kmod ]; + kernelPatches = with self.kernelPatches; [ grsecurity_nixos_kmod grsecurity_modinst ]; extraConfig = callPackage ../os-specific/linux/kernel/grsecurity-nixos-config.nix { }; }; From 247d7c88d228e26a3bfda4f157618ba858114821 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 18 Nov 2016 16:17:14 +0100 Subject: [PATCH 0475/1749] haskell.packages.ghcjs: fix entropy (#20446) --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index c97296cd5bad..b97cbd52fce5 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -130,4 +130,13 @@ self: super: # https://github.com/haskell/haddock/issues/553 wai = dontHaddock super.wai; cereal = addBuildDepend super.cereal [ self.fail ]; + + entropy = overrideCabal super.entropy (old: { + postPatch = old.postPatch or "" + '' + # cabal doesn’t find ghc in this script, since it’s in the bootPkgs + sed -e '/Simple.Program/a import Distribution.Simple.Program.Types' \ + -e 's|mConf.*=.*$|mConf = Just $ simpleConfiguredProgram "ghc" (FoundOnSystem "${self.ghc.bootPkgs.ghc}/bin/ghc")|g' -i Setup.hs + ''; + }); + } From a7043808dd63d3cbda42a273e60bc4a5244bd32f Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 18 Nov 2016 16:01:23 +0100 Subject: [PATCH 0476/1749] haskell/ghcjs: patch Safe out of fast-logger --- .../haskell-modules/configuration-ghcjs.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index b97cbd52fce5..e232152d6dd1 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -139,4 +139,15 @@ self: super: ''; }); + + # https://github.com/kazu-yamamoto/logger/issues/97 + fast-logger = overrideCabal super.fast-logger (old: { + postPatch = old.postPatch or "" + '' + # remove the Safe extensions, since ghcjs-boot directory + # doesn’t provide Trustworthy + sed -ie '/LANGUAGE Safe/d' System/Log/FastLogger/*.hs + cat System/Log/FastLogger/Date.hs + ''; + }); + } From 06e0bac814596a57166c1e862f06f8908deeb4de Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 18 Nov 2016 16:38:04 +0100 Subject: [PATCH 0477/1749] haskell/ghcjs: sort ghcjs packages alphabetically --- .../haskell-modules/configuration-ghcjs.nix | 82 +++++++++++-------- 1 file changed, 47 insertions(+), 35 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index e232152d6dd1..7c8541c5b47c 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -1,3 +1,7 @@ +# GHCJS package fixes +# +# Please insert new packages *alphabetically* +# in the OTHER PACKAGES section. { pkgs }: let @@ -9,6 +13,8 @@ with import ./lib.nix { inherit pkgs; }; self: super: +## GENERAL SETUP BASE PACKAGES + let # The stage 1 packages stage1 = pkgs.lib.genAttrs super.ghc.stage1Packages (pkg: null); # The stage 2 packages. Regenerate with ../compilers/ghcjs/gen-stage2.rb @@ -47,24 +53,26 @@ self: super: terminfo = self.terminfo_0_4_0_1; xhtml = self.xhtml_3000_2_1; - pqueue = overrideCabal super.pqueue (drv: { - postPatch = '' - sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs - sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs - sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs - sed -i -e '32s|null|Data.PQueue.Max.null|' Data/PQueue/Max.hs - sed -i -e '42s|null|Data.PQueue.Prio.Internals.null|' Data/PQueue/Prio/Min.hs - sed -i -e '42s|null|Data.PQueue.Prio.Max.null|' Data/PQueue/Prio/Max.hs + +## OTHER PACKAGES + + cereal = addBuildDepend super.cereal [ self.fail ]; + + entropy = overrideCabal super.entropy (old: { + postPatch = old.postPatch or "" + '' + # cabal doesn’t find ghc in this script, since it’s in the bootPkgs + sed -e '/Simple.Program/a import Distribution.Simple.Program.Types' \ + -e 's|mConf.*=.*$|mConf = Just $ simpleConfiguredProgram "ghc" (FoundOnSystem "${self.ghc.bootPkgs.ghc}/bin/ghc")|g' -i Setup.hs ''; }); - transformers-compat = overrideCabal super.transformers-compat (drv: { - configureFlags = []; - }); - - profunctors = overrideCabal super.profunctors (drv: { - preConfigure = '' - sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs + # https://github.com/kazu-yamamoto/logger/issues/97 + fast-logger = overrideCabal super.fast-logger (old: { + postPatch = old.postPatch or "" + '' + # remove the Safe extensions, since ghcjs-boot directory + # doesn’t provide Trustworthy + sed -ie '/LANGUAGE Safe/d' System/Log/FastLogger/*.hs + cat System/Log/FastLogger/Date.hs ''; }); @@ -98,6 +106,28 @@ self: super: patches = [ ./patches/ghc-paths-nix-ghcjs.patch ]; }); + http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ]; + # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.* + + pqueue = overrideCabal super.pqueue (drv: { + postPatch = '' + sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs + sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs + sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs + sed -i -e '32s|null|Data.PQueue.Max.null|' Data/PQueue/Max.hs + sed -i -e '42s|null|Data.PQueue.Prio.Internals.null|' Data/PQueue/Prio/Min.hs + sed -i -e '42s|null|Data.PQueue.Prio.Max.null|' Data/PQueue/Prio/Max.hs + ''; + }); + + profunctors = overrideCabal super.profunctors (drv: { + preConfigure = '' + sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs + ''; + }); + + protolude = doJailbreak super.protolude; + # reflex 0.3, made compatible with the newest GHCJS. reflex = overrideCabal super.reflex (drv: { src = pkgs.fetchFromGitHub { @@ -122,32 +152,14 @@ self: super: ] drv.libraryHaskellDepends; }); - http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ]; - # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.* - protolude = doJailbreak super.protolude; semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ]; # triggers an internal pattern match failure in haddock # https://github.com/haskell/haddock/issues/553 wai = dontHaddock super.wai; - cereal = addBuildDepend super.cereal [ self.fail ]; - entropy = overrideCabal super.entropy (old: { - postPatch = old.postPatch or "" + '' - # cabal doesn’t find ghc in this script, since it’s in the bootPkgs - sed -e '/Simple.Program/a import Distribution.Simple.Program.Types' \ - -e 's|mConf.*=.*$|mConf = Just $ simpleConfiguredProgram "ghc" (FoundOnSystem "${self.ghc.bootPkgs.ghc}/bin/ghc")|g' -i Setup.hs - ''; + transformers-compat = overrideCabal super.transformers-compat (drv: { + configureFlags = []; }); - # https://github.com/kazu-yamamoto/logger/issues/97 - fast-logger = overrideCabal super.fast-logger (old: { - postPatch = old.postPatch or "" + '' - # remove the Safe extensions, since ghcjs-boot directory - # doesn’t provide Trustworthy - sed -ie '/LANGUAGE Safe/d' System/Log/FastLogger/*.hs - cat System/Log/FastLogger/Date.hs - ''; - }); - } From 64ec4dd87bf7b211773541fa350ef2f56b9c658f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 18 Nov 2016 10:44:53 -0500 Subject: [PATCH 0478/1749] Add haskell packages set for cross ghc --- pkgs/development/compilers/ghc/head.nix | 22 ++++++++++- .../haskell-modules/generic-builder.nix | 37 +++++++++++++------ pkgs/os-specific/darwin/ios-cross/default.nix | 2 +- pkgs/top-level/haskell-packages.nix | 12 +++--- 4 files changed, 53 insertions(+), 20 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index d95791353ae3..f46a017c66aa 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils -, autoconf, automake, happy, alex, cross ? null +, autoconf, automake, happy, alex, crossSystem, selfPkgs, cross ? null }: let @@ -70,6 +70,11 @@ in stdenv.mkDerivation (rec { passthru = { inherit bootPkgs; + } // stdenv.lib.optionalAttrs (crossSystem != null) { + crossCompiler = selfPkgs.ghc.override { + cross = crossSystem; + bootPkgs = selfPkgs; + }; }; meta = { @@ -90,11 +95,24 @@ in stdenv.mkDerivation (rec { ''; configureFlags = [ - "CC=${cross.config}-cc" + "CC=${stdenv.ccCross}/bin/${cross.config}-cc" + "LD=${stdenv.binutilsCross}/bin/${cross.config}-ld" + "AR=${stdenv.binutilsCross}/bin/${cross.config}-ar" + "NM=${stdenv.binutilsCross}/bin/${cross.config}-nm" + "RANLIB=${stdenv.binutilsCross}/bin/${cross.config}-ranlib" "--target=${cross.config}" + "--enable-bootstrap-with-devel-snapshot" ]; buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutilsCross ]; dontSetConfigureCross = true; + + passthru = { + inherit bootPkgs cross; + + cc = "${stdenv.ccCross}/bin/${cross.config}-cc"; + + ld = "${stdenv.binutilsCross}/bin/${cross.config}-ld"; + }; }) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2b597532b44d..478cc7e4fccf 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused , jailbreak-cabal, hscolour, cpphs, nodePackages -}: +}: let isCross = (ghc.cross or null) != null; in { pname , dontStrip ? (ghc.isGhcjs or false) @@ -12,13 +12,14 @@ , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [] , configureFlags ? [] , description ? "" -, doCheck ? stdenv.lib.versionOlder "7.4" ghc.version +, doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version) , doHoogle ? true , editedCabalFile ? null , enableLibraryProfiling ? false , enableExecutableProfiling ? false -, enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) -, enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) +# TODO enable shared libs for cross-compiling +, enableSharedExecutables ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) +, enableSharedLibraries ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) , enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013 , enableStaticLibraries ? true , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] @@ -30,7 +31,8 @@ , jailbreak ? false , license , maintainers ? [] -, doHaddock ? !stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8" +# TODO Do we care about haddock when cross-compiling? +, doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8") , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] @@ -57,14 +59,12 @@ let inherit (stdenv.lib) optional optionals optionalString versionOlder concatStringsSep enableFeature optionalAttrs toUpper; - isCross = ghc.isCross or false; isGhcjs = ghc.isGhcjs or false; packageDbFlag = if isGhcjs || versionOlder "7.6" ghc.version then "package-db" else "package-conf"; - nativeGhc = if isCross then ghc.bootPkgs.ghc else ghc; - nativeIsCross = nativeGhc.isCross or false; + nativeGhc = if isCross || isGhcjs then ghc.bootPkgs.ghc else ghc; nativePackageDbFlag = if versionOlder "7.6" nativeGhc.version then "package-db" else "package-conf"; @@ -88,6 +88,17 @@ let # details are at . enableParallelBuilding = versionOlder "7.8" ghc.version && !hasActiveLibrary; + crossCabalFlags = [ + "--with-ghc=${ghc.cross.config}-ghc" + "--with-ghc-pkg=${ghc.cross.config}-ghc-pkg" + "--with-gcc=${ghc.cc}" + "--with-ld=${ghc.ld}" + "--hsc2hs-options=--cross-compile" + ]; + + crossCabalFlagsString = + stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags); + defaultConfigureFlags = [ "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid" "--with-gcc=$CC" # Clang won't work without that extra information. @@ -106,7 +117,9 @@ let ] ++ optionals isGhcjs [ "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" "--ghcjs" - ]; + ] ++ optionals isCross ([ + "--configure-option=--host=${ghc.cross.config}" + ] ++ crossCabalFlags); setupCompileFlags = [ (optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir") @@ -132,9 +145,9 @@ let ghcEnv = ghc.withPackages (p: haskellBuildInputs); - setupBuilder = if isCross then "${nativeGhc}/bin/ghc" else ghcCommand; + setupBuilder = if isCross || isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand; setupCommand = "./Setup"; - ghcCommand = if isGhcjs then "ghcjs" else "ghc"; + ghcCommand = if isGhcjs then "ghcjs" else if isCross then "${ghc.cross.config}-ghc" else "ghc"; ghcCommandCaps = toUpper ghcCommand; in @@ -236,7 +249,7 @@ stdenv.mkDerivation ({ buildPhase = '' runHook preBuild - ${setupCommand} build ${buildTarget} + ${setupCommand} build ${buildTarget}${crossCabalFlagsString} runHook postBuild ''; diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix index d9f4320556c9..8c70afee69cd 100644 --- a/pkgs/os-specific/darwin/ios-cross/default.nix +++ b/pkgs/os-specific/darwin/ios-cross/default.nix @@ -26,7 +26,7 @@ echo "-target ${prefix} -arch ${arch} -idirafter ${sdk}/usr/include ${if simulator then "-mios-simulator-version-min=7.0" else "-miphoneos-version-min=7.0"}" >> $out/nix-support/cc-cflags # Purposefully overwrite libc-ldflags-before, cctools ld doesn't know dynamic-linker and cc-wrapper doesn't do cross-compilation well enough to adjust - echo "-arch ${arch} -L${sdk}/usr/lib -L${sdk}/usr/lib/system" > $out/nix-support/libc-ldflags-before + echo "-arch ${arch} -L${sdk}/usr/lib -iphoneos_version_min 7.0.0" > $out/nix-support/libc-ldflags-before ''; }; in { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a3867860799d..a3cb0a8ca1c6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -49,10 +49,8 @@ rec { ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) alex happy; - }; - # TODO: how should we support multiple versions of this? - ghcCross = compiler.ghcHEAD.override { - cross = crossSystem; + inherit crossSystem; + selfPkgs = packages.ghcHEAD; }; ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix rec { bootPkgs = packages.ghc784; @@ -125,7 +123,11 @@ rec { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - # TODO Support for ghcCross here + # TODO Support for multiple variants here + ghcCross = callPackage ../development/haskell-modules { + ghc = compiler.ghcHEAD.crossCompiler; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; + }; ghcNokinds = callPackage ../development/haskell-modules { ghc = compiler.ghcNokinds; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { }; From 60ded3f3632d221ca3f82a52392e155517880456 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 18 Nov 2016 18:37:38 +0100 Subject: [PATCH 0479/1749] nixos/cjdns: do not ammend /etc/hosts Generating IPv6 addresses at eval time required building cjdns. Fix #20422 --- nixos/modules/services/networking/cjdns.nix | 51 ++++++++------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 7e981183353d..f50dae2ab7be 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -19,30 +19,21 @@ let type = types.str; description = "Public key at the opposite end of the tunnel."; }; - hostname = mkOption { - default = ""; - example = "foobar.hype"; - type = types.str; - description = "Optional hostname to add to /etc/hosts; prevents reverse lookup failures."; - }; }; }; - # Additional /etc/hosts entries for peers with an associated hostname - cjdnsExtraHosts = import (pkgs.runCommand "cjdns-hosts" {} - # Generate a builder that produces an output usable as a Nix string value - '' - exec >$out - echo \'\' - ${concatStringsSep "\n" (mapAttrsToList (k: v: - optionalString (v.hostname != "") - "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}") - (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))} - echo \'\' - ''); - - parseModules = x: - x // { connectTo = mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; }; + # check for the required attributes, otherwise + # permit attributes not undefined here + checkPeers = x: + x // { + connectTo = mapAttrs + (name: value: + if !hasAttr "publicKey" value then abort "cjdns peer ${name} missing a publicKey" else + if !hasAttr "password" value then abort "cjdns peer ${name} missing a password" else + value + ) + x.connectTo; + }; # would be nice to merge 'cfg' with a //, # but the json nesting is wacky. @@ -53,8 +44,8 @@ let }; authorizedPasswords = map (p: { password = p; }) cfg.authorizedPasswords; interfaces = { - ETHInterface = if (cfg.ETHInterface.bind != "") then [ (parseModules cfg.ETHInterface) ] else [ ]; - UDPInterface = if (cfg.UDPInterface.bind != "") then [ (parseModules cfg.UDPInterface) ] else [ ]; + ETHInterface = if (cfg.ETHInterface.bind != "") then [ (checkPeers cfg.ETHInterface) ] else [ ]; + UDPInterface = if (cfg.UDPInterface.bind != "") then [ (checkPeers cfg.UDPInterface) ] else [ ]; }; privateKey = "@CJDNS_PRIVATE_KEY@"; @@ -134,12 +125,12 @@ in ''; }; connectTo = mkOption { - type = types.attrsOf ( types.submodule ( connectToSubmodule ) ); + type = types.attrsOf (types.attrsOf types.str); default = { }; example = { "192.168.1.1:27313" = { - hostname = "homer.hype"; - password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; + user = "foobar"; + password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k"; }; }; @@ -179,12 +170,12 @@ in }; connectTo = mkOption { - type = types.attrsOf ( types.submodule ( connectToSubmodule ) ); + type = types.attrsOf (types.attrsOf types.str); default = { }; example = { "01:02:03:04:05:06" = { - hostname = "homer.hype"; - password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; + user = "foobar"; + password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k"; }; }; @@ -254,8 +245,6 @@ in }; }; - networking.extraHosts = cjdnsExtraHosts; - assertions = [ { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != null ); message = "Neither cjdns.ETHInterface.bind nor cjdns.UDPInterface.bind defined."; From 2540608f439ab61585d6e22882acbff500b75098 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 19 Nov 2016 03:12:09 +0900 Subject: [PATCH 0480/1749] thunderbird-bin: 45.4.0 -> 45.5.0 --- .../mailreaders/thunderbird-bin/sources.nix | 234 +++++++++--------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index f8509a46248d..967ae7914e91 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -4,123 +4,123 @@ # ruby generate_sources.rb 45.1.1 > sources.nix { - version = "45.4.0"; + version = "45.5.0"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha512 = "8db134f67ea813c12d97b0a44fb6169f42b45b8f9e7e151cb6389ee6628e301c95b5ca7492ec5c803cd44225b1929539e81c4df840bb533ef12740c4b9b82f28"; } - { locale = "ar"; arch = "linux-x86_64"; sha512 = "b3da97b15b71aa536d0acdf08e9e980ddd1917113579db8c9058068bd104b3029c721bf1bac1c9ed56c39540bdb7fd667605259b1c2a8d910401259d2cb0e3e5"; } - { locale = "ast"; arch = "linux-i686"; sha512 = "2e83efd53b191d7bee999fa45f09583c818377443b9bbf3203b7f11a31b67d371e34980267cc509c47a57b4a6540b1f7f4293252f02138b24869c29bfc64423d"; } - { locale = "ast"; arch = "linux-x86_64"; sha512 = "9d9ef1a1bcbb32cf04e26ad499bf1f8122b3b1a964e6c4eb6726d2271fba28c78f0d7bc60641d8cc6c2a0e1153a25483a6f8eb12568128045f7d6cf5ed6746d3"; } - { locale = "be"; arch = "linux-i686"; sha512 = "21cf44b0eb90d3662ef690c56a393bd4453809631209c8953156a1b59b6011fce407c4b3d54d956e5c376f36dac663cd874b4c917f41b9132e445968fd7bc439"; } - { locale = "be"; arch = "linux-x86_64"; sha512 = "ce33a0750430a462aa07ad8995656dbf2689077746de8ee42ec361c544ccd53e182192f95f6ac755ee739035b5f2a2c8233ac1c37c0d156c4a2aabb39806039d"; } - { locale = "bg"; arch = "linux-i686"; sha512 = "fe763ecd1a572ed6e3864aa9d934b821fae2f91f02d959e22e96314e26271a9f5695930a0388fadd6bd34e0f7ab6938a48bfd346901e139128e0e24483c36d90"; } - { locale = "bg"; arch = "linux-x86_64"; sha512 = "935bc0f19a45314341f76cb53dc4c617a5104a0a17c56f60679974eaec9fc8d9ee609d543a5a310bf4d1e8db6cdc54b660db5b2b85af7838dc5711e10ecff77c"; } - { locale = "bn-BD"; arch = "linux-i686"; sha512 = "d9bdc81c10d1ef370275d3f152669ca50a7fb2b126cdd396d63aa8b7c97a46d815b1fa77b8135887b0f6c825ba87617c81e1f3698e455d75b2bc9862e47fe761"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "0b420e4168df1a0b7ff8e4983892de9b08cf644a6e7b28c090477b3efe557a7a34a17ac90a722b497298759d98c1a3346ff84789598359e4052a35b44b3bbba2"; } - { locale = "br"; arch = "linux-i686"; sha512 = "5e0726512ff28ee00498a4a8493d4f00e8375950fe8489c3e5906b37bf057c76eca66ccea8aaf7e165ca56b02ed14041efcab8b75170ae4daa2b2df2bf2ddc8f"; } - { locale = "br"; arch = "linux-x86_64"; sha512 = "1240f62d8a0530ead4b19983a36bdd894b5f812c82b68c49a4f7d9a961e0ff2542244ef405e03bb281ec65f070e815246487347a99bec76dd3509ec4512c1d47"; } - { locale = "ca"; arch = "linux-i686"; sha512 = "ce79eebfe0a93a9e15237317fa3dcca6fd6f20c90adf431366e5d30ce026da0f4af4e1be0745cfa6620b2a75838fbed93a85ed0695c486eb46b58cfb3cea3571"; } - { locale = "ca"; arch = "linux-x86_64"; sha512 = "f290ac184b7086349a173b1597341731b6c696c8806b3b5adb8e7f0121f298ae9971f8f96981662bac72079f03d7d2ce17f0c385662d06657a1519d7bf32ef64"; } - { locale = "cs"; arch = "linux-i686"; sha512 = "a06b8a0db00b35ba16541a72623fc764c87c45e15e69079b757449e9c67988764f65bf6ae214ac4a0c0c541549fb6fb48bd1dbb2efe02541e3bda12938e2d787"; } - { locale = "cs"; arch = "linux-x86_64"; sha512 = "b96dca42026adb793ab5d37544d42ff8d5668adbff6a94f6c37a33ea63eb87622a7eeee8c02976b16c1d8c38b3348387aa46daa2bf5ccfd66f2a176ba4c113ff"; } - { locale = "cy"; arch = "linux-i686"; sha512 = "dee0395f80b3e0db7b6cedf3d7e22b574f3f2734da518db684ab8ddfb502a127d2e0c75849819638ea61fd8604b84f8b1118c036d8ffd5f444ebd8adce19fa2e"; } - { locale = "cy"; arch = "linux-x86_64"; sha512 = "8162ba8abda1906ce0fa78455faf823ce4bf6eaab9ecafa50b5669f2485861f59fe2be3820d75d7f168432ede5e9ced170928e883ebd06f8ab3145065f31e610"; } - { locale = "da"; arch = "linux-i686"; sha512 = "f5bee461d1e0ba0ffc1de1fee05d41d0aa9db904061a7e4947d2a22ce8e3eb9ab40e15ace81a9cb248f72b5c08b699b39b46031f5673045eefe2e3346e7ae18a"; } - { locale = "da"; arch = "linux-x86_64"; sha512 = "dab187762c44a7092136d5b12be43bb3675c37dbaa1ffb36171e9cc76ffd94fd0f80872008bd686515f0a84c3adc9c36d5eff9240e871dff457145bc21981777"; } - { locale = "de"; arch = "linux-i686"; sha512 = "35994979446f4bcf5a6b79875e84999188d8ee58143b741e583302b29c0619566b5d4d65e640156168974e4c59c7d454ffeac47a8aaf35c344bcf2ec44520334"; } - { locale = "de"; arch = "linux-x86_64"; sha512 = "ae7169f84c945cd7886ef0ee84a1e57cb3017ad89b991c0f8dfb36d5537c2d9253345e111916a234c228a99e153c9d8c2f5bbb61e3d4d5fcbe95f507d863b735"; } - { locale = "dsb"; arch = "linux-i686"; sha512 = "1b10d6c4da26452c89089c2938db3559cc46c098baf917ebbcfc1d107bd9591630749aeae87a5b9e8819ebb5e4ad2b7d5321531bbdc3045df604e3929d2d6d93"; } - { locale = "dsb"; arch = "linux-x86_64"; sha512 = "c6195bdf00e05921a19eb37a74c34794cb08d8b8cd43609eed9f64bbe89788d9c87a45df449cc400e6cee31b7ac6f02ce57083581c85885acd620931c657a833"; } - { locale = "el"; arch = "linux-i686"; sha512 = "e7d7f38fecea77d93bb99656a6dd566c6f396e108910152917cd1c908f09d1f276385ed771d5500feac572356e688e43ab3a91651d64bd7d522db9daaa4f32ef"; } - { locale = "el"; arch = "linux-x86_64"; sha512 = "bec617a64ce06f7aacfd936cb85f29684d1afc4246c05f1de6bf1e11819a44eec0e395a446e64676fe6453ce41f173f938a845fb50a625e3f5bb325098e09d11"; } - { locale = "en-GB"; arch = "linux-i686"; sha512 = "c06fcb56eafbe894e15a0380f49ce5455c95b2b6c9520ef3b15f699778a575e5c643db5797e72441a68e063bce0bd4c0003cd0b58c78c7d1a744223598ab3549"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "1b095d5e254c2eef894b9954f42031b6e7eedbf0c753ac3e9f7b51b152dfb9c21d90ace238fe5bd58c63292587e477d23121dd0f96f7489b7564ae1bca27eef7"; } - { locale = "en-US"; arch = "linux-i686"; sha512 = "7561111abeda21de3c4c9f585528ea9fc76409b15c0679b22743180f3b987aefac19ff45a682519511e347b0881e0f924f4efe35a782ceb4da9c6af05132fb78"; } - { locale = "en-US"; arch = "linux-x86_64"; sha512 = "2beacec69acea8bdc98b5a7df5111318c6b47bbe1bb4356d3f9a2ce3b783ce6fad01a3ef11658c9d24d89e5c3f3e5c71de6b6623e93187d1221c25d415dac3c4"; } - { locale = "es-AR"; arch = "linux-i686"; sha512 = "c6d1fc35bb89ed23b5f4e3be2fa6c28c3e29a7e821be1ae79345bb26a6db1ecae67b27f7ac9d3bd5bd803b6c7613aba3f0ad35cb07b607c1030f84a365da2b2c"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "e3c95879782c17963e9f17dfde11a416502bb89d5c712ae445bd476e1bc1fb76bb0716764150b2b1f92ab8487d736c39f29ceb023f226b92f8c07bfb7da8e76e"; } - { locale = "es-ES"; arch = "linux-i686"; sha512 = "3f8f3263650fd4722da121566cd9afe8e671005eafee26f550a940dd76b1ed02c3f34f32f886c2cb2e2b1ed029f9997f2686a2494f4b24b6f32a7bcb8226f6aa"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "587ca874ed5e035291099db107cf29f19562c0adb785c33ad92bab9d5eac2f2615143b5587bf7da7df61c071995eaf7894e5733d2fb311ffa14671c14aed54d3"; } - { locale = "et"; arch = "linux-i686"; sha512 = "a08b99a3e444135d538f3b53669a2f4e900f86406e74076a2ca986c7d9bf55661aac248fa564eda3b6bd491cd284690da9c61a56a43f2884167998a10b666785"; } - { locale = "et"; arch = "linux-x86_64"; sha512 = "97043053f1512e6ac7298208e219bd2cd8dd1abd403ecbae90e365aa69b098becdef3f6cec9998fc71b237d78e3b7693fa93cf9452317bf1f4793425f23c0b5d"; } - { locale = "eu"; arch = "linux-i686"; sha512 = "2de3d5915801e62196339e6acaa7f601740212a59f4ec6c684cb40c830bc6fdab843b3497a168bc6b2889f80449900406c05cabb3ba656d7d6b0be5750a31aab"; } - { locale = "eu"; arch = "linux-x86_64"; sha512 = "834f9e712183f14af927ccb719325dad1a7f778d7d3beeec87cbb559d039b8764efb9447b8a0e40eb0ad55c88b525e5bbc2e2f5729c11b173ef86f63e4f92974"; } - { locale = "fi"; arch = "linux-i686"; sha512 = "b8b1c42b3ab0a365c9a478fea0e83ac49b709dd2d117c1d8ed6fd7946b5dd32a1d3907b653c5aa0fada4ba8cc365ee9fc723fbbed76219a7c5d4b70eb68dbf65"; } - { locale = "fi"; arch = "linux-x86_64"; sha512 = "64b5bc313fa64abc56961b0c6abdcc6fa72cd321f422857fece9bfb3673747d5992d96dc9d98a76c71148b6261ea9a750147c94f171c548170c0681d597d8402"; } - { locale = "fr"; arch = "linux-i686"; sha512 = "45e7a37ac6c18d31e834b88789d6039bed489bc1cb4601399b3cf76feef52c3c36249e297750d39e3e3071c2d90a1ff6f0bcfef8bec89997ac552cceff88e78f"; } - { locale = "fr"; arch = "linux-x86_64"; sha512 = "02a31ae95b6a6dac76eabd8e1de27ff50f29725be221841a738f60e41306d39ea050b73f78105561344d042ed988955e1801b5379bcecadccc89481c3bfcc13e"; } - { locale = "fy-NL"; arch = "linux-i686"; sha512 = "bc14d4d16f0b196eaf92d551df6b565bfdf56806dc97714e97db7fd201c6e4e80df0485f77ff4bc5218b8c2f96a01a39f87c6c3e156c5c0cd72a8b932248370e"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "025411d23fae36123a86b72818b486412aad0f532631e4c48da5dea9b41d7b2875aba463a4a721e422cc4b141c8cce155dab01fd7056dfbadd435cd3e3061f08"; } - { locale = "ga-IE"; arch = "linux-i686"; sha512 = "56d20e9bd013dea41f8686f7ab4da48b1c96e0d93c7639e990daf174cf7c9313ab659eb9256f8ee52adc9659d6ce766921eab1a24a0f963a8a8dc1d614ed34e9"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "1bd36aababa4fa8e47bb62d9a49b2a5303b5b0404f5ea370fd4b6b152327766a42bc6c15a85c693aaf532b9c3aa8598911e313a861d3eb946bb4ac8d0642de6f"; } - { locale = "gd"; arch = "linux-i686"; sha512 = "bc0f98937cb2c2ef98ebf6625179f77d36d12f6c95eb413cd570f4b3a9fbe733888b57ef946fcde2daf59183291a8bd1258e8c7f80b260e6af3138c8b83117f9"; } - { locale = "gd"; arch = "linux-x86_64"; sha512 = "d2729fddbd4db455b1f2b738d9bbd6d155db664c01ba6617128728caffe8f96aada8b02d49fb1b90695c4bf37db6960f51d6c074b5df94ab4e74996370679d2a"; } - { locale = "gl"; arch = "linux-i686"; sha512 = "6306be1026b9127e455a3b0c720f7de495811c3bfb578090ee33d8b4200bec3390c006767d45ce165b57325f1c41e98ce078cf78bdf0a2e9d0bf5fd704cf8374"; } - { locale = "gl"; arch = "linux-x86_64"; sha512 = "cb977c4f60041ccba81ae9708b381d8e073c2041104549973f33695d6f08663d23fc9dccc112d6fd9e4c61847211ecd2b762b81d842853ff80a7b813955295c9"; } - { locale = "he"; arch = "linux-i686"; sha512 = "e39c70ed7711a4c7c5baf0594917e2727bf0d081f9d38d2f0d539e557fa9c20e639c3e98ef8926cdc9f57ffee2c4b8896b044bd1fe9aeca39e64af2b56e35dfd"; } - { locale = "he"; arch = "linux-x86_64"; sha512 = "86ad9d155916dbf7318fe054286b8808bd6072735b6264db61d51745abaa975311776d9a15da13b9f6c536e78714501f1855291bcf59b49cebc047da112fcc91"; } - { locale = "hr"; arch = "linux-i686"; sha512 = "e82a125725373a5fcadb4ad010809fd307f5caea4bbdb428cce3c267da197bc73355f655397283fc6bf93838ce41896b7d6dd1174fc56526a04b61559babf42d"; } - { locale = "hr"; arch = "linux-x86_64"; sha512 = "ba8928e57b1eeeaa2b1e1b95ef87908247695b09d3f7220113820cc13a07223088a1c0468e362488b303a60456e2d63c631150025715d3a4b66b6a6204e31c9b"; } - { locale = "hsb"; arch = "linux-i686"; sha512 = "276a97640f24aade9d0658529e13d4e50b70bd5e98d30c43d7af6e0cdb368d3a54ed9365aea9cc03bef6938bb3c7dc0649ca09543278538fea5dc24a15ab5072"; } - { locale = "hsb"; arch = "linux-x86_64"; sha512 = "ab527b02bc792b2fe2a939a82b5ef4797f7ae94144a5161e11722d46d38da75203139faa85655248e4aba12090d79a46a0db0310b32ec0db02c4e68e932f0d2f"; } - { locale = "hu"; arch = "linux-i686"; sha512 = "34e1f7e790deb7d4594f2edcf6ba1641730bdb6ceb72fb08071daed02713de8ff6931e3986fb3125646ecb3d2f299e5bf5028fc0425ac9790d57d4aace9e81f0"; } - { locale = "hu"; arch = "linux-x86_64"; sha512 = "e7df1f64c41110d56959237555ff3a066b8d503f28c6d504c7080f3af2548d5ee66a60771872065222db57624b40d1a647aa278f89c04fa3c520730147227c83"; } - { locale = "hy-AM"; arch = "linux-i686"; sha512 = "356ac76891199061fd4698c51903ddc7e92858252a6ca502543b0403790b9b80ba8799e847a00331f19b6ab56d2e3d02fac79ec7b5502ed8227c5abd82ad3fc3"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "410ca6dbd22d870ec4d74e0dc19b65009d860e93b905dc43ae0d5086f83ad1dbae81d2213b0f39afbd5e428287d0f35e5c7b923df594494e66fcf08d4663cf82"; } - { locale = "id"; arch = "linux-i686"; sha512 = "ddab3b64afba2862a18879845cea3945fd3a34295ab07e5c7f53435ef8af005fdaa3beb5fedbee27818917a320fa5e1d1cdc618ac1767db9ceb1bf3c912720b0"; } - { locale = "id"; arch = "linux-x86_64"; sha512 = "4b26928f579b56c965992b4425a9af6d85fd7a288d699942448ff8f331833e53625f0d48e62794356ed7056ce75d0efa3fcce3f3be9acee099060b4c5a20e281"; } - { locale = "is"; arch = "linux-i686"; sha512 = "8ad9065d628cddc34fad8afb5477edc2ecbac7add4162c87e6790bbee58e8d40e40b087f879fd09a44f180b30e3929bcfe2ed268fe5bd549c0d5c011be7d974a"; } - { locale = "is"; arch = "linux-x86_64"; sha512 = "f2a14977d98e0e7575dbe1f3f068472bb90d25a9c333ed191ee17fbf647b1c47143136ef7fc1871bcdbf3b55c2d414a05a119a7a2337b9cd05f039d74915c727"; } - { locale = "it"; arch = "linux-i686"; sha512 = "18a3951092f38dded053b25658da79188aff3a3dd6e008f269b0b4c32151f7d2d2483932145ccc50c6c9d199af94b43abde65b61e8b1093d9b4c52692382d8ca"; } - { locale = "it"; arch = "linux-x86_64"; sha512 = "f834a9ba6f6cc2745d4e54eb73ef174e913009e82e989d1386e8598f9f83c32fa65de6902de641b62ebbf183a25f0037d119bb61884f3548d8f425fa63c9f5d0"; } - { locale = "ja"; arch = "linux-i686"; sha512 = "f91904e585e30ac18e4065046ec184607705bce423ea79aadbecf32fa0f9f598a439ae8f955e79389c411f0836dd6bcf9a74e1e78cb70471a3c523a807e43c41"; } - { locale = "ja"; arch = "linux-x86_64"; sha512 = "3052946955110d0f1df66df9933079bbe0b0247f9eef0a07c02c43f6463055bcde33e27b7ec1beb511e70f3b524d55ab404a0be755599f9e15f1902b4eb457c4"; } - { locale = "ko"; arch = "linux-i686"; sha512 = "e0f79d30960bff54ee064ae381dd89b877c2f5055424eaf017382f6b2d1d0b34544cf3d88fefce8f2e294e84477e5109a17fca83083b0c5602ea5d0eec7b9c0c"; } - { locale = "ko"; arch = "linux-x86_64"; sha512 = "ce515c74e7d69394f79ff7adf6ffe2118b0dc76f49672f19cbc299b21705ba18a88c6780f88bf28bcbf208ad33914da13031617a20494160d771ec09c10a798d"; } - { locale = "lt"; arch = "linux-i686"; sha512 = "f9d00ec17abd13d575d651caad02e1a46adef760ca6b706df31708375b7c721f3cfd1d99964cc2e16615f5fc422855dba8fa722d57b355782dba1541cf32e1e1"; } - { locale = "lt"; arch = "linux-x86_64"; sha512 = "2572ee32695dd0abf10a486453a3ca9d7fc26e88993a374677fb5f96edb319a5ba2892d8f9a236195ecd8199a7936d3969830571411ea35a8dc1f229089595e2"; } - { locale = "nb-NO"; arch = "linux-i686"; sha512 = "26db6cf82400b4a1bff5747d4e301c46f3391b97e28b64716e2b2dcfb2ab2da583142b487f90fe0798bee3cdf49d5965b9d9b124e95f1d65b32c9f84c42a7ebc"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "9b83eed9b3e93a5ddf463aa631bb4905abb8e02574e1be8a4cc9fe5cea7f3aee743b0f570a748fba67adbf6096a8443378ddfeedaa9cb0aa8f072dadf906929d"; } - { locale = "nl"; arch = "linux-i686"; sha512 = "ff00b25886df3a9ff0eb9c4c9a1b34be21edc69ac20f0d994b9dd9b0618037c92c15ead664b071d09766a0e764acb5e118185dc3f08c42f2cca62c4c70fc8ffe"; } - { locale = "nl"; arch = "linux-x86_64"; sha512 = "6796f4f3d1525a3b617c99eacec76c1cdc5c8fcadc39120d1da052518cb663093c695060b37120ea6337e21b9fcc20c5a5119878ba1068553772f2d8ed89db32"; } - { locale = "nn-NO"; arch = "linux-i686"; sha512 = "ab236204028e79bb98e78b2900b434f1237e407e864d346fae975d123fa87e727710e41e19625b6c69548497cd9d7716467dc01002e4ff6025301a141125c723"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "0544c952ae8fddf43b784bab00aa9d4fd05566e06b9df15990ea91cc65aace6066855a8bdc3f6e6eb01e2a7030a49df67962de4af8d9d84d003cb2553af71006"; } - { locale = "pa-IN"; arch = "linux-i686"; sha512 = "618d3e621bed807521f4b933a44e8e87b38b2843a5f85f59a83a60a3df6e13a96d1b3c250a9d77200b03be69116cbdeb33c7e2e2b4d02b8672ab90f0e303dfe3"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "226844283b3aa5dd4f224a85101529099c8fde81aed5d354b685953019b27d445ac3347f642ea93145be4dce328c4f1711e0bd21bd9f5a2b97e6b822130546cd"; } - { locale = "pl"; arch = "linux-i686"; sha512 = "4ba51ed645292165343bd104dc36ba0126435fdc06764e587379ed4de6a89a9f7711890f5f12f6176851ffcfbcd267cc1927b6e8c2a710d505cb3bbc7120209c"; } - { locale = "pl"; arch = "linux-x86_64"; sha512 = "2702db95f2e166dd5097ae7c2c83fea39f666a0a9e811e7876042e6b5ee0dcad6061fb6b6950a2f8fd8f97c434476155b8e2a306e1fee5cc54100e2d2ec7d619"; } - { locale = "pt-BR"; arch = "linux-i686"; sha512 = "ec7bb46f323030f180bb7e83b40e421a245ca4a1aec5f548a2bde1796db00fec415889cca836394b172b1923638e61eba4b71f56bf8aaa55b902deaa7f57842e"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "48406e53ba5276f3721cc5a9af825aa48215862134addefdb136ccc013dc63ca664baa820c2f34f4dd02e79e747bcd4ab73b59ab71773f05c5fede7bfc005745"; } - { locale = "pt-PT"; arch = "linux-i686"; sha512 = "27f8bfc56044d000c8c43c759c16c3eb891a0d3b6aa4d62a18477a3dd816f0b67e899a1ec375376ee83fa97d0d2d836fcb5b1eb3407b09b194600206072d6c49"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "7fa5298de1e5128b4895491d99ab5222f23c1e36e2f07582b6e970de95f45b6ae89a8e4a03b394d0910129ca16be593a47217124b1619ec567ec9d470fe78100"; } - { locale = "rm"; arch = "linux-i686"; sha512 = "2e25f6ed8e9c92a888c9b2fc0105d5912a9b85fe438c8889728d5522aebf23e86655af2066046e9ed0ea232a59d19b4affe73fa14d4e15af7cb337fef4438b49"; } - { locale = "rm"; arch = "linux-x86_64"; sha512 = "c2adc7519b2a6670e7c0e7190c6788a5c5c8882b86bbd58c3472de51e958a22126c575413b6a604eca737d120b1da1863f35702f65220bb0e7f81e4deaa21587"; } - { locale = "ro"; arch = "linux-i686"; sha512 = "ac7c8df9f06cf03c4b91e22668697bc74fff7dfa2edbf6873786e98acd5bf79535d8ad9a913811ed3567cb7e4427a8b3751a7adb011bd0567e433064e712be43"; } - { locale = "ro"; arch = "linux-x86_64"; sha512 = "f4f80a8b25410b2a48c95dad316fc98b9f5391f08d3df699628b4bf9e343d00ded9cd1ff71b0d5e441ffe6c6a2edae29790a93b5e2117d7343a537d6cbd0738b"; } - { locale = "ru"; arch = "linux-i686"; sha512 = "73009743b635761c1ac5d588837084cfb7041f639fc81646d2b6ad7bd92be5d7f742562c8c5522248f20dbca7fd430826617ae706821f107911303d416cb5f4c"; } - { locale = "ru"; arch = "linux-x86_64"; sha512 = "cd2dbc81d761077f4fcff759dcb2ff02ae0e61b0b91007e7514081926e9f3cb2bcd2e65fc3ca44ad5d07caa4e4bd9e450feb25bc184f8c136ea3aa6cc4d05968"; } - { locale = "si"; arch = "linux-i686"; sha512 = "d5a416aff2e5fd3b294d8028ee6008c9086b9c5fdb15b52b8810e9e623865b946d46e1b812849ecd7331923f7e7ba01711a909396c8676db917b2a36f7370504"; } - { locale = "si"; arch = "linux-x86_64"; sha512 = "8284411d705c804fb0e90f7358e79e0687ef892342ed06c2030803d07b1a901e7f1a6ac2acb375eac10566b1885826c4fa187d3517a2bea35222bd2604d3992a"; } - { locale = "sk"; arch = "linux-i686"; sha512 = "c905adaeca4c3daa57cd54d9a7ce49762e4ab4d32594dffcbf5b9d581409a9f7a0eea1abb51ffa94c35433d20cfd0be3baa914d9821e8f754cdcdb80de7a82fc"; } - { locale = "sk"; arch = "linux-x86_64"; sha512 = "2741ea21d5714836116595529f4e240accf95ae1e549ac4cb083669beb20d40e7fdeb7805a836ada5d4310e31d74c8bebb1cb5c8f48b3fa585edfd880109b2a1"; } - { locale = "sl"; arch = "linux-i686"; sha512 = "b61cb4971cfd9701dc8aad80848e41bdd399a53fc3282d72e7a866b782cebce928bbc163d2557c24dd0fa3f51f2d2cc40e27fc578d39392d00c15ad08d0df3ad"; } - { locale = "sl"; arch = "linux-x86_64"; sha512 = "47491dfb70268c3ef00d4599e487fc2af35277de2746a106f59eb1b0813a4201c1e3ff735b0d7b48ea23bf3aac18fa1bb8e0c7948651e421f2677b988633e3ca"; } - { locale = "sq"; arch = "linux-i686"; sha512 = "7773088708cc1ca1c115acaafc2d1456b854a413daf9622c2d267dc33e8a4727b6836743c9cfaf8c5694c729241e317a53b8411e37b8d4f94b67bc02c2878e41"; } - { locale = "sq"; arch = "linux-x86_64"; sha512 = "db776cedad7842e02a87347e2f97aa5e583e2d1e2859659032e338b5c855f24241a4a1950fdb3a13b6dec643a73a7cb5f7e527ecdf50deafa5138c9f273d3408"; } - { locale = "sr"; arch = "linux-i686"; sha512 = "e9eb4827e12db0173643bab8ffca55d50238a1184a2e2ae3543248400f39685b999a068ddab523e429c2667f2966e4a0a09c432837f5e852065459cda67e96b4"; } - { locale = "sr"; arch = "linux-x86_64"; sha512 = "a38c5f80c0e6a442d035f7b4c18a350421948e9246ac65389959978cfe51f317644c06ecc567bb09739bee0303e4e2b8920bc7903900eabe92ad244e20370345"; } - { locale = "sv-SE"; arch = "linux-i686"; sha512 = "d7692def00b3a47e86fc01ad192a610352a6c958e53d1b2e4ac6d27a017643e2c0e9887a173268278b9ee7d2e3116368a8dde4d2fce6ea9b56a2bb3963a31ba7"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "4656a0d46d358476fcba3be275740a289d79159fa346f4903cac0830341f9a630f1eb0c007d8429cde47821c441d01e792634d32d6e7b94f1bb2c94f18a56563"; } - { locale = "ta-LK"; arch = "linux-i686"; sha512 = "d6ed8ef83f1d4af62a5c2f92c791822d1b711ed4a51d9656c0e73dbe20510efe017f615537c892b43e43a5503ace92652faa5fa5f2d9956349386fe784fe0dc5"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "7a994549f4f8c33b185d094e5d207942b62bdf983546aec357404b46e74ec0b790c9b83ffd3cf3687b5bf09457cdbc14593af30ea425718baeb5ecc5703ec15b"; } - { locale = "tr"; arch = "linux-i686"; sha512 = "c5833f7c43919a842f7b840a35ec8752401c24c559d620cdbdc83e70d77e5fbb5a364e44ac3c5f1f1339d9752b9a9825ac0e00d314aa9025760800fc4fc3ce18"; } - { locale = "tr"; arch = "linux-x86_64"; sha512 = "f1338235583f5888fb7bd30c4c66341bf7ebc4a771e76571e22a5ef445398c9d2ced0f2f93d99bb2f180fa73a4a1f3560616570c8711e54d40a9b931e5eeb4d1"; } - { locale = "uk"; arch = "linux-i686"; sha512 = "a40710948603a427c098619be1f203f2e7182eeb697de2b1dfdf824e556353b133839f0e5ce929fa9e31e70b1f248053bddeeba394dfb74e6c747aaa537d1df0"; } - { locale = "uk"; arch = "linux-x86_64"; sha512 = "5dc6979da2242e45c5ca8a4ca50dd2858c1781256e5b2a9b8bed84e1b2af9f98e5ddea285e49549b3afc1a98df2ab89d74c99a6082309f0150ff426c1d9449c0"; } - { locale = "vi"; arch = "linux-i686"; sha512 = "fa795ede70edb6c6237502cde8acdb7d5573db1d995d5e96f274b83f8ea0b827c37a5bcfc74b4aa99f1e15bf8dd68e30d756a0bcecc9e5946c2c5e275dad29bd"; } - { locale = "vi"; arch = "linux-x86_64"; sha512 = "de8a0e22cfc727ccbc460a26a0cb80985c1957da99b050f6f00e4b20b050ba605d815577d392504d0a5e53ba4e12045f3a9a36626ed21682c493259fe0400ecf"; } - { locale = "zh-CN"; arch = "linux-i686"; sha512 = "381d66fc71d3f03f979ccd76aef75fdcf8eb2e182b4a0fa81c08976d195bd696d0213482d40ab365f2dad594587ba8359df4db2cf8febd8d724d5c50f3ba72ed"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "d988114967c4656a13fa3fd562166e7444811ce16c5fc2af06619a47b941b8e07de0993a5593f2e5bad22ff6e856e969dc4cedb9c8df0f532a807e4a30b0c2ef"; } - { locale = "zh-TW"; arch = "linux-i686"; sha512 = "097a53d990af79e54e445e05c35fc08c86c0d003a04c48daadebb8dc0bd13f57072a82da01c3ae293f4a6766b3e2082bebe12bbb2a8c2f1c7d8eab23eecc2262"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "9d4dd9e429623009e21b41383776864804803affc9837068bbafd7507bbc5ed70362582da0adb5c811d21c068a96bb4725c4581bf81ac0acb3d57b19fdb4fff6"; } + { locale = "ar"; arch = "linux-i686"; sha512 = "bd6c633bd3ac5fc26f98ba1183f51b4380826d40762b1a28aa2fb6cda2ae776e3dc7909024d7f66b771323d489510c5237977e1380f33e5ac6ece933336e75c5"; } + { locale = "ar"; arch = "linux-x86_64"; sha512 = "bfe82d658ce9950bde473836f2cfcc1319d22939a5fad3804808258faee4e96b0cb208ba386c102e41633137c19d071da3868868ccda8155d2ee02d71c05b132"; } + { locale = "ast"; arch = "linux-i686"; sha512 = "99870cc67812e321dd2338f68612b63a31803065021fcec02b205f45f9cf263ef535421c249ba4a6a7205979679436a746300902b5c716ec333de0b9769d4f47"; } + { locale = "ast"; arch = "linux-x86_64"; sha512 = "911ea7a1852bd61695058f68ae2ad991fd10107d876cf95b95f7df4b42ffe45a787aeee9241e1824281dbd3b1e32d8d815369f674bcaa21ad9268fc2f104a646"; } + { locale = "be"; arch = "linux-i686"; sha512 = "3faa1393235b24a73e04be481601552acd28620807a64129061a4fee18d42022e7765a510b61d17193066feeb99a8f3ca2fac405056f66a401c35f23791c8f83"; } + { locale = "be"; arch = "linux-x86_64"; sha512 = "d2118deecf5ff12d6e9b2807ff3129bd33e3d8d24ef0db067b031894c266636c103efe8e1d0103f41eaf2e1ae6edfa51bbac11973c082a1ad2339c992e7fd856"; } + { locale = "bg"; arch = "linux-i686"; sha512 = "2123fc69d26ed28c6f4a2a8e6ffa3294e594e87608f9c7da3f4a811e39e58e59e1a50af616a6df810f3c8e0872eabcfc4708c4590530d780a52a2200e4a321c3"; } + { locale = "bg"; arch = "linux-x86_64"; sha512 = "bf11f9106525f5e02ee26b89560136a07e142aced7abb3b7d9d7578e413ce24abc20995afe054ce32d3d9b6e4fb68a254bbf6a268658c908b33e2da26efdec03"; } + { locale = "bn-BD"; arch = "linux-i686"; sha512 = "1823ada3babc79e5d38f1012723c3c7eab2f885a7159d3b6b9d54573fb8c8d849799aebf60a66914cb545095894402cae6acf4b49e99d77e3b1a49b5418c04c7"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "737d2557dade96501f4442001a803eafb5c872967850cc875b902acb17b1133fdf0d0248271ff225babb29b937d744ed3294e4e73e82fef96d07a63fab80ba92"; } + { locale = "br"; arch = "linux-i686"; sha512 = "8e4377c42db9535a708a18d0b4d251d0bc14da24bf8cbf5fcb318d77f4a90e26f535f46642c9b940b3ee8887fdfeb218aaa9f846dd3b9cf89ce9d4e6035518af"; } + { locale = "br"; arch = "linux-x86_64"; sha512 = "4720d43ca4bdb2d809b4ed36352c03f05c823485951aee8943c24952aa493ed570c4eaecd83920c6ebc112d71e6afddb7b2851ee5a72faf3b4536fd23b35678e"; } + { locale = "ca"; arch = "linux-i686"; sha512 = "94132e06f04bdd7928090944d3ae65440e15d15ec1f690d157809d5c524b071ea3c0f3f12b6b6987becdbcb33324d7471fd23feffd3f4f136e9f485b5dfc964d"; } + { locale = "ca"; arch = "linux-x86_64"; sha512 = "84e4e65bdab737a8f5663dbcc1116b55a8ef88d9401f30a6a8acbff156913aade12d7b0aa61d9678811032b2e3a905d50ecaf0c9a9653500034e2f90f8ccc510"; } + { locale = "cs"; arch = "linux-i686"; sha512 = "a51b94013fe020edc5b3f75f950fd6bb626c8ad18c73e8884ced1d74feaa97d899482e213639bb26496cada97cfbf4024380c49a45547b9e65c033f8ec09c2f2"; } + { locale = "cs"; arch = "linux-x86_64"; sha512 = "50214c46072d17c30f19f0ce8a15a68a20839b5f985ce3a4c995c9739fc1290ca2d40601b7349c2af2214aef3207fcfda2a9115dfcef9ee1b005523b23a22317"; } + { locale = "cy"; arch = "linux-i686"; sha512 = "a528980e1ca863c47d8b8a8e5b5891916d3de78bd20c1236b9d1954d0f057fb2c247b303eeb8643b6be0fac46a1c665da487c9a5b57f974066a5e3007df92123"; } + { locale = "cy"; arch = "linux-x86_64"; sha512 = "fb3b1f14d55d32afcd22f3fa57736fcd820dbf06e6a92b72b8b1ca2f33df9156a0ffd8d0ada11bc86e11359add9d5c225aa07f4b1321464486cd75ca276594dd"; } + { locale = "da"; arch = "linux-i686"; sha512 = "1519def46f7b154a517344fff1ec076b5288cde722aeffa683dc3f990434fab4558b63d8062306c5a68d1efd3e30c983f3deced50043fac24c256f7b58542498"; } + { locale = "da"; arch = "linux-x86_64"; sha512 = "c5c0e24a0359a0ab178c369d3fcc7bfdf15411088033646d4e699f6e2e3ca8bc8a4719f8c214442661dcdc34e5e1f577dddbda40363cb9824fc9e378ff2444e6"; } + { locale = "de"; arch = "linux-i686"; sha512 = "83f7bc92338a30ed183dc9ee67d94e02dd8c659b8a711adad023f79a6253530cb6f530a4f31ad90796cb78566f2e280cf4ee19060b59323c22ed9bc678bee85f"; } + { locale = "de"; arch = "linux-x86_64"; sha512 = "6163afd45c2730e8970eddd8f5c159d4a0b4c48684fd6900a0b61eff1ba683a320a6ead6cd0052f0b9cb04f7a54f8e6b633c2bf6a594ed9c94afd7fa742e9061"; } + { locale = "dsb"; arch = "linux-i686"; sha512 = "9772c7bbcb2ffd475aba6c00dd527defcc7d2618e6537029abb49a47038c0c16b32f1c35ca4acad2ec53a7e5265598b0a32bad615281cc96afec819eaac32d9c"; } + { locale = "dsb"; arch = "linux-x86_64"; sha512 = "99a29d265454eeeac1f80e91913fdf4c6ec850532dea4a3891d0c0ab0a68e5391b9fb42640269c95214131c63e37e4ff7a2b6ea93c609e7b1ea02a04cabb0749"; } + { locale = "el"; arch = "linux-i686"; sha512 = "b6878a4ef1b32ac0390feffe6da0dc2c5c88e0bb6c88505e653a630eaa47432be1bd2903d97bed855c41dbbd5f5babf7b0b747b8afdc0675ed670c6bf5a69649"; } + { locale = "el"; arch = "linux-x86_64"; sha512 = "a11f653ef20c76187c9a794b70d876f9b2244c5bf9a10a9f7b41969bf35d36b1d75b319bab6cb9b29616546d68be4b587c47e9f54e8cb93f861f1bbfb9c2c1bd"; } + { locale = "en-GB"; arch = "linux-i686"; sha512 = "88f1754d40cabbd473dcd5a24a7a91f7bd625b83b91223eafe78271409720ac9d4cfcf32711f36f72cb8b3269275d950ec55d2f11377880b8fddedd2cb04348b"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "b754899626a8bc0fa7e491e6d18b84e8900266cbd39ab619e8a9821825614a46c6bf42ea490e56a8d25b5467e5e9280936f5a5034e055bfe736140f4bb9c1ce3"; } + { locale = "en-US"; arch = "linux-i686"; sha512 = "a66a92dbc8c2093d7498934c5f8d5a0e68ec3649b74d60d98775e33832902796667f2c06b2001faf07a535de18b6a2cca6f61dac4f8e8173040cdc9eeebbac88"; } + { locale = "en-US"; arch = "linux-x86_64"; sha512 = "4d5c6ce9f3e2a6fa9c44d6b8bc2cc50a2c129037f9a16833cc767efa379c2c2db27b2576c7a8cf93e87646244839614577230161f1bc813755f8fc43ffbafc7b"; } + { locale = "es-AR"; arch = "linux-i686"; sha512 = "317865e753dcf03cbb0acaf67e0a34843e6f3264322e2fe63a1eec916bec07678026e6be4f7ce49626bef945a6f34125f28077ab367f954d11ba6f082014b4e5"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "cfd16a5ec21a1ca13fb5e882a75a767da1387c5f4adbeb3a9f608f0035ba60003650e6d3be57b2af8efba2d0bb8ed94ac879ad5f5e2039fddc6d9228f8ae0336"; } + { locale = "es-ES"; arch = "linux-i686"; sha512 = "7017c9da2dbeb468c2ff3ebba91c2e83a6a233940296fd5bb03b4d1e5531fae189240f630055ab2d6324a0dcece5d2e80d32d7d9ab17a81709985325d5fe505a"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "920dd641893de2e7b7692af104402e9898c3b8e3311960b5f3072cba07e0f8f918932be591cec92ca3a3aa9be6f17d605c55be5d2445864cc8ae025cef83dac2"; } + { locale = "et"; arch = "linux-i686"; sha512 = "0a24d1680b27a1e79985b9f124bc3742f2d4ecaaf2d4742db9ee1f9841d1d4b7d08ba60e71baf50ec6c593bd1a8f51d768a22b364e681b8c8a3651e37735f5f5"; } + { locale = "et"; arch = "linux-x86_64"; sha512 = "5c56cff2cd868985800c95eecffce5fc8d18def49b2c553b5c26decb364ce087d74220b2db78bb4c88c18a06eee4c5d0f3e49f17e54b67bce81083da465b53f7"; } + { locale = "eu"; arch = "linux-i686"; sha512 = "c903ccbcadb68d951442051e558ab657c337713207887c32383902cf82a32cfb04a60ce03a5cc02fc2cd9542ded108beb433eb32270fceb25e8dc29135d2f4ba"; } + { locale = "eu"; arch = "linux-x86_64"; sha512 = "9b782390d45dea01944c1ae29350cf01ee4bbab6ee94d00549aea195e4731b0c410b96f5101c44013352e8323f0baf27bd076a017456f6cc7a221c505fc7883f"; } + { locale = "fi"; arch = "linux-i686"; sha512 = "5b33f4d58604138ffc098e9f3e4284f11ec97e58d0586cfcfb89c0114c61b07c2e1ba0051c5751101838d3a1125fd0dd81ca818d59e967dcc7a6cb166c01b27e"; } + { locale = "fi"; arch = "linux-x86_64"; sha512 = "41ffde0d385bb3f7d271b11e470614e63f3e25e718f5f0eaca383794543c45a067989f7e153c4d48ec59199d2209e1394f89a14f4b776a0a8d1dc58466f91a80"; } + { locale = "fr"; arch = "linux-i686"; sha512 = "2c1e6151f256b4e7b934830c84edd0faa942ad49ee7ee29b767bb75182f296a6a24bc5cd00e9649c78ec649c879fc4c0030d1a73a68b215e72132d0149361b89"; } + { locale = "fr"; arch = "linux-x86_64"; sha512 = "ba12fc325112ac1076a9dbb56db5c9b7c03ba67e196d90529cabc3499ea5f479c5ad4cf3360bc891dad8c76a9cf846e1bc99f775d7ad83c45215261731530e13"; } + { locale = "fy-NL"; arch = "linux-i686"; sha512 = "0588462a5b0777f77dfde87be365beb5864e4a89b11cb869b18b47d2a600fb25287ac01a9e0b74156c0d35cf9e05e14815b3395a9fcb19030300ec74c3697931"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "2333728d503d8d171009258f6b59f41c20175e3ffde9ab65da3199825901e1c10adbab7d83eed5485608203d8e985ba9fae392971a11070b9fa3ab8a257cc28c"; } + { locale = "ga-IE"; arch = "linux-i686"; sha512 = "f43b95950532e23d1ed3a45c309d1e6dd5d79b56ef4b06a44a02485a58aa306a810360349ff2dbb617709785c4633ec3c79ab930752d112e9f971ba2244882b6"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "4fc095fe246ca02ddba8f005ab95dc77b41ed766fff1b0d947f78db1e3fb09a1454d1f3f83b3160127e985a3256d630176f7e6076b4eb936d2529b5f86d1018b"; } + { locale = "gd"; arch = "linux-i686"; sha512 = "72e6c4b9e7afd114690f5416d4018eb72ccdd4f2e71e60328e4df92a4043c19bb1ef917661abb8476fe68068754b17b18f7b8178494ad7f7278568919123f495"; } + { locale = "gd"; arch = "linux-x86_64"; sha512 = "dcd069d8c4b2d096a01b2f24dd4acd60dbedc1b8511d1fa4346be9342b99b81b6252032470733385e70dfadf9cc755c1f4878542d275a17740290a35dabf6285"; } + { locale = "gl"; arch = "linux-i686"; sha512 = "f1e9d759fe8fe2d613bc640d519a73ce843776ab6f7511734522a8728bae07762705b1698a0526accdf9c0c3a9bd233649a01931af2a653d17ae368399df0a1a"; } + { locale = "gl"; arch = "linux-x86_64"; sha512 = "16953e45d9c3618c394e4150c58ca7fca45d90beab9a2253ee6cfe58a85e66aa2c5788fc4988c38b1c70470dc3fb9bb96a09daa354c88160d53739ce95ea25c7"; } + { locale = "he"; arch = "linux-i686"; sha512 = "89a6e7a06694e55128fa584cb6fac0c459d21c6f795caf581532b7ce69e0ba1954029667d5d3afb5835ffad1bc0d7444ab0c59cff2873870aad6bb232ede542a"; } + { locale = "he"; arch = "linux-x86_64"; sha512 = "183ce0c71d7852490f1f78d8a6380c7909f4462d238ecb342e35a8fe5b369161b9399c704011a0741bf0694b67713f93ec187331c414a72e0d77202382a99c7f"; } + { locale = "hr"; arch = "linux-i686"; sha512 = "03c6d917c230cb9075958a6317599efcdecba5d8623a2664342bdc3c450662be64d69c7136c4f7ee6c10b4c7cdad8ea5a19cff2862f1e8aed9e3df3687abe182"; } + { locale = "hr"; arch = "linux-x86_64"; sha512 = "b26d084369b30bd33011b9761b16769795e529575174f5533174bf7fd71ac387708942cb3e709398bd401341c7ca59486e203865adea58e89743520f0557d94a"; } + { locale = "hsb"; arch = "linux-i686"; sha512 = "06dfe62b99b8a52d0d2835c83e9becdd3af3b278e1fc8f7985f2d3883c25ff2e65d55a841c1040816d64faf4115f867c1c18a771e6139ea40fe770cc4dc137f5"; } + { locale = "hsb"; arch = "linux-x86_64"; sha512 = "e303bfc9ce30479d1d79611d29dc95cbdd3ea4a6abdd1df6961cc7e4d832c6b44f6010f5a7e74485b4648e781aae2cfd2da78bbae6ef09e0cac6e5b980abfdc4"; } + { locale = "hu"; arch = "linux-i686"; sha512 = "f454805664f2aa7262449acb74d78fba411e5de175076a50758f149fc4c1b4f5c76f2a36b253acc18bcc809172db3fea17c6cba524918dd80f2b17bad97e237a"; } + { locale = "hu"; arch = "linux-x86_64"; sha512 = "0e8a0a2eefacd575fc52e6a761be481b1a4fe29eab0aaf8d51e2aa624f4cf1f5fae2cc9dfa1f68af83b82813cb8cdb8da3e454711f611a621cc22b33acc44e98"; } + { locale = "hy-AM"; arch = "linux-i686"; sha512 = "3ed1482d68759f143f403c935af3412ab819b6801e13bcaf123ef910db0bbe2c7523b52f1dc5c4a93b1a087f3d78162f2b8c04930abe89abf9536abcea374dc8"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "bb43898b0953dbde2837906da9edeb0924a65488715d8e3cf22698ddf665a8037ec758ed6df4ca04ff2f04df437eb8c71d98496147bd5f92b22246bf967be769"; } + { locale = "id"; arch = "linux-i686"; sha512 = "c2800b997e412cfabd39d7c8412c02817121383ae477cade3db1d75f7be47091b84179e54e3bd968ca79c41199fbc1f5ece63cb2b9eef038e9af6e4034326db0"; } + { locale = "id"; arch = "linux-x86_64"; sha512 = "b5cddfb6c6e8a6fccf6ef4ccd78734e766c081ae5fe3d2a3ad73852d453fdd71eda917eb29ec3bbd2398c7c810c0e61195680de1cded8f4394322a12ce84e0f7"; } + { locale = "is"; arch = "linux-i686"; sha512 = "9ab50f7d7ea5450bfd984ef180eeef8672e21e5d1610def3f3725589740ce57486985706713bb292a1a577dae1f9b6106c568fb2acc11f4bb92c1801af444c8f"; } + { locale = "is"; arch = "linux-x86_64"; sha512 = "39b6c5ae33b191334d0867d031b59b06a86311527f19b1fa8f0bbe0dfbf90f4f2cf952b8d6ed22851828b16aa3019a8208e6f7b603a6d94741ba66111af00955"; } + { locale = "it"; arch = "linux-i686"; sha512 = "13899d6940dd4840566def16ad5d36b6c992349d68bc4d9dbb9c9b73bf53310401e687bf9a4b9837205f5a527f3b7ba1270bb4e4ebb46c129496d49b0b19f2e5"; } + { locale = "it"; arch = "linux-x86_64"; sha512 = "c1434939ff690a4036271c013f926230c7e612a64e41aad6e0885109eb5767fa0639286fd44e370f24cae1d4e70a72be8bb04f5533c66c7fb52ac0d1986a767e"; } + { locale = "ja"; arch = "linux-i686"; sha512 = "7b6464fd5fc2b0c0a54f760df62c9f08c94662d00e98d9d7a58844d189c765d780798a64079507aa84532e91b28a92e4d6f21c51bd9abf8263e8c4267ba2f9b2"; } + { locale = "ja"; arch = "linux-x86_64"; sha512 = "3545594699f209bc78353b3f4b17df5b31f1283e826937cbbd83f34a32aee658c67dffe4cc77a7ea055f09e6d966768715deb7037372d29796a1fddab89383ca"; } + { locale = "ko"; arch = "linux-i686"; sha512 = "df238479c6d58be8986a1ea581e63dd7e42a0c6d4a8fe2b3ef66ceeee34c68a4b02f689844e0a19d59d65abb175cbd95387a4e2d0041e7b126cf7728badaa0df"; } + { locale = "ko"; arch = "linux-x86_64"; sha512 = "e05d44fc6a66c79ca50cc2bfd88d39112783ed636370ea2927cc2202c8b5829f05aa1e6fd9083c4c5a37c8bb873aadc5aa81d0522abed5742fe78ea3258f8e15"; } + { locale = "lt"; arch = "linux-i686"; sha512 = "219d2030e11fdfe5f68f703e6141038177257025b5f1039776cc9093c35b9ac03d197488ceb960d1b2b5c9abc12ac2b4895990afbd430170499d3639476eff5d"; } + { locale = "lt"; arch = "linux-x86_64"; sha512 = "6221204aad7b62fd540a5776ac67ca968c5f7f436d260664184c871f8ecdccac6542f306c2d34ba8b74c17b15caf549ad30852fd003b711572ea3eba0c2a32bc"; } + { locale = "nb-NO"; arch = "linux-i686"; sha512 = "54b3db811b3573cf0084cd5a5df45e33c6540b1d6df301023853b1fb023f786e70b9f6d2b827273504e70809096d392b0fb91ff89ad363c051ddbfbb6dcf8099"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "8ccafab65ece0dbc9d7ea7067846d3a45df6b4a78d543d54f87a52f359a759dd4d3f0272ca3ce8c792feb643c5d3871ed411d0b8719527969acc1cde39577768"; } + { locale = "nl"; arch = "linux-i686"; sha512 = "4ac1dddb4f65c05306738fdfff6b939e4678a59282519a053ae3b919e2c9d0cd4f72f93f6c5925efad101c64a32ec10187fce6734dbdb8002ed05bb1690d8cc0"; } + { locale = "nl"; arch = "linux-x86_64"; sha512 = "58555fc9e43b9599486b25fdf8b0e4e27a0592f52db730123ea0513be255f026a35a2d9ac9be84be158e94c3f95fa5ce9dc531dc94bc839e36092ce6ad560b6e"; } + { locale = "nn-NO"; arch = "linux-i686"; sha512 = "102ff8f498c9acd7fec58973bde3807f2821723a223ac7646985faf1342eeba15b438b57a6c1e64005ebd86b97cd37555ab568ed96c228ca825651e9133c2696"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "eeda11d9e76e713a287130e1c0cfbc8507c0a148061dab878891af0c7751fb517a0f9d3d49c31ae69514e5caafb212c5e23b6254dc310b63c2f241741c8edf29"; } + { locale = "pa-IN"; arch = "linux-i686"; sha512 = "94dcd33d5a992ffd7a47114555d1a12d31e235eec60fa6792fe041154c27dd0d97bf55d0c8bff763502d07a9b458402322a54b0b1943ef7a55457d32360135f7"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "e7a5fd70e80c34c12650fc85af282dffce6fdcaa95c177e18930212605510858d4f71fe0600bccde80aa59bd81f22b4425830fc4c0c689c636105512fb55b0fe"; } + { locale = "pl"; arch = "linux-i686"; sha512 = "a056b9ddf6a2a04adf786bad7cecf4d4c02c0ddf8584ef602e390a2157073a654473f2262a4e418fb31ac0a198fd212ac67a2c9e9e52490b3d4236fc6c73edb6"; } + { locale = "pl"; arch = "linux-x86_64"; sha512 = "081cbbc49b12223e9a9f860fc6072ceb855634419bbb4d1e2923342c7f4f0b634443a0c1f9f60bf8622b9176412c4216d555d7d075bdc120d0c4bd2d809201db"; } + { locale = "pt-BR"; arch = "linux-i686"; sha512 = "22b4194129af89e81e1fa7ab38c2905169ca73c8656c6a7b718cf4013dbc0bcc4336ef68303506894e871487092f8ae7b2a05f914242dd2ea61109e3f969476a"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "c6a5556ceb64c4559e1ce92019312a9b862efe6e5c93380859f8e2787b54cc5e12796446d7effd3bf8c47704e6fadfd80da9261d30c1ab666ebb7a34ac15c525"; } + { locale = "pt-PT"; arch = "linux-i686"; sha512 = "46c292e1daa7755332f29e2e6e785013badb3bd869d497cd8fd85c107e9412bfac9ffe1e14f99addaac3d413e9ac7dcb2ee4ba4dc5dddaeee0fefddf0256e281"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "8c1e72eea7b4d30ffc6e5915d51289abce564674231f80ac0e5e03a45cc971683232ba08893672e424fa1bca75ebcc2847d18f044e2762c16f0d955f56895140"; } + { locale = "rm"; arch = "linux-i686"; sha512 = "0b3305f2c7d2626d2fe57484c694e5400f6d60dcfb62e65ca925501dc1c1ba3a9ab3f71f2d5584a5d6b49567aedd7188582967f0ad6e7a461034e50cfb577d32"; } + { locale = "rm"; arch = "linux-x86_64"; sha512 = "6c875b6806dda0ef2b140ae3a3bb47ae6f5b93a0b6d7b9b2d0e2182b6f3f356c85cbe60c9c79bac51f46a2c1adb59f240f7d1c45be203b38a25832be178cc0a9"; } + { locale = "ro"; arch = "linux-i686"; sha512 = "6043a890614495cf28a1271716e6add0229f8d5ed911fe04152503a20a26e7b4da03475e4a1c08b93cf512bde19916ca1a53d41094ffa8a2d48e4cbc71fcbc33"; } + { locale = "ro"; arch = "linux-x86_64"; sha512 = "9a5a81fd713ffde8e38aa9ed7557a9a8b6b902e8ba316e5bcd5c4af2f73a1fe67a226a9401ddabdf76086af6c8432d00d02cbafc250f03190878deca1bd69588"; } + { locale = "ru"; arch = "linux-i686"; sha512 = "aa205e2f3bc4a4e22520a41c9ba516f6360e062da74a180221b5236cf10d0a30e1ce3b5eec1081a8a9b4de3331fa3f289dfccc0b6785363b3411f77d8832f7c0"; } + { locale = "ru"; arch = "linux-x86_64"; sha512 = "7c8d7402949f34cbf9ba3eb32fe1fa1c225296bd179854a199968f012c64fa3a016dcaa922d0dc0abbe1fb0bae438030f7096aaf79be2c7822df2f529e1fa46a"; } + { locale = "si"; arch = "linux-i686"; sha512 = "841897e3a07a0a6dbb4e912e424ea52b17631549176995e3c8ab1581bbc4e565be084ffd686ae6a4596224a642213477d40a5b2aa702ac6679e1ae71bdd88516"; } + { locale = "si"; arch = "linux-x86_64"; sha512 = "618b49c54e2057c10e3ea5441e2e960e4581589fc2685ca2f42cb1cfb5defd9f26e60d3f7af603757aaf73021133a0bab94ddf3c0cded1442523a55661395720"; } + { locale = "sk"; arch = "linux-i686"; sha512 = "e00c42e2adf10e9d19d434bf67be2ff75f47ba11fb2a5d00d62f9946c3c274795fe2fa83b718cf21cc4ac396f10212ab459c81fa7d866ff6a9af8754b0663db0"; } + { locale = "sk"; arch = "linux-x86_64"; sha512 = "48a0277c6082e84dc51df64c9e726843d1361edee39e27e625f09cecd56c7b82e31d31e121799f34da4e85177506af680dc893b8f305d24ae7f6276146842120"; } + { locale = "sl"; arch = "linux-i686"; sha512 = "585fbe3e399d857ff21307a0ed53c5ea9aabb68232da44febd3c52297e7f9636f6aab6c8f698e2714a83632c48b4b60933568d6dcead5a614fbdc4b90be416c6"; } + { locale = "sl"; arch = "linux-x86_64"; sha512 = "e84ff51b3feb54408e6abaddaf23bddab85d6a3cf78286dcc13da43e743306addcd2dd6fd58419d2e5dfe2e5d63c0ba51810fdd9ec080427d26ab8ec7535eba6"; } + { locale = "sq"; arch = "linux-i686"; sha512 = "9ca817ada82c6f2199b0c357164fc28b98351c69a8cbfd98048eee407ddc05dc90714e7dfca4059a55ce2bcbc133ae22c8f26a8bd632d60b7bb561221d4fcc81"; } + { locale = "sq"; arch = "linux-x86_64"; sha512 = "707088e8fd72c8bf598108f57d684369ff5b1c996e39c88a002f724324b111b2d7c00cfb649eddedbd70dd0df22d10f2f83f9114a71031f33e9adc250a193402"; } + { locale = "sr"; arch = "linux-i686"; sha512 = "243baec5e5daca6cc7410bc3079db3e5201b49f7ea1b76bfdc84fcdfc50c3327e886ce7e008c9350c7bf5128f61c34ae543200bc11ae0d3cfa9166a3000b243d"; } + { locale = "sr"; arch = "linux-x86_64"; sha512 = "212ce66af4689db19b234b463b0f29b01c7ceebf1d4c67a10351f06f2e71b32d050e5232fe0e61e15fa30a852107ca7a1fd80475fac7d2b877074de3b40e6bdc"; } + { locale = "sv-SE"; arch = "linux-i686"; sha512 = "31637fef31f0e1d08ea528bd7b917c6d67ab047c3d1856fd60b8a1de20afec567aed093e27c938aee4c8b1b4269cda5f43a127cc3284deb3db4f0d98a8d23a8a"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "81b745a763fcf3b60b84ddae56cf59e363269986734f26275ad3e32320b8d5ac1a4a714a03861ccd0fdae499767a93b53f5717ca78074c79ca2c9b303406a5ec"; } + { locale = "ta-LK"; arch = "linux-i686"; sha512 = "c35956a5aacdbb2eec20feb41fac23349c621624ccc792c9f6e711935c45afaced43e8c75d00c4c59d0279d62d5092798c3200d25730a1fa15ad03682b5f0d86"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "5bfeaf3ec0ad5ae56b540337b72795e11fe66846df72ec849b51db32091df8ea8a9ba4b2e6c46f2cca2f672419c6ca6fe23de8c7668edce53c38c5587b83c075"; } + { locale = "tr"; arch = "linux-i686"; sha512 = "b617860d43de6c1f191ec0a021b86e49217310fb8aaf1ce5d8be11eb27e77f6cf7338f8e675dd25a53c298b4fc7e5228c289aff86b23b81c8176ac55953ddc03"; } + { locale = "tr"; arch = "linux-x86_64"; sha512 = "f421c0889af9229e7081bb9f4f5a6cced6647bb230b7dd5d14f46bc5a0ba4c36f7a711e9b9df446ee69e165953d1405c1b11c9912447194518bf9c9b58a5da53"; } + { locale = "uk"; arch = "linux-i686"; sha512 = "f33c519ea5fb12e5f98cab4d3de4bc23e8277db9534b765820f8cbe1c24d6d33a033b0ec357f8b13d9d16915f6d677b5b206cdceac86b9f8a09aa1d9e016a510"; } + { locale = "uk"; arch = "linux-x86_64"; sha512 = "1964f6597ba11f10010275f7ff256f8fb86bcafc426c81c4f2d55f5202b0d19bc978a1be24e2b204612bf19097afb0709f00de263fc34dbd43eb6b331f85b9ef"; } + { locale = "vi"; arch = "linux-i686"; sha512 = "4ca3d166fdfa02bdf8581bbe29b1d067011d4922b5308af369407da7e7a00239b75da739f4be88a158e29b939516095101cc03602545900f87d91455ad716c0e"; } + { locale = "vi"; arch = "linux-x86_64"; sha512 = "5e335a87ee0d5ec63e45c2570f628d0ca1cd5577b39f7469aef2367632c10df16525bfffe2a4f80f473d7faacf9e96986130e6548978d9b4f606de3a25a12cc0"; } + { locale = "zh-CN"; arch = "linux-i686"; sha512 = "de86ee26774483a31e74a9f89e144d5bb4eb5493f27cb1b5a21902b8e8cdc0322f15d38498b8d6005b59296715b9d9125676b26661433e280a2f1807fedc3df3"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "291074caef4a1a1162d0c3f90e630985978ddd731fde7d9d1d576c065ee8b89af5cd10196c4b05c537996ab99d00d78119af00bd1cd77e85b567303c38d1e792"; } + { locale = "zh-TW"; arch = "linux-i686"; sha512 = "6873ff342439247d5bda3e3065998b33bdf03f1d80d15a2f733a79eb7ede188a71e628ec3af6a67354f9adab9f67d79a86310060b20de09c623c342e3b894f2b"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "c60f4ef8b1dd22db617e8d6381f2e0ebd37fd8503c363548b5affda704d483432369138943f84ca07c89a15dcf72b9a081f8db6f1c202558050ec997b9389ecd"; } ]; } From 9a1507f2531b2a0afed51e8f171369a54f8e50bd Mon Sep 17 00:00:00 2001 From: Andreas Noever Date: Wed, 16 Nov 2016 23:43:42 +0100 Subject: [PATCH 0481/1749] vmware-guest: fix vmmouse driver Fix automatic mouse grabbing/releasing when running as a vmware guest. 1. The xf86inputvmmouse is not loaded by default. Add it. 2. InptutDevice sections for which specify a driver are ignored if AutoAddDevices is enabled (which it is by default). See [1]. Instead use an InputClass to load the vmmouse driver. [1] https://www.x.org/archive/X11R7.7/doc/man/man5/xorg.conf.5.xhtml#heading8 --- nixos/modules/virtualisation/vmware-guest.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index b9a4f3b11dc1..ac5f87817fe9 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.services.vmwareGuest; open-vm-tools = pkgs.open-vm-tools; + xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse; in { options = { @@ -29,18 +30,17 @@ in services.xserver = { videoDrivers = mkOverride 50 [ "vmware" ]; + modules = [ xf86inputvmmouse ]; config = '' - Section "InputDevice" + Section "InputClass" Identifier "VMMouse" + MatchDevicePath "/dev/input/event*" + MatchProduct "ImPS/2 Generic Wheel Mouse" Driver "vmmouse" EndSection ''; - serverLayoutSection = '' - InputDevice "VMMouse" - ''; - displayManager.sessionCommands = '' ${open-vm-tools}/bin/vmware-user-suid-wrapper ''; From f4c96de8f9a871ae6a70956d6efb3bd6fe18354b Mon Sep 17 00:00:00 2001 From: Tikhon Jelvis Date: Fri, 18 Nov 2016 11:03:44 -0800 Subject: [PATCH 0482/1749] Fixed the emacs24 macport package by adding automake and autoconf build tools. --- pkgs/applications/editors/emacs/macport-24.5.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/macport-24.5.nix b/pkgs/applications/editors/emacs/macport-24.5.nix index 885538dc8837..4a07bd2a0c80 100644 --- a/pkgs/applications/editors/emacs/macport-24.5.nix +++ b/pkgs/applications/editors/emacs/macport-24.5.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext , AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit +, autoconf, automake , ImageCaptureCore, GSS, ImageIO # These may be optional }: @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext ]; + buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext autoconf automake ]; propagatedBuildInputs = [ AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit From 3ebefe817859d2c40aadc85cc8f14e43785b4b44 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Fri, 18 Nov 2016 22:35:58 +0100 Subject: [PATCH 0483/1749] kbfs: 2016-08-02 -> 2016-11-18 --- pkgs/tools/security/kbfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index fb7b8cc9fe74..a38e70df6323 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kbfs-2016-08-02-git"; - version = "1.0.16"; + name = "kbfs-2016-11-18-git"; + version = "1.0.2"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" ]; @@ -12,8 +12,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "keybase"; repo = "kbfs"; - rev = "a8f0714536d15668e0f561ec4d3324762c8cf030"; - sha256 = "0m4k55akd8cv5k8mfpm3rb3fz13z31l49pml7mgviv0hi3mnisqd"; + rev = "aac615d7c50e7512a51a133c14cb699d9941ba8c"; + sha256 = "0vah6x37g2w1f7mb5x16f1815608mvv2d1mrpkpnhz2gz7qzz6bv"; }; buildFlags = [ "-tags production" ]; From 15004268d7af5deecb59424a991995ac4bd70b22 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 03:06:14 +0100 Subject: [PATCH 0484/1749] ocaml-notty: init at 0.1.1 --- .../ocaml-modules/notty/default.nix | 37 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/ocaml-modules/notty/default.nix diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix new file mode 100644 index 000000000000..3178789c3993 --- /dev/null +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -0,0 +1,37 @@ +{ stdenv, buildOcaml, fetchFromGitHub, findlib +, result, uucp, uuseg, uutf +, lwt ? null }: + +with stdenv.lib; + +let withLwt = lwt != null; in + +buildOcaml rec { + version = "0.1.1"; + name = "notty"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "pqwy"; + repo = "notty"; + rev = "v${version}"; + sha256 = "0bw3bq8z2y1rhc20zn13s78sazywyzpg8nmyjch33p7ypxfglf01"; + }; + + buildInputs = [ findlib ]; + propagatedBuildInputs = [ result uucp uuseg uutf ] ++ + optional withLwt [ lwt ]; + + configureFlags = [ "--enable-unix" ] ++ + (if withLwt then ["--enable-lwt"] else ["--disable-lwt"]); + + configurePhase = "./configure --prefix $out $configureFlags"; + + meta = { + inherit (src.meta) homepage; + description = "Declarative terminal graphics for OCaml"; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c7422bdaba4a..fc4346b9482b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -263,6 +263,10 @@ let lwt = ocaml_lwt; }; + notty = callPackage ../development/ocaml-modules/notty { + lwt = ocaml_lwt; + }; + ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; comparelib = callPackage ../development/ocaml-modules/comparelib { }; From cc9466a62761361300f0b4a81d86fe2c5c57bc1f Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 18 Nov 2016 20:45:35 -0200 Subject: [PATCH 0485/1749] uncrustify: 0.63 -> 0.64 --- pkgs/development/tools/misc/uncrustify/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index a4c61a58b899..57c57969a88b 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,15 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "${product}-${version}"; product = "uncrustify"; - version = "0.63"; + version = "0.64"; - src = fetchurl { - url = "mirror://sourceforge/uncrustify/${product}-${version}.tar.gz"; - sha256 = "1qravjzmips3m7asbsd0qllmprrl1rshjlmnfq68w84d38sb3yyz"; + src = fetchFromGitHub { + owner = product; + repo = product; + rev = name; + sha256 = "0gvgv44aqrh7cmj4ji8dpbhp47cklvajlc3s9d9z24x96dhp2v97"; }; + nativeBuildInputs = [ cmake ]; + meta = with stdenv.lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; homepage = http://uncrustify.sourceforge.net/; From 98092df84163faf5ff8c089f3e2a27f4cbcd7bce Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 19 Nov 2016 00:11:44 +0100 Subject: [PATCH 0486/1749] gnupg21: 2.1.15 -> 2.1.16 --- pkgs/tools/security/gnupg/21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index b7a71332e772..51f45f8469d5 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.1.15"; + version = "2.1.16"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1pgz02gd84ab94w4xdg67p9z8kvkyr9d523bvcxxd2hviwh1m362"; + sha256 = "0i483m9q032a0s50f1izb213g4h5i7pcgn395m6hvl3sg2kadfa9"; }; buildInputs = [ From 6f1d4149d54524a1140138f2525ec3a155d2e671 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 18 Nov 2016 18:14:20 -0500 Subject: [PATCH 0487/1749] ios-cross: Fix for simulator --- pkgs/os-specific/darwin/ios-cross/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix index 8c70afee69cd..cd4aed88cdd4 100644 --- a/pkgs/os-specific/darwin/ios-cross/default.nix +++ b/pkgs/os-specific/darwin/ios-cross/default.nix @@ -26,7 +26,7 @@ echo "-target ${prefix} -arch ${arch} -idirafter ${sdk}/usr/include ${if simulator then "-mios-simulator-version-min=7.0" else "-miphoneos-version-min=7.0"}" >> $out/nix-support/cc-cflags # Purposefully overwrite libc-ldflags-before, cctools ld doesn't know dynamic-linker and cc-wrapper doesn't do cross-compilation well enough to adjust - echo "-arch ${arch} -L${sdk}/usr/lib -iphoneos_version_min 7.0.0" > $out/nix-support/libc-ldflags-before + echo "-arch ${arch} -L${sdk}/usr/lib ${lib.optionalString simulator "-L${sdk}/usr/lib/system "}-i${if simulator then "os_simulator" else "phoneos"}_version_min 7.0.0" > $out/nix-support/libc-ldflags-before ''; }; in { From 4cdfa0b96a58907851866b210f8fc24d4d811fc0 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 19 Nov 2016 10:19:54 +0100 Subject: [PATCH 0488/1749] axel: 2.7 -> 2.11 --- pkgs/tools/networking/axel/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 4f05220232fc..af5d8309507d 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, gettext, autoreconfHook }: +{ stdenv, fetchurl, autoreconfHook, gettext, libssl }: stdenv.mkDerivation rec { name = "axel-${version}"; - version = "2.7"; + version = "2.11"; src = fetchurl { url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; - sha256 = "174x4bp4gcwmpf94hdsdxlpk7q7ldgpsicry7x2pa9zw4yz86wl0"; + sha256 = "05askz9pi8kvjyn66rszjfg9arwdzl72jwd38q9h9n5s37vqslky"; }; - buildInputs = [ gettext autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ gettext libssl ]; installFlags = [ "ETCDIR=$(out)/etc" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90ce4488c77d..3f54fbe9bc48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -584,7 +584,9 @@ in awstats = callPackage ../tools/system/awstats { }; - axel = callPackage ../tools/networking/axel { }; + axel = callPackage ../tools/networking/axel { + libssl = openssl; + }; azureus = callPackage ../tools/networking/p2p/azureus { }; From 01643264c22f718e53adf94cbc84ba8424bd89f3 Mon Sep 17 00:00:00 2001 From: Vlad Ki Date: Sat, 19 Nov 2016 14:48:05 +0200 Subject: [PATCH 0489/1749] ceres-solver: glog builds on darwin just fine now --- pkgs/development/libraries/ceres-solver/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 24d309372047..7cd848e602aa 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -3,7 +3,7 @@ , fetchurl , cmake , google-gflags ? null -, glog ? null +, glog , runTests ? false }: @@ -12,11 +12,6 @@ assert runTests -> google-gflags != null; let version = "1.10.0"; - - # glog currently doesn't build on darwin - # Issue: https://code.google.com/p/google-glog/issues/detail?id=121 - useGlog = glog != null && !stdenv.isDarwin; - in stdenv.mkDerivation { name = "ceres-solver-${version}"; @@ -26,8 +21,7 @@ stdenv.mkDerivation { sha256 = "20bb5db05c3e3e14a4062e2cf2b0742d2653359549ecded3e0653104ef3deb17"; }; - buildInputs = [ cmake ] - ++ stdenv.lib.optional useGlog glog + buildInputs = [ cmake glog ] ++ stdenv.lib.optional (google-gflags != null) google-gflags; inherit eigen; @@ -38,7 +32,6 @@ stdenv.mkDerivation { cmakeFlags = " -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 - ${if !useGlog then "-DMINIGLOG=ON" else ""} "; meta = with stdenv.lib; { From f32a8eb6cca994118c673cfe0a5743bcbb3dfa42 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 19 Nov 2016 14:07:57 +0100 Subject: [PATCH 0490/1749] xidel: refactor & fix eval - Fix eval by removing reference to non-existent stdenv.glibc - Simplify patchelf calls - Set meta.platforms = linux --- pkgs/tools/text/xidel/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index c76e0f49734e..91cecce61225 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, patchelf }: +{ stdenv, fetchurl, dpkg }: stdenv.mkDerivation rec { name = "xidel-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { } else throw "xidel is not supported on ${stdenv.system}"; - buildInputs = [ dpkg patchelf ]; + buildInputs = [ dpkg ]; unpackPhase = '' dpkg-deb -x ${src} ./ @@ -34,9 +34,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" cp -a usr/* "$out/" - interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)" - patchelf --set-interpreter "$interpreter" "$out/bin/xidel" - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.glibc]}" "$out/bin/xidel" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin/xidel" ''; meta = with stdenv.lib; { @@ -45,7 +43,7 @@ stdenv.mkDerivation rec { # source contains no license info (AFAICS), but sourceforge says GPLv2 license = licenses.gpl2; # more platforms will be supported when we switch to source build - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } From f13fa8a337863f6d0968bea1a61856beb156a937 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 19 Nov 2016 08:39:13 -0500 Subject: [PATCH 0491/1749] franz: Allow to run with grsecurity kernel --- .../networking/instant-messengers/franz/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 8d7b16337f28..ef84f6402b52 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { "16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy"; }; - phases = [ "unpackPhase" "installPhase" ]; + phases = [ "unpackPhase" "installPhase" "postFixup" ]; deps = with xorg; [ gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus @@ -53,6 +53,10 @@ in stdenv.mkDerivation rec { ln -s $out/share/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps ''; + postFixup = '' + paxmark m $out/share/franz/Franz + ''; + meta = with stdenv.lib; { description = "A free messaging app that combines chat & messaging services into one application"; homepage = http://meetfranz.com; From 250224bf019fd1a96dbe66b36b19f1e45bb662cd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 19 Nov 2016 08:55:57 -0500 Subject: [PATCH 0492/1749] linux: 4.8.8 -> 4.8.9 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index e6e26a4ae5a9..22881fd80767 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.8"; + version = "4.8.9"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0hm60zjsp22rbh8jz4d8rpwsj6bysmlcm0c5m1cxpnfj6cqcjp7w"; + sha256 = "0z8xdr3gqmi295a76rbzngilf49kxxm6ffhr89lbfxnsffyy6m68"; }; kernelPatches = args.kernelPatches; From d3b8a77834e53d16bb11774a1aa3036a0d0f7555 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 19 Nov 2016 08:56:31 -0500 Subject: [PATCH 0493/1749] linux: 4.4.32 -> 4.4.33 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index e307520cf6b8..6e2b1f24645e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.32"; + version = "4.4.33"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03n3wzbqc2h09ydwz3jybrc8ll6f2znr0k7f0hayj0qi5wx1rnpc"; + sha256 = "0w0ygcmfi2jyrya5nj39xviwninzdv5aiz6nimbsw8vvycc2xgr5"; }; kernelPatches = args.kernelPatches; From e69063e71a92685abe2ddad18845b699c0a00356 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 19 Nov 2016 10:16:18 -0500 Subject: [PATCH 0494/1749] rambox: Allow to run with grsecurity kernel --- .../networking/instant-messengers/rambox/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 3408bc923b6c..e0b86dfc6331 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { "0gq0ywk1jr0apl39dnm0vwdwg1inr7fari3cmfz3fvaym7gc8fki"; }; - phases = [ "unpackPhase" "installPhase" ]; + phases = [ "unpackPhase" "installPhase" "postFixup" ]; deps = with xorg; [ gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus @@ -53,6 +53,10 @@ in stdenv.mkDerivation rec { ln -s ${desktopItem}/share/applications/* $out/share/applications ''; + postFixup = '' + paxmark m $out/share/rambox/Rambox + ''; + meta = with stdenv.lib; { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; homepage = http://rambox.pro; From 12cc39514eb10988058a0fefef14634e60f74516 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 19 Nov 2016 10:29:01 -0500 Subject: [PATCH 0495/1749] ios-cross: Document known prefixes --- pkgs/os-specific/darwin/ios-cross/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix index cd4aed88cdd4..1d26a8b350be 100644 --- a/pkgs/os-specific/darwin/ios-cross/default.nix +++ b/pkgs/os-specific/darwin/ios-cross/default.nix @@ -6,7 +6,16 @@ , stdenv , coreutils , gnugrep -}: { prefix, arch, simulator ? false }: let +}: + +/* As of this writing, known-good prefix/arch/simulator triples: + * aarch64-apple-darwin14 | arm64 | false + * arm-apple-darwin10 | armv7 | false + * i386-apple-darwin11 | i386 | true + * x86_64-apple-darwin14 | x86_64 | true + */ + +{ prefix, arch, simulator ? false }: let sdkType = if simulator then "Simulator" else "OS"; sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}10.0.sdk"; From 5a75fe64a559d4a4dcc18cac9e2df3ee73215611 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 19 Nov 2016 17:18:13 +0100 Subject: [PATCH 0496/1749] xxdiff: 4.0 -> 4.0.1 --- pkgs/development/tools/misc/xxdiff/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index 07cc55465d10..51f4de8eacce 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt4, flex, bison, docutils }: stdenv.mkDerivation rec { - name = "xxdiff-4.0"; + name = "xxdiff-4.0.1"; src = fetchurl { url = "mirror://sourceforge/xxdiff/${name}.tar.bz2"; - sha256 = "0c0k8cwxyv5byw7va1n9iykvypv435j0isvys21rkj1bx121al4i"; + sha256 = "0050qd12fvlcfdh0iwjsaxgxdq7jsl70f85fbi7pz23skpddsn5z"; }; nativeBuildInputs = [ flex bison qt4 docutils ]; @@ -18,12 +18,11 @@ stdenv.mkDerivation rec { installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin"; - meta = { - homepage = "http://furius.ca/xxdiff/"; + meta = with stdenv.lib; { + homepage = http://furius.ca/xxdiff/; description = "Graphical file and directories comparator and merge tool"; - license = stdenv.lib.licenses.gpl2; - - platforms = stdenv.lib.platforms.linux; - maintainers = []; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } From 0df6305a9840f90ed53f90d08388db11442df492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 19 Nov 2016 17:53:28 +0100 Subject: [PATCH 0497/1749] llvmPackages: default to 3.9.x (#20461) It seems not to be any mass rebuild at all. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f54fbe9bc48..e333293b8186 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5062,7 +5062,7 @@ in llvm_35 = llvmPackages_35.llvm; llvm_34 = llvmPackages_34.llvm; - llvmPackages = recurseIntoAttrs llvmPackages_37; + llvmPackages = recurseIntoAttrs llvmPackages_39; llvmPackagesSelf = llvmPackages_34.override { stdenv = libcxxStdenv; From eaf42722981f51bcb33b442290fbb4ab24f3039e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 19 Nov 2016 18:20:24 +0100 Subject: [PATCH 0498/1749] llvmPackages: still use 3.7.x on Darwin (#20461) I'm sorry, I forgot that. --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e333293b8186..b472c6191c91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5062,7 +5062,8 @@ in llvm_35 = llvmPackages_35.llvm; llvm_34 = llvmPackages_34.llvm; - llvmPackages = recurseIntoAttrs llvmPackages_39; + llvmPackages = recurseIntoAttrs + (if stdenv.isDarwin then llvmPackages_37 else llvmPackages_39); llvmPackagesSelf = llvmPackages_34.override { stdenv = libcxxStdenv; From e672a9d1d3b2725167b3c819dfaf2e23ee883fe3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Nov 2016 12:18:04 -0600 Subject: [PATCH 0499/1749] dropbox: 13.4.21 -> 14.4.19 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index d10e787b6ff5..3c1ae4b2bbde 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "13.4.21"; + version = "14.4.19"; sha256 = { - "x86_64-linux" = "0ckinjrnnijs2wx80c0bqdlcsw5zhx64rsh3bylcjfbpvyli96q4"; - "i686-linux" = "08lhj4hlhvxm4zp9jai01f8cydfgfkl91l4ydd85yccl9ii4flh5"; + "x86_64-linux" = "06ln88dx6k1d2b2wwj66gj1gyy0s3xvs7m50v8i2ycdw3d9kimkw"; + "i686-linux" = "0mil1h86r8fmzxb6d7ycwz9yqkmj66k37zxxb2x8mw15l9qndrwf"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = From cbc4ee7e10c7bbf5e93773967fab84e253905d45 Mon Sep 17 00:00:00 2001 From: Laverne Schrock Date: Thu, 17 Nov 2016 20:42:01 -0600 Subject: [PATCH 0500/1749] xournal: add desktop file and mime info Fixes #20510. The application now appears in system menus, and Konqueror now suggests opening .xoj files with Xournal. Other file browsers should as well. --- .../applications/graphics/xournal/default.nix | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index b81efb08d8ac..669fc5a28a73 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, makeDesktopItem , ghostscript, atk, gtk2, glib, fontconfig, freetype , libgnomecanvas, libgnomeprint, libgnomeprintui , pango, libX11, xproto, zlib, poppler @@ -21,6 +21,32 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = [ "-lX11" "-lz" ]; + desktopItem = makeDesktopItem { + name = name; + exec = "xournal"; + icon = "xournal"; + desktopName = "Xournal"; + comment = meta.description; + categories = "Office;Graphics;"; + mimeType = "application/pdf;application/x-xoj"; + genericName = "PDF Editor"; + }; + + postInstall='' + mkdir --parents $out/share/mime/packages + cat << EOF > $out/share/mime/packages/xournal.xml + + + Xournal Document + + + + EOF + cp --recursive ${desktopItem}/share/applications $out/share + mkdir --parents $out/share/icons + cp $out/share/xournal/pixmaps/xournal.png $out/share/icons + ''; + meta = { homepage = http://xournal.sourceforge.net/; description = "Note-taking application (supposes stylus)"; From d045f8b4860c0ea7311a05188ab6d472cefbfca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 19 Nov 2016 20:14:02 +0100 Subject: [PATCH 0501/1749] thunderbird: maintenance 45.4.0 -> 45.5.0 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index d44c749a55ad..8e2e5a1be448 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -let version = "45.4.0"; in +let version = "45.5.0"; in let verName = "${version}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz"; - sha512 = "9c601d9625b43103b64e111da3a88fccdc30d4a52aa8a66ee02120bc13f3c5600d24fa1cfd3817975a0e58be9078d192334dd3099aa462468d8ab0cd05a3bcd5"; + sha512 = "719469c4f66a9e4b09c360056c63ef2e1803334901dd4a23f12e455fe8ae4d0aba0a6273b3cf2796c925dc93f0add3df011ffe40148ef0b3f226d0b1a1c37b6a"; }; buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx From cf0339e5ba13627b8b9c84e17262d216a9a75ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 19 Nov 2016 20:32:03 +0100 Subject: [PATCH 0502/1749] beignet, julia: switch back to llvmPackages_37 They fail both with 3.9 and 3.8. --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b472c6191c91..4f7663e6d9e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5034,6 +5034,7 @@ in gmp = gmp6; openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + llvm = llvm_37; }; julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix { @@ -6633,9 +6634,8 @@ in beecrypt = callPackage ../development/libraries/beecrypt { }; beignet = callPackage ../development/libraries/beignet { - inherit (llvmPackages) clang-unwrapped; - inherit (xlibs) libX11; - inherit (xorg) libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm; + inherit (llvmPackages_37) llvm clang-unwrapped; + inherit (xorg) libX11 libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm; inherit (python3Packages) python; inherit (purePackages) gl; }; From 3db83dd19d6af9135ea1ef5b2020729aa04de345 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 19 Nov 2016 21:00:47 +0100 Subject: [PATCH 0503/1749] checkstyle: 6.18 -> 6.19 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index b481c1e80e5d..91037588552c 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.18"; + version = "6.19"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz"; - sha256 = "1ls2q6zvnfsvb3b5d9s1p6c5gcdnwm2mlj2dm8jr4nifkymi6q5m"; + sha256 = "0x899i5yamwyhv7wgii80fv5hl8bdq0b8wlx1f789l85ik8rjwk9"; }; installPhase = '' From c49cd8ee96e9c2feeb143e2c2bc17fc265c7712c Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 19 Nov 2016 21:11:23 +0100 Subject: [PATCH 0504/1749] groovy: 2.4.6 -> 2.4.7 --- pkgs/development/interpreters/groovy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 78d154bb6542..a883080f58e7 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.6"; + version = "2.4.7"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "0s474wy7db7j1pans5ks986b52bdmn40l29zl6xl44y23fsvagwv"; + sha256 = "1mgvpqxc99057szfhhjfirmf3xyhs0vmgb0jzy47wr2jh84xd3a3"; }; buildInputs = [ unzip makeWrapper ]; From 31a770b21cd279360f85dde92761a4425ed4fb31 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 19 Nov 2016 21:38:54 +0100 Subject: [PATCH 0505/1749] progress: 0.13 -> 0.13.1 --- pkgs/tools/misc/progress/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index ab72dc69fa47..0b48a5a66c6e 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ncurses }: +{ stdenv, fetchFromGitHub, pkgconfig, ncurses, which }: stdenv.mkDerivation rec { name = "progress-${version}"; - version = "0.13"; + version = "0.13.1"; src = fetchFromGitHub { owner = "Xfennec"; repo = "progress"; rev = "v${version}"; - sha256 = "0xzpcvz4n0h8m0mhxgpvn1qg8993naip3asjbk3nmk3d4lbyh0b3"; + sha256 = "13nhczzb0zqg5zfpf5vcfi6aahyb8lrr52pvpjgi1zfkh2m9vnig"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig which ]; buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; From d0ea5a40da5f47ce153089eba4282db9d58b98d4 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 19 Nov 2016 22:02:59 +0100 Subject: [PATCH 0506/1749] libfilezilla: 0.7.1 -> 0.8.0 --- pkgs/development/libraries/libfilezilla/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 2158f26f2859..61fb8f2ffd86 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { - url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2"; - sha256 = "1lyxlras357p17vbwfhwny69izjx74xncaxpyk1n4d2jbsvjspfr"; + url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; + sha256 = "0pq143f2j0g6ghl9vk1d3xw4ws2cddc8li8lm69v7lv8inz1dvhb"; }; meta = with stdenv.lib; { From ab96f931267a424d7a84165fb1b95c94b27ef7ea Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 19 Nov 2016 22:14:29 +0100 Subject: [PATCH 0507/1749] filezilla: 3.22.1 -> 3.22.2.2 --- pkgs/applications/networking/ftp/filezilla/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 12a85f5e1db7..d49eaad4d33d 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.22.1"; in +let version = "3.22.2.2"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "0pr8wj2dk5s5xxrsl0pb8y1bna0k1s3c18dh056c6qp02gba1a1f"; + sha256 = "1h02k13x88f04gkf433cxx1xvbr7kkl2aygb4i6581gzhzjifwdv"; }; configureFlags = [ "--disable-manualupdatecheck" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - dbus gnutls wxGTK30 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite + dbus gnutls wxGTK30 libidn tinyxml gettext xdg_utils gtk2 sqlite pugixml libfilezilla nettle ]; meta = with stdenv.lib; { From 80bff0b45945f027a3b72daf898301c68bd1e678 Mon Sep 17 00:00:00 2001 From: Alex Dunn Date: Sat, 19 Nov 2016 13:36:30 -0800 Subject: [PATCH 0508/1749] git: link git-credential-netrc into $out/bin --- .../version-management/git-and-tools/git/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 9c44d420c136..cd737cdf4e6b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -93,6 +93,7 @@ stdenv.mkDerivation { # Install contrib stuff. mkdir -p $out/share/git mv contrib $out/share/git/ + ln -s "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/ mkdir -p $out/share/emacs/site-lisp ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/ mkdir -p $out/etc/bash_completion.d From 5b5310ad0f1c675a88ae7417035cf2ddc1793f30 Mon Sep 17 00:00:00 2001 From: Ignat Loskutov Date: Sun, 20 Nov 2016 03:14:09 +0300 Subject: [PATCH 0509/1749] libxmlxx3: 3.0.0 -> 3.0.1 --- pkgs/development/libraries/libxmlxx/v3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index e9b08609f23c..646fdfbac4f3 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libxml++-${maj_ver}.${min_ver}"; maj_ver = "3.0"; - min_ver = "0"; + min_ver = "1"; src = fetchurl { url = "mirror://gnome/sources/libxml++/${maj_ver}/${name}.tar.xz"; - sha256 = "0lkrajbdys5f6w6qwfijih3hnbk4c6809qx2mmxkb7bj2w269wrg"; + sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r"; }; nativeBuildInputs = [ pkgconfig perl ]; From 175461e09b4631d87716308431b5f83fb2db396e Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sat, 19 Nov 2016 10:06:39 -0400 Subject: [PATCH 0510/1749] cc-wrapper: don't expand $ in response files This makes the response file handling more consistent with GCC. For example, a reponse file may contain: "-Wl,$ORIGIN" GCC will treat this as a double quoted string and not expand the variable reference. Previously, cc-wrapper would expand the variable in the same was as if the string was provided on the command line. --- pkgs/build-support/cc-wrapper/utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh index 481d642f9674..aba5f3295a98 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/cc-wrapper/utils.sh @@ -34,7 +34,7 @@ expandResponseParams() { @*) if [ -e "${p:1}" ]; then args=$(<"${p:1}") - eval 'for arg in '$args'; do params+=("$arg"); done' + eval 'for arg in '${args//$/\\$}'; do params+=("$arg"); done' else params+=("$p") fi From 02668d6c6a8e5492be4339d715da570de9fae8f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 8 Nov 2016 16:01:49 +0100 Subject: [PATCH 0511/1749] ghc: drop patch that disables use of response files https://github.com/NixOS/nixpkgs/issues/11762 has been fixed by https://github.com/NixOS/nixpkgs/commit/1ad1edbb32ce01ba8b47d8e8dad357b0edd6a4dc. --- pkgs/development/compilers/ghc/7.10.3.nix | 1 - pkgs/development/compilers/ghc/8.0.1.nix | 1 - ...pass-linker-flags-via-response-files.patch | 22 ------------------ ...pass-linker-flags-via-response-files.patch | 23 ------------------- ...pass-linker-flags-via-response-files.patch | 20 ---------------- pkgs/development/compilers/ghc/head.nix | 4 ---- 6 files changed, 71 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/ghc-7.x-dont-pass-linker-flags-via-response-files.patch delete mode 100644 pkgs/development/compilers/ghc/ghc-8.x-dont-pass-linker-flags-via-response-files.patch delete mode 100644 pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 31cf0b3c8bde..020e4fd30cf7 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { patches = [ docFixes ./relocation.patch - ./ghc-7.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 ]; buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 5e903822d4bb..98a81b8e59e2 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { }; patches = [ - ./ghc-8.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 ./relocation.patch # Fix https://ghc.haskell.org/trac/ghc/ticket/12130 diff --git a/pkgs/development/compilers/ghc/ghc-7.x-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-7.x-dont-pass-linker-flags-via-response-files.patch deleted file mode 100644 index 129a34ecd86e..000000000000 --- a/pkgs/development/compilers/ghc/ghc-7.x-dont-pass-linker-flags-via-response-files.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs -index 8c3ab1a..47a2da7 100644 ---- a/compiler/main/SysTools.hs -+++ b/compiler/main/SysTools.hs -@@ -414,7 +414,7 @@ runCc dflags args = do - args1 = map Option (getOpts dflags opt_c) - args2 = args0 ++ args1 ++ args - mb_env <- getGccEnv args2 -- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env -+ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env - where - -- discard some harmless warnings from gcc that we can't turn off - cc_filter = unlines . doFilter . lines -@@ -928,7 +928,7 @@ runLink dflags args = do - args1 = map Option (getOpts dflags opt_l) - args2 = args0 ++ linkargs ++ args1 ++ args - mb_env <- getGccEnv args2 -- runSomethingResponseFile dflags ld_filter "Linker" p args2 mb_env -+ runSomethingFiltered dflags ld_filter "Linker" p args2 mb_env - where - ld_filter = case (platformOS (targetPlatform dflags)) of - OSSolaris2 -> sunos_ld_filter diff --git a/pkgs/development/compilers/ghc/ghc-8.x-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-8.x-dont-pass-linker-flags-via-response-files.patch deleted file mode 100644 index 34e098c8f1ee..000000000000 --- a/pkgs/development/compilers/ghc/ghc-8.x-dont-pass-linker-flags-via-response-files.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ubr ghc-8.0.0.20160411-orig/compiler/main/SysTools.hs ghc-8.0.0.20160411-patched/compiler/main/SysTools.hs ---- ghc-8.0.0.20160411-orig/compiler/main/SysTools.hs 2016-04-12 10:50:46.533389045 +0200 -+++ ghc-8.0.0.20160411-patched/compiler/main/SysTools.hs 2016-04-12 10:53:29.973933760 +0200 -@@ -414,7 +414,7 @@ - args1 = map Option (getOpts dflags opt_c) - args2 = args0 ++ args1 ++ args - mb_env <- getGccEnv args2 -- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env -+ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env - where - -- discard some harmless warnings from gcc that we can't turn off - cc_filter = unlines . doFilter . lines -@@ -936,7 +936,7 @@ - args2 = args0 ++ linkargs ++ args1 ++ args - args3 = argFixup args2 [] - mb_env <- getGccEnv args3 -- runSomethingResponseFile dflags ld_filter "Linker" p args3 mb_env -+ runSomethingFiltered dflags ld_filter "Linker" p args3 mb_env - where - testLib lib = "-l" `isPrefixOf` lib || ".a" `isSuffixOf` lib - {- GHC is just blindly appending linker arguments from libraries and -Only in ghc-8.0.0.20160411-patched/compiler/main: SysTools.hs.orig -Only in ghc-8.0.0.20160411-patched/compiler/main: SysTools.hs.rej diff --git a/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch deleted file mode 100644 index ebbb9326a829..000000000000 --- a/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ghc/compiler/main/SysTools.hs 2016-11-09 14:03:05.304528147 -0500 -+++ ghc2/compiler/main/SysTools.hs 2016-11-09 14:00:19.712934686 -0500 -@@ -421,7 +421,7 @@ - args1 = map Option (getOpts dflags opt_c) - args2 = args0 ++ args1 ++ args - mb_env <- getGccEnv args2 -- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env -+ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env - where - -- discard some harmless warnings from gcc that we can't turn off - cc_filter = unlines . doFilter . lines -@@ -911,7 +911,7 @@ - args1 = map Option (getOpts dflags opt_l) - args2 = args0 ++ linkargs ++ args1 ++ args - mb_env <- getGccEnv args2 -- runSomethingResponseFile dflags ld_filter "Linker" p args2 mb_env -+ runSomethingFiltered dflags ld_filter "Linker" p args2 mb_env - where - ld_filter = case (platformOS (targetPlatform dflags)) of - OSSolaris2 -> sunos_ld_filter diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index d95791353ae3..aec6faed585e 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -27,10 +27,6 @@ in stdenv.mkDerivation (rec { sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y"; }; - # This shouldn't be necessary since 1ad1edbb32ce01ba8b47d8e8dad357b0edd6a4dc, but - # see http://hydra.cryp.to/build/2061608/nixlog/1/raw - patches = [ ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch ]; - postPatch = '' echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID From f198e4f52aaaa383bce5bfb219c564fac35e4182 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 19 Nov 2016 19:28:46 -0500 Subject: [PATCH 0512/1749] socket-0.7.0.0: Pass new version of QuickCheck --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 661af0dd261b..793f9e7911f3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1082,4 +1082,5 @@ self: super: { # https://github.com/josefs/STMonadTrans/issues/4 STMonadTrans = dontCheck super.STMonadTrans; + socket_0_7_0_0 = super.socket_0_7_0_0.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_9_2; }); } From 91677169ab1c655d9a2c33be3cacfe5844c93610 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 19 Nov 2016 20:57:54 -0500 Subject: [PATCH 0513/1749] oh-my-zsh: 2016-11-03 -> 2016-11-16 --- pkgs/shells/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index b7a122b06834..4e76c7aef335 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "oh-my-zsh-${version}"; - version = "2016-11-03"; + version = "2016-11-16"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "0b340bc3a5c58609a07987b296f773eaea17b274"; - sha256 = "1ifflqpbsk2gadbl0aqdmnm18bp21i9zcvjzlpldwma6crnfag68"; + rev = "3477ff25274fa75bd9e6110f391f6ad98ca2af72"; + sha256 = "07fvxg5jbw41j4nrs31hm0dfrwdh01gf5ik21gb4b4ddig2mjhc9"; }; phases = "installPhase"; From 3fe1c81060819b82b08f5f297089400a1c67252d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 19 Nov 2016 18:57:02 +0100 Subject: [PATCH 0514/1749] roxterm: 2.9.4 -> 3.3.2 Fixes #19579. --- pkgs/applications/misc/roxterm/default.nix | 28 ++++++++++------------ pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index d07863df0e0d..cbf602b75dab 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -1,28 +1,30 @@ { stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext , gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper -, pkgconfig, python, pythonPackages, vte }: +, pkgconfig, python, pythonPackages, vte +, wrapGAppsHook}: # TODO: Still getting following warning. # WARNING **: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files # Seems related to this: # https://forums.gentoo.org/viewtopic-t-947210-start-0.html -let version = "2.9.4"; +let version = "3.3.2"; in stdenv.mkDerivation rec { name = "roxterm-${version}"; src = fetchurl { - url = "mirror://sourceforge/roxterm/${name}.tar.bz2"; - sha256 = "0djfiwfmnqqp6930kswzr2rss0mh40vglcdybwpxrijcw4n8j21x"; + url = "mirror://sourceforge/roxterm/${name}.tar.xz"; + sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k"; }; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt - makeWrapper pkgconfig python pythonPackages.lockfile ]; - - propagatedBuildInputs = - [ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ]; + makeWrapper python pythonPackages.lockfile dbus_libs dbus_glib + gdk_pixbuf gsettings_desktop_schemas gtk3 + hicolor_icon_theme vte ]; NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0" @@ -37,16 +39,12 @@ in stdenv.mkDerivation rec { # Fix up the LD_LIBRARY_PATH so that expat is on it export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat.out}/lib" - python mscript.py configure --prefix="$out" + python mscript.py configure --prefix="$out" --disable-nls --disable-translations python mscript.py build ''; installPhase = '' python mscript.py install - - wrapProgram "$out/bin/roxterm" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; meta = with stdenv.lib; { @@ -54,10 +52,10 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; description = "Tabbed, VTE-based terminal emulator"; longDescription = '' - Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without the dependencies on Gnome. + Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without + the dependencies on Gnome. ''; maintainers = with maintainers; [ cdepillabout ]; platforms = platforms.linux; - broken = true; # https://github.com/NixOS/nixpkgs/issues/19579 }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f7663e6d9e0..5f0077018461 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15382,8 +15382,7 @@ in roxterm = callPackage ../applications/misc/roxterm { inherit (pythonPackages) lockfile; - inherit (gnome3) gsettings_desktop_schemas; - vte = gnome3.vte_290; + inherit (gnome3) gsettings_desktop_schemas vte; }; xtrace = callPackage ../tools/X11/xtrace { }; From 94731510c42c3d443790f8c8af68a62aac23ccd0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 19 Nov 2016 03:11:00 +0100 Subject: [PATCH 0515/1749] wireguard: 0.0.20161110 -> 0.0.20161116.1 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 54f49bba32b3..9a378988608a 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1"; let name = "wireguard-experimental-${version}"; - version = "0.0.20161110"; + version = "0.0.20161116.1"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-${version}.tar.xz"; - sha256 = "13z416k64gnkp9248h846h40ph83ms7l9mm9b9xpki17j5q7hm10"; + sha256 = "1393p1fllxvl4j0c8qz35k39crmcwrp8rjwxwn1wyhhrks8rs3bk"; }; meta = with stdenv.lib; { From 1fec301ac57553f44ca3afff9798f49cec6a7793 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 20 Nov 2016 04:44:37 +0100 Subject: [PATCH 0516/1749] zfs: remove zfs-tests Removes runtime dependency on gcc and reduces closure size by more than 110MB. --- pkgs/os-specific/linux/zfs/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index f2cf9eca4dc0..d7e406107b1b 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -97,6 +97,9 @@ stdenv.mkDerivation rec { # Fix pkgconfig. ln -s ../share/pkgconfig $out/lib/pkgconfig + + # Remove tests because they add a runtime dependency on gcc + rm -rf $out/share/zfs/zfs-tests ''; meta = { From 23999adb4a34564c3a1ec237002de9be74bbe68c Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Sun, 20 Nov 2016 15:19:46 +1100 Subject: [PATCH 0517/1749] tilda: 1.2.4 -> 1.3.3 --- pkgs/applications/misc/tilda/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 43b7312cda64..a64ab0ea2ca3 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "tilda-${version}"; - version = "1.2.4"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz"; - sha256 = "1f7b52c5d8cfd9038ad2e41fc633fce935f420fa657ed15e3942722c8570751e"; + sha256 = "1cc4qbg1m3i04lj5p6i6xbd0zvy1320pxdgmjhz5p3j95ibsbfki"; }; buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f7663e6d9e0..ca14a86f3241 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14815,7 +14815,7 @@ in tig = gitAndTools.tig; tilda = callPackage ../applications/misc/tilda { - vte = gnome3.vte_290; + vte = gnome3.vte; gtk = gtk3; }; From 497156a6ba4781eff6c640e1b88a90a075e5d9a7 Mon Sep 17 00:00:00 2001 From: Travis Whitaker Date: Sat, 19 Nov 2016 23:13:57 -0800 Subject: [PATCH 0518/1749] xterm: 325 -> 327 --- pkgs/applications/misc/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index adc0c3c9fb63..8d157d414f86 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "xterm-325"; + name = "xterm-327"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "06sz66z4hvjjkvm3r5a5z442iis8lz8yjfzc629pwhj01ixb0c9v"; + sha256 = "02qmfr1y24y5vq6kddksw84b8gxalc96n9wwaj7i8hmk6mn2zyv6"; }; buildInputs = From 39ad303e2175a29151eda7ef399e49e17a651b8c Mon Sep 17 00:00:00 2001 From: Travis Whitaker Date: Sat, 19 Nov 2016 23:34:53 -0800 Subject: [PATCH 0519/1749] tigervnc: 1.6.0 -> 1.7.0 --- pkgs/tools/admin/tigervnc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index eeefd4d99b5c..d0eb9e8fb15a 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.6.0"; + version = "1.7.0"; name = "tigervnc-${version}"; src = fetchgit { url = "https://github.com/TigerVNC/tigervnc/"; - sha256 = "1plljv1cxsax88kv52g02n8c1hzwgp6j1p8z1aqhskw36shg4pij"; - rev = "5a727f25990d05c9a1f85457b45d6aed66409cb3"; + sha256 = "1b6n2gq6078x8dwz471a68jrkgpcxmbiivmlsakr42vrndm7niz3"; + rev = "e25272fc74ef09987ccaa33b9bf1736397c76fdf"; }; inherit fontDirectories; From 9d69aed183b57dcef9531b1ff68943d27b42bcc8 Mon Sep 17 00:00:00 2001 From: dyrnade Date: Tue, 8 Nov 2016 22:39:52 +0200 Subject: [PATCH 0520/1749] simplenote: init at 1.0.6 simplenote package fixed issues after review added installation from source enhanced spaces --- pkgs/applications/misc/simplenote/default.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/applications/misc/simplenote/default.nix diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix new file mode 100644 index 000000000000..7367c8207054 --- /dev/null +++ b/pkgs/applications/misc/simplenote/default.nix @@ -0,0 +1,63 @@ +{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig +, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }: + + stdenv.mkDerivation rec { + + name = "simplenote-${pkgver}"; + pkgver = "1.0.6"; + + src = fetchurl { + url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-x64.${pkgver}.tar.gz"; + sha256 = "18wj880iw92yd57w781dqaj7iv9j3bqhyh2cbikqrl4m5w9xkla8"; + }; + + buildCommand = let + + packages = [ + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome3.gconf + ]; + + libPathNative = lib.makeLibraryPath packages; + libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; + libPath = "${libPathNative}:${libPath64}"; + + in '' + mkdir -p $out/share/ + mkdir -p $out/bin + tar xvzf $src -C $out/share/ + mv $out/share/Simplenote-linux-x64 $out/share/simplenote + mv $out/share/simplenote/Simplenote $out/share/simplenote/simplenote + mkdir -p $out/share/applications + + cat > $out/share/applications/simplenote.desktop << EOF + [Desktop Entry] + Name=Simplenote + Comment=Simplenote for Linux + Exec=$out/bin/simplenote + Icon=$out/share/simplenote/Simplenote.png + Type=Application + StartupNotify=true + Categories=Development; + EOF + + fixupPhase + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:$out/share/simplenote" \ + $out/share/simplenote/simplenote + + ln -s $out/share/simplenote/simplenote $out/bin/simplenote + ''; + + meta = with stdenv.lib; { + description = "The simplest way to keep notes"; + homepage = https://github.com/Automattic/simplenote-electron; + license = licenses.lgpl2; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6a3f16f569..10272a10495c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17506,4 +17506,6 @@ in nitrokey-app = callPackage ../tools/security/nitrokey-app { }; fpm2 = callPackage ../tools/security/fpm2 { }; + + simplenote = callPackage ../applications/misc/simplenote { }; } From 7906624425874069f1976a710eadb43147630cda Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Sun, 20 Nov 2016 13:10:47 +0100 Subject: [PATCH 0521/1749] qtwebengine: hardcode paths Hardcode the paths for which the default path resolution does not work in nix. --- .../development/libraries/qt-5/5.6/qtwebengine/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix index dba3611683e3..e5d7d0d4372c 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix @@ -30,7 +30,12 @@ qtSubmodule { --replace /bin/echo ${coreutils}/bin/echo substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \ --replace /bin/echo ${coreutils}/bin/echo - + + # hardcode paths for which default path resolution does not work in nix + sed -i -e 's,\(static QString potentialResourcesPath =\).*,\1 QLatin1String("'$out'/resources");,' src/core/web_engine_library_info.cpp + sed -i -e 's,\(static QString processPath\),\1 = QLatin1String("'$out'/libexec/QtWebEngineProcess"),' src/core/web_engine_library_info.cpp + sed -i -e 's,\(static QString potentialLocalesPath =\).*,\1 QLatin1String("'$out'/translations/qtwebengine_locales");,' src/core/web_engine_library_info.cpp + configureFlags+="\ -plugindir $out/lib/qt5/plugins \ -importdir $out/lib/qt5/imports \ From 703deb0bc0dfaa352ebba98adcc6f770f5963c9d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 20 Nov 2016 15:11:26 +0100 Subject: [PATCH 0522/1749] slock: 1.3 -> 1.4 fixes CVE-2016-6866 --- pkgs/misc/screensavers/slock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 4e419b6cbb6d..2f20943981a5 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, xproto, libX11, libXext, libXrandr }: stdenv.mkDerivation rec { - name = "slock-1.3"; + name = "slock-1.4"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "065xa9hl7zn0lv2f7yjxphqsa35rg6dn9hv10gys0sh4ljpa7d5s"; + sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"; }; buildInputs = [ xproto libX11 libXext libXrandr ]; installFlags = "DESTDIR=\${out} PREFIX="; From aa4ad9b98a0df701ee7de15565ddb0d35cfdd733 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 20 Nov 2016 15:38:14 +0100 Subject: [PATCH 0523/1749] rustc: Fix hanging build by disabling test. --- pkgs/development/compilers/rust/rustc.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index e1bff12f398e..57480974a3f1 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -93,6 +93,10 @@ stdenv.mkDerivation { # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 rm -vr src/test/run-pass/issue-36023.rs + # Disable test getting stuck on hydra - possible fix: + # https://reviews.llvm.org/rL281650 + rm -vr src/test/run-pass/issue-36474.rs + # Useful debugging parameter # export VERBOSE=1 '' + From c2e5c30bb7b067b3e832ed30903fbfc286f019a2 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 20 Nov 2016 14:50:44 +0100 Subject: [PATCH 0524/1749] offlineimap: 7.0.6 -> 7.0.9 --- pkgs/tools/networking/offlineimap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 93541bd06039..a11b34ef9914 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, }: pythonPackages.buildPythonApplication rec { - version = "7.0.6"; + version = "7.0.9"; name = "offlineimap-${version}"; namePrefix = ""; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "14hmr4f9zv1hhl6azh78rg4csincxzkp1sl4wydd4gwyb74cfpkc"; + sha256 = "1jrg6n4fpww98vj7gfp2li9ab4pbnrpb249cqa1bs8jjwpmrsqac"; }; doCheck = false; From b1be1eee515d47d38fb83b996dc899e38a61b19d Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Sun, 20 Nov 2016 16:06:00 +0100 Subject: [PATCH 0525/1749] erlang_basho_R16B03: Limit platforms to x86_64 --- pkgs/development/interpreters/erlang/R16B03-1-basho.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/erlang/R16B03-1-basho.nix b/pkgs/development/interpreters/erlang/R16B03-1-basho.nix index 9a0e3d6bc10d..cbb5f0789fa2 100644 --- a/pkgs/development/interpreters/erlang/R16B03-1-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B03-1-basho.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { repository. ''; - platforms = platforms.unix; + platforms = ["x86_64-linux" "x86_64-darwin"]; license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ mdaiter ]; }; From 8431345175a343ab137b595ec13d7d344930d507 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 20 Nov 2016 23:28:14 +0800 Subject: [PATCH 0526/1749] syncthin: 0.14.8 -> 0.14.11 --- 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 d7918b3b9120..2601078df224 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.8"; + version = "0.14.11"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0zhxgl6pgf60x99cappdfzk7h23g37hlanh72bwypx7pwbvhc91l"; + sha256 = "12b8284mya5z1q7ighbzk8rqxj0kcv5n0l39dygikfcbl1krr6sg"; }; buildInputs = [ go ]; From 1416ed7b0819bdb3ca1fe2b95ee88d9b23606d86 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 20 Nov 2016 16:06:42 +0100 Subject: [PATCH 0527/1749] vtun: 3.0.3 -> 3.0.4 --- pkgs/tools/networking/vtun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index 09f48d9fa1ad..fb0ee64cc2c0 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, yacc, flex }: stdenv.mkDerivation rec { - name = "vtun-3.0.3"; + name = "vtun-3.0.4"; src = fetchurl { url = "mirror://sourceforge/vtun/${name}.tar.gz"; - sha256 = "1jxrxp3klhc8az54d5qn84cbc0vdafg319jh84dxkrswii7vxp39"; + sha256 = "1fcqzn2bdjw31j1hvv6lg99v2phhszm29kp2xambxzp32mmxzy5b"; }; patches = [ From 36657f586fb07b02936521d909880046850d8bdd Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 20 Nov 2016 16:25:26 +0100 Subject: [PATCH 0528/1749] jikespg: convert md5 to sha256 and adopt it --- pkgs/development/tools/parsing/jikespg/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix index 7cfb39ebdedc..6f0eb3735ffb 100644 --- a/pkgs/development/tools/parsing/jikespg/default.nix +++ b/pkgs/development/tools/parsing/jikespg/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "jikespg-1.3"; src = fetchurl { - url = mirror://sourceforge/jikes/jikespg-1.3.tar.gz; - md5 = "eba183713d9ae61a887211be80eeb21f"; + url = "mirror://sourceforge/jikes/${name}.tar.gz"; + sha256 = "083ibfxaiw1abxmv1crccx1g6sixkbyhxn2hsrlf6fwii08s6rgw"; }; sourceRoot = "jikespg/src"; @@ -16,9 +16,11 @@ stdenv.mkDerivation { cp jikespg $out/bin ''; - meta = { + meta = with stdenv.lib; { homepage = http://jikes.sourceforge.net/; description = "The Jikes Parser Generator"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.ipl10; + maintainers = with maintainers; [ pSub ]; }; } From 264e2eebd7f5c8e03208ea7c1e7307c5bb3b3e21 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 20 Nov 2016 16:27:52 +0100 Subject: [PATCH 0529/1749] parallel: 20160722 -> 20161022 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 023498de371c..d74f27700302 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20160722"; + name = "parallel-20161022"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "e391ebd081e8ba13e870be68106d1beb5def2b001fa5881f46df0ab95304f521"; + sha256 = "1mz82chm5qav6h64rcckxzabr7w4ma0sjx61xav85x0swgcbjdsr"; }; nativeBuildInputs = [ makeWrapper ]; From 56c20d3014a41c50b3f02ffc72986fa243297e56 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 20 Nov 2016 16:35:59 +0100 Subject: [PATCH 0530/1749] telegraf: fix sha256 hash It seems it was wrong since the latest update. --- pkgs/servers/monitoring/telegraf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 51d242d9ee3c..a29c6e16fa85 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "02sldgbsxifd7s3awjj0a4wf7rrcz2xin02b6ygyqxyhj1kqj8i6"; + sha256 = "0i3bmfs54s6m8im5gjm5ccyz31gpvp9cghxjxj46l0g77ncij7dj"; }; goDeps = ./. + builtins.toPath "/deps-${version}.nix"; From ba9e16a7ccc3c79177a44b88d6238ad4f50b2cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 20 Nov 2016 17:05:11 +0100 Subject: [PATCH 0531/1749] acd-cli: pull out of pythonPackages and update to 3.0.2 --- .../networking/sync/acd_cli/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ pkgs/top-level/python-packages.nix | 28 ------------- 3 files changed, 47 insertions(+), 28 deletions(-) create mode 100644 pkgs/applications/networking/sync/acd_cli/default.nix diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix new file mode 100644 index 000000000000..bb767da94d06 --- /dev/null +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, buildPythonApplication, fuse +, appdirs, colorama, dateutil, requests2, requests_toolbelt +, fusepy, sqlalchemy }: + +buildPythonApplication rec { + name = pname + "-" + version; + pname = "acd_cli"; + version = "0.3.2"; + + doCheck = false; + + src = fetchFromGitHub { + owner = "yadayada"; + repo = pname; + rev = version; + sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp"; + }; + + propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests2 + requests_toolbelt sqlalchemy ]; + + makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ]; + + postFixup = '' + function lnOverBin() { + rm -f $out/bin/{$2,.$2-wrapped} + ln -s $out/bin/$1 $out/bin/$2 + } + lnOverBin acd_cli.py acd-cli + lnOverBin acd_cli.py acd_cli + lnOverBin acd_cli.py acdcli + ''; + + meta = with stdenv.lib; { + description = "A command line interface and FUSE filesystem for Amazon Cloud Drive"; + homepage = https://github.com/yadayada/acd_cli; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ edwtjo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa396a5fe6a7..726f5eb53363 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12053,6 +12053,12 @@ in abook = callPackage ../applications/misc/abook { }; + acd-cli = callPackage ../applications/networking/sync/acd_cli { + inherit (python35Packages) + buildPythonApplication appdirs colorama dateutil + requests2 requests_toolbelt sqlalchemy fusepy; + }; + adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { }; aeolus = callPackage ../applications/audio/aeolus { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dac77f709790..341f5192dc61 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -336,34 +336,6 @@ in { }; }; - acd_cli = buildPythonPackage rec { - name = pname + "-" + version; - pname = "acd_cli"; - version = "0.3.1"; - - disabled = !isPy33; - doCheck = !isPy33; - - src = pkgs.fetchFromGitHub { - owner = "yadayada"; - repo = pname; - rev = version; - sha256 = "1ywimbisgb5g7xl9nrfwcm7dv3j8fsrjfp7bxb3l58zbsrzj6z2s"; - }; - - propagatedBuildInputs = with self; [ appdirs colorama dateutil requests2 requests_toolbelt sqlalchemy ]; - - makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${pkgs.fuse}/lib/libfuse.so" ]; - - meta = { - description = "A command line interface and FUSE filesystem for Amazon Cloud Drive"; - homepage = https://github.com/yadayada/acd_cli; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ edwtjo ]; - }; - }; - altair = buildPythonPackage rec { name = "altair-1.0.0"; From 3a05ea53769ad6ac1b2c824f61336a8c165f079a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 5 Nov 2016 15:11:38 +0300 Subject: [PATCH 0532/1749] ejabberd: 16.08 -> 16.09 --- pkgs/servers/xmpp/ejabberd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 7fc2a5f7143c..5f850a09ded1 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -23,12 +23,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "16.08"; + version = "16.09"; name = "ejabberd-${version}"; src = fetchurl { url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "0dqikg0xgph8xjvaxc9r6cyq7k7c8l5jiqr3kyhricziyak9hmdl"; + sha256 = "054gzf4df466a6pyh4w476hxald6637nayy44hvaf31iycxani3v"; }; nativeBuildInputs = [ fakegit ]; @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "040l336570lwxsvlli7kqaa18pz92jbf9105mx394ib62z72vvlp"; + outputHash = "12dj1k5pfxc5rw4qjzqf3848190i559h3f9s1dwzpfpkdgjd38vf"; }; configureFlags = From 4111710b8e27479000f5062b7f76f2f44c1a0582 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 8 Nov 2016 18:18:42 +0300 Subject: [PATCH 0533/1749] bumblebee service: blacklist additional nvidia modules --- nixos/modules/hardware/video/bumblebee.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index 69db518ab21c..76d122ab2124 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -62,7 +62,7 @@ in }; config = mkIf config.hardware.bumblebee.enable { - boot.blacklistedKernelModules = [ "nouveau" "nvidia" ]; + boot.blacklistedKernelModules = [ "nvidia-drm" "nvidia" "nouveau" ]; boot.kernelModules = [ "bbswitch" ]; boot.extraModulePackages = [ kernel.bbswitch ] ++ optional useNvidia kernel.nvidia_x11; From 65f93413708a1aa6b43b573f5d8bebe50fc0f58c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 11 Nov 2016 03:49:02 +0300 Subject: [PATCH 0534/1749] sane service: add saned support --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/services/hardware/sane.nix | 89 +++++++++++++++++++--- pkgs/applications/graphics/sane/config.nix | 17 +++-- 3 files changed, 88 insertions(+), 20 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 80a9a520e24e..79f1e2097388 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -84,7 +84,7 @@ spamd = 56; #networkmanager = 57; # unused nslcd = 58; - #scanner = 59; # unused + scanner = 59; nginx = 60; chrony = 61; #systemd-journal = 62; # unused diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index a34037403123..e69209c560b5 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -7,9 +7,26 @@ let pkg = if config.hardware.sane.snapshot then pkgs.sane-backends-git else pkgs.sane-backends; - backends = [ pkg ] ++ config.hardware.sane.extraBackends; + + sanedConf = pkgs.writeTextFile { + name = "saned.conf"; + destination = "/etc/sane.d/saned.conf"; + text = '' + localhost + ${config.services.saned.extraConfig} + ''; + }; + + env = { + SANE_CONFIG_DIR = config.hardware.sane.configDir; + LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ]; + }; + + backends = [ pkg ] ++ optional config.services.saned.enable sanedConf ++ config.hardware.sane.extraBackends; saneConfig = pkgs.mkSaneConfig { paths = backends; }; + enabled = config.hardware.sane.enable || config.services.saned.enable; + in { @@ -51,27 +68,77 @@ in hardware.sane.configDir = mkOption { type = types.string; + internal = true; description = "The value of SANE_CONFIG_DIR."; }; + services.saned.enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable saned network daemon for remote connection to scanners. + + saned would be runned from scanner user; to allow + access to hardware that doesn't have scanner group + you should add needed groups to this user. + ''; + }; + + services.saned.extraConfig = mkOption { + type = types.lines; + default = ""; + example = "192.168.0.0/24"; + description = '' + Extra saned configuration lines. + ''; + }; + }; ###### implementation - config = mkIf config.hardware.sane.enable { + config = mkMerge [ + (mkIf enabled { + hardware.sane.configDir = mkDefault "${saneConfig}/etc/sane.d"; - hardware.sane.configDir = mkDefault "${saneConfig}/etc/sane.d"; + environment.systemPackages = backends; + environment.sessionVariables = env; + services.udev.packages = backends; - environment.systemPackages = backends; - environment.sessionVariables = { - SANE_CONFIG_DIR = config.hardware.sane.configDir; - LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ]; - }; - services.udev.packages = backends; + users.extraGroups."scanner".gid = config.ids.gids.scanner; + }) - users.extraGroups."scanner".gid = config.ids.gids.scanner; + (mkIf config.services.saned.enable { + networking.firewall.connectionTrackingModules = [ "sane" ]; - }; + systemd.services."saned@" = { + description = "Scanner Service"; + environment = mapAttrs (name: val: toString val) env; + serviceConfig = { + User = "scanner"; + Group = "scanner"; + ExecStart = "${pkg}/bin/saned"; + }; + }; + + systemd.sockets.saned = { + description = "saned incoming socket"; + wantedBy = [ "sockets.target" ]; + listenStreams = [ "0.0.0.0:6566" "[::]:6566" ]; + socketConfig = { + # saned needs to distinguish between IPv4 and IPv6 to open matching data sockets. + BindIPv6Only = "ipv6-only"; + Accept = true; + MaxConnections = 1; + }; + }; + + users.extraUsers."scanner" = { + uid = config.ids.uids.scanner; + group = "scanner"; + }; + }) + ]; } diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix index 4b8c7a4fe921..fb4e56eb6cea 100644 --- a/pkgs/applications/graphics/sane/config.nix +++ b/pkgs/applications/graphics/sane/config.nix @@ -4,25 +4,26 @@ with stdenv.lib; let installSanePath = path: '' - if test -e "${path}/lib/sane"; then + if [ -e "${path}/lib/sane" ]; then find "${path}/lib/sane" -maxdepth 1 -not -type d | while read backend; do - ln -s $backend $out/lib/sane/$(basename $backend) + ln -s "$backend" "$out/lib/sane/$(basename "$backend")" done fi - if test -e "${path}/etc/sane.d"; then + if [ -e "${path}/etc/sane.d" ]; then find "${path}/etc/sane.d" -maxdepth 1 -not -type d | while read conf; do - if test $(basename $conf) = "dll.conf"; then - cat $conf >> $out/etc/sane.d/dll.conf + name="$(basename $conf)" + if [ "$name" = "dll.conf" ] || [ "$name" = "saned.conf" ]; then + cat "$conf" >> "$out/etc/sane.d/$name" else - ln -s $conf $out/etc/sane.d/$(basename $conf) + ln -s "$conf" "$out/etc/sane.d/$name" fi done fi - if test -e "${path}/etc/sane.d/dll.d"; then + if [ -e "${path}/etc/sane.d/dll.d" ]; then find "${path}/etc/sane.d/dll.d" -maxdepth 1 -not -type d | while read conf; do - ln -s $conf $out/etc/sane.d/dll.d/$(basename $conf) + ln -s "$conf" "$out/etc/sane.d/dll.d/$(basename $conf)" done fi ''; From 382047a135811f4e12fdeb11efd39b504b750a1c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 11 Nov 2016 04:12:04 +0300 Subject: [PATCH 0535/1749] sane service: support remote scanners --- nixos/modules/services/hardware/sane.nix | 20 +++++++++++++++++++- pkgs/applications/graphics/sane/config.nix | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index e69209c560b5..8ddb9ef9c53b 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -17,12 +17,21 @@ let ''; }; + netConf = pkgs.writeTextFile { + name = "net.conf"; + destination = "/etc/sane.d/net.conf"; + text = '' + ${lib.optionalString config.services.saned.enable "localhost"} + ${config.hardware.sane.netConf} + ''; + }; + env = { SANE_CONFIG_DIR = config.hardware.sane.configDir; LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ]; }; - backends = [ pkg ] ++ optional config.services.saned.enable sanedConf ++ config.hardware.sane.extraBackends; + backends = [ pkg netConf ] ++ optional config.services.saned.enable sanedConf ++ config.hardware.sane.extraBackends; saneConfig = pkgs.mkSaneConfig { paths = backends; }; enabled = config.hardware.sane.enable || config.services.saned.enable; @@ -72,6 +81,15 @@ in description = "The value of SANE_CONFIG_DIR."; }; + hardware.sane.netConf = mkOption { + type = types.lines; + default = ""; + example = "192.168.0.16"; + description = '' + Network hosts that should be probed for remote scanners. + ''; + }; + services.saned.enable = mkOption { type = types.bool; default = false; diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix index fb4e56eb6cea..c0a0206ddd1f 100644 --- a/pkgs/applications/graphics/sane/config.nix +++ b/pkgs/applications/graphics/sane/config.nix @@ -13,7 +13,7 @@ let installSanePath = path: '' if [ -e "${path}/etc/sane.d" ]; then find "${path}/etc/sane.d" -maxdepth 1 -not -type d | while read conf; do name="$(basename $conf)" - if [ "$name" = "dll.conf" ] || [ "$name" = "saned.conf" ]; then + if [ "$name" = "dll.conf" ] || [ "$name" = "saned.conf" ] || [ "$name" = "net.conf" ]; then cat "$conf" >> "$out/etc/sane.d/$name" else ln -s "$conf" "$out/etc/sane.d/$name" From 1f62bcbc9816c7ac6e4d1f77c5443c9e5fa65d2c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 20 Nov 2016 16:11:22 +0300 Subject: [PATCH 0536/1749] nodePackages: update, add parsoid for nodejs_v6 --- .../node-packages/node-packages-v4.nix | 3902 ++++++++++------- .../node-packages/node-packages-v6.nix | 3528 +++++++++------ 2 files changed, 4648 insertions(+), 2782 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 0e4de5f6bb71..e6c31441967e 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -310,13 +310,13 @@ let sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217"; }; }; - "which-1.2.11" = { + "which-1.2.12" = { name = "which"; packageName = "which"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; - sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; + url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz"; + sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192"; }; }; "os-homedir-1.0.2" = { @@ -868,13 +868,13 @@ let sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a"; }; }; - "moment-2.15.2" = { + "moment-2.16.0" = { name = "moment"; packageName = "moment"; - version = "2.15.2"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz"; - sha1 = "1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc"; + url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz"; + sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; }; }; "ms-rest-1.15.2" = { @@ -1102,13 +1102,13 @@ let sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; }; }; - "jws-3.1.3" = { + "jws-3.1.4" = { name = "jws"; packageName = "jws"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/jws/-/jws-3.1.3.tgz"; - sha1 = "b88f1b4581a2c5ee8813c06b3fdf90ea9b5c7e6c"; + url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz"; + sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2"; }; }; "node-uuid-1.4.7" = { @@ -1138,184 +1138,31 @@ let sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90"; }; }; - "base64url-1.0.6" = { + "base64url-2.0.0" = { name = "base64url"; packageName = "base64url"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz"; - sha1 = "d64d375d68a7c640d912e2358d170dca5bb54681"; - }; - }; - "jwa-1.1.3" = { - name = "jwa"; - packageName = "jwa"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz"; - sha1 = "fa9f2f005ff0c630e7c41526a31f37f79733cd6d"; - }; - }; - "concat-stream-1.4.10" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.4.10"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz"; - sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36"; - }; - }; - "meow-2.0.0" = { - name = "meow"; - packageName = "meow"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-2.0.0.tgz"; - sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; + url = "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz"; + sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb"; }; }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; + "jwa-1.1.4" = { + name = "jwa"; + packageName = "jwa"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz"; + sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e"; }; }; - "typedarray-0.0.6" = { - name = "typedarray"; - packageName = "typedarray"; - version = "0.0.6"; + "safe-buffer-5.0.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; - }; - }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - }; - "camelcase-keys-1.0.0" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz"; - sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec"; - }; - }; - "indent-string-1.2.2" = { - name = "indent-string"; - packageName = "indent-string"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz"; - sha1 = "db99bcc583eb6abbb1e48dcbb1999a986041cb6b"; - }; - }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; - "object-assign-1.0.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; - sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; - }; - }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - }; - "map-obj-1.0.1" = { - name = "map-obj"; - packageName = "map-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - }; - "get-stdin-4.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - }; - "repeating-1.1.3" = { - name = "repeating"; - packageName = "repeating"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; - sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; - }; - }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; - }; - }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; + sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; }; }; "buffer-equal-constant-time-1.0.1" = { @@ -1462,6 +1309,24 @@ let sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; }; }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -1480,6 +1345,15 @@ let sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -1831,6 +1705,15 @@ let sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; }; }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -1948,13 +1831,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.12" = { + "mime-types-2.1.13" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.12"; + version = "2.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz"; - sha1 = "152ba256777020dd4663f54c2e7bc26381e71729"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz"; + sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88"; }; }; "oauth-sign-0.8.2" = { @@ -2020,13 +1903,13 @@ let sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; }; }; - "lodash-4.16.6" = { + "lodash-4.17.2" = { name = "lodash"; packageName = "lodash"; - version = "4.16.6"; + version = "4.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.16.6.tgz"; - sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz"; + sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42"; }; }; "chalk-1.1.3" = { @@ -2353,13 +2236,13 @@ let sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; }; }; - "mime-db-1.24.0" = { + "mime-db-1.25.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz"; - sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz"; + sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392"; }; }; "punycode-1.4.1" = { @@ -2443,6 +2326,15 @@ let sha1 = "6678b32fa0ca218fe569981bbd8871b594060d81"; }; }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; "http-basic-2.5.1" = { name = "http-basic"; packageName = "http-basic"; @@ -2524,13 +2416,13 @@ let sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; }; }; - "bower-1.7.9" = { + "bower-1.8.0" = { name = "bower"; packageName = "bower"; - version = "1.7.9"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; - sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz"; + sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a"; }; }; "bower-endpoint-parser-0.2.1" = { @@ -2776,13 +2668,13 @@ let sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0"; }; }; - "statuses-1.3.0" = { + "statuses-1.3.1" = { name = "statuses"; packageName = "statuses"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz"; - sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a"; + url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; + sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; }; }; "timed-out-2.0.0" = { @@ -2803,13 +2695,13 @@ let sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; }; }; - "readable-stream-2.1.5" = { + "readable-stream-2.2.2" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.1.5"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; - sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; + sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; }; }; "stream-shift-1.0.0" = { @@ -2866,6 +2758,24 @@ let sha1 = "5b46f80147edee578870f086d04821cf998e551f"; }; }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; "normalize-package-data-2.3.5" = { name = "normalize-package-data"; packageName = "normalize-package-data"; @@ -3145,6 +3055,33 @@ let sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; + "is-finite-1.0.2" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "get-stdin-4.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + }; "sort-keys-1.1.2" = { name = "sort-keys"; packageName = "sort-keys"; @@ -3199,22 +3136,22 @@ let sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; }; }; - "debug-2.2.0" = { + "debug-2.3.3" = { name = "debug"; packageName = "debug"; - version = "2.2.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; + sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; }; }; - "ms-0.7.1" = { + "ms-0.7.2" = { name = "ms"; packageName = "ms"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; }; }; "rimraf-2.2.8" = { @@ -3505,13 +3442,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.4.1" = { + "stream-http-2.5.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.1.tgz"; - sha1 = "8ee5689ae69169e8eb8edd6aeb2ca08ab47e8f59"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz"; + sha1 = "585eee513217ed98fe199817e7313b6f772a6802"; }; }; "subarg-1.0.0" = { @@ -3883,13 +3820,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "asn1.js-4.8.1" = { + "asn1.js-4.9.0" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.8.1"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.1.tgz"; - sha1 = "3949b7f5fd1e8bedc13be3abebf477f93490c810"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz"; + sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a"; }; }; "ripemd160-1.0.1" = { @@ -3901,13 +3838,13 @@ let sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"; }; }; - "sha.js-2.4.5" = { + "sha.js-2.4.8" = { name = "sha.js"; packageName = "sha.js"; - version = "2.4.5"; + version = "2.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz"; - sha1 = "27d171efcc82a118b99639ff581660242b506e7c"; + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz"; + sha1 = "37068c2c476b6baf402d14a49c67f597921f634f"; }; }; "miller-rabin-4.0.0" = { @@ -4486,6 +4423,15 @@ let sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; }; }; + "object-assign-1.0.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; + sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; + }; + }; "airplay-js-0.2.16" = { name = "airplay-js"; packageName = "airplay-js"; @@ -4594,13 +4540,13 @@ let sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; }; }; - "mdns-js-0.5.0" = { + "mdns-js-0.5.1" = { name = "mdns-js"; packageName = "mdns-js"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.0.tgz"; - sha1 = "4c8abb6ba7cabdc892d39228c3faa2556e09cf87"; + url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz"; + sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec"; }; }; "plist-2.0.1" = { @@ -4612,13 +4558,13 @@ let sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; }; }; - "mdns-js-packet-0.2.0" = { - name = "mdns-js-packet"; - packageName = "mdns-js-packet"; - version = "0.2.0"; + "dns-js-0.2.1" = { + name = "dns-js"; + packageName = "dns-js"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.2.0.tgz"; - sha1 = "642409e8183c7561cc60615bbd1420ec2fad7616"; + url = "https://registry.npmjs.org/dns-js/-/dns-js-0.2.1.tgz"; + sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673"; }; }; "semver-5.1.1" = { @@ -4738,13 +4684,13 @@ let sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; }; - "magnet-uri-5.1.4" = { + "magnet-uri-5.1.5" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "5.1.4"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.4.tgz"; - sha1 = "225db1f8670a944db87a5fbe27e2d90350513403"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz"; + sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8"; }; }; "parse-torrent-file-4.0.0" = { @@ -5089,6 +5035,15 @@ let sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30"; }; }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; "bncode-0.2.3" = { name = "bncode"; packageName = "bncode"; @@ -5728,13 +5683,13 @@ let sha1 = "364200d5f13646ca8bcd44490271335614792300"; }; }; - "big-integer-1.6.16" = { + "big-integer-1.6.17" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.16"; + version = "1.6.17"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz"; - sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz"; + sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51"; }; }; "sax-0.3.5" = { @@ -6070,6 +6025,15 @@ let sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425"; }; }; + "debug-2.2.0" = { + name = "debug"; + packageName = "debug"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + }; "on-headers-1.0.1" = { name = "on-headers"; packageName = "on-headers"; @@ -6097,6 +6061,15 @@ let sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; }; }; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -6277,13 +6250,13 @@ let sha1 = "d6cce7693505f733c759de57befc1af76c0f0805"; }; }; - "type-is-1.6.13" = { + "type-is-1.6.14" = { name = "type-is"; packageName = "type-is"; - version = "1.6.13"; + version = "1.6.14"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz"; - sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08"; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"; + sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2"; }; }; "utils-merge-1.0.0" = { @@ -6340,22 +6313,22 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "http-errors-1.5.0" = { + "http-errors-1.5.1" = { name = "http-errors"; packageName = "http-errors"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz"; - sha1 = "b1cb3d8260fd8e2386cad3189045943372d48211"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz"; + sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750"; }; }; - "setprototypeof-1.0.1" = { + "setprototypeof-1.0.2" = { name = "setprototypeof"; packageName = "setprototypeof"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz"; - sha1 = "52009b27888c4dc48f591949c0a8275834c1ca7e"; + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz"; + sha1 = "81a552141ec104b88e89ce383103ad5c66564d08"; }; }; "media-typer-0.3.0" = { @@ -6736,6 +6709,15 @@ let sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067"; }; }; + "readable-stream-2.1.5" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; + sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + }; + }; "realize-package-specifier-3.0.3" = { name = "realize-package-specifier"; packageName = "realize-package-specifier"; @@ -7294,13 +7276,13 @@ let sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf"; }; }; - "request-2.78.0" = { + "request-2.79.0" = { name = "request"; packageName = "request"; - version = "2.78.0"; + version = "2.79.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz"; - sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc"; + url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; + sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; "uuid-2.0.3" = { @@ -7456,13 +7438,22 @@ let sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209"; }; }; - "form-data-2.1.1" = { + "form-data-2.1.2" = { name = "form-data"; packageName = "form-data"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz"; - sha1 = "4adf0342e1a79afa1e84c8c320a9ffc82392a1f3"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; + sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; + }; + }; + "uuid-3.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; + sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; }; }; "asynckit-0.4.0" = { @@ -7492,6 +7483,15 @@ let sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; }; }; + "repeating-1.1.3" = { + name = "repeating"; + packageName = "repeating"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; + sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; + }; + }; "semver-diff-2.1.0" = { name = "semver-diff"; packageName = "semver-diff"; @@ -8135,13 +8135,13 @@ let sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; }; }; - "verror-1.8.1" = { + "verror-1.9.0" = { name = "verror"; packageName = "verror"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.8.1.tgz"; - sha1 = "157589400a2d14570a62f2d5dd6a0f6214be3029"; + url = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz"; + sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee"; }; }; "extsprintf-1.3.0" = { @@ -8234,13 +8234,13 @@ let sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd"; }; }; - "basic-auth-1.0.4" = { + "basic-auth-1.1.0" = { name = "basic-auth"; packageName = "basic-auth"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; - sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz"; + sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884"; }; }; "cors-2.8.1" = { @@ -8486,13 +8486,13 @@ let sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; }; }; - "ltgt-2.1.2" = { + "ltgt-2.1.3" = { name = "ltgt"; packageName = "ltgt"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.2.tgz"; - sha1 = "e7472324fee690afc0d5ecf900403ce5788a311d"; + url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz"; + sha1 = "10851a06d9964b971178441c23c9e52698eece34"; }; }; "pull-level-2.0.3" = { @@ -8738,13 +8738,13 @@ let sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; }; }; - "got-6.6.1" = { + "got-6.6.3" = { name = "got"; packageName = "got"; - version = "6.6.1"; + version = "6.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.6.1.tgz"; - sha1 = "542d7a0e34676060e561b1b90d103876eefabed2"; + url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz"; + sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec"; }; }; "lodash.debounce-4.0.8" = { @@ -8909,13 +8909,13 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.12.0" = { + "globals-9.14.0" = { name = "globals"; packageName = "globals"; - version = "9.12.0"; + version = "9.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.12.0.tgz"; - sha1 = "992ce90828c3a55fa8f16fada177adb64664cf9d"; + url = "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz"; + sha1 = "8859936af0038741263053b39d0e76ca241e4034"; }; }; "ignore-3.2.0" = { @@ -8945,13 +8945,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.6.1" = { + "js-yaml-3.7.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; - sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; }; }; "json-stable-stringify-1.0.1" = { @@ -8999,13 +8999,13 @@ let sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; }; }; - "require-uncached-1.0.2" = { + "require-uncached-1.0.3" = { name = "require-uncached"; packageName = "require-uncached"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz"; - sha1 = "67dad3b733089e77030124678a459589faf6a7ec"; + url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz"; + sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; "strip-bom-3.0.0" = { @@ -9323,13 +9323,13 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.8.2" = { + "ajv-4.9.0" = { name = "ajv"; packageName = "ajv"; - version = "4.8.2"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.8.2.tgz"; - sha1 = "65486936ca36fea39a1504332a78bebd5d447bdc"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz"; + sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c"; }; }; "ajv-keywords-1.1.1" = { @@ -9890,13 +9890,13 @@ let sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017"; }; }; - "npmlog-4.0.0" = { + "npmlog-4.0.1" = { name = "npmlog"; packageName = "npmlog"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.0.tgz"; - sha1 = "e094503961c70c1774eb76692080e8d578a9f88f"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz"; + sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8"; }; }; "tar-pack-3.3.0" = { @@ -9917,13 +9917,13 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; - "gauge-2.6.0" = { + "gauge-2.7.1" = { name = "gauge"; packageName = "gauge"; - version = "2.6.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz"; - sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46"; + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz"; + sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7"; }; }; "set-blocking-2.0.0" = { @@ -10125,13 +10125,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.20" = { + "clean-css-3.4.21" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.20"; + version = "3.4.21"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz"; - sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz"; + sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b"; }; }; "commander-2.6.0" = { @@ -10305,6 +10305,15 @@ let sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; "cliui-2.1.0" = { name = "cliui"; packageName = "cliui"; @@ -10422,22 +10431,22 @@ let sha1 = "a98f2ff67183d8ba7cfaca10548bd7ff0550b385"; }; }; - "orchestrator-0.3.7" = { + "orchestrator-0.3.8" = { name = "orchestrator"; packageName = "orchestrator"; - version = "0.3.7"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz"; - sha1 = "c45064e22c5a2a7b99734f409a95ffedc7d3c3df"; + url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz"; + sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e"; }; }; - "pretty-hrtime-1.0.2" = { + "pretty-hrtime-1.0.3" = { name = "pretty-hrtime"; packageName = "pretty-hrtime"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.2.tgz"; - sha1 = "70ca96f4d0628a443b918758f79416a9a7bc9fa8"; + url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; + sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; }; }; "tildify-1.2.0" = { @@ -10476,13 +10485,13 @@ let sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; }; }; - "beeper-1.1.0" = { + "beeper-1.1.1" = { name = "beeper"; packageName = "beeper"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"; - sha1 = "9ee6fc1ce7f54feaace7ce73588b056037866a2c"; + url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz"; + sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; "dateformat-1.0.12" = { @@ -11295,13 +11304,13 @@ let sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; }; }; - "handlebars-4.0.5" = { + "handlebars-4.0.6" = { name = "handlebars"; packageName = "handlebars"; - version = "4.0.5"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz"; - sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.6.tgz"; + sha1 = "2ce4484850537f9c97a8026d5399b935c4ed4ed7"; }; }; "supports-color-3.1.2" = { @@ -11961,6 +11970,15 @@ let sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9"; }; }; + "basic-auth-1.0.4" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; + sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; + }; + }; "connect-2.30.2" = { name = "connect"; packageName = "connect"; @@ -12105,13 +12123,13 @@ let sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; }; }; - "method-override-2.3.6" = { + "method-override-2.3.7" = { name = "method-override"; packageName = "method-override"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz"; - sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e"; + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz"; + sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5"; }; }; "morgan-1.6.1" = { @@ -12150,22 +12168,22 @@ let sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; }; }; - "response-time-2.3.1" = { + "response-time-2.3.2" = { name = "response-time"; packageName = "response-time"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz"; - sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797"; + url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz"; + sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a"; }; }; - "serve-favicon-2.3.0" = { + "serve-favicon-2.3.2" = { name = "serve-favicon"; packageName = "serve-favicon"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz"; - sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz"; + sha1 = "dd419e268de012ab72b319d337f2105013f9381f"; }; }; "serve-index-1.7.3" = { @@ -12204,22 +12222,13 @@ let sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; }; }; - "csrf-3.0.3" = { + "csrf-3.0.4" = { name = "csrf"; packageName = "csrf"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz"; - sha1 = "69d13220de95762808bb120f7533a994fc4293b5"; - }; - }; - "base64-url-1.2.2" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz"; - sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3"; + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz"; + sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5"; }; }; "rndm-1.2.0" = { @@ -12240,13 +12249,13 @@ let sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; }; }; - "uid-safe-2.1.1" = { + "uid-safe-2.1.3" = { name = "uid-safe"; packageName = "uid-safe"; - version = "2.1.1"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz"; - sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666"; + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz"; + sha1 = "077e264a00b3187936b270bb7376a26473631071"; }; }; "random-bytes-1.0.0" = { @@ -12789,6 +12798,15 @@ let sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873"; }; }; + "gauge-2.6.0" = { + name = "gauge"; + packageName = "gauge"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz"; + sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46"; + }; + }; "uid-number-0.0.5" = { name = "uid-number"; packageName = "uid-number"; @@ -13311,49 +13329,49 @@ let sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759"; }; }; - "node-red-node-feedparser-0.1.6" = { + "node-red-node-feedparser-0.1.7" = { name = "node-red-node-feedparser"; packageName = "node-red-node-feedparser"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.6.tgz"; - sha1 = "42eb2e11a010904e6af7257feb27a2a64a1b578d"; - }; - }; - "node-red-node-email-0.1.11" = { - name = "node-red-node-email"; - packageName = "node-red-node-email"; - version = "0.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.11.tgz"; - sha1 = "4a64070f3fc5596fdc50e988813dd4ff003b3fd8"; - }; - }; - "node-red-node-twitter-0.1.7" = { - name = "node-red-node-twitter"; - packageName = "node-red-node-twitter"; version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.7.tgz"; - sha1 = "8cef1e54df6217d83b49fd48684e6ca2ee1cf595"; + url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.7.tgz"; + sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-rbe-0.1.5" = { + "node-red-node-email-0.1.12" = { + name = "node-red-node-email"; + packageName = "node-red-node-email"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz"; + sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5"; + }; + }; + "node-red-node-twitter-0.1.9" = { + name = "node-red-node-twitter"; + packageName = "node-red-node-twitter"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.9.tgz"; + sha1 = "e0ad7f654aab3ff8e7c3d001ec3cee030d33d217"; + }; + }; + "node-red-node-rbe-0.1.6" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.5.tgz"; - sha1 = "9df9b13b8828c9396319a54ad7c0fbb1a4005e9d"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz"; + sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539"; }; }; - "node-red-node-serialport-0.4.0" = { + "node-red-node-serialport-0.4.1" = { name = "node-red-node-serialport"; packageName = "node-red-node-serialport"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.0.tgz"; - sha1 = "dfa63bedd535fa9debef754c373e439f8bc73abe"; + url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz"; + sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c"; }; }; "bcrypt-0.8.7" = { @@ -13509,13 +13527,13 @@ let sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; }; }; - "moment-timezone-0.5.7" = { + "moment-timezone-0.5.9" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.7"; + version = "0.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.7.tgz"; - sha1 = "1305bcada16f046dbbc7ac89abf66effff886cb5"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz"; + sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd"; }; }; "retry-0.6.1" = { @@ -13527,13 +13545,13 @@ let sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918"; }; }; - "cookies-0.6.1" = { + "cookies-0.6.2" = { name = "cookies"; packageName = "cookies"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookies/-/cookies-0.6.1.tgz"; - sha1 = "ef693b1bc6f01f567d46e2f504e9c15fb70cba90"; + url = "https://registry.npmjs.org/cookies/-/cookies-0.6.2.tgz"; + sha1 = "6ac1b052895208e8fc4c4f5f86a9ed31b9cb5ccf"; }; }; "i18next-client-1.10.3" = { @@ -13617,13 +13635,13 @@ let sha1 = "7382c148cb622c4b28af7c727f9673730b73f474"; }; }; - "websocket-stream-3.3.0" = { + "websocket-stream-3.3.3" = { name = "websocket-stream"; packageName = "websocket-stream"; - version = "3.3.0"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.0.tgz"; - sha1 = "69ced776afca68688ed5be73d28511a2c329c8ed"; + url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.3.tgz"; + sha1 = "361da5404a337e60cfbc29b4a46368762679df0b"; }; }; "leven-1.0.2" = { @@ -13896,13 +13914,13 @@ let sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; }; }; - "uue-3.0.0" = { + "uue-3.1.0" = { name = "uue"; packageName = "uue"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/uue/-/uue-3.0.0.tgz"; - sha1 = "07af69344defa9851b7b845c1c18110b8264e51e"; + url = "https://registry.npmjs.org/uue/-/uue-3.1.0.tgz"; + sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6"; }; }; "utf7-1.0.2" = { @@ -13923,13 +13941,13 @@ let sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; }; }; - "serialport-4.0.4" = { + "serialport-4.0.6" = { name = "serialport"; packageName = "serialport"; - version = "4.0.4"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-4.0.4.tgz"; - sha1 = "93e55ad75e0451fcdeabb939c08da01da138a74a"; + url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz"; + sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae"; }; }; "lie-3.1.0" = { @@ -14202,13 +14220,13 @@ let sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; }; }; - "buffer-crc32-0.2.5" = { + "buffer-crc32-0.2.6" = { name = "buffer-crc32"; packageName = "buffer-crc32"; - version = "0.2.5"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"; - sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91"; + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.6.tgz"; + sha1 = "612b318074fc6c4c30504b297247a1f91641253b"; }; }; "fresh-0.1.0" = { @@ -14517,13 +14535,13 @@ let sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2"; }; }; - "raw-socket-1.5.0" = { + "raw-socket-1.5.1" = { name = "raw-socket"; packageName = "raw-socket"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.0.tgz"; - sha1 = "7a0fba1aef118609011a1205e830e626ca522ae9"; + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.1.tgz"; + sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528"; }; }; "argparse-0.1.16" = { @@ -14607,6 +14625,15 @@ let sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; + "mississippi-1.2.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; + sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; + }; + }; "npm-install-checks-3.0.0" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -14616,6 +14643,15 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; + "npm-registry-client-7.3.0" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz"; + sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50"; + }; + }; "opener-1.4.2" = { name = "opener"; packageName = "opener"; @@ -14643,13 +14679,22 @@ let sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6"; }; }; - "request-2.75.0" = { + "request-2.78.0" = { name = "request"; packageName = "request"; - version = "2.75.0"; + version = "2.78.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; - sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz"; + sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc"; + }; + }; + "sorted-union-stream-2.1.3" = { + name = "sorted-union-stream"; + packageName = "sorted-union-stream"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz"; + sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; }; }; "unique-filename-1.1.0" = { @@ -14697,13 +14742,40 @@ let sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; }; }; - "form-data-2.0.0" = { - name = "form-data"; - packageName = "form-data"; - version = "2.0.0"; + "flush-write-stream-1.0.2" = { + name = "flush-write-stream"; + packageName = "flush-write-stream"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; - sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz"; + sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417"; + }; + }; + "from2-2.3.0" = { + name = "from2"; + packageName = "from2"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + }; + "stream-each-1.2.0" = { + name = "stream-each"; + packageName = "stream-each"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz"; + sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991"; + }; + }; + "stream-iterate-1.2.0" = { + name = "stream-iterate"; + packageName = "stream-iterate"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz"; + sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1"; }; }; "unique-slug-2.0.0" = { @@ -14931,13 +15003,13 @@ let sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; }; }; - "npm-3.10.9" = { + "npm-3.10.10" = { name = "npm"; packageName = "npm"; - version = "3.10.9"; + version = "3.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz"; - sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz"; + sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; }; }; "npmi-2.0.1" = { @@ -14985,6 +15057,24 @@ let sha1 = "27c90519196dc15015be02a34ea52986feab8877"; }; }; + "request-2.75.0" = { + name = "request"; + packageName = "request"; + version = "2.75.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; + sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + }; + }; + "form-data-2.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; + sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + }; + }; "boxen-0.6.0" = { name = "boxen"; packageName = "boxen"; @@ -15129,15 +15219,6 @@ let sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2"; }; }; - "bunyan-1.8.4" = { - name = "bunyan"; - packageName = "bunyan"; - version = "1.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.4.tgz"; - sha1 = "98013acc812ebc3806364049edf6c9129d8b8d73"; - }; - }; "connect-busboy-0.0.2" = { name = "connect-busboy"; packageName = "connect-busboy"; @@ -15147,13 +15228,14 @@ let sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097"; }; }; - "core-js-1.2.7" = { - name = "core-js"; - packageName = "core-js"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz"; - sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636"; + "content-type-git+https://github.com/wikimedia/content-type.git#master" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.1"; + src = fetchgit { + url = "https://github.com/wikimedia/content-type.git"; + rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b"; + sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; }; }; "diff-1.4.0" = { @@ -15174,22 +15256,22 @@ let sha1 = "26bc01f739707505c51456af7f59e3373369475d"; }; }; - "express-handlebars-2.0.1" = { + "express-handlebars-3.0.0" = { name = "express-handlebars"; packageName = "express-handlebars"; - version = "2.0.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-2.0.1.tgz"; - sha1 = "975661ffebd6e79463230ba4c8e0ca5cd0522fb1"; + url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.0.0.tgz"; + sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; }; }; - "finalhandler-0.4.1" = { + "finalhandler-0.5.1" = { name = "finalhandler"; packageName = "finalhandler"; - version = "0.4.1"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; - sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; + sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; }; }; "gelf-stream-0.2.4" = { @@ -15201,22 +15283,23 @@ let sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013"; }; }; - "html5-1.0.5" = { - name = "html5"; - packageName = "html5"; - version = "1.0.5"; + "mediawiki-title-0.5.6" = { + name = "mediawiki-title"; + packageName = "mediawiki-title"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/html5/-/html5-1.0.5.tgz"; - sha1 = "c9e6ce4e07a70521904bee1b318a4c48feab5848"; + url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.5.6.tgz"; + sha1 = "549069294e27728a1f13bed3d705d6beecf4ea24"; }; }; - "node-txstatsd-0.1.6" = { - name = "node-txstatsd"; - packageName = "node-txstatsd"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/node-txstatsd/-/node-txstatsd-0.1.6.tgz"; - sha1 = "924d22e5348c40156c2eb5ac29a5bb5609ca2a04"; + "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.1"; + src = fetchgit { + url = "https://github.com/arlolra/negotiator.git"; + rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a"; + sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; "pegjs-git+https://github.com/tstarling/pegjs.git#fork" = { @@ -15225,8 +15308,8 @@ let version = "0.8.0"; src = fetchgit { url = "https://github.com/tstarling/pegjs.git"; - rev = "9162b1e114e41992dd0fdafa24d2574a0b8a836a"; - sha256 = "d0dac8e9de14c4e7c05da55248dd3a422b915a96d668aa14f92747cfdbdb40aa"; + rev = "36d584bd7bbc564c86c058c5dfe8053b1fe1d584"; + sha256 = "df0bf31b132e63beae73a28f1edfe0a2e9edf01660632c72834c682e2b484905"; }; }; "prfun-2.1.4" = { @@ -15238,6 +15321,15 @@ let sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; }; }; + "service-runner-2.1.11" = { + name = "service-runner"; + packageName = "service-runner"; + version = "2.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz"; + sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb"; + }; + }; "simplediff-0.1.1" = { name = "simplediff"; packageName = "simplediff"; @@ -15247,6 +15339,15 @@ let sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; }; }; + "yargs-4.8.1" = { + name = "yargs"; + packageName = "yargs"; + version = "4.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz"; + sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"; + }; + }; "is-arguments-1.0.2" = { name = "is-arguments"; packageName = "is-arguments"; @@ -15256,13 +15357,103 @@ let sha1 = "07e30ad79531844179b642d2d8399435182c8727"; }; }; - "dtrace-provider-0.7.1" = { + "busboy-0.2.13" = { + name = "busboy"; + packageName = "busboy"; + version = "0.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz"; + sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6"; + }; + }; + "dicer-0.2.5" = { + name = "dicer"; + packageName = "dicer"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; + sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; + }; + }; + "streamsearch-0.1.2" = { + name = "streamsearch"; + packageName = "streamsearch"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; + sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + }; + }; + "gelfling-0.2.0" = { + name = "gelfling"; + packageName = "gelfling"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz"; + sha1 = "23a13c366883adae32ecfd252a566be302b88dc3"; + }; + }; + "bunyan-1.8.5" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz"; + sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a"; + }; + }; + "bunyan-syslog-udp-0.1.0" = { + name = "bunyan-syslog-udp"; + packageName = "bunyan-syslog-udp"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.1.0.tgz"; + sha1 = "fbfaee03a81cd2a95abc18f92c99f2bb87e2429c"; + }; + }; + "gelf-stream-1.1.1" = { + name = "gelf-stream"; + packageName = "gelf-stream"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz"; + sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669"; + }; + }; + "hot-shots-4.3.1" = { + name = "hot-shots"; + packageName = "hot-shots"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.3.1.tgz"; + sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239"; + }; + }; + "limitation-0.1.9" = { + name = "limitation"; + packageName = "limitation"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/limitation/-/limitation-0.1.9.tgz"; + sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03"; + }; + }; + "yargs-5.0.0" = { + name = "yargs"; + packageName = "yargs"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; + sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + }; + }; + "dtrace-provider-0.8.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz"; - sha1 = "c06b308f2f10d5d5838aec9c571e5d588dc71d04"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz"; + sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625"; }; }; "mv-2.1.1" = { @@ -15301,139 +15492,167 @@ let sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; }; }; - "busboy-0.2.13" = { - name = "busboy"; - packageName = "busboy"; - version = "0.2.13"; - src = fetchurl { - url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz"; - sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6"; - }; - }; - "dicer-0.2.5" = { - name = "dicer"; - packageName = "dicer"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; - sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; - }; - }; - "streamsearch-0.1.2" = { - name = "streamsearch"; - packageName = "streamsearch"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; - sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; - }; - }; - "handlebars-3.0.3" = { - name = "handlebars"; - packageName = "handlebars"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-3.0.3.tgz"; - sha1 = "0e09651a2f0fb3c949160583710d551f92e6d2ad"; - }; - }; - "object.assign-1.1.1" = { - name = "object.assign"; - packageName = "object.assign"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-1.1.1.tgz"; - sha1 = "f229674273f94fcb230d02c1958a8b94ec9ef95c"; - }; - }; - "uglify-js-2.3.6" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; - sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; - }; - }; - "gelfling-0.2.0" = { + "gelfling-0.3.1" = { name = "gelfling"; packageName = "gelfling"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz"; - sha1 = "23a13c366883adae32ecfd252a566be302b88dc3"; - }; - }; - "opts-1.2.2" = { - name = "opts"; - packageName = "opts"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/opts/-/opts-1.2.2.tgz"; - sha1 = "81782b93014a1cd88d56c226643fd4282473853d"; - }; - }; - "html5-entities-1.0.0" = { - name = "html5-entities"; - packageName = "html5-entities"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html5-entities/-/html5-entities-1.0.0.tgz"; - sha1 = "e568fd84d8efb52c806b16c98b92dad548ebe370"; - }; - }; - "jsdom-0.11.1" = { - name = "jsdom"; - packageName = "jsdom"; - version = "0.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-0.11.1.tgz"; - sha1 = "f1a79756ebc2116932caef8c6bfde7022dacdbfb"; - }; - }; - "nwmatcher-1.3.9" = { - name = "nwmatcher"; - packageName = "nwmatcher"; - version = "1.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.9.tgz"; - sha1 = "8bab486ff7fa3dfd086656bbe8b17116d3692d2a"; - }; - }; - "xmlhttprequest-1.8.0" = { - name = "xmlhttprequest"; - packageName = "xmlhttprequest"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz"; - sha1 = "67fe075c5c24fef39f9d65f5f7b7fe75171968fc"; - }; - }; - "cssom-0.3.1" = { - name = "cssom"; - packageName = "cssom"; version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.3.1.tgz"; - sha1 = "c9e37ef2490e64f6d1baa10fda852257082c25d3"; + url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz"; + sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04"; }; }; - "cssstyle-0.2.37" = { - name = "cssstyle"; - packageName = "cssstyle"; - version = "0.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz"; - sha1 = "541097234cb2513c83ceed3acddc27ff27987d54"; + "kad-git+https://github.com/gwicke/kad.git#master" = { + name = "kad"; + packageName = "kad"; + version = "1.3.6"; + src = fetchgit { + url = "https://github.com/gwicke/kad.git"; + rev = "f35971036f43814043245da82b12d035b7bbfd16"; + sha256 = "9529b2615547db37851d15b39155c608d6b8d0641366d14cce728824b6135a35"; }; }; - "contextify-0.1.15" = { - name = "contextify"; - packageName = "contextify"; - version = "0.1.15"; + "clarinet-0.11.0" = { + name = "clarinet"; + packageName = "clarinet"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/contextify/-/contextify-0.1.15.tgz"; - sha1 = "3d34681d14a5ccbbe609c9ee11eda206b8cf266f"; + url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz"; + sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719"; + }; + }; + "kad-fs-0.0.4" = { + name = "kad-fs"; + packageName = "kad-fs"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz"; + sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a"; + }; + }; + "kad-localstorage-0.0.7" = { + name = "kad-localstorage"; + packageName = "kad-localstorage"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz"; + sha1 = "f7a2e780da53fb28b943c2c5a894c279aa810f17"; + }; + }; + "kad-memstore-0.0.1" = { + name = "kad-memstore"; + packageName = "kad-memstore"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz"; + sha1 = "83cb748496ac491c7135104cbe56b88ca7392477"; + }; + }; + "merge-1.2.0" = { + name = "merge"; + packageName = "merge"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz"; + sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da"; + }; + }; + "msgpack5-3.4.1" = { + name = "msgpack5"; + packageName = "msgpack5"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.4.1.tgz"; + sha1 = "350ef35899c6c8773710fd84d881ddd3340a8114"; + }; + }; + "dom-storage-2.0.2" = { + name = "dom-storage"; + packageName = "dom-storage"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz"; + sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; + }; + }; + "get-caller-file-1.0.2" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; + sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; + }; + }; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "which-module-1.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; + }; + }; + "window-size-0.2.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; + sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; + }; + }; + "yargs-parser-3.2.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; + sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; + }; + }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; + "yargs-parser-2.4.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; + sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; "airplayer-2.0.0" = { @@ -15454,13 +15673,13 @@ let sha1 = "b8d19188b3243e390f302410bd0cb1622db82649"; }; }; - "inquirer-1.2.2" = { + "inquirer-1.2.3" = { name = "inquirer"; packageName = "inquirer"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.2.tgz"; - sha1 = "f725c1316f0020e7f3d538c8c5ad0c2732c1c451"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz"; + sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; }; "network-address-1.1.0" = { @@ -15634,13 +15853,13 @@ let sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; }; }; - "dns-packet-1.1.0" = { + "dns-packet-1.1.1" = { name = "dns-packet"; packageName = "dns-packet"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.0.tgz"; - sha1 = "c11ce43bd9977aa789af72de06b6e4ad6e84730d"; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz"; + sha1 = "2369d45038af045f3898e6fa56862aed3f40296c"; }; }; "external-editor-1.1.1" = { @@ -15715,13 +15934,13 @@ let sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad"; }; }; - "socket.io-0.9.17" = { + "socket.io-1.6.0" = { name = "socket.io"; packageName = "socket.io"; - version = "0.9.17"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz"; - sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz"; + sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1"; }; }; "torrent-stream-0.18.1" = { @@ -16093,13 +16312,121 @@ let sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0"; }; }; - "socket.io-client-0.9.16" = { + "engine.io-1.8.0" = { + name = "engine.io"; + packageName = "engine.io"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz"; + sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa"; + }; + }; + "socket.io-adapter-0.5.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; + sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; + }; + }; + "socket.io-client-1.6.0" = { name = "socket.io-client"; packageName = "socket.io-client"; - version = "0.9.16"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz"; - sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6"; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz"; + sha1 = "5b668f4f771304dfeed179064708386fa6717853"; + }; + }; + "socket.io-parser-2.3.1" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; + sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; + }; + }; + "engine.io-parser-1.3.1" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz"; + sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf"; + }; + }; + "base64-arraybuffer-0.1.5" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; + sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; + }; + }; + "wtf-8-1.0.0" = { + name = "wtf-8"; + packageName = "wtf-8"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; + sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; + }; + }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + }; + }; + "engine.io-client-1.8.0" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz"; + sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c"; + }; + }; + "parseuri-0.0.5" = { + name = "parseuri"; + packageName = "parseuri"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz"; + sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; + }; + }; + "parsejson-0.0.3" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; + sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; + }; + }; + "parseqs-0.0.5" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; + sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; + }; + }; + "xmlhttprequest-ssl-1.5.3" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; + sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; }; }; "bittorrent-dht-3.2.6" = { @@ -16859,6 +17186,15 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; + "uglify-js-2.3.6" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; + sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; + }; + }; "markdown-it-4.4.0" = { name = "markdown-it"; packageName = "markdown-it"; @@ -17264,6 +17600,15 @@ let sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3"; }; }; + "js-yaml-3.6.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; + sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + }; + }; "whet.extend-0.9.9" = { name = "whet.extend"; packageName = "whet.extend"; @@ -17309,31 +17654,22 @@ let sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; }; }; - "longjohn-0.2.9" = { + "longjohn-0.2.11" = { name = "longjohn"; packageName = "longjohn"; - version = "0.2.9"; + version = "0.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.9.tgz"; - sha1 = "db1bf175fcfffcfce099132d1470f52f41a31519"; + url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz"; + sha1 = "83736a15ae5f48711b625153e98012f2de659e69"; }; }; - "node-appc-0.2.31" = { + "node-appc-0.2.39" = { name = "node-appc"; packageName = "node-appc"; - version = "0.2.31"; + version = "0.2.39"; src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.31.tgz"; - sha1 = "8d8d0052fd8b8ce4bc44f06883009f7c950bc8c2"; - }; - }; - "request-2.62.0" = { - name = "request"; - packageName = "request"; - version = "2.62.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.62.0.tgz"; - sha1 = "55c165f702a146f1e21e0725c0b75e1136487b0f"; + url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.39.tgz"; + sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4"; }; }; "sprintf-0.1.5" = { @@ -17345,22 +17681,22 @@ let sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; }; }; - "winston-1.0.2" = { + "winston-1.1.2" = { name = "winston"; packageName = "winston"; - version = "1.0.2"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-1.0.2.tgz"; - sha1 = "351c58e2323f8a4ca29a45195aa9aa3b4c35d76f"; + url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz"; + sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c"; }; }; - "wrench-1.5.8" = { + "wrench-1.5.9" = { name = "wrench"; packageName = "wrench"; - version = "1.5.8"; + version = "1.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; - sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; + url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz"; + sha1 = "411691c63a9b2531b1700267279bdeca23b2142a"; }; }; "source-map-support-0.3.2" = { @@ -17390,85 +17726,58 @@ let sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; }; }; - "diff-2.1.0" = { + "diff-2.2.1" = { name = "diff"; packageName = "diff"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-2.1.0.tgz"; - sha1 = "39b5aa97f0d1600b428ad0a91dc8efcc9b29e288"; + url = "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz"; + sha1 = "76ec8ea33535344078079fbe8cf03435ffb185ec"; }; }; - "node-uuid-1.4.3" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; - sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; - }; - }; - "request-2.61.0" = { + "request-2.69.0" = { name = "request"; packageName = "request"; - version = "2.61.0"; + version = "2.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.61.0.tgz"; - sha1 = "6973cb2ac94885f02693f554eec64481d6013f9f"; + url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; + sha1 = "cf91d2e000752b1217155c005241911991a2346a"; }; }; - "semver-5.0.1" = { + "semver-5.1.0" = { name = "semver"; packageName = "semver"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.1.tgz"; - sha1 = "9fb3f4004f900d83c47968fe42f7583e05832cc9"; - }; - }; - "uglify-js-2.4.24" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz"; - sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e"; - }; - }; - "har-validator-1.8.0" = { - name = "har-validator"; - packageName = "har-validator"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz"; - sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2"; - }; - }; - "bluebird-2.11.0" = { - name = "bluebird"; - packageName = "bluebird"; - version = "2.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"; - sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1"; - }; - }; - "yargs-3.5.4" = { - name = "yargs"; - packageName = "yargs"; - version = "3.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz"; - sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361"; - }; - }; - "qs-5.1.0" = { - name = "qs"; - packageName = "qs"; version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"; - sha1 = "4d932e5c7ea411cca76a312d39a606200fd50cd9"; + url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; + sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; + }; + }; + "wrench-1.5.8" = { + name = "wrench"; + packageName = "wrench"; + version = "1.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; + sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; + }; + }; + "uglify-js-2.6.1" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz"; + sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; + }; + }; + "qs-6.0.2" = { + name = "qs"; + packageName = "qs"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; + sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; }; }; "bluebird-3.3.5" = { @@ -17570,13 +17879,13 @@ let sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3"; }; }; - "knockout-3.4.0" = { + "knockout-3.4.1" = { name = "knockout"; packageName = "knockout"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.4.0.tgz"; - sha1 = "59d7261815a11eb7c1a3f3c7077ca898a44caadb"; + url = "https://registry.npmjs.org/knockout/-/knockout-3.4.1.tgz"; + sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0"; }; }; "lodash-4.12.0" = { @@ -17678,13 +17987,13 @@ let sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; }; }; - "color-convert-1.6.0" = { + "color-convert-1.8.2" = { name = "color-convert"; packageName = "color-convert"; - version = "1.6.0"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.6.0.tgz"; - sha1 = "7592755faf53938a05b1ea8e5374cab77d6dd190"; + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.8.2.tgz"; + sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339"; }; }; "color-string-0.3.0" = { @@ -17723,6 +18032,15 @@ let sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c"; }; }; + "finalhandler-0.4.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; + sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + }; + }; "send-0.13.1" = { name = "send"; packageName = "send"; @@ -17849,22 +18167,22 @@ let sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484"; }; }; - "editions-1.3.1" = { + "editions-1.3.3" = { name = "editions"; packageName = "editions"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-1.3.1.tgz"; - sha1 = "008425f64dc1401db45ec110e06aa602562419c0"; + url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz"; + sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b"; }; }; - "typechecker-4.3.0" = { + "typechecker-4.4.0" = { name = "typechecker"; packageName = "typechecker"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/typechecker/-/typechecker-4.3.0.tgz"; - sha1 = "6f6d6815753e88d6812aa80de4a3fd18948e6e62"; + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.0.tgz"; + sha1 = "efc56882d36e435c6eb978200e22b88278a3f7fc"; }; }; "underscore-1.5.2" = { @@ -18038,24 +18356,6 @@ let sha1 = "7d250d8fa1c218119ecde51390458a57d5171376"; }; }; - "camelcase-3.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; - sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; - }; - }; - "lodash.assign-4.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; - sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; - }; - }; "pkg-conf-1.1.3" = { name = "pkg-conf"; packageName = "pkg-conf"; @@ -18065,15 +18365,6 @@ let sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b"; }; }; - "require-main-filename-1.0.1" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; - }; - }; "set-blocking-1.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -18083,24 +18374,6 @@ let sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5"; }; }; - "window-size-0.2.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; - sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; - }; - }; - "yargs-parser-2.4.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; - sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; - }; - }; "symbol-0.2.3" = { name = "symbol"; packageName = "symbol"; @@ -18437,7 +18710,7 @@ in sources."os-tmpdir-1.0.2" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -18491,52 +18764,10 @@ in (sources."adal-node-0.1.21" // { dependencies = [ sources."date-utils-1.2.21" - (sources."jws-3.1.3" // { + (sources."jws-3.1.4" // { dependencies = [ - (sources."base64url-1.0.6" // { - dependencies = [ - (sources."concat-stream-1.4.10" // { - dependencies = [ - sources."inherits-2.0.3" - sources."typedarray-0.0.6" - (sources."readable-stream-1.1.14" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - ]; - }) - ]; - }) - (sources."meow-2.0.0" // { - dependencies = [ - (sources."camelcase-keys-1.0.0" // { - dependencies = [ - sources."camelcase-1.2.1" - sources."map-obj-1.0.1" - ]; - }) - (sources."indent-string-1.2.2" // { - dependencies = [ - sources."get-stdin-4.0.1" - (sources."repeating-1.1.3" // { - dependencies = [ - (sources."is-finite-1.0.2" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - ]; - }) - sources."minimist-1.2.0" - sources."object-assign-1.0.0" - ]; - }) - ]; - }) - (sources."jwa-1.1.3" // { + sources."base64url-2.0.0" + (sources."jwa-1.1.4" // { dependencies = [ sources."buffer-equal-constant-time-1.0.1" (sources."ecdsa-sig-formatter-1.0.7" // { @@ -18546,6 +18777,7 @@ in }) ]; }) + sources."safe-buffer-5.0.1" ]; }) sources."node-uuid-1.4.7" @@ -18696,7 +18928,7 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.15.2" + sources."moment-2.16.0" (sources."ms-rest-1.15.2" // { dependencies = [ sources."duplexer-0.1.1" @@ -18817,7 +19049,7 @@ in dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; @@ -18901,9 +19133,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" @@ -19011,10 +19243,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.7.9"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; - sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz"; + sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a"; }; buildInputs = globalBuildInputs; meta = { @@ -19038,7 +19270,7 @@ in sources."sprintf-js-1.0.3" ]; }) - sources."bower-1.7.9" + sources."bower-1.8.0" sources."bower-endpoint-parser-0.2.1" (sources."bower-json-0.6.0" // { dependencies = [ @@ -19062,7 +19294,7 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -19087,12 +19319,12 @@ in sources."prepend-http-1.0.4" (sources."read-all-stream-2.2.0" // { dependencies = [ - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -19100,7 +19332,7 @@ in }) ]; }) - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."timed-out-2.0.0" ]; }) @@ -19288,9 +19520,9 @@ in (sources."promised-temp-0.1.0" // { dependencies = [ sources."q-1.4.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."mkdirp-0.5.1" // { @@ -19439,7 +19671,7 @@ in }) (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.1" // { + (sources."asn1.js-4.9.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -19470,7 +19702,7 @@ in dependencies = [ sources."cipher-base-1.0.3" sources."ripemd160-1.0.1" - sources."sha.js-2.4.5" + sources."sha.js-2.4.8" ]; }) sources."create-hmac-1.1.4" @@ -19491,7 +19723,7 @@ in sources."browserify-rsa-4.0.1" (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.1" // { + (sources."asn1.js-4.9.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -19597,7 +19829,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -19614,7 +19846,7 @@ in sources."jsonify-0.0.0" ]; }) - sources."sha.js-2.4.5" + sources."sha.js-2.4.8" ]; }) (sources."shell-quote-1.6.1" // { @@ -19626,7 +19858,7 @@ in ]; }) sources."stream-browserify-2.0.1" - (sources."stream-http-2.4.1" // { + (sources."stream-http-2.5.0" // { dependencies = [ sources."builtin-status-codes-2.0.0" sources."to-arraybuffer-1.0.1" @@ -19762,9 +19994,9 @@ in ]; }) sources."debounced-seeker-1.0.0" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."fs-extended-0.2.1" @@ -19904,9 +20136,9 @@ in dependencies = [ (sources."airplay-js-0.2.16" // { dependencies = [ - (sources."mdns-js-0.5.0" // { + (sources."mdns-js-0.5.1" // { dependencies = [ - (sources."mdns-js-packet-0.2.0" // { + (sources."dns-js-0.2.1" // { dependencies = [ sources."qap-3.1.3" ]; @@ -19958,7 +20190,7 @@ in dependencies = [ sources."blob-to-buffer-1.2.6" sources."get-stdin-5.0.1" - (sources."magnet-uri-5.1.4" // { + (sources."magnet-uri-5.1.5" // { dependencies = [ sources."thirty-two-1.0.2" sources."uniq-1.0.1" @@ -20184,7 +20416,7 @@ in dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -20198,7 +20430,7 @@ in }) (sources."simple-websocket-4.1.0" // { dependencies = [ - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -20359,7 +20591,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; @@ -20404,7 +20636,7 @@ in sources."ansi-0.3.1" (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.16" + sources."big-integer-1.6.17" ]; }) sources."cordova-registry-mapper-1.1.15" @@ -20623,7 +20855,7 @@ in }) (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.1" // { + (sources."asn1.js-4.9.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -20654,7 +20886,7 @@ in dependencies = [ sources."cipher-base-1.0.3" sources."ripemd160-1.0.1" - sources."sha.js-2.4.5" + sources."sha.js-2.4.8" ]; }) sources."create-hmac-1.1.4" @@ -20675,7 +20907,7 @@ in sources."browserify-rsa-4.0.1" (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.1" // { + (sources."asn1.js-4.9.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -20757,7 +20989,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -20774,7 +21006,7 @@ in sources."jsonify-0.0.0" ]; }) - sources."sha.js-2.4.5" + sources."sha.js-2.4.8" ]; }) (sources."shell-quote-1.6.1" // { @@ -20786,7 +21018,7 @@ in ]; }) sources."stream-browserify-2.0.1" - (sources."stream-http-2.4.1" // { + (sources."stream-http-2.5.0" // { dependencies = [ sources."builtin-status-codes-2.0.0" sources."to-arraybuffer-1.0.1" @@ -20862,9 +21094,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.6.1" @@ -20873,7 +21105,7 @@ in sources."bytes-2.3.0" (sources."compressible-2.0.9" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) (sources."debug-2.2.0" // { @@ -20889,9 +21121,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.6.1" @@ -20913,7 +21145,7 @@ in sources."etag-1.7.0" (sources."finalhandler-0.5.0" // { dependencies = [ - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -20938,24 +21170,24 @@ in (sources."send-0.14.1" // { dependencies = [ sources."destroy-1.0.4" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" ]; }) sources."mime-1.3.4" sources."ms-0.7.1" - sources."statuses-1.3.0" + sources."statuses-1.3.1" ]; }) sources."serve-static-1.11.1" - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -21175,9 +21407,9 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."es6-symbol-3.1.0" // { @@ -21319,7 +21551,7 @@ in dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; @@ -21394,9 +21626,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" @@ -21434,7 +21666,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -21699,7 +21931,7 @@ in }) ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -21711,7 +21943,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -21778,15 +22010,16 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."tough-cookie-2.3.2" // { @@ -21870,7 +22103,7 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -21901,12 +22134,12 @@ in sources."pinkie-2.0.4" ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -22012,9 +22245,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.5.3" @@ -22119,7 +22352,7 @@ in dependencies = [ (sources."buffercursor-0.0.12" // { dependencies = [ - (sources."verror-1.8.1" // { + (sources."verror-1.9.0" // { dependencies = [ sources."assert-plus-1.0.0" sources."core-util-is-1.0.2" @@ -22136,7 +22369,7 @@ in dependencies = [ (sources."buffercursor-0.0.12" // { dependencies = [ - (sources."verror-1.8.1" // { + (sources."verror-1.9.0" // { dependencies = [ sources."assert-plus-1.0.0" sources."core-util-is-1.0.2" @@ -22153,7 +22386,7 @@ in dependencies = [ (sources."buffercursor-0.0.12" // { dependencies = [ - (sources."verror-1.8.1" // { + (sources."verror-1.9.0" // { dependencies = [ sources."assert-plus-1.0.0" sources."core-util-is-1.0.2" @@ -22198,9 +22431,9 @@ in sources."component-emitter-1.1.2" sources."methods-1.0.1" sources."cookiejar-2.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."reduce-component-1.0.1" @@ -22249,7 +22482,7 @@ in sources."through-2.3.8" ]; }) - sources."basic-auth-1.0.4" + sources."basic-auth-1.1.0" sources."cookie-signature-1.0.6" (sources."cors-2.8.1" // { dependencies = [ @@ -22292,7 +22525,7 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -22351,7 +22584,7 @@ in sources."xtend-3.0.0" ]; }) - sources."ltgt-2.1.2" + sources."ltgt-2.1.3" (sources."pull-level-2.0.3" // { dependencies = [ sources."level-post-1.0.5" @@ -22447,7 +22680,7 @@ in }) ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -22509,12 +22742,12 @@ in }) ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -22562,7 +22795,7 @@ in }) (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) sources."aws4-1.5.0" @@ -22572,7 +22805,7 @@ in sources."minimist-0.0.10" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."caseless-0.11.0" @@ -22583,7 +22816,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -22667,12 +22900,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -22682,6 +22914,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) ]; @@ -22714,7 +22947,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."got-6.6.1" // { + (sources."got-6.6.3" // { dependencies = [ (sources."create-error-class-3.0.2" // { dependencies = [ @@ -22901,10 +23134,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.9.1"; + version = "3.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.9.1.tgz"; - sha1 = "5a8597706fc6048bc6061ac754d4a211d28f4f5b"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz"; + sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7"; }; dependencies = [ (sources."babel-code-frame-6.16.0" // { @@ -22944,9 +23177,9 @@ in }) ]; }) - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."doctrine-1.5.0" // { @@ -23060,7 +23293,7 @@ in sources."path-is-absolute-1.0.1" ]; }) - sources."globals-9.12.0" + sources."globals-9.14.0" sources."ignore-3.2.0" sources."imurmurhash-0.1.4" (sources."inquirer-0.12.0" // { @@ -23136,7 +23369,7 @@ in sources."tryit-1.0.3" ]; }) - (sources."js-yaml-3.6.1" // { + (sources."js-yaml-3.7.0" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -23157,7 +23390,7 @@ in sources."type-check-0.3.2" ]; }) - sources."lodash-4.16.6" + sources."lodash-4.17.2" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -23176,7 +23409,7 @@ in sources."path-is-inside-1.0.2" sources."pluralize-1.2.1" sources."progress-1.1.8" - (sources."require-uncached-1.0.2" // { + (sources."require-uncached-1.0.3" // { dependencies = [ (sources."caller-path-0.1.0" // { dependencies = [ @@ -23200,7 +23433,7 @@ in sources."strip-json-comments-1.0.4" (sources."table-3.8.3" // { dependencies = [ - (sources."ajv-4.8.2" // { + (sources."ajv-4.9.0" // { dependencies = [ sources."co-4.6.0" ]; @@ -23260,7 +23493,7 @@ in dependencies = [ sources."bower-endpoint-parser-0.2.1" sources."bower-logger-0.2.1" - sources."bower-1.7.9" + sources."bower-1.8.0" (sources."glob-3.2.11" // { dependencies = [ sources."inherits-2.0.3" @@ -23450,7 +23683,7 @@ in (sources."readdirp-2.1.0" // { dependencies = [ sources."graceful-fs-4.1.10" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -23478,12 +23711,12 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -23496,7 +23729,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -23532,7 +23765,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -23544,7 +23777,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -23628,12 +23861,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -23643,6 +23875,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."rimraf-2.5.4" // { @@ -23944,7 +24177,7 @@ in (sources."jade-1.11.0" // { dependencies = [ sources."character-parser-1.2.1" - (sources."clean-css-3.4.20" // { + (sources."clean-css-3.4.21" // { dependencies = [ (sources."commander-2.8.1" // { dependencies = [ @@ -24083,7 +24316,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; @@ -24133,7 +24366,7 @@ in dependencies = [ sources."array-differ-1.0.0" sources."array-uniq-1.0.3" - sources."beeper-1.1.0" + sources."beeper-1.1.1" (sources."dateformat-1.0.12" // { dependencies = [ sources."get-stdin-4.0.1" @@ -24445,7 +24678,7 @@ in sources."os-tmpdir-1.0.2" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -24504,7 +24737,7 @@ in ]; }) sources."minimist-1.2.0" - (sources."orchestrator-0.3.7" // { + (sources."orchestrator-0.3.8" // { dependencies = [ (sources."end-of-stream-0.1.5" // { dependencies = [ @@ -24519,7 +24752,7 @@ in sources."stream-consume-0.1.0" ]; }) - sources."pretty-hrtime-1.0.2" + sources."pretty-hrtime-1.0.3" sources."semver-4.3.6" (sources."tildify-1.2.0" // { dependencies = [ @@ -24852,7 +25085,7 @@ in sources."path-is-absolute-1.0.1" ]; }) - (sources."handlebars-4.0.5" // { + (sources."handlebars-4.0.6" // { dependencies = [ (sources."optimist-0.6.1" // { dependencies = [ @@ -24917,7 +25150,7 @@ in }) ]; }) - (sources."js-yaml-3.6.1" // { + (sources."js-yaml-3.7.0" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -24943,7 +25176,7 @@ in sources."has-flag-1.0.0" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -25093,10 +25326,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; - sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; }; dependencies = [ (sources."argparse-1.0.9" // { @@ -25134,11 +25367,11 @@ in ]; }) sources."depd-1.1.0" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" ]; }) sources."iconv-lite-0.4.13" @@ -25153,12 +25386,12 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -25256,7 +25489,7 @@ in sources."path-is-absolute-1.0.1" (sources."readdirp-2.1.0" // { dependencies = [ - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -25284,12 +25517,12 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -25302,7 +25535,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -25338,7 +25571,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -25350,7 +25583,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -25434,12 +25667,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -25449,6 +25681,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) sources."semver-5.3.0" @@ -25494,7 +25727,7 @@ in sources."colors-1.1.2" (sources."combine-lists-1.0.1" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) (sources."connect-3.5.0" // { @@ -25512,7 +25745,7 @@ in sources."ee-first-1.1.1" ]; }) - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -25800,9 +26033,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.5.3" @@ -25810,7 +26043,7 @@ in }) (sources."compressible-2.0.9" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -25822,12 +26055,12 @@ in }) (sources."csurf-1.8.3" // { dependencies = [ - (sources."csrf-3.0.3" // { + (sources."csrf-3.0.4" // { dependencies = [ - sources."base64-url-1.2.2" + sources."base64-url-1.3.3" sources."rndm-1.2.0" sources."tsscmp-1.0.5" - (sources."uid-safe-2.1.1" // { + (sources."uid-safe-2.1.3" // { dependencies = [ sources."random-bytes-1.0.0" ]; @@ -25840,9 +26073,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.6.1" @@ -25874,11 +26107,16 @@ in (sources."http-errors-1.3.1" // { dependencies = [ sources."inherits-2.0.3" - sources."statuses-1.3.0" + sources."statuses-1.3.1" ]; }) - (sources."method-override-2.3.6" // { + (sources."method-override-2.3.7" // { dependencies = [ + (sources."debug-2.3.3" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) sources."vary-1.1.0" ]; }) @@ -25907,10 +26145,14 @@ in sources."on-headers-1.0.1" sources."pause-0.1.0" sources."qs-4.0.0" - sources."response-time-2.3.1" - (sources."serve-favicon-2.3.0" // { + (sources."response-time-2.3.2" // { dependencies = [ - sources."ms-0.7.1" + sources."depd-1.1.0" + ]; + }) + (sources."serve-favicon-2.3.2" // { + dependencies = [ + sources."ms-0.7.2" ]; }) (sources."serve-index-1.7.3" // { @@ -25922,9 +26164,9 @@ in }) sources."batch-0.5.3" sources."escape-html-1.0.3" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -25948,12 +26190,12 @@ in }) ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -26050,7 +26292,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; @@ -26277,12 +26519,12 @@ in ]; }) sources."object-assign-4.1.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -26448,7 +26690,7 @@ in sources."wrappy-1.0.2" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -26460,7 +26702,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -26544,12 +26786,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -26559,6 +26800,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) sources."retry-0.8.0" @@ -26594,12 +26836,12 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -26813,12 +27055,12 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -26865,9 +27107,9 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."es6-symbol-3.1.0" // { @@ -26884,7 +27126,7 @@ in }) ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -26896,7 +27138,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -26980,12 +27222,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -26995,6 +27236,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) sources."rimraf-2.5.4" @@ -27005,7 +27247,7 @@ in sources."inherits-2.0.3" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -27076,7 +27318,7 @@ in dependencies = [ (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.16" + sources."big-integer-1.6.17" ]; }) (sources."meow-3.7.0" // { @@ -27209,18 +27451,18 @@ in }) ]; }) - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."express-4.14.0" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.6.1" @@ -27231,13 +27473,18 @@ in sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) sources."depd-1.1.0" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" (sources."finalhandler-0.5.0" // { dependencies = [ - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -27262,24 +27509,24 @@ in (sources."send-0.14.1" // { dependencies = [ sources."destroy-1.0.4" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" ]; }) sources."mime-1.3.4" sources."ms-0.7.1" - sources."statuses-1.3.0" + sources."statuses-1.3.1" ]; }) sources."serve-static-1.11.1" - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -27323,11 +27570,11 @@ in ]; }) sources."semver-4.3.6" - (sources."serve-favicon-2.3.0" // { + (sources."serve-favicon-2.3.2" // { dependencies = [ sources."etag-1.7.0" sources."fresh-0.3.0" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."parseurl-1.3.1" ]; }) @@ -27351,17 +27598,17 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -27370,7 +27617,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -27398,7 +27645,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -27410,7 +27657,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -27494,12 +27741,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -27509,6 +27755,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."rimraf-2.5.4" // { @@ -27555,6 +27802,11 @@ in }) (sources."tar-pack-3.3.0" // { dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.10" @@ -27614,17 +27866,17 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -27633,7 +27885,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -27661,7 +27913,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -27673,7 +27925,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -27757,12 +28009,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -27772,6 +28023,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."rimraf-2.5.4" // { @@ -27818,6 +28070,11 @@ in }) (sources."tar-pack-3.3.0" // { dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.10" @@ -27862,7 +28119,7 @@ in }) ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -27942,17 +28199,17 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -27961,7 +28218,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -27997,7 +28254,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -28009,7 +28266,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -28093,12 +28350,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -28108,6 +28364,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."rimraf-2.5.4" // { @@ -28310,7 +28567,7 @@ in (sources."readdirp-2.1.0" // { dependencies = [ sources."graceful-fs-4.1.10" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -28338,12 +28595,12 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -28356,7 +28613,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -28392,7 +28649,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -28404,7 +28661,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -28488,12 +28745,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -28503,6 +28759,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."rimraf-2.5.4" // { @@ -28537,6 +28794,11 @@ in }) (sources."tar-pack-3.3.0" // { dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.10" @@ -28567,9 +28829,9 @@ in }) ]; }) - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."es6-promise-3.3.1" @@ -28703,7 +28965,7 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -28734,12 +28996,12 @@ in sources."pinkie-2.0.4" ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -28821,11 +29083,11 @@ in ]; }) sources."depd-1.1.0" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" ]; }) sources."iconv-lite-0.4.13" @@ -28835,11 +29097,11 @@ in ]; }) sources."qs-6.2.0" - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -28872,7 +29134,7 @@ in sources."domhandler-2.3.0" sources."domutils-1.5.1" sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -28912,9 +29174,9 @@ in }) (sources."cron-1.1.1" // { dependencies = [ - (sources."moment-timezone-0.5.7" // { + (sources."moment-timezone-0.5.9" // { dependencies = [ - sources."moment-2.15.2" + sources."moment-2.16.0" ]; }) ]; @@ -28923,9 +29185,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.6.1" @@ -28947,7 +29209,7 @@ in sources."etag-1.7.0" (sources."finalhandler-0.5.0" // { dependencies = [ - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -28972,23 +29234,23 @@ in (sources."send-0.14.1" // { dependencies = [ sources."destroy-1.0.4" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" ]; }) sources."mime-1.3.4" sources."ms-0.7.1" - sources."statuses-1.3.0" + sources."statuses-1.3.1" ]; }) sources."serve-static-1.11.1" - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -28999,9 +29261,9 @@ in }) (sources."follow-redirects-0.2.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."stream-consume-0.1.0" @@ -29053,7 +29315,7 @@ in }) (sources."i18next-1.10.6" // { dependencies = [ - (sources."cookies-0.6.1" // { + (sources."cookies-0.6.2" // { dependencies = [ sources."depd-1.1.0" sources."keygrip-1.0.1" @@ -29212,7 +29474,7 @@ in (sources."ordered-read-streams-0.3.0" // { dependencies = [ sources."is-stream-1.1.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -29324,7 +29586,7 @@ in }) ]; }) - (sources."websocket-stream-3.3.0" // { + (sources."websocket-stream-3.3.3" // { dependencies = [ (sources."duplexify-3.5.0" // { dependencies = [ @@ -29337,7 +29599,7 @@ in }) ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -29384,9 +29646,9 @@ in dependencies = [ sources."uid2-0.0.3" sources."utils-merge-1.0.0" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) ]; @@ -29500,12 +29762,12 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; }) - (sources."node-red-node-feedparser-0.1.6" // { + (sources."node-red-node-feedparser-0.1.7" // { dependencies = [ (sources."feedparser-1.1.3" // { dependencies = [ @@ -29552,7 +29814,7 @@ in dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; @@ -29636,9 +29898,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" @@ -29655,7 +29917,7 @@ in }) ]; }) - (sources."node-red-node-email-0.1.11" // { + (sources."node-red-node-email-0.1.12" // { dependencies = [ (sources."nodemailer-1.11.0" // { dependencies = [ @@ -29675,9 +29937,9 @@ in sources."libqp-1.1.0" (sources."needle-0.10.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."iconv-lite-0.4.13" @@ -29689,9 +29951,9 @@ in }) (sources."needle-0.11.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."iconv-lite-0.4.13" @@ -29734,7 +29996,7 @@ in ]; }) sources."mime-1.3.4" - (sources."uue-3.0.0" // { + (sources."uue-3.1.0" // { dependencies = [ sources."extend-3.0.0" ]; @@ -29756,11 +30018,11 @@ in }) ]; }) - (sources."node-red-node-twitter-0.1.7" // { + (sources."node-red-node-twitter-0.1.9" // { dependencies = [ sources."twitter-ng-0.6.2" sources."oauth-0.9.14" - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -29772,7 +30034,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -29856,12 +30118,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -29871,14 +30132,15 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) ]; }) - sources."node-red-node-rbe-0.1.5" - (sources."node-red-node-serialport-0.4.0" // { + sources."node-red-node-rbe-0.1.6" + (sources."node-red-node-serialport-0.4.1" // { dependencies = [ - (sources."serialport-4.0.4" // { + (sources."serialport-4.0.6" // { dependencies = [ sources."bindings-1.2.1" (sources."commander-2.9.0" // { @@ -29886,9 +30148,9 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."lie-3.1.0" // { @@ -29904,17 +30166,17 @@ in sources."minimist-0.0.8" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -29923,7 +30185,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -29959,7 +30221,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -29971,7 +30233,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -30050,12 +30312,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -30065,6 +30326,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."rimraf-2.5.4" // { @@ -30111,6 +30373,11 @@ in }) (sources."tar-pack-3.3.0" // { dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) (sources."fstream-1.0.10" // { dependencies = [ sources."graceful-fs-4.1.10" @@ -30228,7 +30495,7 @@ in sources."range-parser-0.0.4" sources."mkdirp-0.3.5" sources."cookie-0.0.5" - sources."buffer-crc32-0.2.5" + sources."buffer-crc32-0.2.6" sources."fresh-0.1.0" sources."methods-0.0.1" (sources."send-0.1.0" // { @@ -30237,9 +30504,9 @@ in ]; }) sources."cookie-signature-1.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) ]; @@ -30347,7 +30614,7 @@ in }) (sources."net-ping-1.1.7" // { dependencies = [ - (sources."raw-socket-1.5.0" // { + (sources."raw-socket-1.5.1" // { dependencies = [ sources."nan-2.3.5" ]; @@ -30376,12 +30643,18 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "3.10.9"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz"; - sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3"; + url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz"; + sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae"; }; dependencies = [ + (sources."JSONStream-1.2.1" // { + dependencies = [ + sources."jsonparse-1.2.0" + sources."through-2.3.8" + ]; + }) sources."abbrev-1.0.9" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" @@ -30485,6 +30758,62 @@ in sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" + (sources."mississippi-1.2.0" // { + dependencies = [ + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."typedarray-0.0.6" + (sources."readable-stream-2.0.6" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + (sources."duplexify-3.5.0" // { + dependencies = [ + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."stream-shift-1.0.0" + ]; + }) + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."flush-write-stream-1.0.2" + sources."from2-2.3.0" + sources."pump-1.0.1" + sources."pumpify-1.3.5" + (sources."stream-each-1.2.0" // { + dependencies = [ + sources."stream-shift-1.0.0" + ]; + }) + (sources."through2-2.0.1" // { + dependencies = [ + (sources."readable-stream-2.0.6" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + sources."xtend-4.0.1" + ]; + }) + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -30535,9 +30864,9 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."es6-symbol-3.1.0" // { @@ -30570,7 +30899,7 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-4.2.0" - (sources."npm-registry-client-7.2.1" // { + (sources."npm-registry-client-7.3.0" // { dependencies = [ (sources."concat-stream-1.5.2" // { dependencies = [ @@ -30618,7 +30947,7 @@ in ]; }) sources."npm-user-validate-0.1.5" - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -30626,7 +30955,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."has-color-0.1.7" sources."object-assign-4.1.0" @@ -30703,23 +31032,10 @@ in ]; }) sources."realize-package-specifier-3.0.3" - (sources."request-2.75.0" // { + (sources."request-2.78.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" - (sources."bl-1.1.2" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -30728,7 +31044,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.0.0" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -30803,14 +31119,14 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.2.1" + sources."qs-6.3.0" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -30826,6 +31142,26 @@ in sources."sha-2.0.1" sources."slide-1.1.6" sources."sorted-object-2.0.1" + (sources."sorted-union-stream-2.1.3" // { + dependencies = [ + (sources."from2-1.3.0" // { + dependencies = [ + (sources."readable-stream-1.1.14" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + ]; + }) + ]; + }) + (sources."stream-iterate-1.2.0" // { + dependencies = [ + sources."stream-shift-1.0.0" + ]; + }) + ]; + }) sources."strip-ansi-3.0.1" (sources."tar-2.2.1" // { dependencies = [ @@ -30846,7 +31182,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -30901,7 +31237,7 @@ in }) (sources."npm-registry-client-0.2.27" // { dependencies = [ - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -30913,7 +31249,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -30997,12 +31333,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -31012,6 +31347,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) sources."graceful-fs-2.0.3" @@ -31052,17 +31388,17 @@ in }) sources."retry-0.6.0" sources."couch-login-0.1.20" - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -31071,7 +31407,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -31269,9 +31605,9 @@ in sources."jju-1.3.0" ]; }) - sources."lodash-4.16.6" + sources."lodash-4.17.2" sources."node-alias-1.0.4" - (sources."npm-3.10.9" // { + (sources."npm-3.10.10" // { dependencies = [ sources."abbrev-1.0.9" sources."ansicolors-0.3.2" @@ -31426,9 +31762,9 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."es6-symbol-3.1.0" // { @@ -31509,7 +31845,7 @@ in ]; }) sources."npm-user-validate-0.1.5" - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -31517,7 +31853,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."has-color-0.1.7" sources."object-assign-4.1.0" @@ -31676,9 +32012,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" @@ -31718,7 +32054,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -31855,12 +32191,12 @@ in ]; }) sources."read-all-stream-3.1.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -31924,10 +32260,10 @@ in parsoid = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; - version = "0.5.3"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/parsoid/-/parsoid-0.5.3.tgz"; - sha1 = "f1dea92c78b80f6af02d3652025e31fd8a81efde"; + url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz"; + sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723"; }; dependencies = [ sources."async-0.9.2" @@ -31947,11 +32283,11 @@ in ]; }) sources."depd-1.1.0" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" ]; }) sources."iconv-lite-0.4.13" @@ -31966,85 +32302,33 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; }) ]; }) - (sources."bunyan-1.8.4" // { - dependencies = [ - (sources."dtrace-provider-0.7.1" // { - dependencies = [ - sources."nan-2.4.0" - ]; - }) - (sources."mv-2.1.1" // { - dependencies = [ - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."ncp-2.0.0" - (sources."rimraf-2.4.5" // { - dependencies = [ - (sources."glob-6.0.4" // { - dependencies = [ - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.3" // { - dependencies = [ - (sources."brace-expansion-1.1.6" // { - dependencies = [ - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) - ]; - }) - ]; - }) - sources."safe-json-stringify-1.0.3" - sources."moment-2.15.2" - ]; - }) (sources."compression-1.6.2" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."negotiator-0.6.1" ]; }) sources."bytes-2.3.0" (sources."compressible-2.0.9" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) (sources."debug-2.2.0" // { @@ -32077,7 +32361,8 @@ in }) ]; }) - sources."core-js-1.2.7" + sources."content-type-git+https://github.com/wikimedia/content-type.git#master" + sources."core-js-2.4.1" sources."diff-1.4.0" sources."domino-1.0.27" sources."entities-1.1.1" @@ -32085,12 +32370,11 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."negotiator-0.6.1" ]; }) sources."array-flatten-1.1.1" @@ -32109,7 +32393,7 @@ in sources."etag-1.7.0" (sources."finalhandler-0.5.0" // { dependencies = [ - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -32134,24 +32418,24 @@ in (sources."send-0.14.1" // { dependencies = [ sources."destroy-1.0.4" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" ]; }) sources."mime-1.3.4" sources."ms-0.7.1" - sources."statuses-1.3.0" + sources."statuses-1.3.1" ]; }) sources."serve-static-1.11.1" - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -32160,9 +32444,9 @@ in sources."vary-1.1.0" ]; }) - (sources."express-handlebars-2.0.1" // { + (sources."express-handlebars-3.0.0" // { dependencies = [ - (sources."glob-5.0.15" // { + (sources."glob-6.0.4" // { dependencies = [ (sources."inflight-1.0.6" // { dependencies = [ @@ -32188,49 +32472,92 @@ in sources."path-is-absolute-1.0.1" ]; }) - (sources."graceful-fs-3.0.11" // { - dependencies = [ - sources."natives-1.1.0" - ]; - }) - (sources."handlebars-3.0.3" // { + sources."graceful-fs-4.1.10" + (sources."handlebars-4.0.6" // { dependencies = [ + sources."async-1.5.2" (sources."optimist-0.6.1" // { dependencies = [ sources."wordwrap-0.0.3" sources."minimist-0.0.10" ]; }) - (sources."source-map-0.1.43" // { + (sources."source-map-0.4.4" // { dependencies = [ sources."amdefine-1.0.1" ]; }) - (sources."uglify-js-2.3.6" // { + (sources."uglify-js-2.7.4" // { dependencies = [ sources."async-0.2.10" - (sources."optimist-0.3.7" // { + sources."source-map-0.5.6" + sources."uglify-to-browserify-1.0.2" + (sources."yargs-3.10.0" // { dependencies = [ - sources."wordwrap-0.0.3" + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + (sources."center-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.0.4" // { + dependencies = [ + sources."is-buffer-1.1.4" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + ]; + }) + sources."lazy-cache-1.0.4" + ]; + }) + (sources."right-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.0.4" // { + dependencies = [ + sources."is-buffer-1.1.4" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + ]; + }) + ]; + }) + sources."wordwrap-0.0.2" + ]; + }) + sources."decamelize-1.2.0" + sources."window-size-0.1.0" ]; }) ]; }) ]; }) - (sources."object.assign-1.1.1" // { + (sources."object.assign-4.0.4" // { dependencies = [ + sources."function-bind-1.1.0" sources."object-keys-1.0.11" + (sources."define-properties-1.1.2" // { + dependencies = [ + sources."foreach-2.0.5" + ]; + }) ]; }) - (sources."promise-6.1.0" // { + (sources."promise-7.1.1" // { dependencies = [ - sources."asap-1.0.0" + sources."asap-2.0.5" ]; }) ]; }) - (sources."finalhandler-0.4.1" // { + (sources."finalhandler-0.5.1" // { dependencies = [ (sources."debug-2.2.0" // { dependencies = [ @@ -32243,6 +32570,7 @@ in sources."ee-first-1.1.1" ]; }) + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -32251,61 +32579,22 @@ in sources."gelfling-0.2.0" ]; }) - (sources."html5-1.0.5" // { + (sources."js-yaml-3.7.0" // { dependencies = [ - sources."opts-1.2.2" - sources."html5-entities-1.0.0" - (sources."jsdom-0.11.1" // { + (sources."argparse-1.0.9" // { dependencies = [ - (sources."htmlparser2-3.9.2" // { - dependencies = [ - sources."domelementtype-1.3.0" - sources."domhandler-2.3.0" - (sources."domutils-1.5.1" // { - dependencies = [ - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - ]; - }) - sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { - dependencies = [ - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."nwmatcher-1.3.9" - sources."xmlhttprequest-1.8.0" - sources."cssom-0.3.1" - sources."cssstyle-0.2.37" - (sources."contextify-0.1.15" // { - dependencies = [ - sources."bindings-1.2.1" - sources."nan-2.4.0" - ]; - }) + sources."sprintf-js-1.0.3" ]; }) + sources."esprima-2.7.3" ]; }) - sources."node-txstatsd-0.1.6" + sources."mediawiki-title-0.5.6" + sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."node-uuid-1.4.7" sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" - (sources."prfun-2.1.4" // { - dependencies = [ - sources."core-js-2.4.1" - ]; - }) - (sources."request-2.78.0" // { + sources."prfun-2.1.4" + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -32317,7 +32606,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -32401,9 +32690,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."oauth-sign-0.8.2" @@ -32415,19 +32704,385 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) sources."semver-5.3.0" - (sources."serve-favicon-2.3.0" // { + (sources."serve-favicon-2.3.2" // { dependencies = [ sources."etag-1.7.0" sources."fresh-0.3.0" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."parseurl-1.3.1" ]; }) + (sources."service-runner-2.1.11" // { + dependencies = [ + sources."bluebird-3.4.6" + (sources."bunyan-1.8.5" // { + dependencies = [ + (sources."dtrace-provider-0.8.0" // { + dependencies = [ + sources."nan-2.4.0" + ]; + }) + (sources."mv-2.1.1" // { + dependencies = [ + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."ncp-2.0.0" + (sources."rimraf-2.4.5" // { + dependencies = [ + (sources."glob-6.0.4" // { + dependencies = [ + (sources."inflight-1.0.6" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.1" + ]; + }) + ]; + }) + ]; + }) + sources."safe-json-stringify-1.0.3" + sources."moment-2.16.0" + ]; + }) + sources."bunyan-syslog-udp-0.1.0" + sources."extend-3.0.0" + (sources."gelf-stream-1.1.1" // { + dependencies = [ + sources."gelfling-0.3.1" + ]; + }) + sources."hot-shots-4.3.1" + (sources."limitation-0.1.9" // { + dependencies = [ + (sources."kad-git+https://github.com/gwicke/kad.git#master" // { + dependencies = [ + sources."clarinet-0.11.0" + sources."colors-1.1.2" + sources."hat-0.0.3" + sources."kad-fs-0.0.4" + (sources."kad-localstorage-0.0.7" // { + dependencies = [ + sources."dom-storage-2.0.2" + ]; + }) + sources."kad-memstore-0.0.1" + sources."lodash-3.10.1" + sources."merge-1.2.0" + sources."ms-0.7.2" + (sources."msgpack5-3.4.1" // { + dependencies = [ + (sources."bl-1.1.2" // { + dependencies = [ + (sources."readable-stream-2.0.6" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + sources."inherits-2.0.3" + ]; + }) + ]; + }) + (sources."readable-stream-2.2.2" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."inherits-2.0.3" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + (sources."yargs-5.0.0" // { + dependencies = [ + (sources."cliui-3.2.0" // { + dependencies = [ + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."wrap-ansi-2.0.0" + ]; + }) + sources."decamelize-1.2.0" + sources."get-caller-file-1.0.2" + sources."lodash.assign-4.2.0" + (sources."os-locale-1.4.0" // { + dependencies = [ + (sources."lcid-1.0.0" // { + dependencies = [ + sources."invert-kv-1.0.0" + ]; + }) + ]; + }) + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + (sources."find-up-1.1.2" // { + dependencies = [ + sources."path-exists-2.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."read-pkg-1.1.0" // { + dependencies = [ + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.10" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + ]; + }) + (sources."normalize-package-data-2.3.5" // { + dependencies = [ + sources."hosted-git-info-2.1.5" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.4" + ]; + }) + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.10" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + ]; + }) + sources."which-module-1.0.0" + sources."window-size-0.2.0" + sources."y18n-3.2.1" + (sources."yargs-parser-3.2.0" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + ]; + }) + ]; + }) sources."simplediff-0.1.1" - sources."yargs-1.3.3" + (sources."yargs-4.8.1" // { + dependencies = [ + (sources."cliui-3.2.0" // { + dependencies = [ + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."wrap-ansi-2.0.0" + ]; + }) + sources."decamelize-1.2.0" + sources."get-caller-file-1.0.2" + sources."lodash.assign-4.2.0" + (sources."os-locale-1.4.0" // { + dependencies = [ + (sources."lcid-1.0.0" // { + dependencies = [ + sources."invert-kv-1.0.0" + ]; + }) + ]; + }) + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + (sources."find-up-1.1.2" // { + dependencies = [ + sources."path-exists-2.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."read-pkg-1.1.0" // { + dependencies = [ + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.10" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + ]; + }) + (sources."normalize-package-data-2.3.5" // { + dependencies = [ + sources."hosted-git-info-2.1.5" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.4" + ]; + }) + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.10" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + ]; + }) + sources."which-module-1.0.0" + sources."window-size-0.2.0" + sources."y18n-3.2.1" + (sources."yargs-parser-2.4.1" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -32457,7 +33112,7 @@ in }) (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.16" + sources."big-integer-1.6.17" ]; }) (sources."concat-stream-1.5.2" // { @@ -32564,9 +33219,10 @@ in }) (sources."multicast-dns-6.1.0" // { dependencies = [ - (sources."dns-packet-1.1.0" // { + (sources."dns-packet-1.1.1" // { dependencies = [ sources."ip-1.1.4" + sources."safe-buffer-5.0.1" ]; }) sources."thunky-0.1.0" @@ -32704,7 +33360,7 @@ in ]; }) sources."clivas-0.2.0" - (sources."inquirer-1.2.2" // { + (sources."inquirer-1.2.3" // { dependencies = [ sources."ansi-escapes-1.4.0" (sources."chalk-1.1.3" // { @@ -32766,7 +33422,7 @@ in sources."object-assign-4.1.0" ]; }) - sources."lodash-4.16.6" + sources."lodash-4.17.2" sources."mute-stream-0.0.6" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -32812,7 +33468,7 @@ in dependencies = [ sources."blob-to-buffer-1.2.6" sources."get-stdin-5.0.1" - (sources."magnet-uri-5.1.4" // { + (sources."magnet-uri-5.1.5" // { dependencies = [ sources."thirty-two-1.0.2" sources."uniq-1.0.1" @@ -33044,7 +33700,7 @@ in dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -33058,7 +33714,7 @@ in }) (sources."simple-websocket-4.1.0" // { dependencies = [ - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -33085,9 +33741,9 @@ in }) ]; }) - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."inherits-2.0.3" @@ -33112,10 +33768,10 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.0.30"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.30.tgz"; - sha1 = "858a78e9ad0bdffa91997a6f0ca0bd809320ad98"; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz"; + sha1 = "683d54067d44699b2eff8bfc793e780df2912666"; }; dependencies = [ (sources."connect-multiparty-1.2.5" // { @@ -33332,30 +33988,133 @@ in sources."xtend-4.0.1" ]; }) - (sources."socket.io-0.9.17" // { + (sources."socket.io-1.6.0" // { dependencies = [ - (sources."socket.io-client-0.9.16" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."uglify-js-1.2.5" - (sources."ws-0.4.32" // { - dependencies = [ - sources."commander-2.1.0" - sources."nan-1.0.0" - sources."tinycolor-0.0.1" - sources."options-0.0.6" - ]; - }) - sources."xmlhttprequest-1.4.2" - (sources."active-x-obfuscator-0.0.1" // { - dependencies = [ - sources."zeparser-0.0.5" - ]; - }) + sources."ms-0.7.2" + ]; + }) + (sources."engine.io-1.8.0" // { + dependencies = [ + (sources."accepts-1.3.3" // { + dependencies = [ + (sources."mime-types-2.1.13" // { + dependencies = [ + sources."mime-db-1.25.0" + ]; + }) + sources."negotiator-0.6.1" + ]; + }) + sources."base64id-0.1.0" + (sources."engine.io-parser-1.3.1" // { + dependencies = [ + sources."after-0.8.1" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.5" + sources."blob-0.0.4" + (sources."has-binary-0.1.6" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + sources."wtf-8-1.0.0" + ]; + }) + (sources."ws-1.1.1" // { + dependencies = [ + sources."options-0.0.6" + sources."ultron-1.0.2" + ]; + }) + sources."cookie-0.3.1" + ]; + }) + (sources."has-binary-0.1.7" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + sources."object-assign-4.1.0" + sources."socket.io-adapter-0.5.0" + (sources."socket.io-client-1.6.0" // { + dependencies = [ + sources."backo2-1.0.2" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + (sources."engine.io-client-1.8.0" // { + dependencies = [ + sources."component-inherit-0.0.3" + (sources."engine.io-parser-1.3.1" // { + dependencies = [ + sources."after-0.8.1" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.5" + sources."blob-0.0.4" + (sources."has-binary-0.1.6" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + sources."wtf-8-1.0.0" + ]; + }) + sources."has-cors-1.1.0" + (sources."parsejson-0.0.3" // { + dependencies = [ + (sources."better-assert-1.0.2" // { + dependencies = [ + sources."callsite-1.0.0" + ]; + }) + ]; + }) + (sources."parseqs-0.0.5" // { + dependencies = [ + (sources."better-assert-1.0.2" // { + dependencies = [ + sources."callsite-1.0.0" + ]; + }) + ]; + }) + (sources."ws-1.1.1" // { + dependencies = [ + sources."options-0.0.6" + sources."ultron-1.0.2" + ]; + }) + sources."xmlhttprequest-ssl-1.5.3" + sources."yeast-0.1.2" + ]; + }) + sources."indexof-0.0.1" + sources."object-component-0.0.3" + (sources."parseuri-0.0.5" // { + dependencies = [ + (sources."better-assert-1.0.2" // { + dependencies = [ + sources."callsite-1.0.0" + ]; + }) + ]; + }) + sources."to-array-0.1.4" + ]; + }) + (sources."socket.io-parser-2.3.1" // { + dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + sources."json3-3.3.2" + sources."component-emitter-1.1.2" + sources."isarray-0.0.1" ]; }) - sources."policyfile-0.0.4" - sources."base64id-0.1.0" - sources."redis-0.7.3" ]; }) (sources."torrent-stream-0.18.1" // { @@ -33366,9 +34125,9 @@ in sources."addr-to-ip-port-1.4.2" sources."bencode-0.7.0" sources."buffer-equal-0.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."inherits-2.0.3" @@ -33403,9 +34162,9 @@ in sources."bencode-0.6.0" sources."bn.js-1.3.0" sources."buffer-equal-0.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."extend.js-0.0.2" @@ -33547,10 +34306,10 @@ in dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -33682,15 +34441,15 @@ in dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" @@ -33790,7 +34549,7 @@ in sources."throttleit-1.0.0" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -33959,9 +34718,9 @@ in ]; }) sources."cookie-signature-1.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) ]; @@ -33988,7 +34747,7 @@ in }) (sources."openid-2.0.6" // { dependencies = [ - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -34000,7 +34759,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -34084,12 +34843,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -34099,6 +34857,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) ]; @@ -34108,7 +34867,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; @@ -34160,9 +34919,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.5.3" @@ -34244,12 +35003,12 @@ in }) ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -34290,12 +35049,12 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -34306,9 +35065,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.6.1" @@ -34317,7 +35076,7 @@ in sources."bytes-2.3.0" (sources."compressible-2.0.9" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) (sources."debug-2.2.0" // { @@ -34334,7 +35093,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."js-yaml-3.6.1" // { + (sources."js-yaml-3.7.0" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -34344,13 +35103,13 @@ in sources."esprima-2.7.3" ]; }) - (sources."cookies-0.6.1" // { + (sources."cookies-0.6.2" // { dependencies = [ sources."depd-1.1.0" sources."keygrip-1.0.1" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -34362,7 +35121,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -34441,12 +35200,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -34456,6 +35214,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) sources."async-0.9.2" @@ -34467,9 +35226,9 @@ in sources."sigmund-1.0.1" ]; }) - (sources."bunyan-1.8.4" // { + (sources."bunyan-1.8.5" // { dependencies = [ - (sources."dtrace-provider-0.7.1" // { + (sources."dtrace-provider-0.8.0" // { dependencies = [ sources."nan-2.4.0" ]; @@ -34510,7 +35269,7 @@ in ]; }) sources."safe-json-stringify-1.0.3" - sources."moment-2.15.2" + sources."moment-2.16.0" ]; }) (sources."handlebars-2.0.0" // { @@ -34566,7 +35325,7 @@ in }) sources."entities-1.1.1" sources."inherits-2.0.3" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -34597,11 +35356,11 @@ in ]; }) sources."sinopia-htpasswd-0.4.5" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" ]; }) (sources."readable-stream-1.1.14" // { @@ -34667,12 +35426,12 @@ in }) ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -34752,7 +35511,7 @@ in }) ]; }) - (sources."verror-1.8.1" // { + (sources."verror-1.9.0" // { dependencies = [ sources."assert-plus-1.0.0" sources."core-util-is-1.0.2" @@ -34838,12 +35597,12 @@ in (sources."sshpk-agent-1.2.1" // { dependencies = [ sources."assert-plus-0.1.5" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -34882,7 +35641,7 @@ in (sources."cmdln-3.2.1" // { dependencies = [ sources."extsprintf-1.3.0" - (sources."verror-1.8.1" // { + (sources."verror-1.9.0" // { dependencies = [ sources."assert-plus-1.0.0" sources."core-util-is-1.0.2" @@ -34923,9 +35682,9 @@ in sources."minimist-0.0.8" ]; }) - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."sax-0.5.8" @@ -35040,13 +35799,17 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.0.10"; + version = "5.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.0.10.tgz"; - sha1 = "9bbae581957b33265a71774e8fd9f4766441bf1d"; + url = "https://registry.npmjs.org/titanium/-/titanium-5.0.11.tgz"; + sha1 = "dd0f7132475a5db6ea188222876d28538b47df27"; }; dependencies = [ - sources."async-1.4.2" + (sources."async-2.1.2" // { + dependencies = [ + sources."lodash-4.17.2" + ]; + }) sources."colors-1.1.2" (sources."fields-0.1.24" // { dependencies = [ @@ -35055,7 +35818,7 @@ in ]; }) sources."humanize-0.0.9" - (sources."longjohn-0.2.9" // { + (sources."longjohn-0.2.11" // { dependencies = [ (sources."source-map-support-0.3.2" // { dependencies = [ @@ -35068,20 +35831,23 @@ in }) ]; }) - sources."moment-2.10.6" - (sources."node-appc-0.2.31" // { + sources."moment-2.16.0" + (sources."node-appc-0.2.39" // { dependencies = [ sources."adm-zip-0.4.7" - sources."diff-2.1.0" - sources."node-uuid-1.4.3" + sources."async-1.5.2" + sources."diff-2.2.1" + sources."node-uuid-1.4.7" (sources."optimist-0.6.1" // { dependencies = [ sources."wordwrap-0.0.3" sources."minimist-0.0.10" ]; }) - (sources."request-2.61.0" // { + (sources."request-2.69.0" // { dependencies = [ + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" (sources."bl-1.0.3" // { dependencies = [ (sources."readable-stream-2.0.6" // { @@ -35097,57 +35863,24 @@ in ]; }) sources."caseless-0.11.0" + (sources."combined-stream-1.0.5" // { + dependencies = [ + sources."delayed-stream-1.0.0" + ]; + }) sources."extend-3.0.0" sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; }) - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."har-validator-2.0.6" // { dependencies = [ - sources."mime-db-1.24.0" - ]; - }) - sources."qs-4.0.0" - sources."tunnel-agent-0.4.3" - (sources."tough-cookie-2.3.2" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - (sources."http-signature-0.11.0" // { - dependencies = [ - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."ctype-0.5.3" - ]; - }) - sources."oauth-sign-0.8.2" - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - sources."aws-sign2-0.5.0" - sources."stringstream-0.0.5" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."isstream-0.1.2" - (sources."har-validator-1.8.0" // { - dependencies = [ - sources."bluebird-2.11.0" (sources."chalk-1.1.3" // { dependencies = [ sources."ansi-styles-2.2.1" @@ -35182,102 +35915,135 @@ in sources."xtend-4.0.1" ]; }) + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) ]; }) + (sources."hawk-3.1.3" // { + dependencies = [ + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + (sources."http-signature-1.1.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + (sources."jsprim-1.3.1" // { + dependencies = [ + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + ]; + }) + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."dashdash-1.14.0" + sources."getpass-0.1.6" + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + ]; + }) + ]; + }) + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + (sources."mime-types-2.1.13" // { + dependencies = [ + sources."mime-db-1.25.0" + ]; + }) + sources."oauth-sign-0.8.2" + sources."qs-6.0.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.2.2" + sources."tunnel-agent-0.4.3" ]; }) - sources."semver-5.0.1" - (sources."uglify-js-2.4.24" // { + sources."semver-5.1.0" + sources."wrench-1.5.8" + (sources."uglify-js-2.6.1" // { dependencies = [ sources."async-0.2.10" - (sources."source-map-0.1.34" // { - dependencies = [ - sources."amdefine-1.0.1" - ]; - }) + sources."source-map-0.5.6" sources."uglify-to-browserify-1.0.2" - (sources."yargs-3.5.4" // { + (sources."yargs-3.10.0" // { dependencies = [ sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + (sources."center-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.0.4" // { + dependencies = [ + sources."is-buffer-1.1.4" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + ]; + }) + sources."lazy-cache-1.0.4" + ]; + }) + (sources."right-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.0.4" // { + dependencies = [ + sources."is-buffer-1.1.4" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + ]; + }) + ]; + }) + sources."wordwrap-0.0.2" + ]; + }) sources."decamelize-1.2.0" sources."window-size-0.1.0" - sources."wordwrap-0.0.2" ]; }) ]; }) - sources."xmldom-0.1.19" + sources."xmldom-0.1.22" ]; }) - (sources."request-2.62.0" // { + (sources."request-2.78.0" // { dependencies = [ - (sources."bl-1.0.3" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" sources."caseless-0.11.0" - sources."extend-3.0.0" - sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - (sources."async-2.1.2" // { - dependencies = [ - sources."lodash-4.16.6" - ]; - }) - ]; - }) - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { - dependencies = [ - sources."mime-db-1.24.0" - ]; - }) - sources."node-uuid-1.4.7" - sources."qs-5.1.0" - sources."tunnel-agent-0.4.3" - (sources."tough-cookie-2.3.2" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - (sources."http-signature-0.11.0" // { - dependencies = [ - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."ctype-0.5.3" - ]; - }) - sources."oauth-sign-0.8.2" - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - sources."aws-sign2-0.5.0" - sources."stringstream-0.0.5" (sources."combined-stream-1.0.5" // { dependencies = [ sources."delayed-stream-1.0.0" ]; }) - sources."isstream-0.1.2" - (sources."har-validator-1.8.0" // { + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + (sources."form-data-2.1.2" // { + dependencies = [ + sources."asynckit-0.4.0" + ]; + }) + (sources."har-validator-2.0.6" // { dependencies = [ - sources."bluebird-2.11.0" (sources."chalk-1.1.3" // { dependencies = [ sources."ansi-styles-2.2.1" @@ -35312,11 +36078,67 @@ in sources."xtend-4.0.1" ]; }) + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) ]; }) + (sources."hawk-3.1.3" // { + dependencies = [ + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + (sources."http-signature-1.1.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + (sources."jsprim-1.3.1" // { + dependencies = [ + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + ]; + }) + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."dashdash-1.14.0" + sources."getpass-0.1.6" + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + ]; + }) + ]; + }) + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + (sources."mime-types-2.1.13" // { + dependencies = [ + sources."mime-db-1.25.0" + ]; + }) + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.3.0" + sources."stringstream-0.0.5" + (sources."tough-cookie-2.3.2" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tunnel-agent-0.4.3" ]; }) - sources."semver-5.0.3" + sources."semver-5.3.0" sources."sprintf-0.1.5" (sources."temp-0.8.3" // { dependencies = [ @@ -35324,7 +36146,7 @@ in sources."rimraf-2.2.8" ]; }) - (sources."winston-1.0.2" // { + (sources."winston-1.1.2" // { dependencies = [ sources."async-1.0.0" sources."colors-1.0.3" @@ -35335,7 +36157,7 @@ in sources."stack-trace-0.0.9" ]; }) - sources."wrench-1.5.8" + sources."wrench-1.5.9" ]; buildInputs = globalBuildInputs; meta = { @@ -35348,10 +36170,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.0.6"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.0.6.tgz"; - sha1 = "5385499ac9811508c2c43e0ea07a1ddca435e111"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz"; + sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd"; }; buildInputs = globalBuildInputs; meta = { @@ -35447,11 +36269,11 @@ in ]; }) sources."depd-1.1.0" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" ]; }) sources."iconv-lite-0.4.13" @@ -35466,12 +36288,12 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -35481,7 +36303,7 @@ in (sources."color-0.11.4" // { dependencies = [ sources."clone-1.0.2" - (sources."color-convert-1.6.0" // { + (sources."color-convert-1.8.2" // { dependencies = [ sources."color-name-1.1.1" ]; @@ -35509,9 +36331,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."negotiator-0.5.3" @@ -35566,12 +36388,12 @@ in sources."statuses-1.2.1" ]; }) - (sources."type-is-1.6.13" // { + (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) ]; @@ -35719,8 +36541,8 @@ in (sources."extract-opts-3.3.1" // { dependencies = [ sources."eachr-3.2.0" - sources."editions-1.3.1" - sources."typechecker-4.3.0" + sources."editions-1.3.3" + sources."typechecker-4.4.0" ]; }) ]; @@ -35731,7 +36553,7 @@ in sources."underscore-1.5.2" ]; }) - sources."knockout-3.4.0" + sources."knockout-3.4.1" sources."lodash-4.12.0" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -35891,9 +36713,9 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) (sources."es6-symbol-3.1.0" // { @@ -36095,9 +36917,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" @@ -36132,7 +36954,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -36210,7 +37032,7 @@ in sources."wrappy-1.0.2" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -36222,7 +37044,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -36306,12 +37128,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -36321,6 +37142,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) sources."retry-0.8.0" @@ -36330,12 +37152,12 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -36615,9 +37437,9 @@ in sources."component-emitter-1.1.2" sources."methods-1.0.1" sources."cookiejar-2.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."reduce-component-1.0.1" @@ -36974,15 +37796,15 @@ in dependencies = [ (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.6" + sources."lodash-4.17.2" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) sources."node-uuid-1.4.7" @@ -37082,7 +37904,7 @@ in sources."throttleit-1.0.0" ]; }) - (sources."which-1.2.11" // { + (sources."which-1.2.12" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -37142,12 +37964,12 @@ in sources."prr-0.0.0" ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -37401,7 +38223,7 @@ in }) ]; }) - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -37424,12 +38246,12 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npmlog-4.0.0" // { + (sources."npmlog-4.0.1" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -37442,7 +38264,7 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."aproba-1.0.4" sources."has-color-0.1.7" @@ -37478,7 +38300,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.78.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.5.0" @@ -37490,7 +38312,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.1" // { + (sources."form-data-2.1.2" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -37574,12 +38396,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.12" // { + (sources."mime-types-2.1.13" // { dependencies = [ - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" @@ -37589,6 +38410,7 @@ in ]; }) sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" ]; }) (sources."rimraf-2.5.4" // { diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index b2202168ef67..6ece606398ac 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -229,13 +229,13 @@ let sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; }; }; - "amdefine-1.0.0" = { + "amdefine-1.0.1" = { name = "amdefine"; packageName = "amdefine"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"; - sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33"; + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; }; }; "wordwrap-0.0.3" = { @@ -310,13 +310,13 @@ let sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217"; }; }; - "which-1.2.11" = { + "which-1.2.12" = { name = "which"; packageName = "which"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; - sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; + url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz"; + sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192"; }; }; "os-homedir-1.0.2" = { @@ -418,13 +418,13 @@ let sha1 = "afccda7d6e46632bf3e4016e573e2da1c8874b3a"; }; }; - "azure-arm-commerce-0.1.1" = { + "azure-arm-commerce-0.2.0" = { name = "azure-arm-commerce"; packageName = "azure-arm-commerce"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.1.1.tgz"; - sha1 = "3329693b8aba7d1b84e10ae2655d54262a1f1c59"; + url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.2.0.tgz"; + sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd"; }; }; "azure-arm-compute-0.19.0" = { @@ -436,13 +436,13 @@ let sha1 = "7dce93299d8f25f9fa689323b11565f9c774c83e"; }; }; - "azure-arm-hdinsight-0.2.0" = { + "azure-arm-hdinsight-0.2.2" = { name = "azure-arm-hdinsight"; packageName = "azure-arm-hdinsight"; - version = "0.2.0"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.0.tgz"; - sha1 = "13d2cff9110485970bf063c7411eefe148e3790f"; + url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz"; + sha1 = "3daeade6d26f6b115d8598320541ad2dcaa9516d"; }; }; "azure-arm-hdinsight-jobs-0.1.0" = { @@ -463,13 +463,13 @@ let sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f"; }; }; - "azure-arm-iothub-0.1.1" = { + "azure-arm-iothub-0.1.4" = { name = "azure-arm-iothub"; packageName = "azure-arm-iothub"; - version = "0.1.1"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.1.tgz"; - sha1 = "edce480a3e1836745d0fcf8f0f1d8e0b2c022535"; + url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.4.tgz"; + sha1 = "58a0ba627216257a05d77f6aeeff8d0b45f9463d"; }; }; "azure-arm-servermanagement-0.1.2" = { @@ -868,13 +868,13 @@ let sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a"; }; }; - "moment-2.15.2" = { + "moment-2.16.0" = { name = "moment"; packageName = "moment"; - version = "2.15.2"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz"; - sha1 = "1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc"; + url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz"; + sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; }; }; "ms-rest-1.15.2" = { @@ -1102,13 +1102,13 @@ let sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; }; }; - "jws-3.1.3" = { + "jws-3.1.4" = { name = "jws"; packageName = "jws"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/jws/-/jws-3.1.3.tgz"; - sha1 = "b88f1b4581a2c5ee8813c06b3fdf90ea9b5c7e6c"; + url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz"; + sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2"; }; }; "node-uuid-1.4.7" = { @@ -1138,184 +1138,31 @@ let sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90"; }; }; - "base64url-1.0.6" = { + "base64url-2.0.0" = { name = "base64url"; packageName = "base64url"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz"; - sha1 = "d64d375d68a7c640d912e2358d170dca5bb54681"; - }; - }; - "jwa-1.1.3" = { - name = "jwa"; - packageName = "jwa"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz"; - sha1 = "fa9f2f005ff0c630e7c41526a31f37f79733cd6d"; - }; - }; - "concat-stream-1.4.10" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.4.10"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz"; - sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36"; - }; - }; - "meow-2.0.0" = { - name = "meow"; - packageName = "meow"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-2.0.0.tgz"; - sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; + url = "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz"; + sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb"; }; }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; + "jwa-1.1.4" = { + name = "jwa"; + packageName = "jwa"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz"; + sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e"; }; }; - "typedarray-0.0.6" = { - name = "typedarray"; - packageName = "typedarray"; - version = "0.0.6"; + "safe-buffer-5.0.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; - }; - }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - }; - "camelcase-keys-1.0.0" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz"; - sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec"; - }; - }; - "indent-string-1.2.2" = { - name = "indent-string"; - packageName = "indent-string"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz"; - sha1 = "db99bcc583eb6abbb1e48dcbb1999a986041cb6b"; - }; - }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; - "object-assign-1.0.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; - sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; - }; - }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - }; - "map-obj-1.0.1" = { - name = "map-obj"; - packageName = "map-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - }; - "get-stdin-4.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - }; - "repeating-1.1.3" = { - name = "repeating"; - packageName = "repeating"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; - sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; - }; - }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; - }; - }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; + sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; }; }; "buffer-equal-constant-time-1.0.1" = { @@ -1462,6 +1309,24 @@ let sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; }; }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -1480,6 +1345,15 @@ let sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -1831,6 +1705,15 @@ let sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; }; }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -1948,13 +1831,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.12" = { + "mime-types-2.1.13" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.12"; + version = "2.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz"; - sha1 = "152ba256777020dd4663f54c2e7bc26381e71729"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz"; + sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88"; }; }; "oauth-sign-0.8.2" = { @@ -2020,13 +1903,13 @@ let sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; }; }; - "lodash-4.16.4" = { + "lodash-4.17.2" = { name = "lodash"; packageName = "lodash"; - version = "4.16.4"; + version = "4.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"; - sha1 = "01ce306b9bad1319f2a5528674f88297aeb70127"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz"; + sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42"; }; }; "chalk-1.1.3" = { @@ -2353,13 +2236,13 @@ let sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; }; }; - "mime-db-1.24.0" = { + "mime-db-1.25.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz"; - sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz"; + sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392"; }; }; "punycode-1.4.1" = { @@ -2416,6 +2299,15 @@ let sha1 = "0c989774f2870c69378aa665648cdc60f343aa53"; }; }; + "concat-stream-1.5.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; + sha1 = "708978624d856af41a5a741defdd261da752c266"; + }; + }; "http-response-object-1.1.0" = { name = "http-response-object"; packageName = "http-response-object"; @@ -2434,6 +2326,15 @@ let sha1 = "6678b32fa0ca218fe569981bbd8871b594060d81"; }; }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; "http-basic-2.5.1" = { name = "http-basic"; packageName = "http-basic"; @@ -2497,13 +2398,13 @@ let sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; }; }; - "bower-1.7.9" = { + "bower-1.8.0" = { name = "bower"; packageName = "bower"; - version = "1.7.9"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; - sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz"; + sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a"; }; }; "bower-endpoint-parser-0.2.1" = { @@ -2749,13 +2650,13 @@ let sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0"; }; }; - "statuses-1.3.0" = { + "statuses-1.3.1" = { name = "statuses"; packageName = "statuses"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz"; - sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a"; + url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; + sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; }; }; "timed-out-2.0.0" = { @@ -2776,13 +2677,13 @@ let sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; }; }; - "readable-stream-2.1.5" = { + "readable-stream-2.2.2" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.1.5"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; - sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; + sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; }; }; "stream-shift-1.0.0" = { @@ -2839,6 +2740,24 @@ let sha1 = "5b46f80147edee578870f086d04821cf998e551f"; }; }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; "normalize-package-data-2.3.5" = { name = "normalize-package-data"; packageName = "normalize-package-data"; @@ -3028,13 +2947,13 @@ let sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; }; }; - "graceful-fs-4.1.9" = { + "graceful-fs-4.1.10" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.9"; + version = "4.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz"; - sha1 = "baacba37d19d11f9d146d3578bc99958c3787e29"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz"; + sha1 = "f2d720c22092f743228775c75e3612632501f131"; }; }; "parse-json-2.2.0" = { @@ -3118,6 +3037,33 @@ let sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; + "is-finite-1.0.2" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "get-stdin-4.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + }; "sort-keys-1.1.2" = { name = "sort-keys"; packageName = "sort-keys"; @@ -3172,22 +3118,22 @@ let sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; }; }; - "debug-2.2.0" = { + "debug-2.3.3" = { name = "debug"; packageName = "debug"; - version = "2.2.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; + sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; }; }; - "ms-0.7.1" = { + "ms-0.7.2" = { name = "ms"; packageName = "ms"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; }; }; "rimraf-2.2.8" = { @@ -3262,15 +3208,6 @@ let sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4"; }; }; - "concat-stream-1.5.2" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; - sha1 = "708978624d856af41a5a741defdd261da752c266"; - }; - }; "console-browserify-1.1.0" = { name = "console-browserify"; packageName = "console-browserify"; @@ -3487,13 +3424,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.4.1" = { + "stream-http-2.5.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.1.tgz"; - sha1 = "8ee5689ae69169e8eb8edd6aeb2ca08ab47e8f59"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz"; + sha1 = "585eee513217ed98fe199817e7313b6f772a6802"; }; }; "subarg-1.0.0" = { @@ -3865,13 +3802,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "asn1.js-4.8.1" = { + "asn1.js-4.9.0" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.8.1"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.1.tgz"; - sha1 = "3949b7f5fd1e8bedc13be3abebf477f93490c810"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz"; + sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a"; }; }; "ripemd160-1.0.1" = { @@ -3883,13 +3820,13 @@ let sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"; }; }; - "sha.js-2.4.5" = { + "sha.js-2.4.8" = { name = "sha.js"; packageName = "sha.js"; - version = "2.4.5"; + version = "2.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz"; - sha1 = "27d171efcc82a118b99639ff581660242b506e7c"; + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz"; + sha1 = "37068c2c476b6baf402d14a49c67f597921f634f"; }; }; "miller-rabin-4.0.0" = { @@ -4468,6 +4405,15 @@ let sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; }; }; + "object-assign-1.0.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; + sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; + }; + }; "airplay-js-0.2.16" = { name = "airplay-js"; packageName = "airplay-js"; @@ -4576,13 +4522,13 @@ let sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; }; }; - "mdns-js-0.5.0" = { + "mdns-js-0.5.1" = { name = "mdns-js"; packageName = "mdns-js"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.0.tgz"; - sha1 = "4c8abb6ba7cabdc892d39228c3faa2556e09cf87"; + url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz"; + sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec"; }; }; "plist-2.0.1" = { @@ -4594,13 +4540,13 @@ let sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; }; }; - "mdns-js-packet-0.2.0" = { - name = "mdns-js-packet"; - packageName = "mdns-js-packet"; - version = "0.2.0"; + "dns-js-0.2.1" = { + name = "dns-js"; + packageName = "dns-js"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.2.0.tgz"; - sha1 = "642409e8183c7561cc60615bbd1420ec2fad7616"; + url = "https://registry.npmjs.org/dns-js/-/dns-js-0.2.1.tgz"; + sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673"; }; }; "semver-5.1.1" = { @@ -4720,13 +4666,13 @@ let sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; }; - "magnet-uri-5.1.4" = { + "magnet-uri-5.1.5" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "5.1.4"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.4.tgz"; - sha1 = "225db1f8670a944db87a5fbe27e2d90350513403"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz"; + sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8"; }; }; "parse-torrent-file-4.0.0" = { @@ -4981,13 +4927,13 @@ let sha1 = "3db1525aac0367b67bd2e532d2773e7c40be2e68"; }; }; - "ip-1.1.3" = { + "ip-1.1.4" = { name = "ip"; packageName = "ip"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-1.1.3.tgz"; - sha1 = "12b16294a38925486d618a1103506e4eb4f8b296"; + url = "https://registry.npmjs.org/ip/-/ip-1.1.4.tgz"; + sha1 = "de8247ffef940451832550fba284945e6e039bfb"; }; }; "magnet-uri-4.2.3" = { @@ -5071,6 +5017,15 @@ let sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30"; }; }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; "bncode-0.2.3" = { name = "bncode"; packageName = "bncode"; @@ -5557,13 +5512,13 @@ let sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c"; }; }; - "exit-on-epipe-0.0.1" = { + "exit-on-epipe-0.1.0" = { name = "exit-on-epipe"; packageName = "exit-on-epipe"; - version = "0.0.1"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.0.1.tgz"; - sha1 = "ea41650007098c8444519a5d48958170c4ad929b"; + url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.1.0.tgz"; + sha1 = "aa2f0155b78b34fe60dd2b462e84637ba5ed0697"; }; }; "sax-1.2.1" = { @@ -5719,13 +5674,13 @@ let sha1 = "364200d5f13646ca8bcd44490271335614792300"; }; }; - "big-integer-1.6.16" = { + "big-integer-1.6.17" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.16"; + version = "1.6.17"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz"; - sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz"; + sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51"; }; }; "sax-0.3.5" = { @@ -6052,13 +6007,22 @@ let sha1 = "d5b680a165b6201739acb611542aabc2d8ceb070"; }; }; - "compressible-2.0.8" = { + "compressible-2.0.9" = { name = "compressible"; packageName = "compressible"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.8.tgz"; - sha1 = "7162e6c46d3b9d200ffb45cb4e4a0f7832732503"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz"; + sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425"; + }; + }; + "debug-2.2.0" = { + name = "debug"; + packageName = "debug"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; }; }; "on-headers-1.0.1" = { @@ -6088,6 +6052,15 @@ let sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; }; }; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -6268,13 +6241,13 @@ let sha1 = "d6cce7693505f733c759de57befc1af76c0f0805"; }; }; - "type-is-1.6.13" = { + "type-is-1.6.14" = { name = "type-is"; packageName = "type-is"; - version = "1.6.13"; + version = "1.6.14"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz"; - sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08"; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"; + sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2"; }; }; "utils-merge-1.0.0" = { @@ -6331,22 +6304,22 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "http-errors-1.5.0" = { + "http-errors-1.5.1" = { name = "http-errors"; packageName = "http-errors"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz"; - sha1 = "b1cb3d8260fd8e2386cad3189045943372d48211"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz"; + sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750"; }; }; - "setprototypeof-1.0.1" = { + "setprototypeof-1.0.2" = { name = "setprototypeof"; packageName = "setprototypeof"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz"; - sha1 = "52009b27888c4dc48f591949c0a8275834c1ca7e"; + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz"; + sha1 = "81a552141ec104b88e89ce383103ad5c66564d08"; }; }; "media-typer-0.3.0" = { @@ -6727,6 +6700,15 @@ let sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067"; }; }; + "readable-stream-2.1.5" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; + sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + }; + }; "realize-package-specifier-3.0.3" = { name = "realize-package-specifier"; packageName = "realize-package-specifier"; @@ -6952,22 +6934,22 @@ let sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac"; }; }; - "request-2.76.0" = { + "request-2.79.0" = { name = "request"; packageName = "request"; - version = "2.76.0"; + version = "2.79.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.76.0.tgz"; - sha1 = "be44505afef70360a0436955106be3945d95560e"; + url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; + sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; - "form-data-2.1.1" = { + "form-data-2.1.2" = { name = "form-data"; packageName = "form-data"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz"; - sha1 = "4adf0342e1a79afa1e84c8c320a9ffc82392a1f3"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; + sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; }; }; "qs-6.3.0" = { @@ -6979,6 +6961,15 @@ let sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442"; }; }; + "uuid-3.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; + sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -7411,13 +7402,13 @@ let sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; }; }; - "code-point-at-1.0.1" = { + "code-point-at-1.1.0" = { name = "code-point-at"; packageName = "code-point-at"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz"; - sha1 = "1104cd34f9b5b45d3eba88f1babc1924e1ce35fb"; + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -7483,6 +7474,15 @@ let sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; }; }; + "repeating-1.1.3" = { + name = "repeating"; + packageName = "repeating"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; + sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; + }; + }; "semver-diff-2.1.0" = { name = "semver-diff"; packageName = "semver-diff"; @@ -8126,13 +8126,13 @@ let sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; }; }; - "verror-1.8.1" = { + "verror-1.9.0" = { name = "verror"; packageName = "verror"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.8.1.tgz"; - sha1 = "157589400a2d14570a62f2d5dd6a0f6214be3029"; + url = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz"; + sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee"; }; }; "extsprintf-1.3.0" = { @@ -8225,13 +8225,13 @@ let sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd"; }; }; - "basic-auth-1.0.4" = { + "basic-auth-1.1.0" = { name = "basic-auth"; packageName = "basic-auth"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; - sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz"; + sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884"; }; }; "cors-2.8.1" = { @@ -8477,13 +8477,13 @@ let sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; }; }; - "ltgt-2.1.2" = { + "ltgt-2.1.3" = { name = "ltgt"; packageName = "ltgt"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.2.tgz"; - sha1 = "e7472324fee690afc0d5ecf900403ce5788a311d"; + url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz"; + sha1 = "10851a06d9964b971178441c23c9e52698eece34"; }; }; "pull-level-2.0.3" = { @@ -8495,13 +8495,13 @@ let sha1 = "9500635e257945d6feede185f5d7a24773455b17"; }; }; - "pull-stream-3.4.5" = { + "pull-stream-3.5.0" = { name = "pull-stream"; packageName = "pull-stream"; - version = "3.4.5"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.4.5.tgz"; - sha1 = "dab04df30f28d1da8db0f236805f25436b01ba72"; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz"; + sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7"; }; }; "typewiselite-1.0.0" = { @@ -8729,13 +8729,13 @@ let sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; }; }; - "got-6.5.0" = { + "got-6.6.3" = { name = "got"; packageName = "got"; - version = "6.5.0"; + version = "6.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.5.0.tgz"; - sha1 = "67dcc727db871c7b250320860180e24d2db18a04"; + url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz"; + sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec"; }; }; "lodash.debounce-4.0.8" = { @@ -8810,6 +8810,15 @@ let sha1 = "298067659cb68a2b4670abbefde02a3819981f5b"; }; }; + "timed-out-3.0.0" = { + name = "timed-out"; + packageName = "timed-out"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-3.0.0.tgz"; + sha1 = "ff88de96030ce960eabd42487db61d3add229273"; + }; + }; "url-parse-lax-1.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -8891,13 +8900,13 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.12.0" = { + "globals-9.14.0" = { name = "globals"; packageName = "globals"; - version = "9.12.0"; + version = "9.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.12.0.tgz"; - sha1 = "992ce90828c3a55fa8f16fada177adb64664cf9d"; + url = "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz"; + sha1 = "8859936af0038741263053b39d0e76ca241e4034"; }; }; "ignore-3.2.0" = { @@ -8927,13 +8936,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.6.1" = { + "js-yaml-3.7.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; - sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; }; }; "json-stable-stringify-1.0.1" = { @@ -8981,13 +8990,13 @@ let sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; }; }; - "require-uncached-1.0.2" = { + "require-uncached-1.0.3" = { name = "require-uncached"; packageName = "require-uncached"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz"; - sha1 = "67dad3b733089e77030124678a459589faf6a7ec"; + url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz"; + sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; "strip-bom-3.0.0" = { @@ -9305,13 +9314,13 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.8.2" = { + "ajv-4.9.0" = { name = "ajv"; packageName = "ajv"; - version = "4.8.2"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.8.2.tgz"; - sha1 = "65486936ca36fea39a1504332a78bebd5d447bdc"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz"; + sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c"; }; }; "ajv-keywords-1.1.1" = { @@ -9404,13 +9413,13 @@ let sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; }; }; - "forever-monitor-1.6.0" = { + "forever-monitor-1.7.1" = { name = "forever-monitor"; packageName = "forever-monitor"; - version = "1.6.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.6.0.tgz"; - sha1 = "3de1afd3e49f25712987281a252c02cb2463ad40"; + url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.7.1.tgz"; + sha1 = "5d820f4a3a78db2d81ae2671f158b9e86a091bb8"; }; }; "nconf-0.6.9" = { @@ -9512,15 +9521,6 @@ let sha1 = "2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"; }; }; - "minimatch-2.0.10" = { - name = "minimatch"; - packageName = "minimatch"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; - sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; - }; - }; "ps-tree-0.0.3" = { name = "ps-tree"; packageName = "ps-tree"; @@ -9584,13 +9584,13 @@ let sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "fsevents-1.0.14" = { + "fsevents-1.0.15" = { name = "fsevents"; packageName = "fsevents"; - version = "1.0.14"; + version = "1.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.14.tgz"; - sha1 = "558e8cc38643d8ef40fe45158486d0d25758eee4"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.15.tgz"; + sha1 = "fa63f590f3c2ad91275e4972a6cea545fb0aae44"; }; }; "micromatch-2.3.11" = { @@ -9881,13 +9881,13 @@ let sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017"; }; }; - "npmlog-4.0.0" = { + "npmlog-4.0.1" = { name = "npmlog"; packageName = "npmlog"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.0.tgz"; - sha1 = "e094503961c70c1774eb76692080e8d578a9f88f"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz"; + sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8"; }; }; "tar-pack-3.3.0" = { @@ -9908,13 +9908,13 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; - "gauge-2.6.0" = { + "gauge-2.7.1" = { name = "gauge"; packageName = "gauge"; - version = "2.6.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz"; - sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46"; + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz"; + sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7"; }; }; "set-blocking-2.0.0" = { @@ -10116,13 +10116,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.20" = { + "clean-css-3.4.21" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.20"; + version = "3.4.21"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz"; - sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz"; + sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b"; }; }; "commander-2.6.0" = { @@ -10296,6 +10296,15 @@ let sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; "cliui-2.1.0" = { name = "cliui"; packageName = "cliui"; @@ -10413,22 +10422,22 @@ let sha1 = "a98f2ff67183d8ba7cfaca10548bd7ff0550b385"; }; }; - "orchestrator-0.3.7" = { + "orchestrator-0.3.8" = { name = "orchestrator"; packageName = "orchestrator"; - version = "0.3.7"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz"; - sha1 = "c45064e22c5a2a7b99734f409a95ffedc7d3c3df"; + url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz"; + sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e"; }; }; - "pretty-hrtime-1.0.2" = { + "pretty-hrtime-1.0.3" = { name = "pretty-hrtime"; packageName = "pretty-hrtime"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.2.tgz"; - sha1 = "70ca96f4d0628a443b918758f79416a9a7bc9fa8"; + url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; + sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; }; }; "tildify-1.2.0" = { @@ -10467,13 +10476,13 @@ let sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; }; }; - "beeper-1.1.0" = { + "beeper-1.1.1" = { name = "beeper"; packageName = "beeper"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"; - sha1 = "9ee6fc1ce7f54feaace7ce73588b056037866a2c"; + url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz"; + sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; "dateformat-1.0.12" = { @@ -10980,6 +10989,15 @@ let sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; }; }; + "minimatch-2.0.10" = { + name = "minimatch"; + packageName = "minimatch"; + version = "2.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; + sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; + }; + }; "ordered-read-streams-0.1.0" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -11277,13 +11295,13 @@ let sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; }; }; - "handlebars-4.0.5" = { + "handlebars-4.0.6" = { name = "handlebars"; packageName = "handlebars"; - version = "4.0.5"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz"; - sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.6.tgz"; + sha1 = "2ce4484850537f9c97a8026d5399b935c4ed4ed7"; }; }; "supports-color-3.1.2" = { @@ -11943,6 +11961,15 @@ let sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9"; }; }; + "basic-auth-1.0.4" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; + sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; + }; + }; "connect-2.30.2" = { name = "connect"; packageName = "connect"; @@ -12087,13 +12114,13 @@ let sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; }; }; - "method-override-2.3.6" = { + "method-override-2.3.7" = { name = "method-override"; packageName = "method-override"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz"; - sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e"; + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz"; + sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5"; }; }; "morgan-1.6.1" = { @@ -12132,22 +12159,22 @@ let sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; }; }; - "response-time-2.3.1" = { + "response-time-2.3.2" = { name = "response-time"; packageName = "response-time"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz"; - sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797"; + url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz"; + sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a"; }; }; - "serve-favicon-2.3.0" = { + "serve-favicon-2.3.2" = { name = "serve-favicon"; packageName = "serve-favicon"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz"; - sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz"; + sha1 = "dd419e268de012ab72b319d337f2105013f9381f"; }; }; "serve-index-1.7.3" = { @@ -12186,22 +12213,13 @@ let sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; }; }; - "csrf-3.0.3" = { + "csrf-3.0.4" = { name = "csrf"; packageName = "csrf"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz"; - sha1 = "69d13220de95762808bb120f7533a994fc4293b5"; - }; - }; - "base64-url-1.2.2" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz"; - sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3"; + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz"; + sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5"; }; }; "rndm-1.2.0" = { @@ -12222,13 +12240,13 @@ let sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; }; }; - "uid-safe-2.1.1" = { + "uid-safe-2.1.3" = { name = "uid-safe"; packageName = "uid-safe"; - version = "2.1.1"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz"; - sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666"; + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz"; + sha1 = "077e264a00b3187936b270bb7376a26473631071"; }; }; "random-bytes-1.0.0" = { @@ -12771,6 +12789,15 @@ let sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873"; }; }; + "gauge-2.6.0" = { + name = "gauge"; + packageName = "gauge"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz"; + sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46"; + }; + }; "uid-number-0.0.5" = { name = "uid-number"; packageName = "uid-number"; @@ -13302,49 +13329,49 @@ let sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759"; }; }; - "node-red-node-feedparser-0.1.6" = { + "node-red-node-feedparser-0.1.7" = { name = "node-red-node-feedparser"; packageName = "node-red-node-feedparser"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.6.tgz"; - sha1 = "42eb2e11a010904e6af7257feb27a2a64a1b578d"; - }; - }; - "node-red-node-email-0.1.11" = { - name = "node-red-node-email"; - packageName = "node-red-node-email"; - version = "0.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.11.tgz"; - sha1 = "4a64070f3fc5596fdc50e988813dd4ff003b3fd8"; - }; - }; - "node-red-node-twitter-0.1.7" = { - name = "node-red-node-twitter"; - packageName = "node-red-node-twitter"; version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.7.tgz"; - sha1 = "8cef1e54df6217d83b49fd48684e6ca2ee1cf595"; + url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.7.tgz"; + sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-rbe-0.1.5" = { + "node-red-node-email-0.1.12" = { + name = "node-red-node-email"; + packageName = "node-red-node-email"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz"; + sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5"; + }; + }; + "node-red-node-twitter-0.1.9" = { + name = "node-red-node-twitter"; + packageName = "node-red-node-twitter"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.9.tgz"; + sha1 = "e0ad7f654aab3ff8e7c3d001ec3cee030d33d217"; + }; + }; + "node-red-node-rbe-0.1.6" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.5.tgz"; - sha1 = "9df9b13b8828c9396319a54ad7c0fbb1a4005e9d"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz"; + sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539"; }; }; - "node-red-node-serialport-0.4.0" = { + "node-red-node-serialport-0.4.1" = { name = "node-red-node-serialport"; packageName = "node-red-node-serialport"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.0.tgz"; - sha1 = "dfa63bedd535fa9debef754c373e439f8bc73abe"; + url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz"; + sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c"; }; }; "bcrypt-0.8.7" = { @@ -13500,13 +13527,13 @@ let sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; }; }; - "moment-timezone-0.5.7" = { + "moment-timezone-0.5.9" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.7"; + version = "0.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.7.tgz"; - sha1 = "1305bcada16f046dbbc7ac89abf66effff886cb5"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz"; + sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd"; }; }; "retry-0.6.1" = { @@ -13518,13 +13545,13 @@ let sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918"; }; }; - "cookies-0.6.1" = { + "cookies-0.6.2" = { name = "cookies"; packageName = "cookies"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookies/-/cookies-0.6.1.tgz"; - sha1 = "ef693b1bc6f01f567d46e2f504e9c15fb70cba90"; + url = "https://registry.npmjs.org/cookies/-/cookies-0.6.2.tgz"; + sha1 = "6ac1b052895208e8fc4c4f5f86a9ed31b9cb5ccf"; }; }; "i18next-client-1.10.3" = { @@ -13608,13 +13635,13 @@ let sha1 = "7382c148cb622c4b28af7c727f9673730b73f474"; }; }; - "websocket-stream-3.3.0" = { + "websocket-stream-3.3.3" = { name = "websocket-stream"; packageName = "websocket-stream"; - version = "3.3.0"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.0.tgz"; - sha1 = "69ced776afca68688ed5be73d28511a2c329c8ed"; + url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.3.tgz"; + sha1 = "361da5404a337e60cfbc29b4a46368762679df0b"; }; }; "leven-1.0.2" = { @@ -13887,13 +13914,13 @@ let sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; }; }; - "uue-3.0.0" = { + "uue-3.1.0" = { name = "uue"; packageName = "uue"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/uue/-/uue-3.0.0.tgz"; - sha1 = "07af69344defa9851b7b845c1c18110b8264e51e"; + url = "https://registry.npmjs.org/uue/-/uue-3.1.0.tgz"; + sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6"; }; }; "utf7-1.0.2" = { @@ -13914,13 +13941,13 @@ let sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; }; }; - "serialport-4.0.3" = { + "serialport-4.0.6" = { name = "serialport"; packageName = "serialport"; - version = "4.0.3"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-4.0.3.tgz"; - sha1 = "31339c4a13f9009852975204f6068c1a6a20a4a1"; + url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz"; + sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae"; }; }; "lie-3.1.0" = { @@ -14193,13 +14220,13 @@ let sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; }; }; - "buffer-crc32-0.2.5" = { + "buffer-crc32-0.2.6" = { name = "buffer-crc32"; packageName = "buffer-crc32"; - version = "0.2.5"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"; - sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91"; + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.6.tgz"; + sha1 = "612b318074fc6c4c30504b297247a1f91641253b"; }; }; "fresh-0.1.0" = { @@ -14508,13 +14535,13 @@ let sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2"; }; }; - "raw-socket-1.5.0" = { + "raw-socket-1.5.1" = { name = "raw-socket"; packageName = "raw-socket"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.0.tgz"; - sha1 = "7a0fba1aef118609011a1205e830e626ca522ae9"; + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.1.tgz"; + sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528"; }; }; "argparse-0.1.16" = { @@ -14598,6 +14625,15 @@ let sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; + "mississippi-1.2.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; + sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; + }; + }; "npm-install-checks-3.0.0" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -14607,6 +14643,15 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; + "npm-registry-client-7.3.0" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz"; + sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50"; + }; + }; "opener-1.4.2" = { name = "opener"; packageName = "opener"; @@ -14634,13 +14679,22 @@ let sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6"; }; }; - "request-2.75.0" = { + "request-2.78.0" = { name = "request"; packageName = "request"; - version = "2.75.0"; + version = "2.78.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; - sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz"; + sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc"; + }; + }; + "sorted-union-stream-2.1.3" = { + name = "sorted-union-stream"; + packageName = "sorted-union-stream"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz"; + sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; }; }; "unique-filename-1.1.0" = { @@ -14688,13 +14742,40 @@ let sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; }; }; - "form-data-2.0.0" = { - name = "form-data"; - packageName = "form-data"; - version = "2.0.0"; + "flush-write-stream-1.0.2" = { + name = "flush-write-stream"; + packageName = "flush-write-stream"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; - sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz"; + sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417"; + }; + }; + "from2-2.3.0" = { + name = "from2"; + packageName = "from2"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + }; + "stream-each-1.2.0" = { + name = "stream-each"; + packageName = "stream-each"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz"; + sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991"; + }; + }; + "stream-iterate-1.2.0" = { + name = "stream-iterate"; + packageName = "stream-iterate"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz"; + sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1"; }; }; "unique-slug-2.0.0" = { @@ -14922,13 +15003,13 @@ let sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; }; }; - "npm-3.10.9" = { + "npm-3.10.10" = { name = "npm"; packageName = "npm"; - version = "3.10.9"; + version = "3.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz"; - sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz"; + sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; }; }; "npmi-2.0.1" = { @@ -14976,6 +15057,24 @@ let sha1 = "27c90519196dc15015be02a34ea52986feab8877"; }; }; + "request-2.75.0" = { + name = "request"; + packageName = "request"; + version = "2.75.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; + sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + }; + }; + "form-data-2.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; + sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + }; + }; "boxen-0.6.0" = { name = "boxen"; packageName = "boxen"; @@ -15075,13 +15174,13 @@ let sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; }; }; - "got-5.6.0" = { + "got-5.7.1" = { name = "got"; packageName = "got"; - version = "5.6.0"; + version = "5.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-5.6.0.tgz"; - sha1 = "bb1d7ee163b78082bbc8eb836f3f395004ea6fbf"; + url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; + sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; }; }; "registry-auth-token-3.1.0" = { @@ -15102,13 +15201,458 @@ let sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; }; }; - "unzip-response-1.0.1" = { + "unzip-response-1.0.2" = { name = "unzip-response"; packageName = "unzip-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz"; + sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; + }; + }; + "babybird-0.0.1" = { + name = "babybird"; + packageName = "babybird"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babybird/-/babybird-0.0.1.tgz"; + sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2"; + }; + }; + "connect-busboy-0.0.2" = { + name = "connect-busboy"; + packageName = "connect-busboy"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-busboy/-/connect-busboy-0.0.2.tgz"; + sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097"; + }; + }; + "content-type-git+https://github.com/wikimedia/content-type.git#master" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.1"; + src = fetchgit { + url = "https://github.com/wikimedia/content-type.git"; + rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b"; + sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; + }; + }; + "diff-1.4.0" = { + name = "diff"; + packageName = "diff"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; + sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; + }; + }; + "domino-1.0.27" = { + name = "domino"; + packageName = "domino"; + version = "1.0.27"; + src = fetchurl { + url = "https://registry.npmjs.org/domino/-/domino-1.0.27.tgz"; + sha1 = "26bc01f739707505c51456af7f59e3373369475d"; + }; + }; + "express-handlebars-3.0.0" = { + name = "express-handlebars"; + packageName = "express-handlebars"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.0.0.tgz"; + sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; + }; + }; + "finalhandler-0.5.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; + sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; + }; + }; + "gelf-stream-0.2.4" = { + name = "gelf-stream"; + packageName = "gelf-stream"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz"; + sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013"; + }; + }; + "mediawiki-title-0.5.6" = { + name = "mediawiki-title"; + packageName = "mediawiki-title"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.5.6.tgz"; + sha1 = "549069294e27728a1f13bed3d705d6beecf4ea24"; + }; + }; + "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.1"; + src = fetchgit { + url = "https://github.com/arlolra/negotiator.git"; + rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a"; + sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; + }; + }; + "pegjs-git+https://github.com/tstarling/pegjs.git#fork" = { + name = "pegjs"; + packageName = "pegjs"; + version = "0.8.0"; + src = fetchgit { + url = "https://github.com/tstarling/pegjs.git"; + rev = "36d584bd7bbc564c86c058c5dfe8053b1fe1d584"; + sha256 = "df0bf31b132e63beae73a28f1edfe0a2e9edf01660632c72834c682e2b484905"; + }; + }; + "prfun-2.1.4" = { + name = "prfun"; + packageName = "prfun"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prfun/-/prfun-2.1.4.tgz"; + sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; + }; + }; + "service-runner-2.1.11" = { + name = "service-runner"; + packageName = "service-runner"; + version = "2.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz"; + sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb"; + }; + }; + "simplediff-0.1.1" = { + name = "simplediff"; + packageName = "simplediff"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz"; + sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; + }; + }; + "yargs-4.8.1" = { + name = "yargs"; + packageName = "yargs"; + version = "4.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz"; + sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"; + }; + }; + "is-arguments-1.0.2" = { + name = "is-arguments"; + packageName = "is-arguments"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.2.tgz"; + sha1 = "07e30ad79531844179b642d2d8399435182c8727"; + }; + }; + "busboy-0.2.13" = { + name = "busboy"; + packageName = "busboy"; + version = "0.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz"; + sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6"; + }; + }; + "dicer-0.2.5" = { + name = "dicer"; + packageName = "dicer"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; + sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; + }; + }; + "streamsearch-0.1.2" = { + name = "streamsearch"; + packageName = "streamsearch"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; + sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + }; + }; + "gelfling-0.2.0" = { + name = "gelfling"; + packageName = "gelfling"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz"; + sha1 = "23a13c366883adae32ecfd252a566be302b88dc3"; + }; + }; + "bunyan-1.8.5" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz"; + sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a"; + }; + }; + "bunyan-syslog-udp-0.1.0" = { + name = "bunyan-syslog-udp"; + packageName = "bunyan-syslog-udp"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.1.0.tgz"; + sha1 = "fbfaee03a81cd2a95abc18f92c99f2bb87e2429c"; + }; + }; + "gelf-stream-1.1.1" = { + name = "gelf-stream"; + packageName = "gelf-stream"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz"; + sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669"; + }; + }; + "hot-shots-4.3.1" = { + name = "hot-shots"; + packageName = "hot-shots"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.3.1.tgz"; + sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239"; + }; + }; + "limitation-0.1.9" = { + name = "limitation"; + packageName = "limitation"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/limitation/-/limitation-0.1.9.tgz"; + sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03"; + }; + }; + "yargs-5.0.0" = { + name = "yargs"; + packageName = "yargs"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; + sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + }; + }; + "dtrace-provider-0.8.0" = { + name = "dtrace-provider"; + packageName = "dtrace-provider"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz"; + sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625"; + }; + }; + "mv-2.1.1" = { + name = "mv"; + packageName = "mv"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz"; + sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; + }; + }; + "safe-json-stringify-1.0.3" = { + name = "safe-json-stringify"; + packageName = "safe-json-stringify"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz"; + sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e"; + }; + }; + "ncp-2.0.0" = { + name = "ncp"; + packageName = "ncp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; + sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; + }; + }; + "rimraf-2.4.5" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; + sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; + }; + }; + "gelfling-0.3.1" = { + name = "gelfling"; + packageName = "gelfling"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz"; + sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04"; + }; + }; + "kad-git+https://github.com/gwicke/kad.git#master" = { + name = "kad"; + packageName = "kad"; + version = "1.3.6"; + src = fetchgit { + url = "https://github.com/gwicke/kad.git"; + rev = "f35971036f43814043245da82b12d035b7bbfd16"; + sha256 = "9529b2615547db37851d15b39155c608d6b8d0641366d14cce728824b6135a35"; + }; + }; + "clarinet-0.11.0" = { + name = "clarinet"; + packageName = "clarinet"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz"; + sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719"; + }; + }; + "kad-fs-0.0.4" = { + name = "kad-fs"; + packageName = "kad-fs"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz"; + sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a"; + }; + }; + "kad-localstorage-0.0.7" = { + name = "kad-localstorage"; + packageName = "kad-localstorage"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz"; + sha1 = "f7a2e780da53fb28b943c2c5a894c279aa810f17"; + }; + }; + "kad-memstore-0.0.1" = { + name = "kad-memstore"; + packageName = "kad-memstore"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz"; + sha1 = "83cb748496ac491c7135104cbe56b88ca7392477"; + }; + }; + "merge-1.2.0" = { + name = "merge"; + packageName = "merge"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz"; + sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da"; + }; + }; + "msgpack5-3.4.1" = { + name = "msgpack5"; + packageName = "msgpack5"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.4.1.tgz"; + sha1 = "350ef35899c6c8773710fd84d881ddd3340a8114"; + }; + }; + "dom-storage-2.0.2" = { + name = "dom-storage"; + packageName = "dom-storage"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz"; + sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; + }; + }; + "get-caller-file-1.0.2" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; + sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; + }; + }; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.1.tgz"; - sha1 = "4a73959f2989470fa503791cefb54e1dbbc68412"; + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "which-module-1.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; + }; + }; + "window-size-0.2.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; + sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; + }; + }; + "yargs-parser-3.2.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; + sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; + }; + }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; + "yargs-parser-2.4.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; + sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; "airplayer-2.0.0" = { @@ -15129,13 +15673,13 @@ let sha1 = "b8d19188b3243e390f302410bd0cb1622db82649"; }; }; - "inquirer-1.2.2" = { + "inquirer-1.2.3" = { name = "inquirer"; packageName = "inquirer"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.2.tgz"; - sha1 = "f725c1316f0020e7f3d538c8c5ad0c2732c1c451"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz"; + sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; }; "network-address-1.1.0" = { @@ -15309,13 +15853,13 @@ let sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; }; }; - "dns-packet-1.1.0" = { + "dns-packet-1.1.1" = { name = "dns-packet"; packageName = "dns-packet"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.0.tgz"; - sha1 = "c11ce43bd9977aa789af72de06b6e4ad6e84730d"; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz"; + sha1 = "2369d45038af045f3898e6fa56862aed3f40296c"; }; }; "external-editor-1.1.1" = { @@ -15390,13 +15934,13 @@ let sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad"; }; }; - "socket.io-0.9.17" = { + "socket.io-1.6.0" = { name = "socket.io"; packageName = "socket.io"; - version = "0.9.17"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz"; - sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz"; + sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1"; }; }; "torrent-stream-0.18.1" = { @@ -15768,13 +16312,121 @@ let sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0"; }; }; - "socket.io-client-0.9.16" = { + "engine.io-1.8.0" = { + name = "engine.io"; + packageName = "engine.io"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz"; + sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa"; + }; + }; + "socket.io-adapter-0.5.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; + sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; + }; + }; + "socket.io-client-1.6.0" = { name = "socket.io-client"; packageName = "socket.io-client"; - version = "0.9.16"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz"; - sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6"; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz"; + sha1 = "5b668f4f771304dfeed179064708386fa6717853"; + }; + }; + "socket.io-parser-2.3.1" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; + sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; + }; + }; + "engine.io-parser-1.3.1" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz"; + sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf"; + }; + }; + "base64-arraybuffer-0.1.5" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; + sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; + }; + }; + "wtf-8-1.0.0" = { + name = "wtf-8"; + packageName = "wtf-8"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; + sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; + }; + }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + }; + }; + "engine.io-client-1.8.0" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz"; + sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c"; + }; + }; + "parseuri-0.0.5" = { + name = "parseuri"; + packageName = "parseuri"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz"; + sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; + }; + }; + "parsejson-0.0.3" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; + sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; + }; + }; + "parseqs-0.0.5" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; + sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; + }; + }; + "xmlhttprequest-ssl-1.5.3" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; + sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; }; }; "bittorrent-dht-3.2.6" = { @@ -16390,15 +17042,6 @@ let sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2"; }; }; - "bunyan-1.8.4" = { - name = "bunyan"; - packageName = "bunyan"; - version = "1.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.4.tgz"; - sha1 = "98013acc812ebc3806364049edf6c9129d8b8d73"; - }; - }; "handlebars-2.0.0" = { name = "handlebars"; packageName = "handlebars"; @@ -16543,51 +17186,6 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; - "dtrace-provider-0.7.1" = { - name = "dtrace-provider"; - packageName = "dtrace-provider"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz"; - sha1 = "c06b308f2f10d5d5838aec9c571e5d588dc71d04"; - }; - }; - "mv-2.1.1" = { - name = "mv"; - packageName = "mv"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz"; - sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; - }; - }; - "safe-json-stringify-1.0.3" = { - name = "safe-json-stringify"; - packageName = "safe-json-stringify"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz"; - sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e"; - }; - }; - "ncp-2.0.0" = { - name = "ncp"; - packageName = "ncp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; - sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; - }; - }; - "rimraf-2.4.5" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; - sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; - }; - }; "uglify-js-2.3.6" = { name = "uglify-js"; packageName = "uglify-js"; @@ -17002,6 +17600,15 @@ let sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3"; }; }; + "js-yaml-3.6.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; + sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + }; + }; "whet.extend-0.9.9" = { name = "whet.extend"; packageName = "whet.extend"; @@ -17047,31 +17654,22 @@ let sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; }; }; - "longjohn-0.2.9" = { + "longjohn-0.2.11" = { name = "longjohn"; packageName = "longjohn"; - version = "0.2.9"; + version = "0.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.9.tgz"; - sha1 = "db1bf175fcfffcfce099132d1470f52f41a31519"; + url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz"; + sha1 = "83736a15ae5f48711b625153e98012f2de659e69"; }; }; - "node-appc-0.2.31" = { + "node-appc-0.2.39" = { name = "node-appc"; packageName = "node-appc"; - version = "0.2.31"; + version = "0.2.39"; src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.31.tgz"; - sha1 = "8d8d0052fd8b8ce4bc44f06883009f7c950bc8c2"; - }; - }; - "request-2.62.0" = { - name = "request"; - packageName = "request"; - version = "2.62.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.62.0.tgz"; - sha1 = "55c165f702a146f1e21e0725c0b75e1136487b0f"; + url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.39.tgz"; + sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4"; }; }; "sprintf-0.1.5" = { @@ -17083,22 +17681,22 @@ let sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; }; }; - "winston-1.0.2" = { + "winston-1.1.2" = { name = "winston"; packageName = "winston"; - version = "1.0.2"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-1.0.2.tgz"; - sha1 = "351c58e2323f8a4ca29a45195aa9aa3b4c35d76f"; + url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz"; + sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c"; }; }; - "wrench-1.5.8" = { + "wrench-1.5.9" = { name = "wrench"; packageName = "wrench"; - version = "1.5.8"; + version = "1.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; - sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; + url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz"; + sha1 = "411691c63a9b2531b1700267279bdeca23b2142a"; }; }; "source-map-support-0.3.2" = { @@ -17128,85 +17726,58 @@ let sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; }; }; - "diff-2.1.0" = { + "diff-2.2.1" = { name = "diff"; packageName = "diff"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-2.1.0.tgz"; - sha1 = "39b5aa97f0d1600b428ad0a91dc8efcc9b29e288"; + url = "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz"; + sha1 = "76ec8ea33535344078079fbe8cf03435ffb185ec"; }; }; - "node-uuid-1.4.3" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; - sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; - }; - }; - "request-2.61.0" = { + "request-2.69.0" = { name = "request"; packageName = "request"; - version = "2.61.0"; + version = "2.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.61.0.tgz"; - sha1 = "6973cb2ac94885f02693f554eec64481d6013f9f"; + url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; + sha1 = "cf91d2e000752b1217155c005241911991a2346a"; }; }; - "semver-5.0.1" = { + "semver-5.1.0" = { name = "semver"; packageName = "semver"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.1.tgz"; - sha1 = "9fb3f4004f900d83c47968fe42f7583e05832cc9"; - }; - }; - "uglify-js-2.4.24" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz"; - sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e"; - }; - }; - "har-validator-1.8.0" = { - name = "har-validator"; - packageName = "har-validator"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz"; - sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2"; - }; - }; - "bluebird-2.11.0" = { - name = "bluebird"; - packageName = "bluebird"; - version = "2.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"; - sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1"; - }; - }; - "yargs-3.5.4" = { - name = "yargs"; - packageName = "yargs"; - version = "3.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz"; - sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361"; - }; - }; - "qs-5.1.0" = { - name = "qs"; - packageName = "qs"; version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"; - sha1 = "4d932e5c7ea411cca76a312d39a606200fd50cd9"; + url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; + sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; + }; + }; + "wrench-1.5.8" = { + name = "wrench"; + packageName = "wrench"; + version = "1.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; + sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; + }; + }; + "uglify-js-2.6.1" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz"; + sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; + }; + }; + "qs-6.0.2" = { + name = "qs"; + packageName = "qs"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; + sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; }; }; "bluebird-3.3.5" = { @@ -17227,13 +17798,13 @@ let sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a"; }; }; - "color-0.11.3" = { + "color-0.11.4" = { name = "color"; packageName = "color"; - version = "0.11.3"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-0.11.3.tgz"; - sha1 = "4bad1d0d52499dd00dbd6f0868442467e49394e6"; + url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz"; + sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764"; }; }; "crossroads-0.12.2" = { @@ -17308,13 +17879,13 @@ let sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3"; }; }; - "knockout-3.4.0" = { + "knockout-3.4.1" = { name = "knockout"; packageName = "knockout"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.4.0.tgz"; - sha1 = "59d7261815a11eb7c1a3f3c7077ca898a44caadb"; + url = "https://registry.npmjs.org/knockout/-/knockout-3.4.1.tgz"; + sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0"; }; }; "lodash-4.12.0" = { @@ -17416,13 +17987,13 @@ let sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; }; }; - "color-convert-1.5.0" = { + "color-convert-1.8.2" = { name = "color-convert"; packageName = "color-convert"; - version = "1.5.0"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.5.0.tgz"; - sha1 = "7a2b4efb4488df85bca6443cb038b7100fbe7de1"; + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.8.2.tgz"; + sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339"; }; }; "color-string-0.3.0" = { @@ -17596,22 +18167,22 @@ let sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484"; }; }; - "editions-1.3.1" = { + "editions-1.3.3" = { name = "editions"; packageName = "editions"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-1.3.1.tgz"; - sha1 = "008425f64dc1401db45ec110e06aa602562419c0"; + url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz"; + sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b"; }; }; - "typechecker-4.3.0" = { + "typechecker-4.4.0" = { name = "typechecker"; packageName = "typechecker"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/typechecker/-/typechecker-4.3.0.tgz"; - sha1 = "6f6d6815753e88d6812aa80de4a3fd18948e6e62"; + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.0.tgz"; + sha1 = "efc56882d36e435c6eb978200e22b88278a3f7fc"; }; }; "underscore-1.5.2" = { @@ -17785,24 +18356,6 @@ let sha1 = "7d250d8fa1c218119ecde51390458a57d5171376"; }; }; - "camelcase-3.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; - sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; - }; - }; - "lodash.assign-4.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; - sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; - }; - }; "pkg-conf-1.1.3" = { name = "pkg-conf"; packageName = "pkg-conf"; @@ -17812,15 +18365,6 @@ let sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b"; }; }; - "require-main-filename-1.0.1" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; - }; - }; "set-blocking-1.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -17830,24 +18374,6 @@ let sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5"; }; }; - "window-size-0.2.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; - sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; - }; - }; - "yargs-parser-2.4.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; - sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; - }; - }; "symbol-0.2.3" = { name = "symbol"; packageName = "symbol"; @@ -17884,6 +18410,15 @@ let sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; }; }; + "tmp-0.0.30" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz"; + sha1 = "72419d4a8be7d6ce75148fd8b324e593a711c2ed"; + }; + }; "follow-redirects-0.0.3" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -18149,7 +18684,7 @@ in sources."async-0.2.10" sources."optimist-0.3.7" sources."uglify-to-browserify-1.0.2" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" sources."wordwrap-0.0.3" sources."array-unique-0.2.1" (sources."global-modules-0.2.3" // { @@ -18165,7 +18700,7 @@ in }) sources."ini-1.3.4" sources."osenv-0.1.3" - sources."which-1.2.11" + sources."which-1.2.12" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."isexe-1.1.2" @@ -18184,10 +18719,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.6"; + version = "0.10.7"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.6.tgz"; - sha1 = "02c79f5337a1d981e14ef6b2529ac09a42436328"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.7.tgz"; + sha1 = "48e59f6be202122c0d71153efab4f924065da586"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -18204,12 +18739,12 @@ in }) sources."azure-arm-authorization-2.0.0" sources."azure-arm-cdn-0.2.1" - sources."azure-arm-commerce-0.1.1" + sources."azure-arm-commerce-0.2.0" sources."azure-arm-compute-0.19.0" - sources."azure-arm-hdinsight-0.2.0" + sources."azure-arm-hdinsight-0.2.2" sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" - sources."azure-arm-iothub-0.1.1" + sources."azure-arm-iothub-0.1.4" sources."azure-arm-servermanagement-0.1.2" sources."azure-arm-network-0.17.0" sources."azure-arm-powerbiembedded-0.1.0" @@ -18250,7 +18785,6 @@ in sources."readable-stream-2.0.6" sources."validator-3.22.2" sources."xml2js-0.2.7" - sources."isarray-1.0.0" ]; }) sources."azure-arm-batch-0.3.0" @@ -18275,7 +18809,7 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.15.2" + sources."moment-2.16.0" sources."ms-rest-1.15.2" (sources."ms-rest-azure-1.15.2" // { dependencies = [ @@ -18299,7 +18833,11 @@ in sources."colors-0.6.2" ]; }) - sources."readable-stream-1.0.34" + (sources."readable-stream-1.0.34" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) (sources."request-2.74.0" // { dependencies = [ sources."extend-3.0.0" @@ -18331,32 +18869,12 @@ in sources."xmlbuilder-0.4.3" sources."read-1.0.7" sources."date-utils-1.2.21" - sources."jws-3.1.3" + sources."jws-3.1.4" sources."xmldom-0.1.22" sources."xpath.js-1.0.6" - sources."base64url-1.0.6" - sources."jwa-1.1.3" - (sources."concat-stream-1.4.10" // { - dependencies = [ - sources."readable-stream-1.1.14" - ]; - }) - sources."meow-2.0.0" - sources."inherits-2.0.3" - sources."typedarray-0.0.6" - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."camelcase-keys-1.0.0" - sources."indent-string-1.2.2" - sources."minimist-1.2.0" - sources."object-assign-1.0.0" - sources."camelcase-1.2.1" - sources."map-obj-1.0.1" - sources."get-stdin-4.0.1" - sources."repeating-1.1.3" - sources."is-finite-1.0.2" - sources."number-is-nan-1.0.1" + sources."base64url-2.0.0" + sources."jwa-1.1.4" + sources."safe-buffer-5.0.1" sources."buffer-equal-constant-time-1.0.1" sources."ecdsa-sig-formatter-1.0.7" sources."base64-url-1.3.3" @@ -18368,7 +18886,11 @@ in sources."browserify-mime-1.2.9" sources."json-edm-parser-0.1.2" sources."jsonparse-1.2.0" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."stack-trace-0.0.9" sources."keypress-0.1.0" @@ -18399,13 +18921,10 @@ in }) sources."deep-equal-1.0.1" sources."i-0.3.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."ncp-0.4.2" sources."rimraf-2.5.4" + sources."minimist-0.0.8" sources."glob-7.1.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -18423,7 +18942,6 @@ in (sources."bl-1.1.2" // { dependencies = [ sources."readable-stream-2.0.6" - sources."isarray-1.0.0" ]; }) sources."caseless-0.11.0" @@ -18446,14 +18964,14 @@ in sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.2.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."lodash-4.16.4" + sources."lodash-4.17.2" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."escape-string-regexp-1.0.5" @@ -18497,15 +19015,21 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."ctype-0.5.2" sources."source-map-0.1.43" sources."fibers-1.0.15" sources."galaxy-0.1.12" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) sources."http-response-object-1.1.0" sources."then-request-2.2.0" + sources."typedarray-0.0.6" sources."http-basic-2.5.1" sources."promise-7.1.1" sources."asap-2.0.5" @@ -18523,10 +19047,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.7.9"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; - sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz"; + sha1 = "55dbebef0ad9155382d9e9d3e497c1372345b44a"; }; buildInputs = globalBuildInputs; meta = { @@ -18546,13 +19070,13 @@ in }; dependencies = [ sources."argparse-1.0.4" - sources."bower-1.7.9" + sources."bower-1.8.0" sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" ]; }) sources."lodash-4.2.1" @@ -18586,11 +19110,11 @@ in sources."object-assign-2.1.1" sources."prepend-http-1.0.4" sources."read-all-stream-2.2.0" - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."timed-out-2.0.0" sources."end-of-stream-1.0.0" sources."inherits-2.0.3" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."stream-shift-1.0.0" sources."once-1.3.3" sources."wrappy-1.0.2" @@ -18627,12 +19151,12 @@ in sources."pinkie-2.0.4" (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" ]; }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" ]; }) sources."parse-json-2.2.0" @@ -18652,12 +19176,12 @@ in sources."natives-1.1.0" (sources."jsonfile-2.4.0" // { dependencies = [ - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" ]; }) (sources."klaw-1.3.1" // { dependencies = [ - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" ]; }) sources."path-is-absolute-1.0.1" @@ -18673,13 +19197,13 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."q-1.4.1" - sources."debug-2.2.0" + sources."debug-2.3.3" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."ms-0.7.1" + sources."ms-0.7.2" sources."os-tmpdir-1.0.2" ]; buildInputs = globalBuildInputs; @@ -18738,12 +19262,12 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."resolve-1.1.7" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.4.1" + sources."stream-http-2.5.0" sources."string_decoder-0.10.31" sources."subarg-1.0.0" (sources."syntax-error-1.1.6" // { @@ -18809,9 +19333,9 @@ in sources."parse-asn1-5.0.0" sources."brorand-1.0.6" sources."hash.js-1.0.3" - sources."asn1.js-4.8.1" + sources."asn1.js-4.9.0" sources."ripemd160-1.0.1" - sources."sha.js-2.4.5" + sources."sha.js-2.4.8" sources."miller-rabin-4.0.0" sources."inflight-1.0.6" sources."minimatch-3.0.3" @@ -18868,7 +19392,7 @@ in sources."chalk-1.0.0" sources."chromecast-player-0.2.3" sources."debounced-seeker-1.0.0" - sources."debug-2.2.0" + sources."debug-2.3.3" sources."fs-extended-0.2.1" sources."got-1.2.2" sources."internal-ip-1.2.0" @@ -18907,7 +19431,7 @@ in (sources."xml2js-0.4.17" // { dependencies = [ sources."xmlbuilder-4.2.1" - sources."lodash-4.16.4" + sources."lodash-4.17.2" ]; }) sources."xtend-4.0.1" @@ -18936,7 +19460,7 @@ in sources."thunky-0.1.0" sources."wrap-fn-0.1.5" sources."co-3.1.0" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."object-assign-1.0.0" (sources."meow-3.7.0" // { dependencies = [ @@ -18970,7 +19494,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -19020,13 +19544,13 @@ in ]; }) sources."windows-no-runnable-0.0.6" - (sources."mdns-js-0.5.0" // { + (sources."mdns-js-0.5.1" // { dependencies = [ sources."semver-5.1.1" ]; }) sources."plist-2.0.1" - sources."mdns-js-packet-0.2.0" + sources."dns-js-0.2.1" sources."qap-3.1.3" sources."base64-js-1.1.2" sources."xmlbuilder-8.2.2" @@ -19044,7 +19568,7 @@ in sources."mute-stream-0.0.4" sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" - sources."magnet-uri-5.1.4" + sources."magnet-uri-5.1.5" sources."parse-torrent-file-4.0.0" sources."simple-get-2.3.0" sources."thirty-two-1.0.2" @@ -19091,7 +19615,7 @@ in sources."randombytes-2.0.3" sources."run-parallel-1.1.6" sources."inherits-2.0.3" - sources."ip-1.1.3" + sources."ip-1.1.4" sources."flatten-0.0.1" sources."fifo-0.1.4" (sources."peer-wire-protocol-0.7.0" // { @@ -19141,13 +19665,13 @@ in sources."run-series-1.1.4" (sources."simple-peer-6.0.7" // { dependencies = [ - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; }) (sources."simple-websocket-4.1.0" // { dependencies = [ - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; }) @@ -19198,7 +19722,7 @@ in sources."isarray-1.0.0" ]; }) - sources."exit-on-epipe-0.0.1" + sources."exit-on-epipe-0.1.0" sources."commander-2.9.0" sources."typedarray-0.0.6" sources."graceful-readlink-1.0.1" @@ -19254,7 +19778,7 @@ in (sources."insight-0.8.3" // { dependencies = [ sources."async-1.5.2" - sources."request-2.76.0" + sources."request-2.79.0" sources."qs-6.3.0" ]; }) @@ -19273,7 +19797,7 @@ in sources."semver-5.3.0" sources."shelljs-0.5.3" sources."unorm-1.4.1" - sources."big-integer-1.6.16" + sources."big-integer-1.6.17" sources."sax-0.3.5" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -19324,9 +19848,11 @@ in sources."glob-7.0.6" sources."nopt-3.0.6" sources."npm-package-arg-4.1.1" + sources."readable-stream-2.1.5" sources."request-2.74.0" sources."semver-5.1.1" sources."tar-2.2.1" + sources."isarray-1.0.0" sources."form-data-1.0.1" ]; }) @@ -19417,7 +19943,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.1.5" // { + (sources."readable-stream-2.2.2" // { dependencies = [ sources."isarray-1.0.0" ]; @@ -19425,7 +19951,7 @@ in sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.4.1" + sources."stream-http-2.5.0" sources."string_decoder-0.10.31" sources."subarg-1.0.0" (sources."syntax-error-1.1.6" // { @@ -19488,9 +20014,9 @@ in sources."parse-asn1-5.0.0" sources."brorand-1.0.6" sources."hash.js-1.0.3" - sources."asn1.js-4.8.1" + sources."asn1.js-4.9.0" sources."ripemd160-1.0.1" - sources."sha.js-2.4.5" + sources."sha.js-2.4.8" sources."miller-rabin-4.0.0" sources."function-bind-1.1.0" sources."is-buffer-1.1.4" @@ -19527,13 +20053,13 @@ in sources."ansi-regex-2.0.0" sources."accepts-1.3.3" sources."bytes-2.3.0" - sources."compressible-2.0.8" + sources."compressible-2.0.9" sources."debug-2.2.0" sources."on-headers-1.0.1" sources."vary-1.1.0" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."negotiator-0.6.1" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."ms-0.7.1" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -19556,21 +20082,17 @@ in sources."range-parser-1.2.0" sources."send-0.14.1" sources."serve-static-1.11.1" - sources."type-is-1.6.13" + sources."type-is-1.6.14" sources."utils-merge-1.0.0" - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" sources."ipaddr.js-1.1.1" sources."destroy-1.0.4" - (sources."http-errors-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - ]; - }) + sources."http-errors-1.5.1" sources."mime-1.3.4" - sources."setprototypeof-1.0.1" + sources."setprototypeof-1.0.2" sources."media-typer-0.3.0" sources."npm-package-arg-4.2.0" sources."promzard-0.3.0" @@ -19586,7 +20108,7 @@ in sources."mute-stream-0.0.6" sources."json-parse-helpfulerror-1.0.3" sources."normalize-package-data-2.3.5" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."jju-1.3.0" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" @@ -19633,7 +20155,7 @@ in sources."npm-install-checks-1.0.7" (sources."npm-registry-client-7.2.1" // { dependencies = [ - sources."request-2.76.0" + sources."request-2.79.0" sources."qs-6.3.0" ]; }) @@ -19654,7 +20176,7 @@ in sources."text-table-0.2.0" sources."uid-number-0.0.6" sources."umask-1.1.0" - sources."which-1.2.11" + sources."which-1.2.12" sources."write-file-atomic-1.1.4" sources."imurmurhash-0.1.4" sources."wcwidth-1.0.1" @@ -19678,18 +20200,18 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."commander-2.9.0" @@ -19747,9 +20269,10 @@ in sources."isarray-1.0.0" ]; }) + sources."node-uuid-1.4.7" (sources."async-2.1.2" // { dependencies = [ - sources."lodash-4.16.4" + sources."lodash-4.17.2" ]; }) sources."isexe-1.1.2" @@ -19762,12 +20285,15 @@ in }) sources."bplist-creator-0.0.4" sources."stream-buffers-0.2.6" - sources."configstore-1.4.0" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) sources."inquirer-0.10.1" sources."lodash.debounce-3.1.1" sources."object-assign-4.1.0" sources."os-name-1.0.3" - sources."uuid-2.0.3" sources."xdg-basedir-2.0.0" sources."ansi-escapes-1.4.0" sources."cli-cursor-1.0.2" @@ -19783,7 +20309,7 @@ in sources."restore-cursor-1.0.1" sources."exit-hook-1.1.1" sources."onetime-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."lodash._getnative-3.9.1" @@ -19927,9 +20453,9 @@ in sources."cookie-0.1.2" sources."merge-descriptors-0.0.2" sources."utils-merge-1.0.0" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."negotiator-0.5.3" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."ms-0.7.0" sources."crc-3.2.1" sources."ee-first-1.1.0" @@ -19953,7 +20479,7 @@ in }) sources."binaryheap-0.0.3" sources."buffercursor-0.0.12" - sources."verror-1.8.1" + sources."verror-1.9.0" sources."assert-plus-1.0.0" sources."core-util-is-1.0.2" sources."extsprintf-1.3.0" @@ -19998,7 +20524,7 @@ in }; dependencies = [ sources."JSONStream-0.8.4" - sources."basic-auth-1.0.4" + sources."basic-auth-1.1.0" sources."cookie-signature-1.0.6" sources."cors-2.8.1" sources."docker-parse-image-3.0.1" @@ -20055,7 +20581,7 @@ in sources."readable-stream-2.0.6" ]; }) - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; }) @@ -20079,7 +20605,7 @@ in (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; }) @@ -20090,9 +20616,9 @@ in sources."util-deprecate-1.0.2" sources."level-packager-0.18.0" sources."bytewise-1.1.0" - sources."ltgt-2.1.2" + sources."ltgt-2.1.3" sources."pull-level-2.0.3" - sources."pull-stream-3.4.5" + sources."pull-stream-3.5.0" sources."typewiselite-1.0.0" sources."bytewise-core-1.2.3" sources."typewise-1.0.3" @@ -20149,10 +20675,10 @@ in sources."async-2.0.1" sources."aws4-1.5.0" sources."optimist-0.6.1" - sources."request-2.76.0" + sources."request-2.79.0" sources."jsonparse-1.2.0" sources."through-2.3.8" - sources."lodash-4.16.4" + sources."lodash-4.17.2" sources."wordwrap-0.0.3" sources."minimist-0.0.10" sources."aws-sign2-0.6.0" @@ -20160,20 +20686,20 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -20223,7 +20749,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" ]; buildInputs = globalBuildInputs; @@ -20244,7 +20770,7 @@ in }; dependencies = [ sources."chalk-1.1.3" - sources."got-6.5.0" + sources."got-6.6.3" sources."has-ansi-2.0.0" sources."lodash.debounce-4.0.8" sources."log-update-1.0.2" @@ -20263,7 +20789,7 @@ in sources."is-stream-1.1.0" sources."lowercase-keys-1.0.0" sources."node-status-codes-2.0.1" - sources."timed-out-2.0.0" + sources."timed-out-3.0.0" sources."unzip-response-2.0.1" sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" @@ -20302,7 +20828,7 @@ in sources."path-exists-2.1.0" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -20327,16 +20853,16 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.9.0"; + version = "3.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.9.0.tgz"; - sha1 = "68c8fa86b1e0a3f038040f3b5808b7508c128f8e"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz"; + sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7"; }; dependencies = [ sources."babel-code-frame-6.16.0" sources."chalk-1.1.3" sources."concat-stream-1.5.2" - sources."debug-2.2.0" + sources."debug-2.3.3" sources."doctrine-1.5.0" sources."escope-3.6.0" sources."espree-3.3.2" @@ -20344,23 +20870,23 @@ in sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."glob-7.1.1" - sources."globals-9.12.0" + sources."globals-9.14.0" sources."ignore-3.2.0" sources."imurmurhash-0.1.4" sources."inquirer-0.12.0" sources."is-my-json-valid-2.15.0" sources."is-resolvable-1.0.0" - sources."js-yaml-3.6.1" + sources."js-yaml-3.7.0" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.16.4" + sources."lodash-4.17.2" sources."mkdirp-0.5.1" sources."natural-compare-1.4.0" sources."optionator-0.8.2" sources."path-is-inside-1.0.2" sources."pluralize-1.2.1" sources."progress-1.1.8" - sources."require-uncached-1.0.2" + sources."require-uncached-1.0.3" sources."shelljs-0.7.5" sources."strip-bom-3.0.0" sources."strip-json-comments-1.0.4" @@ -20387,7 +20913,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."es6-map-0.1.4" sources."es6-weak-map-2.0.1" (sources."esrecurse-4.1.0" // { @@ -20411,7 +20937,7 @@ in sources."flat-cache-1.2.1" sources."circular-json-0.3.1" sources."del-2.2.2" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."write-0.2.1" sources."globby-5.0.0" sources."is-path-cwd-1.0.0" @@ -20445,7 +20971,7 @@ in sources."restore-cursor-1.0.1" sources."exit-hook-1.1.1" sources."onetime-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."mute-stream-0.0.5" sources."number-is-nan-1.0.1" @@ -20471,7 +20997,7 @@ in sources."interpret-1.0.1" sources."rechoir-0.6.2" sources."resolve-1.1.7" - sources."ajv-4.8.2" + sources."ajv-4.9.0" sources."ajv-keywords-1.1.1" sources."slice-ansi-0.0.4" sources."co-4.6.0" @@ -20511,7 +21037,7 @@ in dependencies = [ sources."bower-endpoint-parser-0.2.1" sources."bower-logger-0.2.1" - sources."bower-1.7.9" + sources."bower-1.8.0" sources."glob-3.2.11" sources."inherits-2.0.3" sources."minimatch-0.3.0" @@ -20528,10 +21054,10 @@ in forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; - version = "0.15.2"; + version = "0.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/forever/-/forever-0.15.2.tgz"; - sha1 = "fbf21a791ac76bc1a9149a322bc177f338cf5cf9"; + url = "https://registry.npmjs.org/forever/-/forever-0.15.3.tgz"; + sha1 = "77d9d7e15fd2f511ad9d84a110c7dd8fc8ecebc2"; }; dependencies = [ (sources."cliff-0.1.10" // { @@ -20546,7 +21072,7 @@ in sources."optimist-0.6.0" ]; }) - sources."forever-monitor-1.6.0" + sources."forever-monitor-1.7.1" (sources."nconf-0.6.9" // { dependencies = [ sources."async-0.2.9" @@ -20591,7 +21117,7 @@ in sources."revalidator-0.1.8" sources."mute-stream-0.0.6" sources."chokidar-1.6.1" - sources."minimatch-2.0.10" + sources."minimatch-3.0.3" sources."ps-tree-0.0.3" sources."anymatch-1.3.0" sources."async-each-1.0.1" @@ -20599,12 +21125,8 @@ in sources."inherits-2.0.3" sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" - (sources."readdirp-2.1.0" // { - dependencies = [ - sources."minimatch-3.0.3" - ]; - }) - sources."fsevents-1.0.14" + sources."readdirp-2.1.0" + sources."fsevents-1.0.15" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -20639,12 +21161,9 @@ in sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.7.0" - sources."graceful-fs-4.1.9" - sources."readable-stream-2.1.5" + sources."graceful-fs-4.1.10" + sources."readable-stream-2.2.2" sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" @@ -20658,25 +21177,26 @@ in ]; }) sources."nopt-3.0.6" - sources."npmlog-4.0.0" + sources."npmlog-4.0.1" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.76.0" + sources."request-2.79.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ sources."once-1.3.3" + sources."readable-stream-2.1.5" ]; }) sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { + (sources."gauge-2.7.1" // { dependencies = [ sources."object-assign-4.1.0" ]; @@ -20690,7 +21210,7 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" @@ -20703,20 +21223,20 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -20764,13 +21284,9 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" - (sources."glob-7.1.1" // { - dependencies = [ - sources."minimatch-3.0.3" - ]; - }) + sources."glob-7.1.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."once-1.4.0" @@ -20778,13 +21294,12 @@ in sources."block-stream-0.0.9" sources."fstream-1.0.10" sources."debug-2.2.0" - (sources."fstream-ignore-1.0.5" // { - dependencies = [ - sources."minimatch-3.0.3" - ]; - }) + sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" sources."ms-0.7.1" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" (sources."event-stream-0.5.3" // { dependencies = [ sources."optimist-0.2.8" @@ -20883,7 +21398,7 @@ in sources."xml2js-0.4.17" sources."msgpack-1.0.2" sources."character-parser-1.2.1" - (sources."clean-css-3.4.20" // { + (sources."clean-css-3.4.21" // { dependencies = [ sources."commander-2.8.1" ]; @@ -20913,7 +21428,7 @@ in }) sources."source-map-0.4.4" sources."graceful-readlink-1.0.1" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" sources."acorn-2.7.0" sources."is-promise-2.1.0" sources."promise-6.1.0" @@ -20948,7 +21463,7 @@ in sources."weak-map-1.0.5" sources."sax-1.2.1" sources."xmlbuilder-4.2.1" - sources."lodash-4.16.4" + sources."lodash-4.17.2" sources."nan-2.4.0" ]; buildInputs = globalBuildInputs; @@ -20974,8 +21489,8 @@ in sources."interpret-1.0.1" sources."liftoff-2.3.0" sources."minimist-1.2.0" - sources."orchestrator-0.3.7" - sources."pretty-hrtime-1.0.2" + sources."orchestrator-0.3.8" + sources."pretty-hrtime-1.0.3" sources."semver-4.3.6" sources."tildify-1.2.0" sources."v8flags-2.0.11" @@ -20997,7 +21512,7 @@ in sources."ansi-regex-2.0.0" sources."array-differ-1.0.0" sources."array-uniq-1.0.3" - sources."beeper-1.1.0" + sources."beeper-1.1.1" sources."dateformat-1.0.12" sources."fancy-log-1.2.0" sources."gulplog-1.0.0" @@ -21048,7 +21563,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -21142,7 +21657,7 @@ in sources."is-windows-0.2.0" sources."ini-1.3.4" sources."osenv-0.1.3" - sources."which-1.2.11" + sources."which-1.2.12" sources."os-tmpdir-1.0.2" sources."isexe-1.1.2" sources."lodash.assignwith-4.2.0" @@ -21319,12 +21834,12 @@ in sources."escodegen-1.8.1" sources."esprima-2.7.3" sources."glob-5.0.15" - (sources."handlebars-4.0.5" // { + (sources."handlebars-4.0.6" // { dependencies = [ sources."source-map-0.4.4" ]; }) - sources."js-yaml-3.6.1" + sources."js-yaml-3.7.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -21334,7 +21849,7 @@ in sources."once-1.4.0" sources."resolve-1.1.7" sources."supports-color-3.1.2" - sources."which-1.2.11" + sources."which-1.2.12" sources."wordwrap-1.0.0" sources."estraverse-1.9.3" sources."esutils-2.0.2" @@ -21345,7 +21860,7 @@ in sources."type-check-0.3.2" sources."levn-0.3.0" sources."fast-levenshtein-2.0.5" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."minimatch-3.0.3" @@ -21500,10 +22015,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; - sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; }; dependencies = [ sources."argparse-1.0.9" @@ -21533,7 +22048,7 @@ in sources."colors-1.1.2" (sources."combine-lists-1.0.1" // { dependencies = [ - sources."lodash-4.16.4" + sources."lodash-4.17.2" ]; }) sources."connect-3.5.0" @@ -21549,7 +22064,7 @@ in ]; }) sources."glob-7.1.1" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."http-proxy-1.15.2" sources."isbinaryfile-3.0.1" sources."lodash-3.10.1" @@ -21574,21 +22089,21 @@ in sources."content-type-1.0.2" sources."debug-2.2.0" sources."depd-1.1.0" - sources."http-errors-1.5.0" + sources."http-errors-1.5.1" sources."iconv-lite-0.4.13" sources."on-finished-2.3.0" sources."qs-6.2.0" sources."raw-body-2.1.7" - sources."type-is-1.6.13" + sources."type-is-1.6.14" sources."ms-0.7.1" - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.12" - sources."mime-db-1.24.0" + sources."mime-types-2.1.13" + sources."mime-db-1.25.0" sources."anymatch-1.3.0" sources."async-each-1.0.1" sources."glob-parent-2.0.0" @@ -21596,7 +22111,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.0.14" + sources."fsevents-1.0.15" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -21631,7 +22146,7 @@ in sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.7.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -21642,25 +22157,29 @@ in sources."node-pre-gyp-0.6.31" sources."mkdirp-0.5.1" sources."nopt-3.0.6" - sources."npmlog-4.0.0" + sources."npmlog-4.0.1" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - (sources."request-2.76.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."qs-6.3.0" ]; }) sources."semver-5.3.0" sources."tar-2.2.1" - sources."tar-pack-3.3.0" + (sources."tar-pack-3.3.0" // { + dependencies = [ + sources."readable-stream-2.1.5" + ]; + }) sources."minimist-0.0.8" sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.1" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.0.4" @@ -21671,7 +22190,7 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" @@ -21684,18 +22203,18 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -21911,9 +22430,11 @@ in }) sources."finalhandler-0.4.0" sources."http-errors-1.3.1" - (sources."method-override-2.3.6" // { + (sources."method-override-2.3.7" // { dependencies = [ + sources."debug-2.3.3" sources."vary-1.1.0" + sources."ms-0.7.2" ]; }) sources."morgan-1.6.1" @@ -21921,8 +22442,16 @@ in sources."on-headers-1.0.1" sources."pause-0.1.0" sources."qs-4.0.0" - sources."response-time-2.3.1" - sources."serve-favicon-2.3.0" + (sources."response-time-2.3.2" // { + dependencies = [ + sources."depd-1.1.0" + ]; + }) + (sources."serve-favicon-2.3.2" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) (sources."serve-index-1.7.3" // { dependencies = [ sources."escape-html-1.0.3" @@ -21936,7 +22465,7 @@ in sources."statuses-1.2.1" ]; }) - sources."type-is-1.6.13" + sources."type-is-1.6.14" sources."vhost-3.0.2" sources."iconv-lite-0.4.11" sources."on-finished-2.3.0" @@ -21949,20 +22478,20 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."accepts-1.2.13" - sources."compressible-2.0.8" - sources."mime-types-2.1.12" + sources."compressible-2.0.9" + sources."mime-types-2.1.13" sources."negotiator-0.5.3" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."ms-0.7.1" - sources."csrf-3.0.3" - sources."base64-url-1.2.2" + sources."csrf-3.0.4" + sources."base64-url-1.3.3" sources."rndm-1.2.0" sources."tsscmp-1.0.5" - sources."uid-safe-2.1.1" + sources."uid-safe-2.1.3" sources."random-bytes-1.0.0" sources."crc-3.3.0" sources."inherits-2.0.3" - sources."statuses-1.3.0" + sources."statuses-1.3.1" sources."readable-stream-1.1.14" sources."stream-counter-0.2.0" sources."core-util-is-1.0.2" @@ -21984,7 +22513,7 @@ in sources."uid2-0.0.3" sources."sax-1.2.1" sources."xmlbuilder-4.2.1" - sources."lodash-4.16.4" + sources."lodash-4.17.2" ]; buildInputs = globalBuildInputs; meta = { @@ -22024,7 +22553,7 @@ in sources."isarray-0.0.1" ]; }) - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."gulp-sourcemaps-1.6.0" sources."is-valid-glob-0.3.0" sources."lazystream-1.0.0" @@ -22211,7 +22740,7 @@ in sources."nijs-0.0.23" sources."chownr-1.0.1" sources."concat-stream-1.5.2" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."mkdirp-0.5.1" sources."normalize-package-data-2.3.5" (sources."npm-package-arg-4.2.0" // { @@ -22220,7 +22749,7 @@ in ]; }) sources."once-1.4.0" - sources."request-2.76.0" + sources."request-2.79.0" sources."retry-0.8.0" sources."rimraf-2.5.4" sources."slide-1.1.6" @@ -22248,20 +22777,20 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -22311,7 +22840,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -22333,7 +22862,7 @@ in sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."config-chain-1.1.11" @@ -22377,18 +22906,18 @@ in dependencies = [ sources."fstream-1.0.10" sources."glob-7.1.1" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."minimatch-3.0.3" sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."npmlog-3.1.2" sources."osenv-0.1.3" sources."path-array-1.0.1" - sources."request-2.76.0" + sources."request-2.79.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."which-1.2.11" + sources."which-1.2.12" sources."inherits-2.0.3" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -22405,7 +22934,7 @@ in sources."gauge-2.6.0" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -22420,16 +22949,16 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."array-index-1.0.0" - sources."debug-2.2.0" + sources."debug-2.3.3" sources."es6-symbol-3.1.0" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."d-0.1.1" sources."es5-ext-0.10.12" sources."es6-iterator-2.0.0" @@ -22439,20 +22968,20 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -22500,7 +23029,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" sources."isexe-1.1.2" @@ -22524,17 +23053,22 @@ in dependencies = [ sources."async-0.9.2" sources."biased-opener-0.2.8" - sources."debug-2.2.0" - sources."express-4.14.0" + sources."debug-2.3.3" + (sources."express-4.14.0" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) sources."glob-5.0.15" sources."path-is-absolute-1.0.1" sources."rc-1.1.6" sources."semver-4.3.6" - sources."serve-favicon-2.3.0" + sources."serve-favicon-2.3.2" sources."strong-data-uri-1.0.4" sources."v8-debug-0.7.7" sources."v8-profiler-5.6.5" - sources."which-1.2.11" + sources."which-1.2.12" sources."ws-1.1.1" sources."yargs-3.32.0" sources."browser-launcher2-0.4.6" @@ -22572,7 +23106,7 @@ in sources."bplist-parser-0.1.1" sources."meow-3.7.0" sources."untildify-2.1.0" - sources."big-integer-1.6.16" + sources."big-integer-1.6.17" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" @@ -22600,7 +23134,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -22613,7 +23147,7 @@ in sources."is-finite-1.0.2" sources."number-is-nan-1.0.1" sources."get-stdin-4.0.1" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."accepts-1.3.3" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -22624,7 +23158,12 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - sources."finalhandler-0.5.0" + (sources."finalhandler-0.5.0" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) sources."fresh-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -22634,24 +23173,29 @@ in sources."proxy-addr-1.1.2" sources."qs-6.2.0" sources."range-parser-1.2.0" - sources."send-0.14.1" + (sources."send-0.14.1" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) sources."serve-static-1.11.1" - sources."type-is-1.6.13" + sources."type-is-1.6.14" sources."utils-merge-1.0.0" sources."vary-1.1.0" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."negotiator-0.6.1" - sources."mime-db-1.24.0" - sources."statuses-1.3.0" + sources."mime-db-1.25.0" + sources."statuses-1.3.1" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" sources."ipaddr.js-1.1.1" sources."destroy-1.0.4" - sources."http-errors-1.5.0" + sources."http-errors-1.5.1" sources."mime-1.3.4" - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" sources."media-typer-0.3.0" sources."inflight-1.0.6" sources."minimatch-3.0.3" @@ -22673,8 +23217,8 @@ in ]; }) sources."nopt-3.0.6" - sources."npmlog-4.0.0" - (sources."request-2.76.0" // { + sources."npmlog-4.0.1" + (sources."request-2.79.0" // { dependencies = [ sources."qs-6.3.0" ]; @@ -22682,18 +23226,21 @@ in sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ + sources."debug-2.2.0" sources."once-1.3.3" + sources."readable-stream-2.1.5" sources."rimraf-2.5.4" + sources."ms-0.7.1" sources."glob-7.1.1" ]; }) sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.1" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -22705,7 +23252,7 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."ansi-regex-2.0.0" sources."aws-sign2-0.6.0" @@ -22714,18 +23261,18 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -22805,33 +23352,34 @@ in dependencies = [ sources."mkdirp-0.5.1" sources."nopt-3.0.6" - sources."npmlog-4.0.0" + sources."npmlog-4.0.1" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.76.0" + sources."request-2.79.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ sources."once-1.3.3" + sources."readable-stream-2.1.5" ]; }) sources."minimist-0.0.8" sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.1" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -22843,7 +23391,7 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" @@ -22856,20 +23404,20 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -22917,7 +23465,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -22931,7 +23479,7 @@ in sources."concat-map-0.0.1" sources."block-stream-0.0.9" sources."fstream-1.0.10" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."debug-2.2.0" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" @@ -22955,7 +23503,11 @@ in }; dependencies = [ sources."chokidar-1.6.1" - sources."debug-2.2.0" + (sources."debug-2.3.3" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) sources."es6-promise-3.3.1" sources."ignore-by-default-1.0.1" sources."lodash.defaults-3.1.2" @@ -22976,7 +23528,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.0.14" + sources."fsevents-1.0.15" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -23011,8 +23563,8 @@ in sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.7.0" - sources."graceful-fs-4.1.9" - sources."readable-stream-2.1.5" + sources."graceful-fs-4.1.10" + sources."readable-stream-2.2.2" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -23023,26 +23575,28 @@ in sources."node-pre-gyp-0.6.31" sources."mkdirp-0.5.1" sources."nopt-3.0.6" - sources."npmlog-4.0.0" + sources."npmlog-4.0.1" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.76.0" + sources."request-2.79.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ + sources."debug-2.2.0" sources."once-1.3.3" + sources."readable-stream-2.1.5" ]; }) sources."minimist-0.0.8" sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.1" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.0.4" @@ -23053,7 +23607,7 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" @@ -23066,20 +23620,20 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -23127,7 +23681,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -23161,7 +23715,11 @@ in sources."pause-stream-0.0.11" sources."split-0.3.3" sources."stream-combiner-0.0.4" - sources."configstore-1.4.0" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) sources."is-npm-1.0.0" sources."latest-version-1.0.1" sources."repeating-1.1.3" @@ -23169,7 +23727,6 @@ in sources."string-length-1.0.1" sources."os-tmpdir-1.0.2" sources."osenv-0.1.3" - sources."uuid-2.0.3" sources."write-file-atomic-1.2.0" sources."xdg-basedir-2.0.0" sources."os-homedir-1.0.2" @@ -23255,17 +23812,17 @@ in sources."when-3.7.7" sources."ws-0.8.1" sources."xml2js-0.4.17" - sources."node-red-node-feedparser-0.1.6" - sources."node-red-node-email-0.1.11" - (sources."node-red-node-twitter-0.1.7" // { + sources."node-red-node-feedparser-0.1.7" + sources."node-red-node-email-0.1.12" + (sources."node-red-node-twitter-0.1.9" // { dependencies = [ - sources."request-2.76.0" - sources."form-data-2.1.1" + sources."request-2.79.0" + sources."form-data-2.1.2" sources."qs-6.3.0" ]; }) - sources."node-red-node-rbe-0.1.5" - sources."node-red-node-serialport-0.4.0" + sources."node-red-node-rbe-0.1.6" + sources."node-red-node-serialport-0.4.1" (sources."bcrypt-0.8.7" // { dependencies = [ sources."nan-2.3.5" @@ -23275,18 +23832,18 @@ in sources."content-type-1.0.2" sources."debug-2.2.0" sources."depd-1.1.0" - sources."http-errors-1.5.0" + sources."http-errors-1.5.1" sources."iconv-lite-0.4.13" sources."on-finished-2.3.0" sources."qs-6.2.0" - sources."type-is-1.6.13" + sources."type-is-1.6.14" sources."ms-0.7.1" - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" sources."ee-first-1.1.1" - sources."mime-types-2.1.12" - sources."mime-db-1.24.0" + sources."mime-types-2.1.13" + sources."mime-db-1.25.0" sources."css-select-1.2.0" (sources."dom-serializer-0.1.0" // { dependencies = [ @@ -23313,7 +23870,7 @@ in sources."nth-check-1.0.1" sources."domelementtype-1.3.0" sources."domhandler-2.3.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -23323,8 +23880,8 @@ in sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."vary-1.1.0" - sources."moment-timezone-0.5.7" - sources."moment-2.15.2" + sources."moment-timezone-0.5.9" + sources."moment-2.16.0" sources."accepts-1.3.3" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -23349,7 +23906,7 @@ in sources."destroy-1.0.4" sources."mime-1.3.4" sources."stream-consume-0.1.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" @@ -23365,7 +23922,7 @@ in sources."concat-map-0.0.1" sources."async-0.1.22" sources."retry-0.6.1" - sources."cookies-0.6.1" + sources."cookies-0.6.2" sources."i18next-client-1.10.3" sources."json5-0.2.0" sources."keygrip-1.0.1" @@ -23393,7 +23950,7 @@ in sources."pump-1.0.1" sources."reinterval-1.1.0" sources."split2-2.1.0" - (sources."websocket-stream-3.3.0" // { + (sources."websocket-stream-3.3.3" // { dependencies = [ sources."ws-1.1.1" ]; @@ -23525,7 +24082,7 @@ in sources."nan-2.4.0" sources."sax-1.2.1" sources."xmlbuilder-4.2.1" - sources."lodash-4.16.4" + sources."lodash-4.17.2" (sources."feedparser-1.1.3" // { dependencies = [ sources."sax-0.6.1" @@ -23649,17 +24206,23 @@ in ]; }) sources."encoding-0.1.12" - sources."uue-3.0.0" + sources."uue-3.1.0" sources."utf7-1.0.2" sources."twitter-ng-0.6.2" sources."oauth-0.9.14" + sources."uuid-3.0.0" sources."asynckit-0.4.0" - sources."serialport-4.0.3" + (sources."serialport-4.0.6" // { + dependencies = [ + sources."debug-2.3.3" + sources."ms-0.7.2" + ]; + }) sources."lie-3.1.0" (sources."node-pre-gyp-0.6.31" // { dependencies = [ - sources."request-2.76.0" - sources."form-data-2.1.1" + sources."request-2.79.0" + sources."form-data-2.1.2" sources."qs-6.3.0" ]; }) @@ -23670,17 +24233,18 @@ in sources."minimist-0.0.8" ]; }) - sources."npmlog-4.0.0" + sources."npmlog-4.0.1" sources."rc-1.1.6" sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ sources."once-1.3.3" + sources."readable-stream-2.1.5" ]; }) sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.1" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.0.4" @@ -23690,7 +24254,7 @@ in sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."deep-extend-0.4.1" @@ -23762,14 +24326,14 @@ in sources."range-parser-0.0.4" sources."mkdirp-0.3.5" sources."cookie-0.0.5" - sources."buffer-crc32-0.2.5" + sources."buffer-crc32-0.2.6" sources."fresh-0.1.0" sources."methods-0.0.1" sources."send-0.1.0" sources."cookie-signature-1.0.1" - (sources."debug-2.2.0" // { + (sources."debug-2.3.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."qs-0.5.1" @@ -23821,7 +24385,7 @@ in sources."xoauth2-0.1.8" sources."wordwrap-0.0.3" sources."minimist-0.0.10" - (sources."raw-socket-1.5.0" // { + (sources."raw-socket-1.5.1" // { dependencies = [ sources."nan-2.3.5" ]; @@ -23841,12 +24405,13 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "3.10.9"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz"; - sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3"; + url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz"; + sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae"; }; dependencies = [ + sources."JSONStream-1.2.1" sources."abbrev-1.0.9" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" @@ -23864,7 +24429,7 @@ in sources."fstream-1.0.10" sources."fstream-npm-1.2.0" sources."glob-7.1.1" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -23882,6 +24447,7 @@ in sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" + sources."mississippi-1.2.0" sources."mkdirp-0.5.1" (sources."node-gyp-3.4.0" // { dependencies = [ @@ -23894,13 +24460,17 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-4.2.0" - (sources."npm-registry-client-7.2.1" // { + (sources."npm-registry-client-7.3.0" // { dependencies = [ sources."npmlog-3.1.2" ]; }) sources."npm-user-validate-0.1.5" - sources."npmlog-4.0.0" + (sources."npmlog-4.0.1" // { + dependencies = [ + sources."gauge-2.7.1" + ]; + }) sources."once-1.4.0" sources."opener-1.4.2" sources."osenv-0.1.3" @@ -23916,13 +24486,20 @@ in sources."read-package-tree-5.1.5" sources."readable-stream-2.1.5" sources."realize-package-specifier-3.0.3" - sources."request-2.75.0" + sources."request-2.78.0" sources."retry-0.10.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."sha-2.0.1" sources."slide-1.1.6" sources."sorted-object-2.0.1" + (sources."sorted-union-stream-2.1.3" // { + dependencies = [ + sources."from2-1.3.0" + sources."readable-stream-1.1.14" + sources."isarray-0.0.1" + ]; + }) sources."strip-ansi-3.0.1" sources."tar-2.2.1" sources."text-table-0.2.0" @@ -23931,7 +24508,7 @@ in sources."unique-filename-1.1.0" sources."unpipe-1.0.0" sources."validate-npm-package-name-2.2.2" - sources."which-1.2.11" + sources."which-1.2.12" sources."wrappy-1.0.2" sources."write-file-atomic-1.2.0" sources."ansi-regex-2.0.0" @@ -23945,6 +24522,8 @@ in sources."lodash.restparam-3.6.1" sources."readdir-scoped-modules-1.0.2" sources."validate-npm-package-license-3.0.1" + sources."jsonparse-1.2.0" + sources."through-2.3.8" sources."wcwidth-1.0.1" sources."defaults-1.0.3" sources."clone-1.0.2" @@ -23959,6 +24538,40 @@ in sources."promzard-0.3.0" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + (sources."duplexify-3.5.0" // { + dependencies = [ + sources."end-of-stream-1.0.0" + sources."once-1.3.3" + ]; + }) + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."flush-write-stream-1.0.2" + sources."from2-2.3.0" + sources."pump-1.0.1" + sources."pumpify-1.3.5" + sources."stream-each-1.2.0" + (sources."through2-2.0.1" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + sources."typedarray-0.0.6" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."stream-shift-1.0.0" + sources."xtend-4.0.1" sources."minimist-0.0.8" sources."path-array-1.0.1" sources."are-we-there-yet-1.1.2" @@ -23971,29 +24584,18 @@ in sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."array-index-1.0.0" - sources."debug-2.2.0" + sources."debug-2.3.3" sources."es6-symbol-3.1.0" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."d-0.1.1" sources."es5-ext-0.10.12" sources."es6-iterator-2.0.0" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" - (sources."concat-stream-1.5.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - ]; - }) - sources."typedarray-0.0.6" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."mute-stream-0.0.6" @@ -24003,26 +24605,21 @@ in sources."buffer-shims-1.0.0" sources."aws-sign2-0.6.0" sources."aws4-1.5.0" - (sources."bl-1.1.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - ]; - }) sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.0.0" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.2.1" + sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -24040,7 +24637,6 @@ in sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.0" - sources."xtend-4.0.1" sources."is-property-1.0.2" sources."pinkie-2.0.4" sources."hoek-2.16.3" @@ -24073,8 +24669,9 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" + sources."stream-iterate-1.2.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" sources."builtins-0.0.7" @@ -24131,7 +24728,7 @@ in sources."coffee-script-1.11.1" sources."underscore-1.4.4" sources."underscore.string-2.3.3" - sources."request-2.76.0" + sources."request-2.79.0" sources."graceful-fs-2.0.3" sources."slide-1.1.6" sources."chownr-0.0.2" @@ -24139,27 +24736,27 @@ in sources."rimraf-2.5.4" sources."retry-0.6.0" sources."couch-login-0.1.20" - sources."npmlog-4.0.0" + sources."npmlog-4.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.5.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -24209,7 +24806,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -24224,10 +24821,10 @@ in sources."concat-map-0.0.1" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.1" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -24241,7 +24838,7 @@ in sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" (sources."config-chain-1.1.11" // { @@ -24298,9 +24895,9 @@ in sources."find-up-1.1.2" sources."get-stdin-5.0.1" sources."json-parse-helpfulerror-1.0.3" - sources."lodash-4.16.4" + sources."lodash-4.17.2" sources."node-alias-1.0.4" - sources."npm-3.10.9" + sources."npm-3.10.10" (sources."npmi-2.0.1" // { dependencies = [ sources."semver-4.3.6" @@ -24340,7 +24937,7 @@ in sources."fstream-1.0.10" sources."fstream-npm-1.2.0" sources."glob-7.1.1" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -24376,7 +24973,11 @@ in ]; }) sources."npm-user-validate-0.1.5" - sources."npmlog-4.0.0" + (sources."npmlog-4.0.1" // { + dependencies = [ + sources."gauge-2.7.1" + ]; + }) sources."once-1.4.0" sources."opener-1.4.2" sources."osenv-0.1.3" @@ -24405,7 +25006,7 @@ in sources."unique-filename-1.1.0" sources."unpipe-1.0.0" sources."validate-npm-package-name-2.2.2" - sources."which-1.2.11" + sources."which-1.2.12" sources."wrappy-1.0.2" sources."write-file-atomic-1.2.0" sources."debuglog-1.0.1" @@ -24444,13 +25045,13 @@ in sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."array-index-1.0.0" - sources."debug-2.2.0" + sources."debug-2.3.3" sources."es6-symbol-3.1.0" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."d-0.1.1" sources."es5-ext-0.10.12" sources."es6-iterator-2.0.0" @@ -24490,7 +25091,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -24535,7 +25136,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" @@ -24562,12 +25163,11 @@ in sources."uuid-2.0.3" sources."is-obj-1.0.1" sources."package-json-2.4.0" - sources."got-5.6.0" + sources."got-5.7.1" sources."registry-auth-token-3.1.0" sources."registry-url-3.1.0" sources."create-error-class-3.0.2" sources."duplexer2-0.1.4" - sources."is-plain-obj-1.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" @@ -24575,8 +25175,8 @@ in sources."node-status-codes-1.0.0" sources."parse-json-2.2.0" sources."read-all-stream-3.1.0" - sources."timed-out-2.0.0" - sources."unzip-response-1.0.1" + sources."timed-out-3.0.0" + sources."unzip-response-1.0.2" sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" sources."error-ex-1.3.0" @@ -24598,6 +25198,357 @@ in }; production = true; }; + parsoid = nodeEnv.buildNodePackage { + name = "parsoid"; + packageName = "parsoid"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz"; + sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723"; + }; + dependencies = [ + sources."async-0.9.2" + sources."babybird-0.0.1" + (sources."body-parser-1.15.2" // { + dependencies = [ + sources."content-type-1.0.2" + ]; + }) + (sources."compression-1.6.2" // { + dependencies = [ + sources."bytes-2.3.0" + ]; + }) + sources."connect-busboy-0.0.2" + sources."content-type-git+https://github.com/wikimedia/content-type.git#master" + sources."core-js-2.4.1" + sources."diff-1.4.0" + sources."domino-1.0.27" + sources."entities-1.1.1" + (sources."express-4.14.0" // { + dependencies = [ + sources."content-type-1.0.2" + sources."finalhandler-0.5.0" + ]; + }) + sources."express-handlebars-3.0.0" + sources."finalhandler-0.5.1" + sources."gelf-stream-0.2.4" + sources."js-yaml-3.7.0" + sources."mediawiki-title-0.5.6" + sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" + sources."node-uuid-1.4.7" + sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" + sources."prfun-2.1.4" + (sources."request-2.79.0" // { + dependencies = [ + sources."qs-6.3.0" + ]; + }) + sources."semver-5.3.0" + (sources."serve-favicon-2.3.2" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) + (sources."service-runner-2.1.11" // { + dependencies = [ + sources."gelf-stream-1.1.1" + sources."yargs-5.0.0" + sources."gelfling-0.3.1" + sources."cliui-3.2.0" + sources."window-size-0.2.0" + ]; + }) + sources."simplediff-0.1.1" + (sources."yargs-4.8.1" // { + dependencies = [ + sources."cliui-3.2.0" + sources."window-size-0.2.0" + sources."yargs-parser-2.4.1" + sources."camelcase-3.0.0" + ]; + }) + sources."asap-2.0.5" + sources."is-arguments-1.0.2" + sources."bytes-2.4.0" + sources."debug-2.2.0" + sources."depd-1.1.0" + sources."http-errors-1.5.1" + sources."iconv-lite-0.4.13" + sources."on-finished-2.3.0" + sources."qs-6.2.0" + sources."raw-body-2.1.7" + sources."type-is-1.6.14" + sources."ms-0.7.1" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" + sources."ee-first-1.1.1" + sources."unpipe-1.0.0" + sources."media-typer-0.3.0" + sources."mime-types-2.1.13" + sources."mime-db-1.25.0" + sources."accepts-1.3.3" + sources."compressible-2.0.9" + sources."on-headers-1.0.1" + sources."vary-1.1.0" + sources."busboy-0.2.13" + sources."dicer-0.2.5" + sources."readable-stream-1.1.14" + sources."streamsearch-0.1.2" + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."array-flatten-1.1.1" + sources."content-disposition-0.5.1" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."encodeurl-1.0.1" + sources."escape-html-1.0.3" + sources."etag-1.7.0" + sources."fresh-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."parseurl-1.3.1" + sources."path-to-regexp-0.1.7" + sources."proxy-addr-1.1.2" + sources."range-parser-1.2.0" + sources."send-0.14.1" + sources."serve-static-1.11.1" + sources."utils-merge-1.0.0" + sources."forwarded-0.1.0" + sources."ipaddr.js-1.1.1" + sources."destroy-1.0.4" + sources."mime-1.3.4" + sources."glob-6.0.4" + sources."graceful-fs-4.1.10" + (sources."handlebars-4.0.6" // { + dependencies = [ + sources."async-1.5.2" + ]; + }) + sources."object.assign-4.0.4" + sources."promise-7.1.1" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."optimist-0.6.1" + sources."source-map-0.4.4" + (sources."uglify-js-2.7.4" // { + dependencies = [ + sources."async-0.2.10" + sources."source-map-0.5.6" + sources."yargs-3.10.0" + ]; + }) + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + sources."amdefine-1.0.1" + sources."uglify-to-browserify-1.0.2" + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + sources."wordwrap-0.0.2" + ]; + }) + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.0.4" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.4" + sources."function-bind-1.1.0" + sources."object-keys-1.0.11" + sources."define-properties-1.1.2" + sources."foreach-2.0.5" + sources."gelfling-0.2.0" + sources."argparse-1.0.9" + sources."esprima-2.7.3" + sources."sprintf-js-1.0.3" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.2" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."oauth-sign-0.8.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."punycode-1.4.1" + sources."bluebird-3.4.6" + sources."bunyan-1.8.5" + sources."bunyan-syslog-udp-0.1.0" + sources."hot-shots-4.3.1" + (sources."limitation-0.1.9" // { + dependencies = [ + sources."readable-stream-2.2.2" + sources."isarray-1.0.0" + ]; + }) + sources."dtrace-provider-0.8.0" + sources."mv-2.1.1" + sources."safe-json-stringify-1.0.3" + sources."moment-2.16.0" + sources."nan-2.4.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."ncp-2.0.0" + sources."rimraf-2.4.5" + sources."kad-git+https://github.com/gwicke/kad.git#master" + sources."clarinet-0.11.0" + sources."colors-1.1.2" + sources."hat-0.0.3" + (sources."kad-fs-0.0.4" // { + dependencies = [ + sources."readable-stream-2.2.2" + sources."isarray-1.0.0" + ]; + }) + sources."kad-localstorage-0.0.7" + (sources."kad-memstore-0.0.1" // { + dependencies = [ + sources."readable-stream-2.2.2" + sources."isarray-1.0.0" + ]; + }) + sources."lodash-3.10.1" + sources."merge-1.2.0" + (sources."msgpack5-3.4.1" // { + dependencies = [ + sources."readable-stream-2.2.2" + sources."isarray-1.0.0" + ]; + }) + sources."buffer-shims-1.0.0" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + sources."dom-storage-2.0.2" + (sources."bl-1.1.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" + ]; + }) + sources."get-caller-file-1.0.2" + sources."lodash.assign-4.2.0" + sources."os-locale-1.4.0" + sources."read-pkg-up-1.0.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + sources."string-width-1.0.2" + sources."which-module-1.0.0" + sources."y18n-3.2.1" + (sources."yargs-parser-3.2.0" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + sources."wrap-ansi-2.0.0" + sources."lcid-1.0.0" + sources."invert-kv-1.0.0" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."load-json-file-1.1.0" + sources."normalize-package-data-2.3.5" + sources."path-type-1.1.0" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."hosted-git-info-2.1.5" + sources."is-builtin-module-1.0.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."code-point-at-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Mediawiki parser for the VisualEditor."; + homepage = "https://github.com/wikimedia/parsoid#readme"; + license = "GPL-2.0+"; + }; + production = true; + }; peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; @@ -24609,9 +25560,9 @@ in dependencies = [ sources."airplayer-2.0.0" sources."clivas-0.2.0" - (sources."inquirer-1.2.2" // { + (sources."inquirer-1.2.3" // { dependencies = [ - sources."lodash-4.16.4" + sources."lodash-4.17.2" ]; }) sources."keypress-0.2.1" @@ -24657,7 +25608,7 @@ in sources."plist-1.2.0" sources."reverse-http-1.2.0" sources."stream-buffers-2.2.0" - sources."big-integer-1.6.16" + sources."big-integer-1.6.17" sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.0.6" @@ -24686,7 +25637,7 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.0.0" sources."string-width-1.0.2" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."array-flatten-2.1.0" @@ -24695,9 +25646,10 @@ in sources."dns-txt-2.0.2" sources."multicast-dns-6.1.0" sources."multicast-dns-service-types-1.1.0" - sources."dns-packet-1.1.0" + sources."dns-packet-1.1.1" sources."thunky-0.1.0" - sources."ip-1.1.3" + sources."ip-1.1.4" + sources."safe-buffer-5.0.1" sources."meow-3.7.0" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" @@ -24727,7 +25679,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -24759,7 +25711,7 @@ in sources."is-promise-2.1.0" sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" - sources."magnet-uri-5.1.4" + sources."magnet-uri-5.1.5" sources."parse-torrent-file-4.0.0" sources."simple-get-2.3.0" sources."thirty-two-1.0.2" @@ -24833,7 +25785,7 @@ in sources."bencode-0.8.0" ]; }) - sources."debug-2.2.0" + sources."debug-2.3.3" sources."re-emitter-1.1.3" sources."buffer-equals-1.0.4" sources."k-bucket-0.6.0" @@ -24858,7 +25810,7 @@ in sources."addr-to-ip-port-1.4.2" sources."options-0.0.6" sources."ultron-1.0.2" - sources."ms-0.7.1" + sources."ms-0.7.2" ]; buildInputs = globalBuildInputs; meta = { @@ -24871,10 +25823,10 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.0.30"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.30.tgz"; - sha1 = "858a78e9ad0bdffa91997a6f0ca0bd809320ad98"; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz"; + sha1 = "683d54067d44699b2eff8bfc793e780df2912666"; }; dependencies = [ sources."connect-multiparty-1.2.5" @@ -24889,7 +25841,11 @@ in sources."pump-1.0.1" sources."range-parser-1.2.0" sources."read-torrent-1.3.0" - sources."socket.io-0.9.17" + (sources."socket.io-1.6.0" // { + dependencies = [ + sources."debug-2.3.3" + ]; + }) (sources."torrent-stream-0.18.1" // { dependencies = [ sources."end-of-stream-0.1.5" @@ -25022,32 +25978,84 @@ in sources."boom-0.3.8" sources."cryptiles-0.1.3" sources."sntp-0.1.4" - sources."socket.io-client-0.9.16" - sources."policyfile-0.0.4" - sources."base64id-0.1.0" - sources."redis-0.7.3" - sources."uglify-js-1.2.5" - (sources."ws-0.4.32" // { + (sources."engine.io-1.8.0" // { dependencies = [ - sources."commander-2.1.0" + sources."debug-2.3.3" + sources."cookie-0.3.1" ]; }) - sources."xmlhttprequest-1.4.2" - sources."active-x-obfuscator-0.0.1" - sources."nan-1.0.0" - sources."tinycolor-0.0.1" + sources."has-binary-0.1.7" + sources."object-assign-4.1.0" + (sources."socket.io-adapter-0.5.0" // { + dependencies = [ + sources."debug-2.3.3" + ]; + }) + (sources."socket.io-client-1.6.0" // { + dependencies = [ + sources."debug-2.3.3" + ]; + }) + (sources."socket.io-parser-2.3.1" // { + dependencies = [ + sources."debug-2.2.0" + sources."component-emitter-1.1.2" + sources."ms-0.7.1" + ]; + }) + sources."ms-0.7.2" + (sources."accepts-1.3.3" // { + dependencies = [ + sources."mime-types-2.1.13" + sources."negotiator-0.6.1" + sources."mime-db-1.25.0" + ]; + }) + sources."base64id-0.1.0" + (sources."engine.io-parser-1.3.1" // { + dependencies = [ + sources."has-binary-0.1.6" + ]; + }) + sources."ws-1.1.1" + sources."after-0.8.1" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.5" + sources."blob-0.0.4" + sources."wtf-8-1.0.0" sources."options-0.0.6" - sources."zeparser-0.0.5" + sources."ultron-1.0.2" + sources."backo2-1.0.2" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + (sources."engine.io-client-1.8.0" // { + dependencies = [ + sources."debug-2.3.3" + ]; + }) + sources."indexof-0.0.1" + sources."object-component-0.0.3" + sources."parseuri-0.0.5" + sources."to-array-0.1.4" + sources."component-inherit-0.0.3" + sources."has-cors-1.1.0" + sources."parsejson-0.0.3" + sources."parseqs-0.0.5" + sources."xmlhttprequest-ssl-1.5.3" + sources."yeast-0.1.2" + sources."better-assert-1.0.2" + sources."callsite-1.0.0" + sources."json3-3.3.2" sources."bitfield-0.1.0" (sources."bittorrent-dht-3.2.6" // { dependencies = [ - sources."debug-2.2.0" + sources."debug-2.3.3" ]; }) (sources."bittorrent-tracker-2.12.1" // { dependencies = [ sources."bencode-0.6.0" - sources."debug-2.2.0" + sources."debug-2.3.3" ]; }) sources."bncode-0.5.3" @@ -25056,7 +26064,7 @@ in sources."ip-0.3.3" (sources."ip-set-1.0.1" // { dependencies = [ - sources."ip-1.1.3" + sources."ip-1.1.4" ]; }) sources."peer-wire-swarm-0.9.2" @@ -25071,9 +26079,8 @@ in sources."run-parallel-1.1.6" sources."simple-get-1.4.3" sources."string2compact-1.2.2" - sources."ms-0.7.1" sources."ip-regex-1.0.3" - sources."unzip-response-1.0.1" + sources."unzip-response-1.0.2" sources."ipaddr.js-1.2.0" sources."bn.js-1.3.0" sources."extend.js-0.0.2" @@ -25098,7 +26105,7 @@ in sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."which-1.2.11" + sources."which-1.2.12" sources."isexe-1.1.2" ]; buildInputs = globalBuildInputs; @@ -25125,7 +26132,7 @@ in sources."progress-1.1.8" sources."request-2.67.0" sources."request-progress-2.0.1" - sources."which-1.2.11" + sources."which-1.2.12" sources."concat-stream-1.5.0" sources."debug-0.7.4" sources."mkdirp-0.5.0" @@ -25141,7 +26148,7 @@ in sources."minimist-0.0.8" sources."fd-slicer-1.0.1" sources."pend-1.2.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" @@ -25164,7 +26171,7 @@ in sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."node-uuid-1.4.7" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" @@ -25179,8 +26186,8 @@ in sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" sources."async-2.1.2" - sources."lodash-4.16.4" - sources."mime-db-1.24.0" + sources."lodash-4.17.2" + sources."mime-db-1.25.0" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" (sources."sshpk-1.10.1" // { @@ -25257,7 +26264,7 @@ in sources."commander-2.9.0" sources."detective-4.3.2" sources."glob-5.0.15" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."iconv-lite-0.4.13" sources."mkdirp-0.5.1" sources."private-0.1.6" @@ -25280,7 +26287,7 @@ in sources."source-map-0.5.6" sources."ast-types-0.8.15" sources."base62-0.1.1" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -25340,7 +26347,7 @@ in sources."methods-0.1.0" sources."send-0.1.4" sources."cookie-signature-1.0.1" - sources."debug-2.2.0" + sources."debug-2.3.3" sources."qs-0.6.5" sources."bytes-0.2.1" sources."pause-0.0.1" @@ -25356,13 +26363,12 @@ in sources."inherits-2.0.3" sources."keypress-0.1.0" sources."mime-1.2.11" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" sources."request-2.9.203" (sources."openid-2.0.6" // { dependencies = [ - sources."request-2.76.0" - sources."node-uuid-1.4.7" + sources."request-2.79.0" sources."qs-6.3.0" ]; }) @@ -25376,7 +26382,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" (sources."har-validator-2.0.6" // { dependencies = [ sources."commander-2.9.0" @@ -25387,11 +26393,12 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -25440,7 +26447,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."punycode-1.4.1" sources."events.node-0.4.9" ]; @@ -25494,13 +26501,13 @@ in ]; }) sources."commander-2.9.0" - sources."js-yaml-3.6.1" - (sources."cookies-0.6.1" // { + sources."js-yaml-3.7.0" + (sources."cookies-0.6.2" // { dependencies = [ sources."depd-1.1.0" ]; }) - (sources."request-2.76.0" // { + (sources."request-2.79.0" // { dependencies = [ sources."qs-6.3.0" ]; @@ -25509,7 +26516,7 @@ in sources."es6-shim-0.21.1" sources."semver-4.3.6" sources."minimatch-1.0.0" - sources."bunyan-1.8.4" + sources."bunyan-1.8.5" sources."handlebars-2.0.0" sources."highlight.js-8.9.1" sources."lunr-0.7.2" @@ -25518,11 +26525,10 @@ in sources."JSONStream-1.2.1" sources."mkdirp-0.5.1" sources."sinopia-htpasswd-0.4.5" - (sources."http-errors-1.5.0" // { + (sources."http-errors-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" ]; }) (sources."readable-stream-1.1.14" // { @@ -25573,12 +26579,12 @@ in sources."http-errors-1.3.1" ]; }) - sources."type-is-1.6.13" + sources."type-is-1.6.14" sources."vary-1.0.1" sources."utils-merge-1.0.0" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."negotiator-0.5.3" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."ms-0.7.1" sources."unpipe-1.0.0" sources."ee-first-1.1.1" @@ -25593,7 +26599,7 @@ in sources."raw-body-1.3.4" sources."bytes-1.0.0" sources."iconv-lite-0.4.8" - sources."compressible-2.0.8" + sources."compressible-2.0.9" sources."on-headers-1.0.1" sources."graceful-readlink-1.0.1" sources."argparse-1.0.9" @@ -25606,18 +26612,18 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."chalk-1.1.3" @@ -25668,10 +26674,10 @@ in sources."punycode-1.4.1" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" - sources."dtrace-provider-0.7.1" + sources."dtrace-provider-0.8.0" sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" - sources."moment-2.15.2" + sources."moment-2.16.0" sources."nan-2.4.0" sources."ncp-2.0.0" sources."rimraf-2.4.5" @@ -25694,7 +26700,7 @@ in }) sources."wordwrap-0.0.3" sources."source-map-0.1.43" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" sources."markdown-it-4.4.0" sources."sanitize-html-1.13.0" sources."entities-1.1.1" @@ -25703,7 +26709,7 @@ in sources."uc.micro-1.0.3" (sources."htmlparser2-3.9.2" // { dependencies = [ - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" ]; }) sources."regexp-quote-0.0.0" @@ -25751,17 +26757,17 @@ in sources."readdirp-2.1.0" sources."colors-1.0.3" sources."graceful-readlink-1.0.1" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."minimatch-3.0.3" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."set-immediate-shim-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -25846,7 +26852,7 @@ in sources."semver-4.3.6" sources."spdy-1.32.5" sources."tunnel-agent-0.4.3" - (sources."verror-1.8.1" // { + (sources."verror-1.9.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25896,7 +26902,7 @@ in ]; }) sources."json-schema-0.2.3" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."buffer-shims-1.0.0" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -25925,12 +26931,12 @@ in dependencies = [ sources."css-parse-1.7.0" sources."mkdirp-0.5.1" - sources."debug-2.2.0" + sources."debug-2.3.3" sources."sax-0.5.8" sources."glob-7.0.6" sources."source-map-0.1.43" sources."minimist-0.0.8" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -25941,7 +26947,7 @@ in sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -25993,13 +26999,13 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.0.10"; + version = "5.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.0.10.tgz"; - sha1 = "9bbae581957b33265a71774e8fd9f4766441bf1d"; + url = "https://registry.npmjs.org/titanium/-/titanium-5.0.11.tgz"; + sha1 = "dd0f7132475a5db6ea188222876d28538b47df27"; }; dependencies = [ - sources."async-1.4.2" + sources."async-2.1.2" sources."colors-1.1.2" (sources."fields-0.1.24" // { dependencies = [ @@ -26007,68 +27013,71 @@ in ]; }) sources."humanize-0.0.9" - sources."longjohn-0.2.9" - sources."moment-2.10.6" - (sources."node-appc-0.2.31" // { + sources."longjohn-0.2.11" + sources."moment-2.16.0" + (sources."node-appc-0.2.39" // { dependencies = [ - sources."request-2.61.0" - sources."semver-5.0.1" + sources."async-1.5.2" + sources."request-2.69.0" + sources."semver-5.1.0" + sources."wrench-1.5.8" ]; }) - (sources."request-2.62.0" // { + (sources."request-2.78.0" // { dependencies = [ - sources."qs-5.1.0" + sources."form-data-2.1.2" + sources."qs-6.3.0" + sources."tough-cookie-2.3.2" ]; }) - sources."semver-5.0.3" + sources."semver-5.3.0" sources."sprintf-0.1.5" sources."temp-0.8.3" - (sources."winston-1.0.2" // { + (sources."winston-1.1.2" // { dependencies = [ sources."async-1.0.0" sources."colors-1.0.3" ]; }) - sources."wrench-1.5.8" + sources."wrench-1.5.9" + sources."lodash-4.17.2" sources."keypress-0.2.1" sources."source-map-support-0.3.2" sources."source-map-0.1.32" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" sources."adm-zip-0.4.7" - sources."diff-2.1.0" - sources."node-uuid-1.4.3" + sources."diff-2.2.1" + sources."node-uuid-1.4.7" sources."optimist-0.6.1" - (sources."uglify-js-2.4.24" // { + (sources."uglify-js-2.6.1" // { dependencies = [ sources."async-0.2.10" - sources."source-map-0.1.34" + sources."source-map-0.5.6" ]; }) - sources."xmldom-0.1.19" + sources."xmldom-0.1.22" sources."wordwrap-0.0.3" sources."minimist-0.0.10" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" sources."bl-1.0.3" sources."caseless-0.11.0" + sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - sources."async-2.1.2" - ]; - }) - sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."qs-4.0.0" - sources."tunnel-agent-0.4.3" - sources."tough-cookie-2.3.2" - sources."http-signature-0.11.0" - sources."oauth-sign-0.8.2" + sources."form-data-1.0.1" + sources."har-validator-2.0.6" sources."hawk-3.1.3" - sources."aws-sign2-0.5.0" - sources."stringstream-0.0.5" - sources."combined-stream-1.0.5" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" sources."isstream-0.1.2" - sources."har-validator-1.8.0" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.13" + sources."oauth-sign-0.8.2" + sources."qs-6.0.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.2.2" + sources."tunnel-agent-0.4.3" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" sources."inherits-2.0.3" @@ -26076,21 +27085,11 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."lodash-4.16.4" - sources."mime-db-1.24.0" - sources."punycode-1.4.1" - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."ctype-0.5.3" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" sources."delayed-stream-1.0.0" - sources."bluebird-2.11.0" sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -26103,15 +27102,58 @@ in sources."jsonpointer-4.0.0" sources."xtend-4.0.1" sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.25.0" sources."uglify-to-browserify-1.0.2" - (sources."yargs-3.5.4" // { + sources."yargs-3.10.0" + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { dependencies = [ sources."wordwrap-0.0.2" ]; }) - sources."camelcase-1.2.1" sources."decamelize-1.2.0" sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.0.4" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.4" + sources."asynckit-0.4.0" + sources."punycode-1.4.1" sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" sources."cycle-1.0.3" @@ -26130,10 +27172,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.0.6"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.0.6.tgz"; - sha1 = "5385499ac9811508c2c43e0ea07a1ddca435e111"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz"; + sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd"; }; buildInputs = globalBuildInputs; meta = { @@ -26191,7 +27233,7 @@ in sources."bluebird-3.3.5" sources."blueimp-md5-2.3.1" sources."body-parser-1.15.2" - sources."color-0.11.3" + sources."color-0.11.4" sources."cookie-parser-1.4.3" sources."crossroads-0.12.2" sources."diff2html-1.2.0" @@ -26210,7 +27252,7 @@ in sources."getmac-1.2.1" sources."hasher-1.2.0" sources."keen.io-0.1.3" - sources."knockout-3.4.0" + sources."knockout-3.4.1" sources."lodash-4.12.0" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -26238,11 +27280,11 @@ in }) (sources."npm-registry-client-7.1.2" // { dependencies = [ - sources."request-2.76.0" + sources."request-2.79.0" sources."retry-0.8.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" @@ -26313,23 +27355,23 @@ in sources."content-type-1.0.2" sources."debug-2.2.0" sources."depd-1.1.0" - sources."http-errors-1.5.0" + sources."http-errors-1.5.1" sources."iconv-lite-0.4.13" sources."on-finished-2.3.0" sources."qs-6.2.0" sources."raw-body-2.1.7" - sources."type-is-1.6.13" + sources."type-is-1.6.14" sources."ms-0.7.1" - sources."inherits-2.0.1" - sources."setprototypeof-1.0.1" - sources."statuses-1.3.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + sources."statuses-1.3.1" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.12" - sources."mime-db-1.24.0" + sources."mime-types-2.1.13" + sources."mime-db-1.25.0" sources."clone-1.0.2" - sources."color-convert-1.5.0" + sources."color-convert-1.8.2" sources."color-string-0.3.0" sources."color-name-1.1.1" sources."cookie-0.3.1" @@ -26440,8 +27482,8 @@ in }) sources."extract-opts-3.3.1" sources."eachr-3.2.0" - sources."editions-1.3.1" - sources."typechecker-4.3.0" + sources."editions-1.3.3" + sources."typechecker-4.4.0" sources."underscore-1.5.2" sources."abbrev-1.0.9" sources."ansicolors-0.3.2" @@ -26463,7 +27505,7 @@ in sources."minimatch-3.0.3" ]; }) - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -26526,7 +27568,7 @@ in sources."umask-1.1.0" sources."unique-filename-1.1.0" sources."validate-npm-package-name-2.2.2" - sources."which-1.2.11" + sources."which-1.2.12" sources."wrappy-1.0.2" sources."write-file-atomic-1.1.4" sources."ansi-regex-2.0.0" @@ -26657,6 +27699,7 @@ in ]; }) sources."typedarray-0.0.6" + sources."uuid-3.0.0" sources."asynckit-0.4.0" sources."punycode-1.4.1" sources."passport-strategy-1.0.0" @@ -26768,7 +27811,7 @@ in sources."is-utf8-0.2.1" sources."read-pkg-1.1.0" sources."path-type-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" ]; @@ -26798,7 +27841,7 @@ in sources."kew-0.7.0" ]; }) - sources."tmp-0.0.29" + sources."tmp-0.0.30" sources."follow-redirects-0.0.3" (sources."config-chain-1.1.11" // { dependencies = [ @@ -26824,7 +27867,7 @@ in sources."progress-1.1.8" sources."request-2.67.0" sources."request-progress-2.0.1" - sources."which-1.2.11" + sources."which-1.2.12" sources."concat-stream-1.5.0" sources."debug-0.7.4" sources."yauzl-2.4.1" @@ -26838,7 +27881,7 @@ in sources."minimist-0.0.8" sources."fd-slicer-1.0.1" sources."pend-1.2.0" - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" @@ -26859,7 +27902,7 @@ in sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" + sources."mime-types-2.1.13" sources."node-uuid-1.4.7" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" @@ -26874,8 +27917,8 @@ in sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" sources."async-2.1.2" - sources."lodash-4.16.4" - sources."mime-db-1.24.0" + sources."lodash-4.17.2" + sources."mime-db-1.25.0" sources."assert-plus-0.2.0" sources."jsprim-1.3.1" (sources."sshpk-1.10.1" // { @@ -26980,18 +28023,18 @@ in sources."source-map-0.4.4" ]; }) - sources."graceful-fs-4.1.9" + sources."graceful-fs-4.1.10" sources."big.js-3.1.3" sources."emojis-list-2.1.0" sources."json5-0.5.0" sources."object-assign-4.1.0" sources."errno-0.1.4" - sources."readable-stream-2.1.5" + sources."readable-stream-2.2.2" sources."prr-0.0.0" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" @@ -27069,7 +28112,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.0.14" + sources."fsevents-1.0.15" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -27108,25 +28151,26 @@ in sources."nan-2.4.0" sources."node-pre-gyp-0.6.31" sources."nopt-3.0.6" - sources."npmlog-4.0.0" + sources."npmlog-4.0.1" (sources."rc-1.1.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.76.0" + sources."request-2.79.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ sources."once-1.3.3" + sources."readable-stream-2.1.5" ]; }) sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.1" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."aproba-1.0.4" @@ -27136,7 +28180,7 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.1" + sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" @@ -27149,20 +28193,20 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.12" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.13" sources."oauth-sign-0.8.2" sources."qs-6.3.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" (sources."chalk-1.1.3" // { @@ -27213,7 +28257,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.0" - sources."mime-db-1.24.0" + sources."mime-db-1.25.0" sources."glob-7.1.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -27226,7 +28270,7 @@ in sources."uid-number-0.0.6" sources."ms-0.7.1" sources."source-list-map-0.1.6" - sources."amdefine-1.0.0" + sources."amdefine-1.0.1" ]; buildInputs = globalBuildInputs; meta = { From 5bfaa2d3ad5947730ad28e26622c8c49b45ba609 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 20 Nov 2016 17:41:20 +0300 Subject: [PATCH 0537/1749] lambdabot: fix to use new haskell-src-exts --- .../haskell-modules/configuration-common.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 793f9e7911f3..36626031ed2f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -989,6 +989,25 @@ self: super: { # The latest Hoogle needs versions not yet in LTS Haskell 7.x. hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_18_2; }; + # To be in sync with Hoogle. + lambdabot-haskell-plugins = (overrideCabal super.lambdabot-haskell-plugins (drv: { + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/lambdabot/lambdabot/commit/78a2361024724acb70bc1c12c42f3a16015bb373.patch"; + sha256 = "0aw0jpw07idkrg8pdn3y3qzhjfrxsvmx3plg51m1aqgbzs000yxf"; + stripLen = 2; + addPrefixes = true; + }) + ]; + + jailbreak = true; + })).override { + haskell-src-exts = self.haskell-src-exts-simple; + }; + + # Needs new version. + haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_18_2; }; + # Test suite fails a QuickCheck property. optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0; From 6bb292d42b60ec78e92836c33d6f0b270d760e84 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 20 Nov 2016 17:41:38 +0300 Subject: [PATCH 0538/1749] parsoid service: update, use declarative configuration Old configuration format is disabled now (it can still be used, but with additional steps). This is a backwards incompatible change. --- nixos/doc/manual/release-notes/rl-1703.xml | 9 ++++++ nixos/modules/rename.nix | 3 ++ nixos/modules/services/misc/parsoid.nix | 37 +++++++++++----------- 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 743f3dce2302..a133630e1464 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -68,6 +68,15 @@ following incompatible changes: that may be in /etc. + + + + Parsoid service now uses YAML configuration format. + service.parsoid.interwikis is now called + service.parsoid.wikis and is a list of either API URLs + or attribute sets as specified in parsoid's documentation. + + diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 0d2e0f981db8..81b197186c41 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -144,6 +144,9 @@ with lib; # murmur (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ]) + # parsoid + (mkRemovedOptionModule [ "services" "parsoid" "interwikis" ] [ "services" "parsoid" "wikis" ]) + # Options that are obsolete and have no replacement. (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") (mkRemovedOptionModule [ "programs" "bash" "enable" ] "") diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix index ab1b54068772..ae3f84333d2d 100644 --- a/nixos/modules/services/misc/parsoid.nix +++ b/nixos/modules/services/misc/parsoid.nix @@ -6,20 +6,21 @@ let cfg = config.services.parsoid; - conf = '' - exports.setup = function( parsoidConfig ) { - ${toString (mapAttrsToList (name: str: "parsoidConfig.setInterwiki('${name}', '${str}');") cfg.interwikis)} + confTree = { + worker_heartbeat_timeout = 300000; + logging = { level = "info"; }; + services = [{ + module = "lib/index.js"; + entrypoint = "apiServiceWorker"; + conf = { + mwApis = map (x: if isAttrs x then x else { uri = x; }) cfg.wikis; + serverInterface = cfg.interface; + serverPort = cfg.port; + }; + }]; + }; - parsoidConfig.serverInterface = "${cfg.interface}"; - parsoidConfig.serverPort = ${toString cfg.port}; - - parsoidConfig.useSelser = true; - - ${cfg.extraConfig} - }; - ''; - - confFile = builtins.toFile "localsettings.js" conf; + confFile = pkgs.writeText "config.yml" (builtins.toJSON (recursiveUpdate confTree cfg.extraConfig)); in { @@ -38,9 +39,9 @@ in ''; }; - interwikis = mkOption { - type = types.attrsOf types.str; - example = { localhost = "http://localhost/api.php"; }; + wikis = mkOption { + type = types.listOf (types.either types.str types.attrs); + example = [ "http://localhost/api.php" ]; description = '' Used MediaWiki API endpoints. ''; @@ -71,8 +72,8 @@ in }; extraConfig = mkOption { - type = types.lines; - default = ""; + type = types.attrs; + default = {}; description = '' Extra configuration to add to parsoid configuration. ''; From 15567e6d8e338f339e4fafada1362bdaa9612cb3 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 30 Sep 2016 02:27:34 +0300 Subject: [PATCH 0539/1749] tarsnap service: fix multiple simultaneous archives with a single key --- nixos/modules/rename.nix | 3 + nixos/modules/services/backup/tarsnap.nix | 148 +++++++++++----------- 2 files changed, 79 insertions(+), 72 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 81b197186c41..a89ce2c743d4 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -147,6 +147,9 @@ with lib; # parsoid (mkRemovedOptionModule [ "services" "parsoid" "interwikis" ] [ "services" "parsoid" "wikis" ]) + # tarsnap + (mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives..cachedir") + # Options that are obsolete and have no replacement. (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") (mkRemovedOptionModule [ "programs" "bash" "enable" ] "") diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index 24892a2a59a1..67112343c335 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -1,25 +1,25 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; let - cfg = config.services.tarsnap; + gcfg = config.services.tarsnap; configFile = name: cfg: '' - cachedir ${config.services.tarsnap.cachedir}/${name} - keyfile ${cfg.keyfile} + keyfile ${cfg.keyfile} + ${optionalString (cfg.cachedir != null) "cachedir ${cfg.cachedir}"} ${optionalString cfg.nodump "nodump"} ${optionalString cfg.printStats "print-stats"} ${optionalString cfg.printStats "humanize-numbers"} ${optionalString (cfg.checkpointBytes != null) ("checkpoint-bytes "+cfg.checkpointBytes)} ${optionalString cfg.aggressiveNetworking "aggressive-networking"} - ${concatStringsSep "\n" (map (v: "exclude "+v) cfg.excludes)} - ${concatStringsSep "\n" (map (v: "include "+v) cfg.includes)} + ${concatStringsSep "\n" (map (v: "exclude ${v}") cfg.excludes)} + ${concatStringsSep "\n" (map (v: "include ${v}") cfg.includes)} ${optionalString cfg.lowmem "lowmem"} ${optionalString cfg.verylowmem "verylowmem"} - ${optionalString (cfg.maxbw != null) ("maxbw "+toString cfg.maxbw)} - ${optionalString (cfg.maxbwRateUp != null) ("maxbw-rate-up "+toString cfg.maxbwRateUp)} - ${optionalString (cfg.maxbwRateDown != null) ("maxbw-rate-down "+toString cfg.maxbwRateDown)} + ${optionalString (cfg.maxbw != null) "maxbw ${toString cfg.maxbw}"} + ${optionalString (cfg.maxbwRateUp != null) "maxbw-rate-up ${toString cfg.maxbwRateUp}"} + ${optionalString (cfg.maxbwRateDown != null) "maxbw-rate-down ${toString cfg.maxbwRateDown}"} ''; in { @@ -60,34 +60,13 @@ in ''; }; - cachedir = mkOption { - type = types.nullOr types.path; - default = "/var/cache/tarsnap"; - description = '' - The cache allows tarsnap to identify previously stored data - blocks, reducing archival time and bandwidth usage. - - Should the cache become desynchronized or corrupted, tarsnap - will refuse to run until you manually rebuild the cache with - tarsnap --fsck. - - Note that each individual archive (specified below) has its own cache - directory specified under cachedir; this is because - tarsnap locks the cache during backups, meaning multiple services - archives cannot be backed up concurrently or overlap with a shared - cache. - - Set to null to disable caching. - ''; - }; - archives = mkOption { - type = types.attrsOf (types.submodule ( + type = types.attrsOf (types.submodule ({ config, ... }: { options = { keyfile = mkOption { type = types.str; - default = config.services.tarsnap.keyfile; + default = gcfg.keyfile; description = '' Set a specific keyfile for this archive. This defaults to "/root/tarsnap.key" if left unspecified. @@ -107,6 +86,21 @@ in ''; }; + cachedir = mkOption { + type = types.nullOr types.path; + default = "/var/cache/tarsnap/${utils.escapeSystemdPath config.keyfile}"; + description = '' + The cache allows tarsnap to identify previously stored data + blocks, reducing archival time and bandwidth usage. + + Should the cache become desynchronized or corrupted, tarsnap + will refuse to run until you manually rebuild the cache with + tarsnap --fsck. + + Set to null to disable caching. + ''; + }; + nodump = mkOption { type = types.bool; default = true; @@ -249,7 +243,7 @@ in }; gamedata = - { directories = [ "/var/lib/minecraft "]; + { directories = [ "/var/lib/minecraft" ]; period = "*:30"; }; } @@ -262,8 +256,8 @@ in archive names are suffixed by a 1 second resolution timestamp. For each member of the set is created a timer which triggers the - instanced tarsnap@ service unit. You may use - systemctl start tarsnap@archive-name to + instanced tarsnap-archive-name service unit. You may use + systemctl start tarsnap-archive-name to manually trigger creation of archive-name at any time. ''; @@ -271,63 +265,73 @@ in }; }; - config = mkIf cfg.enable { + config = mkIf gcfg.enable { assertions = (mapAttrsToList (name: cfg: { assertion = cfg.directories != []; message = "Must specify paths for tarsnap to back up"; - }) cfg.archives) ++ + }) gcfg.archives) ++ (mapAttrsToList (name: cfg: { assertion = !(cfg.lowmem && cfg.verylowmem); message = "You cannot set both lowmem and verylowmem"; - }) cfg.archives); + }) gcfg.archives); - systemd.services."tarsnap@" = { - description = "Tarsnap archive '%i'"; - requires = [ "network-online.target" ]; - after = [ "network-online.target" ]; + systemd.services = + mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" { + description = "Tarsnap archive '${name}'"; + requires = [ "network-online.target" ]; + after = [ "network-online.target" ]; - path = [ pkgs.iputils pkgs.tarsnap pkgs.coreutils ]; + path = [ pkgs.iputils pkgs.tarsnap pkgs.utillinux ]; - # In order for the persistent tarsnap timer to work reliably, we have to - # make sure that the tarsnap server is reachable after systemd starts up - # the service - therefore we sleep in a loop until we can ping the - # endpoint. - preStart = "while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done"; - scriptArgs = "%i"; - script = '' - mkdir -p -m 0755 ${dirOf cfg.cachedir} - mkdir -p -m 0700 ${cfg.cachedir} - chown root:root ${cfg.cachedir} - chmod 0700 ${cfg.cachedir} - mkdir -p -m 0700 ${cfg.cachedir}/$1 - DIRS=`cat /etc/tarsnap/$1.dirs` - exec tarsnap --configfile /etc/tarsnap/$1.conf -c -f $1-$(date +"%Y%m%d%H%M%S") $DIRS - ''; + # In order for the persistent tarsnap timer to work reliably, we have to + # make sure that the tarsnap server is reachable after systemd starts up + # the service - therefore we sleep in a loop until we can ping the + # endpoint. + preStart = '' + while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done + ''; - serviceConfig = { - IOSchedulingClass = "idle"; - NoNewPrivileges = "true"; - CapabilityBoundingSet = "CAP_DAC_READ_SEARCH"; - PermissionsStartOnly = "true"; - }; - }; + script = + let run = ''tarsnap --configfile "/etc/tarsnap/${name}.conf" -c -f "${name}-$(date +"%Y%m%d%H%M%S")" ${concatStringsSep " " cfg.directories}''; + in if (cfg.cachedir != null) then '' + mkdir -p ${cfg.cachedir} + chmod 0700 ${cfg.cachedir} + + ( flock 9 + if [ ! -e ${cfg.cachedir}/firstrun ]; then + ( flock 10 + flock -u 9 + tarsnap --configfile "/etc/tarsnap/${name}.conf" --fsck + flock 9 + ) 10>${cfg.cachedir}/firstrun + fi + ) 9>${cfg.cachedir}/lockf + + exec flock ${cfg.cachedir}/firstrun ${run} + '' else "exec ${run}"; + + serviceConfig = { + Type = "oneshot"; + IOSchedulingClass = "idle"; + NoNewPrivileges = "true"; + CapabilityBoundingSet = [ "CAP_DAC_READ_SEARCH" ]; + PermissionsStartOnly = "true"; + }; + }) gcfg.archives; # Note: the timer must be Persistent=true, so that systemd will start it even # if e.g. your laptop was asleep while the latest interval occurred. - systemd.timers = mapAttrs' (name: cfg: nameValuePair "tarsnap@${name}" + systemd.timers = mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" { timerConfig.OnCalendar = cfg.period; timerConfig.Persistent = "true"; wantedBy = [ "timers.target" ]; - }) cfg.archives; + }) gcfg.archives; environment.etc = - (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf" + mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf" { text = configFile name cfg; - }) cfg.archives) // - (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.dirs" - { text = concatStringsSep " " cfg.directories; - }) cfg.archives); + }) gcfg.archives; environment.systemPackages = [ pkgs.tarsnap ]; }; From c9b0e88c0b250b26a64d8d68e325f6a2e962c1d0 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Thu, 10 Nov 2016 22:53:43 +0100 Subject: [PATCH 0540/1749] NixOS Manual: Container Networking with NM Network Manager calls dhclient on container interfaces and fails which locks you out of the container after a few seconds, unless you tell it not to manage these interfaces. --- nixos/doc/manual/administration/container-networking.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml index 1b1576d3babe..d89d262eff4e 100644 --- a/nixos/doc/manual/administration/container-networking.xml +++ b/nixos/doc/manual/administration/container-networking.xml @@ -47,4 +47,12 @@ where eth0 should be replaced with the desired external interface. Note that ve-+ is a wildcard that matches all container interfaces. +If you are using Network Manager, you need to explicitly prevent +it from managing container interfaces: + + +networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; + + +
From c1b919ff5c13103017e750fb6a7a1dfdeaf23394 Mon Sep 17 00:00:00 2001 From: obadz Date: Sun, 20 Nov 2016 16:23:48 +0000 Subject: [PATCH 0541/1749] haskellPackages.ghc-core: 0.5.6 -> 2012-12-15 --- .../haskell-modules/configuration-common.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 36626031ed2f..12910b1b6a6f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1102,4 +1102,15 @@ self: super: { STMonadTrans = dontCheck super.STMonadTrans; socket_0_7_0_0 = super.socket_0_7_0_0.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_9_2; }); + + # 0.5.6 invokes $PAGER in a way that crashes if there are args such as $PAGER="less -R" + ghc-core = overrideCabal super.ghc-core (drv: { + src = pkgs.fetchFromGitHub { + owner = "shachaf"; + repo = "ghc-core"; + rev = "630196adf0bebf073328325302453ef1c409fd9a"; + sha256 = "05jzpjy5zkri2faw5jnq5vh12mx58lrb0zfzz4h598miq2vc8848"; + }; + version = "2012-12-15"; + }); } From f7e0bc2ae7333c29f3d0c7120f65297d491b63e9 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 20 Nov 2016 18:05:18 +0100 Subject: [PATCH 0542/1749] Make all meta.maintainers attributes lists --- .../emacs-modes/color-theme-solarized/default.nix | 9 ++++----- .../pidgin-plugins/telegram-purple/default.nix | 10 +++++----- pkgs/applications/video/mpv/scripts/convert.nix | 2 +- pkgs/applications/window-managers/compton/git.nix | 2 +- pkgs/development/libraries/netcdf-fortran/default.nix | 10 +++++----- pkgs/development/tools/misc/elfutils/default.nix | 2 +- pkgs/games/multimc/default.nix | 10 +++++----- pkgs/os-specific/linux/kernel/linux-mptcp.nix | 2 +- pkgs/tools/misc/pws/default.nix | 2 +- pkgs/tools/security/softhsm/default.nix | 8 ++++---- pkgs/tools/text/reckon/default.nix | 2 +- 11 files changed, 29 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix index ef006439a555..6b51f117ad85 100644 --- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix @@ -24,12 +24,11 @@ stdenv.mkDerivation rec { install *.el* $out/share/emacs/site-lisp ''; - meta = { + meta = with stdenv.lib; { description = "Precision colors for machines and people"; homepage = http://ethanschoonover.com/solarized; - maintainers = "Samuel Rivas "; - license = stdenv.lib.licenses.mit; - - platforms = stdenv.lib.platforms.all; + maintainers = [ maintainers.samuelrivas ]; + license = licenses.mit; + platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 1a036c3083b2..4b68d603f211 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib/pidgin/ - cp bin/*.so $out/lib/pidgin/ + cp bin/*.so $out/lib/pidgin/ #*/ cp tg-server.tglpub $out/lib/pidgin/server.tglpub mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48} cp imgs/telegram16.png $out/pixmaps/pidgin/protocols/16 @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { cp imgs/telegram48.png $out/pixmaps/pidgin/protocols/48 ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/majn/telegram-purple; description = "Telegram for Pidgin / libpurple"; - license = stdenv.lib.licenses.gpl2; - maintainers = stdenv.lib.maintainers.jagajaga; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.jagajaga ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index 8dc2fc037e6d..9e36f790c782 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Convert parts of a video while you are watching it in mpv"; homepage = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; - maintainers = lib.maintainers.profpatsch; + maintainers = [ lib.maintainers.profpatsch ]; longDescription = '' When this script is loaded into mpv, you can hit Alt+W to mark the beginning and Alt+W again to mark the end of the clip. Then a settings window opens. diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix index 61b356311785..159468f79047 100644 --- a/pkgs/applications/window-managers/compton/git.nix +++ b/pkgs/applications/window-managers/compton/git.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { additional features, such as additional effects, and a fork at a well-defined and proper place. ''; - maintainers = maintainers.ertes; + maintainers = [ maintainers.ertes ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 53b2b6358649..35f675a305af 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ netcdf hdf5 curl gfortran ]; doCheck = true; - meta = { + meta = with stdenv.lib; { description = "Fortran API to manipulate netcdf files"; - homepage = "http://www.unidata.ucar.edu/software/netcdf/"; - license = stdenv.lib.licenses.free; - maintainers = stdenv.lib.maintainers.bzizou; - platforms = stdenv.lib.platforms.unix; + homepage = http://www.unidata.ucar.edu/software/netcdf/; + license = licenses.free; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index d4a2f80599f7..6386d3176a92 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { description = "A set of utilities to handle ELF objects"; platforms = lib.platforms.linux; license = lib.licenses.gpl3; - maintainers = lib.maintainers.eelco; + maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 2e528a8203fe..00d4fbf84511 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -40,19 +40,19 @@ stdenv.mkDerivation { mkdir -pv $out/bin/jars $out/lib cp -v MultiMC $out/bin/ - cp -v jars/*.jar $out/bin/jars/ + cp -v jars/*.jar $out/bin/jars/ #*/ cp -v librainbow.so libnbt++.so libMultiMC_logic.so $out/lib wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk7}/bin/ ''; - meta = { + meta = with stdenv.lib; { homepage = https://multimc.org/; description = "A free, open source launcher for Minecraft"; longDescription = '' Allows you to have multiple, separate instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface. ''; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = stdenv.lib.maintainers.cleverca22; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.cleverca22 ]; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 199ff9122cbe..a037343751ca 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -7,7 +7,7 @@ import ./generic.nix (args // rec { extraMeta = { branch = "4.1"; - maintainers = stdenv.lib.maintainers.layus; + maintainers = [ stdenv.lib.maintainers.layus ]; }; src = fetchurl { diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index 811e57c0a084..ac4f4524b992 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Command-line password safe"; homepage = https://github.com/janlelis/pws; license = licenses.mit; - maintainers = maintainers.swistak35; + maintainers = [ maintainers.swistak35 ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 4bd199686763..5f282dd378a5 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/var"; - meta = { + meta = with stdenv.lib; { homepage = https://www.opendnssec.org/softhsm; description = "Cryptographic store accessible through a PKCS #11 interface"; - license = stdenv.lib.licenses.bsd2; - maintainers = stdenv.lib.maintainers.leenaars; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd2; + maintainers = [ maintainers.leenaars ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index 370fcf265d51..b6340fd2df46 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flexibly import bank account CSV files into Ledger for command line accounting"; license = licenses.mit; - maintainers = "mckean.kylej@gmail.com"; + maintainers = [ "mckean.kylej@gmail.com" ]; platforms = platforms.unix; }; } From dd3c853b439a326f64159b69c25959bd2d083350 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 20 Nov 2016 18:11:29 +0100 Subject: [PATCH 0543/1749] Fix typos: licence -> license --- pkgs/development/tools/godef/default.nix | 2 +- pkgs/tools/misc/bibtex2html/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index ddb136ed86ea..837da4a09dc9 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -18,6 +18,6 @@ buildGoPackage rec { description = "Print where symbols are defined in Go source code"; homepage = "https://github.com/rogpeppe/godef/"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - licence = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index 068d3e3866e0..74894da54182 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of tools for translating from BibTeX to HTML"; homepage = https://www.lri.fr/~filliatr/bibtex2html/; - licence = licenses.gpl2; + license = licenses.gpl2; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.scolobb ]; }; From 1ff6680efe4c01db25e7b30e43bcd7348d3b8640 Mon Sep 17 00:00:00 2001 From: montag451 Date: Sun, 20 Nov 2016 18:45:58 +0100 Subject: [PATCH 0544/1749] asn1c: init at 0.9.27 (#20577) --- lib/maintainers.nix | 1 + pkgs/development/compilers/asn1c/default.nix | 33 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/compilers/asn1c/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 115f09f119fa..79c581159523 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -289,6 +289,7 @@ mlieberman85 = "Michael Lieberman "; modulistic = "Pablo Costa "; mog = "Matthew O'Gorman "; + montag451 = "montag451 "; moosingin3space = "Nathan Moos "; moretea = "Maarten Hoogendoorn "; mornfall = "Petr Ročkai "; diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix new file mode 100644 index 000000000000..d3c4bf19a65b --- /dev/null +++ b/pkgs/development/compilers/asn1c/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "asn1c-${version}"; + version = "0.9.27"; + + src = fetchurl { + url = "http://lionet.info/soft/asn1c-${version}.tar.gz"; + sha256 = "17nvn2kzvlryasr9dzqg6gs27b9lvqpval0k31pb64bjqbhn8pq2"; + }; + + outputs = [ "out" "doc" "man" ]; + + buildInputs = [ perl ]; + + preConfigure = '' + patchShebangs examples/crfc2asn1.pl + ''; + + postInstall = '' + cp -r skeletons/standard-modules $out/share/asn1c + ''; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = http://lionet.info/asn1c/compiler.html; + description = "Open Source ASN.1 Compiler"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = [ maintainers.montag451 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 726f5eb53363..696c65a9e5f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4499,6 +4499,8 @@ in arachne-pnr = callPackage ../development/compilers/arachne-pnr { }; + asn1c = callPackage ../development/compilers/asn1c { }; + aspectj = callPackage ../development/compilers/aspectj { }; ats = callPackage ../development/compilers/ats { }; From a8498a7e280be77cea7612d28c3ae71ba34575bd Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Sun, 20 Nov 2016 13:30:30 -0500 Subject: [PATCH 0545/1749] minecraft-server: 1.10.2 -> 1.11 --- pkgs/games/minecraft-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 3cd35c728bfc..8590f9a7420b 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "minecraft-server-${version}"; - version = "1.10.2"; + version = "1.11"; src = fetchurl { url = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar"; - sha256 = "08bss3laa265aavdgivzsv7asd5s2sdqnlqr767j3yf54y14cpqr"; + sha256 = "10vgvkklv3l66cvin2ikva2nj86gjl6p9ffizd6r89ixv1grcxrj"; }; preferLocalBuild = true; From efbe416d401edce9842f700791ae87daf618fa67 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 20 Nov 2016 21:02:18 +0100 Subject: [PATCH 0546/1749] sonarr: 2.0.0.4326 -> 2.0.0.4389 --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index a86862a14a56..a6f0fb800558 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4326"; + version = "2.0.0.4389"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "1lrfwwy5bjsmrq6zpx0kadmlacafmj44qhifswbhljlykxwsld7r"; + sha256 = "17vvfld6m1wr8yxvm9i7gaxny04ymvq86pizad816a73jk4h16my"; }; buildInputs = [ From 840db709ebd74027e917d37fd2b42da86f50ea10 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 20 Nov 2016 20:59:48 +0100 Subject: [PATCH 0547/1749] telepathy_haze: add patch to fix build Without the patch, the build fails with recent versions of Pidgin. --- .../instant-messengers/telepathy/haze/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index ffc29a52aa1f..b1880be6562b 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pidgin, telepathy_glib, glib, dbus_glib, pkgconfig, libxslt }: +{ stdenv, fetchurl, fetchpatch, pidgin, telepathy_glib, glib, dbus_glib, pkgconfig, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libxslt ]; + patches = [ + # Patch from Gentoo that helps telepathy-haze build with more + # recent versions of pidgin. + (fetchpatch { + url = https://raw.githubusercontent.com/gentoo/gentoo/master/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch; + sha256 = "0fa1p4n1559qd096w7ya4kvfnc1c98ykarkxzlpkwvzbczwzng3c"; + }) + ]; + meta = { description = "A Telepathy connection manager based on libpurple"; platforms = stdenv.lib.platforms.gnu; # Random choice From 515974a66bc04ea71610c81324580e2b33ee0d8c Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 20 Nov 2016 16:59:33 +0100 Subject: [PATCH 0548/1749] haskellPackages.ReadArgs: jailbreak to fix build fixes #20515 --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 12910b1b6a6f..4343adf084f4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1113,4 +1113,9 @@ self: super: { }; version = "2012-12-15"; }); + + # Encountered missing dependencies: hspec >=1.3 && <2.1 + # https://github.com/rampion/ReadArgs/issues/8 + ReadArgs = doJailbreak super.ReadArgs; + } From 6343616e3bfe8a2cea4e27198f39e46ffb01d7a2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 11 Nov 2016 01:32:03 +0300 Subject: [PATCH 0549/1749] libproxy: 0.4.11 -> 0.4.13 --- .../libraries/libproxy/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 4c9733c6a5e5..36c486ce53d2 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, glib }: +{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib, glib }: stdenv.mkDerivation rec { - name = "libproxy-0.4.11"; - src = fetchurl { - url = "http://libproxy.googlecode.com/files/${name}.tar.gz"; - sha256 = "0jw6454gxjykmbnbh544axi8hzz9gmm4jz1y5gw1hdqnakg36gyw"; + name = "libproxy-${version}"; + version = "0.4.13"; + + src = fetchFromGitHub { + owner = "libproxy"; + repo = "libproxy"; + rev = version; + sha256 = "0yg4wr44ync6x3p107ic00m1l04xqhni9jn1vzvkw3nfjd0k6f92"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs @@ -14,7 +18,10 @@ stdenv.mkDerivation rec { # now some optional deps, but many more are possible ++ [ glib ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.lgpl21; + homepage = "http://libproxy.github.io/libproxy/"; + description = "A library that provides automatic proxy configuration management"; }; } From bf0b20bb018bb288e8f92bbc0fbbf6d72001818f Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 20 Nov 2016 21:55:03 +0100 Subject: [PATCH 0550/1749] autojump: 22.2.4 -> 22.5.0 --- pkgs/tools/misc/autojump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index ea486dd5154f..817510bfb761 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, python, bash }: let - version = "22.2.4"; + version = "22.5.0"; in stdenv.mkDerivation rec { name = "autojump-${version}"; @@ -9,7 +9,7 @@ in src = fetchurl { url = "http://github.com/joelthelion/autojump/archive/release-v${version}.tar.gz"; name = "autojump-${version}.tar.gz"; - sha256 = "816badb0721f735e2b86bdfa8b333112f3867343c7c2263c569f75b4ec91f475"; + sha256 = "00ai0j37ka3557a8m7ig44dby7v01pckwi8gl479vz5b5pw1z8cd"; }; buildInputs = [ python bash ]; From 5ad8a56d1621b7678d61c0def9c621a5e64b0eb3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 20 Nov 2016 21:51:11 +0100 Subject: [PATCH 0551/1749] grsecurity module: remove use of mkEnableOption --- nixos/modules/security/grsecurity.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 53c2ace784ef..155bbea8c6e6 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -27,7 +27,14 @@ in options.security.grsecurity = { - enable = mkEnableOption "grsecurity/PaX"; + enable = mkOption { + type = types.bool; + example = true; + default = false; + description = '' + Enable grsecurity/PaX. + ''; + }; lockTunables = mkOption { type = types.bool; From 98935c7103927690b4ca366a2763140081615794 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 20 Nov 2016 21:54:38 +0100 Subject: [PATCH 0552/1749] grsecurity module: remove requiredKernelConfig Using a custom package set with the NixOS module is no longer something I wish to support. It's still *possible* but not advertised. Secondly, the requiredKernelConfig didn't really do anything (setting kernelPackages to a non-grsec kernel would just silently let the user boot into a non-grsec setup ...). --- nixos/modules/security/grsecurity.nix | 10 ---------- nixos/modules/security/grsecurity.xml | 8 +++----- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 155bbea8c6e6..c37bcb70d9d2 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -65,20 +65,10 @@ in config = mkIf cfg.enable { - # Allow the user to select a different package set, subject to the stated - # required kernel config boot.kernelPackages = mkDefault pkgs.linuxPackages_grsec_nixos; boot.kernelParams = optional cfg.disableEfiRuntimeServices "noefi"; - system.requiredKernelConfig = with config.lib.kernelConfig; - [ (isEnabled "GRKERNSEC") - (isEnabled "PAX") - (isYes "GRKERNSEC_SYSCTL") - (isYes "GRKERNSEC_SYSCTL_DISTRO") - (isNo "GRKERNSEC_NO_RBAC") - ]; - nixpkgs.config.grsecurity = true; # Install PaX related utillities into the system profile. diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index 37314bdba8a5..6f9884336b1e 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -225,11 +225,9 @@ - The NixOS module makes several assumptions about the kernel and so may be - incompatible with your customised kernel. Most of these assumptions are - encoded as assertions — mismatches should ideally result in a build - failure. Currently, the only way to work around incompatibilities is to - eschew the NixOS module and do all configuration yourself. + The NixOS module makes several assumptions about the kernel and so + may be incompatible with your customised kernel. Currently, the only way + to work around incompatibilities is to eschew the NixOS module. From 2eb6ec1bc491b5a6ed7f6d5164ca6366f986da49 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 20 Nov 2016 22:10:34 +0100 Subject: [PATCH 0553/1749] grsecurity module: remove code pertaining to zfs I don't know if it still the case that zfs fails to boot; either way, that's the user's responsibility to contend with. --- nixos/modules/security/grsecurity.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index c37bcb70d9d2..ea245ecc5b6a 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -6,14 +6,6 @@ let cfg = config.security.grsecurity; grsecLockPath = "/proc/sys/kernel/grsecurity/grsec_lock"; - # Ascertain whether ZFS is required for booting the system; grsecurity is - # currently incompatible with ZFS, rendering the system unbootable. - zfsNeededForBoot = filter - (fs: (fs.neededForBoot - || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ]) - && fs.fsType == "zfs") - config.system.build.fileSystems != []; - # Ascertain whether NixOS container support is required containerSupportRequired = config.boot.enableContainers && config.containers != {}; @@ -132,11 +124,5 @@ in "kernel.grsecurity.chroot_caps" = mkForce 0; }; - assertions = [ - { assertion = !zfsNeededForBoot; - message = "grsecurity is currently incompatible with ZFS"; - } - ]; - }; } From 32c71c06d2c50c74570f934c6523ee386ccbe5af Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 20 Nov 2016 22:28:46 +0100 Subject: [PATCH 0554/1749] pax-utils: 1.1.6 -> 1.1.7 --- pkgs/os-specific/linux/pax-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 65cbf1c45890..1e4373f286c1 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { url = "https://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "04hvsizzspfzfq6hhfif7ya9nwsc0cs6z6n2bq1zfh7agd8nqhzm"; + sha256 = "045dxgl4kkmq6205iw6fqyx3565gd607p3xpad5l9scdi3qdp6xv"; }; makeFlags = [ @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "https://dev.gentoo.org/~vapier/dist/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice joachifm ]; }; } From 0df3553a3854ad0765fa7ab723c66cc9d788a915 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 20 Nov 2016 22:29:09 +0100 Subject: [PATCH 0555/1749] paxtest: 0.9.14 -> 0.9.15 --- pkgs/os-specific/linux/paxtest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix index 0c2fd9b6f86c..4611a3c09b77 100644 --- a/pkgs/os-specific/linux/paxtest/default.nix +++ b/pkgs/os-specific/linux/paxtest/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "paxtest-${version}"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "https://www.grsecurity.net/~spender/${name}.tar.gz"; - sha256 = "0j40h3x42k5mr5gc5np4wvr9cdf9szk2f46swf42zny8rlgxiskx"; + sha256 = "0zv6vlaszlik98gj9200sv0irvfzrvjn46rnr2v2m37x66288lym"; }; enableParallelBuilding = true; From 6d428242a948a4241851b6770de5fc566313c2ef Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 20 Nov 2016 22:47:29 +0100 Subject: [PATCH 0556/1749] linuxPackages.spl: now builds against grsecurity kernel --- pkgs/os-specific/linux/spl/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index c86efe22f6ef..e84c964d675f 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -60,6 +60,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ]; - broken = buildKernel && (kernel.features.grsecurity or false); }; } From 4058735122db43991db1c3cea4ce9795cff52bee Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Mon, 21 Nov 2016 00:17:21 +0200 Subject: [PATCH 0557/1749] flask: 0.10.1 -> 0.11.1 --- 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 341f5192dc61..b8e9cd8cb7b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10984,11 +10984,11 @@ in { }; flask = buildPythonPackage { - name = "flask-0.10.1"; + name = "flask-0.11.1"; src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask/Flask-0.10.1.tar.gz"; - sha256 = "4c83829ff83d408b5e1d4995472265411d2c414112298f2eb4b359d9e4563373"; + url = "mirror://pypi/F/Flask/Flask-0.11.1.tar.gz"; + sha256 = "03kbfll4sj3v5z7r31c7bhfpi11r1np076d4p1k2kg4yzcmkywdl"; }; propagatedBuildInputs = with self; [ itsdangerous click werkzeug jinja2 ]; From f7c097556ba96375bf69b13ed3b0613e59722011 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Thu, 3 Nov 2016 17:49:36 +0100 Subject: [PATCH 0558/1749] stanchion: init at 2.1.1 --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/databases/stanchion.nix | 211 ++++++++++++++++++ pkgs/servers/nosql/riak-cs/stanchion.nix | 63 ++++++ pkgs/top-level/all-packages.nix | 4 + 5 files changed, 281 insertions(+) create mode 100644 nixos/modules/services/databases/stanchion.nix create mode 100644 pkgs/servers/nosql/riak-cs/stanchion.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 79f1e2097388..47c140df2482 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -279,6 +279,7 @@ hound = 259; leaps = 260; ipfs = 261; + stanchion = 262; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -528,6 +529,7 @@ hound = 259; leaps = 260; ipfs = 261; + stanchion = 262; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0c930eb2eb0c..56f880fdbd38 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -159,6 +159,7 @@ ./services/databases/postgresql.nix ./services/databases/redis.nix ./services/databases/riak.nix + ./services/databases/stanchion.nix ./services/databases/virtuoso.nix ./services/desktops/accountsservice.nix ./services/desktops/geoclue2.nix diff --git a/nixos/modules/services/databases/stanchion.nix b/nixos/modules/services/databases/stanchion.nix new file mode 100644 index 000000000000..af44e17ee58c --- /dev/null +++ b/nixos/modules/services/databases/stanchion.nix @@ -0,0 +1,211 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.stanchion; + +in + +{ + + ###### interface + + options = { + + services.stanchion = { + + enable = mkEnableOption "stanchion"; + + package = mkOption { + type = types.package; + default = pkgs.stanchion; + example = literalExample "pkgs.stanchion"; + description = '' + Stanchion package to use. + ''; + }; + + nodeName = mkOption { + type = types.str; + default = "stanchion@127.0.0.1"; + description = '' + Name of the Erlang node. + ''; + }; + + adminKey = mkOption { + type = types.str; + default = ""; + description = '' + Name of admin user. + ''; + }; + + adminSecret = mkOption { + type = types.str; + default = ""; + description = '' + Name of admin secret + ''; + }; + + riakHost = mkOption { + type = types.str; + default = "127.0.0.1:8087"; + description = '' + Name of riak hosting service. + ''; + }; + + listener = mkOption { + type = types.str; + default = "127.0.0.1:8085"; + description = '' + Name of Riak CS listening service. + ''; + }; + + stanchionHost = mkOption { + type = types.str; + default = "127.0.0.1:8085"; + description = '' + Name of stanchion hosting service. + ''; + }; + + stanchionSsl = mkOption { + type = types.bool; + default = true; + description = '' + Tell stanchion to use SSL. + ''; + }; + + distributedCookie = mkOption { + type = types.str; + default = "riak"; + description = '' + Cookie for distributed node communication. All nodes in the + same cluster should use the same cookie or they will not be able to + communicate. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/db/stanchion"; + description = '' + Data directory for Stanchion. + ''; + }; + + logDir = mkOption { + type = types.path; + default = "/var/log/stanchion"; + description = '' + Log directory for Stanchino. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional text to be appended to stanchion.conf. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ cfg.package ]; + + environment.etc."stanchion/advanced.config".text = '' + [{stanchion, []}]. + ''; + + environment.etc."stanchion/stanchion.conf".text = '' + listener = ${cfg.listener} + + riak_host = ${cfg.riakHost} + + ${optionalString (cfg.adminKey == "") "#"} admin.key=${optionalString (cfg.adminKey != "") cfg.adminKey} + ${optionalString (cfg.adminSecret == "") "#"} admin.secret=${optionalString (cfg.adminSecret != "") cfg.adminSecret} + + platform_bin_dir = ${pkgs.stanchion}/bin + platform_data_dir = ${cfg.dataDir} + platform_etc_dir = /etc/stanchion + platform_lib_dir = ${pkgs.stanchion}/lib + platform_log_dir = ${cfg.logDir} + + nodename = ${cfg.nodeName} + + distributed_cookie = ${cfg.distributedCookie} + + stanchion_ssl=${if cfg.stanchionSsl then "on" else "off"} + + ${cfg.extraConfig} + ''; + + users.extraUsers.stanchion = { + name = "stanchion"; + uid = config.ids.uids.stanchion; + group = "stanchion"; + description = "Stanchion server user"; + }; + + users.extraGroups.stanchion.gid = config.ids.gids.stanchion; + + systemd.services.stanchion = { + description = "Stanchion Server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + path = [ + pkgs.utillinux # for `logger` + pkgs.bash + ]; + + environment.HOME = "${cfg.dataDir}"; + environment.STANCHION_DATA_DIR = "${cfg.dataDir}"; + environment.STANCHION_LOG_DIR = "${cfg.logDir}"; + environment.STANCHION_ETC_DIR = "/etc/stanchion"; + + preStart = '' + if ! test -e ${cfg.logDir}; then + mkdir -m 0755 -p ${cfg.logDir} + chown -R stanchion:stanchion ${cfg.logDir} + fi + + if ! test -e ${cfg.dataDir}; then + mkdir -m 0700 -p ${cfg.dataDir} + chown -R stanchion:stanchion ${cfg.dataDir} + fi + ''; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/stanchion console"; + ExecStop = "${cfg.package}/bin/stanchion stop"; + StandardInput = "tty"; + User = "stanchion"; + Group = "stanchion"; + PermissionsStartOnly = true; + # Give Stanchion a decent amount of time to clean up. + TimeoutStopSec = 120; + LimitNOFILE = 65536; + }; + + unitConfig.RequiresMountsFor = [ + "${cfg.dataDir}" + "${cfg.logDir}" + "/etc/stanchion" + ]; + }; + }; +} diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix new file mode 100644 index 000000000000..5835b7e29c93 --- /dev/null +++ b/pkgs/servers/nosql/riak-cs/stanchion.nix @@ -0,0 +1,63 @@ +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak }: + +stdenv.mkDerivation rec { + name = "stanchion-2.1.1"; + + buildInputs = [ + which unzip erlang pam git wget + ]; + + src = fetchurl { + url = "http://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz"; + sha256 = "1443arwgg7qvlx3msyg99qvvhck7qxphdjslcp494i60fhr2g8ja"; + }; + + + postPatch = '' + sed -i deps/node_package/priv/base/env.sh \ + -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/stanchion}@' \ + -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \ + -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \ + -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/stanchion}@' \ + -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@' + ''; + + preBuild = '' + patchShebangs . + ''; + + buildPhase = '' + runHook preBuild + + make rel + + runHook postBuild + ''; + + doCheck = false; + + installPhase = '' + runHook preInstall + + mkdir $out + mv rel/stanchion/etc rel/stanchion/riak-etc + mkdir -p rel/stanchion/etc + mv rel/stanchion/riak-etc rel/stanchion/etc/stanchion + mv rel/stanchion/* $out + + for prog in $out/bin/*; do + substituteInPlace $prog \ + --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \ + ". $out/lib/env.sh" + done + + runHook postInstall + ''; + + meta = with lib; { + maintainers = with maintainers; [ mdaiter ]; + description = "Manager for Riak CS"; + platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 696c65a9e5f1..c405b14d89cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10245,6 +10245,10 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; + stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { + erlang = erlang_basho_R16B03; + }; + influxdb = callPackage ../servers/nosql/influxdb { }; mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { From f6bbc6c4770b987bdd85a38c86528eeca834f240 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 20 Nov 2016 17:23:32 -0500 Subject: [PATCH 0559/1749] linux: 4.9-rc5 -> 4.9-rc6 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 5838d2db1faf..9979b854693b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9-rc5"; - modDirVersion = "4.9.0-rc5"; + version = "4.9-rc6"; + modDirVersion = "4.9.0-rc6"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0fpfczs13dwsy6nf0a0838399l34pxwxxljs472scvx9jbarm9j9"; + sha256 = "0pxf4gzg8qxlf0i83vybf8g22aj0jjbk6n63bh9nciqhbshilr1w"; }; features.iwlwifi = true; From bfc1ba475ab42cbf5b7ff15b9248afa85a0f2b97 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Thu, 3 Nov 2016 18:20:08 +0100 Subject: [PATCH 0560/1749] riak-cs: init at 2.1.1 riak-cs: added to all-packages Added Riak CS nix file to pkgs Added service file for Riak CS Removed Erlang_basho specific bindings from the Riak CS repo riak-cs: changed description riak-cs: added license riak-cs: added maintainer riak_cs: chgned indentations riak-cs: removed overly complex srcs mechanism riak-cs: added systemd module riak-cs: changed Erlang module to Basho-specific version riak-cs: made modular form riak-cs: Added a default package in service options riak-cs: Fixed default package in service options riak-cs: Patched Makefile riak_cs: added to module-list riak_cs: changed from string to actual package in modules --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/databases/riak-cs.nix | 201 +++++++++++++++++++ pkgs/servers/nosql/riak-cs/2.1.1.nix | 67 +++++++ pkgs/top-level/all-packages.nix | 4 + 5 files changed, 275 insertions(+) create mode 100644 nixos/modules/services/databases/riak-cs.nix create mode 100644 pkgs/servers/nosql/riak-cs/2.1.1.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 47c140df2482..b61c1f4799ec 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -280,6 +280,7 @@ leaps = 260; ipfs = 261; stanchion = 262; + riak-cs = 263; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -530,6 +531,7 @@ leaps = 260; ipfs = 261; stanchion = 262; + riak-cs = 263; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 56f880fdbd38..d82f1fbc54fd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -159,6 +159,7 @@ ./services/databases/postgresql.nix ./services/databases/redis.nix ./services/databases/riak.nix + ./services/databases/riak-cs.nix ./services/databases/stanchion.nix ./services/databases/virtuoso.nix ./services/desktops/accountsservice.nix diff --git a/nixos/modules/services/databases/riak-cs.nix b/nixos/modules/services/databases/riak-cs.nix new file mode 100644 index 000000000000..77717118c645 --- /dev/null +++ b/nixos/modules/services/databases/riak-cs.nix @@ -0,0 +1,201 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.riak-cs; + +in + +{ + + ###### interface + + options = { + + services.riak-cs = { + + enable = mkEnableOption "riak-cs"; + + package = mkOption { + type = types.package; + default = pkgs.riak-cs; + example = literalExample "pkgs.riak"; + description = '' + Riak package to use. + ''; + }; + + nodeName = mkOption { + type = types.string; + default = "riak-cs@127.0.0.1"; + description = '' + Name of the Erlang node. + ''; + }; + + anonymousUserCreation = mkOption { + type = types.bool; + default = false; + description = '' + Anonymous user creation. + ''; + }; + + riakHost = mkOption { + type = types.string; + default = "127.0.0.1:8087"; + description = '' + Name of riak hosting service. + ''; + }; + + listener = mkOption { + type = types.string; + default = "127.0.0.1:8080"; + description = '' + Name of Riak CS listening service. + ''; + }; + + stanchionHost = mkOption { + type = types.string; + default = "127.0.0.1:8085"; + description = '' + Name of stanchion hosting service. + ''; + }; + + stanchionSsl = mkOption { + type = types.bool; + default = true; + description = '' + Tell stanchion to use SSL. + ''; + }; + + distributedCookie = mkOption { + type = types.string; + default = "riak"; + description = '' + Cookie for distributed node communication. All nodes in the + same cluster should use the same cookie or they will not be able to + communicate. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/db/riak-cs"; + description = '' + Data directory for Riak CS. + ''; + }; + + logDir = mkOption { + type = types.path; + default = "/var/log/riak-cs"; + description = '' + Log directory for Riak CS. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional text to be appended to riak-cs.conf. + ''; + }; + + extraAdvancedConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional text to be appended to advanced.config. + ''; + }; + }; + + }; + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ cfg.package ]; + environment.etc."riak-cs/riak-cs.conf".text = '' + nodename = ${cfg.nodeName} + distributed_cookie = ${cfg.distributedCookie} + + platform_log_dir = ${cfg.logDir} + + riak_host = ${cfg.riakHost} + listener = ${cfg.listener} + stanchion_host = ${cfg.stanchionHost} + + anonymous_user_creation = ${if cfg.anonymousUserCreation then "on" else "off"} + + ${cfg.extraConfig} + ''; + + environment.etc."riak-cs/advanced.config".text = '' + ${cfg.extraAdvancedConfig} + ''; + + users.extraUsers.riak-cs = { + name = "riak-cs"; + uid = config.ids.uids.riak-cs; + group = "riak"; + description = "Riak CS server user"; + }; + + systemd.services.riak-cs = { + description = "Riak CS Server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + path = [ + pkgs.utillinux # for `logger` + pkgs.bash + ]; + + environment.HOME = "${cfg.dataDir}"; + environment.RIAK_CS_DATA_DIR = "${cfg.dataDir}"; + environment.RIAK_CS_LOG_DIR = "${cfg.logDir}"; + environment.RIAK_CS_ETC_DIR = "/etc/riak"; + + preStart = '' + if ! test -e ${cfg.logDir}; then + mkdir -m 0755 -p ${cfg.logDir} + chown -R riak-cs ${cfg.logDir} + fi + + if ! test -e ${cfg.dataDir}; then + mkdir -m 0700 -p ${cfg.dataDir} + chown -R riak-cs ${cfg.dataDir} + fi + ''; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/riak-cs console"; + ExecStop = "${cfg.package}/bin/riak-cs stop"; + StandardInput = "tty"; + User = "riak-cs"; + Group = "riak-cs"; + PermissionsStartOnly = true; + # Give Riak a decent amount of time to clean up. + TimeoutStopSec = 120; + LimitNOFILE = 65536; + }; + + unitConfig.RequiresMountsFor = [ + "${cfg.dataDir}" + "${cfg.logDir}" + "/etc/riak" + ]; + }; + }; +} diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix new file mode 100644 index 000000000000..439af4da565b --- /dev/null +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak }: + +stdenv.mkDerivation rec { + name = "riak_cs-2.1.1"; + + buildInputs = [ + which unzip erlang pam git wget + ]; + + src = fetchurl { + url = "http://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz"; + sha256 = "115cac127aac6d759c1b429a52e0d18e491c0719a6530b1b88aa52c4efdbedd5"; + }; + + + postPatch = '' + sed -i deps/node_package/priv/base/env.sh \ + -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak-cs}@' \ + -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \ + -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \ + -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak-cs}@' \ + -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@' + + sed -i ./Makefile \ + -e 's@rel: deps compile@rel: deps compile-src@' + ''; + + preBuild = '' + patchShebangs . + ''; + + buildPhase = '' + runHook preBuild + + make locked-deps + make rel + + runHook postBuild + ''; + + doCheck = false; + + installPhase = '' + runHook preInstall + + mkdir $out + mv rel/riak-cs/etc rel/riak-cs/riak-etc + mkdir -p rel/riak-cs/etc + mv rel/riak-cs/riak-etc rel/riak-cs/etc/riak-cs + mv rel/riak-cs/* $out + + for prog in $out/bin/*; do + substituteInPlace $prog \ + --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \ + ". $out/lib/env.sh" + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Dynamo inspired NoSQL DB by Basho with S3 compatibility"; + platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + maintainer = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c405b14d89cc..65ad74c6ee0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10245,6 +10245,10 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; + riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { + erlang = erlang_basho_R16B03; + }; + stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { erlang = erlang_basho_R16B03; }; From 6dae6b87401637fd6ab9c242a95848bba1c773b2 Mon Sep 17 00:00:00 2001 From: Travis Whitaker Date: Sun, 20 Nov 2016 15:16:56 -0800 Subject: [PATCH 0561/1749] 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 0c6b3a3647fdc604ebfcce7091103d6deb0e9fc9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 21 Nov 2016 02:45:56 +0300 Subject: [PATCH 0562/1749] gnome3.polari: mark as broken --- pkgs/desktops/gnome-3/3.22/apps/polari/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix index 1927585fd321..a827831c801c 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix @@ -1,6 +1,7 @@ { stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme , telepathy_glib, gjs, itstool, telepathy_idle, libxml2 -, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }: +, pkgconfig, gtk3, glib, librsvg, libsecret, libsoup +, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -8,7 +9,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ telepathy_idle ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook - telepathy_glib gjs gdk_pixbuf librsvg libxml2 ]; + telepathy_glib gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ]; enableParallelBuilding = true; @@ -18,5 +19,6 @@ stdenv.mkDerivation rec { maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; + broken = true; }; } From c2274cdfb584297325ea6420aec1814b3e17753a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 11 Nov 2016 01:26:11 +0300 Subject: [PATCH 0563/1749] spidermonkey: cleanup and rename versions --- .../networking/browsers/elinks/default.nix | 6 +-- .../interpreters/spidermonkey/1.8.0-rc1.nix | 36 ------------------ ...{arm-flags.patch => 1.8.5-arm-flags.patch} | 0 ...dvanilla.patch => 1.8.5-findvanilla.patch} | 0 .../spidermonkey/{185-1.0.0.nix => 1.8.5.nix} | 12 +++--- .../spidermonkey/{17.0.nix => 17.nix} | 0 .../spidermonkey/{24.2.nix => 24.nix} | 5 ++- .../spidermonkey/{31.5.nix => 31.nix} | 6 ++- .../interpreters/spidermonkey/Makefile.extra | 10 ----- .../interpreters/spidermonkey/default.nix | 37 ------------------- pkgs/development/libraries/polkit/default.nix | 4 +- pkgs/servers/mediatomb/default.nix | 5 +-- pkgs/top-level/all-packages.nix | 21 ++++------- pkgs/top-level/php-packages.nix | 4 +- 14 files changed, 30 insertions(+), 116 deletions(-) delete mode 100644 pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix rename pkgs/development/interpreters/spidermonkey/{arm-flags.patch => 1.8.5-arm-flags.patch} (100%) rename pkgs/development/interpreters/spidermonkey/{findvanilla.patch => 1.8.5-findvanilla.patch} (100%) rename pkgs/development/interpreters/spidermonkey/{185-1.0.0.nix => 1.8.5.nix} (87%) rename pkgs/development/interpreters/spidermonkey/{17.0.nix => 17.nix} (100%) rename pkgs/development/interpreters/spidermonkey/{24.2.nix => 24.nix} (93%) rename pkgs/development/interpreters/spidermonkey/{31.5.nix => 31.nix} (89%) delete mode 100644 pkgs/development/interpreters/spidermonkey/Makefile.extra delete mode 100644 pkgs/development/interpreters/spidermonkey/default.nix diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index a785b8593504..cc34318edf3c 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl -, spidermonkey, gpm +, spidermonkey_1_8_5, gpm , enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2 , enablePython ? false, python ? null }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ ./gc-init.patch ]; - buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ] + buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey_1_8_5 gpm ] ++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enablePython python; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { '' --enable-finger --enable-html-highlight --with-perl --enable-gopher --enable-cgi --enable-bittorrent - --with-spidermonkey=${spidermonkey} + --with-spidermonkey=${spidermonkey_1_8_5} --enable-nntp --with-openssl=${openssl.dev} '' + stdenv.lib.optionalString enableGuile " --with-guile" + stdenv.lib.optionalString enablePython " --with-python"; diff --git a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix deleted file mode 100644 index 24ba479186ec..000000000000 --- a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, readline, nspr }: - -stdenv.mkDerivation rec { - version = "1.8.0-rc1"; - name = "spidermonkey-${version}"; - - src = fetchurl { - url = "mirror://mozilla/js/js-${version}.tar.gz"; - sha256 = "374398699ac3fd802d98d642486cf6b0edc082a119c9c9c499945a0bc73e3413"; - }; - - buildInputs = [ readline nspr ]; - - postUnpack = "sourceRoot=\${sourceRoot}/src"; - - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.isi686 "pic"; - - makefileExtra = ./Makefile.extra; - makefile = "Makefile.ref"; - - patchPhase = - '' - cat ${makefileExtra} >> ${makefile} - sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile} - ''; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" - ''; - - makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1 JS_THREADSAFE=1"; - - meta = { - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/interpreters/spidermonkey/arm-flags.patch b/pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch similarity index 100% rename from pkgs/development/interpreters/spidermonkey/arm-flags.patch rename to pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch diff --git a/pkgs/development/interpreters/spidermonkey/findvanilla.patch b/pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch similarity index 100% rename from pkgs/development/interpreters/spidermonkey/findvanilla.patch rename to pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix similarity index 87% rename from pkgs/development/interpreters/spidermonkey/185-1.0.0.nix rename to pkgs/development/interpreters/spidermonkey/1.8.5.nix index 582e7039d17c..3c5eef01db01 100644 --- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -1,11 +1,11 @@ -{ stdenv, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }: +{ stdenv, lib, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }: stdenv.mkDerivation rec { - version = "185-1.0.0"; name = "spidermonkey-${version}"; + version = "1.8.5"; src = fetchurl { - url = "mirror://mozilla/js/js${version}.tar.gz"; + url = "mirror://mozilla/js/js185-1.0.0.tar.gz"; sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687"; }; @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" export LIBXUL_DIST=$out - ${if stdenv.isArm then "autoreconf --verbose --force" else ""} + ${lib.optionalString stdenv.isArm "autoreconf --verbose --force"} ''; patches = stdenv.lib.optionals stdenv.isArm [ # Explained below in configureFlags for ARM - ./findvanilla.patch + ./1.8.5-findvanilla.patch # Fix for hard float flags. - ./arm-flags.patch + ./1.8.5-arm-flags.patch ]; patchFlags = "-p3"; diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.nix similarity index 100% rename from pkgs/development/interpreters/spidermonkey/17.0.nix rename to pkgs/development/interpreters/spidermonkey/17.nix diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.nix similarity index 93% rename from pkgs/development/interpreters/spidermonkey/24.2.nix rename to pkgs/development/interpreters/spidermonkey/24.nix index 279528e9e83c..6e354c542963 100644 --- a/pkgs/development/interpreters/spidermonkey/24.2.nix +++ b/pkgs/development/interpreters/spidermonkey/24.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline }: +{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline, icu }: stdenv.mkDerivation rec { version = "24.2.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - buildInputs = [ pkgconfig perl python2 zip libffi readline ]; + buildInputs = [ pkgconfig perl python2 zip libffi readline icu ]; postPatch = '' # Fixes an issue with version detection under perl 5.22.x @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { "--libdir=$(lib)/lib" "--includedir=$(dev)/include" "--enable-threadsafe" + "--with-system-icu" "--with-system-nspr" "--with-system-ffi" "--enable-readline" diff --git a/pkgs/development/interpreters/spidermonkey/31.5.nix b/pkgs/development/interpreters/spidermonkey/31.nix similarity index 89% rename from pkgs/development/interpreters/spidermonkey/31.5.nix rename to pkgs/development/interpreters/spidermonkey/31.nix index f52d526e3fa9..585ebc120d8e 100644 --- a/pkgs/development/interpreters/spidermonkey/31.5.nix +++ b/pkgs/development/interpreters/spidermonkey/31.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline }: +{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, nspr, icu, readline }: stdenv.mkDerivation rec { version = "31.5.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd"; }; - buildInputs = [ pkgconfig perl python2 zip libffi readline ]; + buildInputs = [ pkgconfig perl python2 zip libffi readline nspr icu ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-threadsafe" "--with-system-ffi" + "--with-system-nspr" + "--with-system-icu" "--enable-readline" # enabling these because they're wanted by 0ad. They may or may diff --git a/pkgs/development/interpreters/spidermonkey/Makefile.extra b/pkgs/development/interpreters/spidermonkey/Makefile.extra deleted file mode 100644 index a764cfc69cb6..000000000000 --- a/pkgs/development/interpreters/spidermonkey/Makefile.extra +++ /dev/null @@ -1,10 +0,0 @@ -install: $(PROGRAM) $(SHARED_LIBRARY) - mkdir -pv $(DIST)/{bin,lib} - mkdir -pv $(DIST)/include - cp -v $(PROGRAM) $(DIST)/bin - cp -v $(SHARED_LIBRARY) $(LIBRARY) $(DIST)/lib - cp -v $(JS_HFILES) $(API_HFILES) $(OTHER_HFILES) $(DIST)/include - mkdir -pv $(DIST)/include/js - find . -name '*.h' -exec cp '{}' $(DIST)/include/js ';' - find . -name '*.msg' -exec cp '{}' $(DIST)/include/js ';' - diff --git a/pkgs/development/interpreters/spidermonkey/default.nix b/pkgs/development/interpreters/spidermonkey/default.nix deleted file mode 100644 index 1fe4b90b2b80..000000000000 --- a/pkgs/development/interpreters/spidermonkey/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, readline }: - -stdenv.mkDerivation rec { - name = "spidermonkey-1.7"; - - src = fetchurl { - url = mirror://mozilla/js/js-1.7.0.tar.gz; - sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4"; - }; - - hardeningDisable = [ "format" ] - ++ stdenv.lib.optional stdenv.isi686 "stackprotector"; - - buildInputs = [ readline ]; - - postUnpack = "sourceRoot=\${sourceRoot}/src"; - - makefileExtra = ./Makefile.extra; - makefile = "Makefile.ref"; - - patchPhase = - '' - cat ${makefileExtra} >> ${makefile} - sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile} - ''; - - CFLAGS = "-DPIC -fPIC -DJS_C_STRINGS_ARE_UTF8"; - - makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1"; - - meta = with stdenv.lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"; - license = licenses.mpl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index ab1943b85909..ff67ff8a1bbf 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey +{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey_17 , gobjectIntrospection, libxslt, docbook_xsl, docbook_xml_dtd_412 , useSystemd ? stdenv.isLinux, systemd }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; # small man pages in $bin buildInputs = - [ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ] + [ pkgconfig glib expat pam intltool spidermonkey_17 gobjectIntrospection ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ] # man pages ++ stdenv.lib.optional useSystemd systemd; diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index c4a5b0ebd290..75d12a5f66fe 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchgit -, sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg, file +, sqlite, expat, mp4v2, flac, spidermonkey_1_8_5, taglib, libexif, curl, ffmpeg, file , pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { - name = "mediatomb-${version}"; version = "0.12.1"; @@ -13,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd"; }; - buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file mp4v2 flac + buildInputs = [ sqlite expat spidermonkey_1_8_5 taglib libexif curl ffmpeg file mp4v2 flac pkgconfig autoreconfHook ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65ad74c6ee0b..28a1c36fe2af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5700,12 +5700,11 @@ in spark = callPackage ../applications/networking/cluster/spark { }; - spidermonkey = callPackage ../development/interpreters/spidermonkey { }; - spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { }; - spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { }; - spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.0.nix { }; - spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.2.nix { }; - spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.5.nix { }; + spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; + spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; + spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.nix { }; + spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { }; + spidermonkey = spidermonkey_31; supercollider = callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; @@ -8843,9 +8842,7 @@ in polarssl = mbedtls; - polkit = callPackage ../development/libraries/polkit { - spidermonkey = spidermonkey_17; - }; + polkit = callPackage ../development/libraries/polkit { }; polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { }; @@ -10002,7 +9999,7 @@ in charybdis = callPackage ../servers/irc/charybdis {}; couchdb = callPackage ../servers/http/couchdb { - spidermonkey = spidermonkey_185; + spidermonkey = spidermonkey_1_8_5; python = python27; sphinx = python27Packages.sphinx; erlang = erlangR16; @@ -10105,9 +10102,7 @@ in mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - mediatomb = callPackage ../servers/mediatomb { - spidermonkey = spidermonkey_185; - }; + mediatomb = callPackage ../servers/mediatomb { }; memcached = callPackage ../servers/memcached {}; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 6313ff5372cd..1808d65b75c4 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -79,10 +79,10 @@ let sha256 = "1ywrsp90w6rlgq3v2vmvp2zvvykkgqqasab7h9bf3vgvgv3qasbg"; configureFlags = [ - "--with-spidermonkey=${pkgs.spidermonkey_185}" + "--with-spidermonkey=${pkgs.spidermonkey_1_8_5}" ]; - buildInputs = [ pkgs.spidermonkey_185 ]; + buildInputs = [ pkgs.spidermonkey_1_8_5 ]; }; xdebug = if isPhp7 then xdebug24 else xdebug23; From bc5b9a3fa46b9098610b466a29402bc2e35a5912 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 11 Nov 2016 01:31:31 +0300 Subject: [PATCH 0564/1749] spidermonkey_38: init at 38.2.1.rc0 --- .../interpreters/spidermonkey/38.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/interpreters/spidermonkey/38.nix diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix new file mode 100644 index 000000000000..89c02f262001 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline, icu, zlib, nspr }: + +stdenv.mkDerivation rec { + version = "38.2.1.rc0"; + name = "spidermonkey-${version}"; + + # the release notes point to some guys home directory, see + # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38 + # probably it would be more ideal to pull a particular tag/revision + # from the mercurial repo + src = fetchurl { + url = "https://people.mozilla.org/~sstangl/mozjs-${version}.tar.bz2"; + sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681"; + }; + + buildInputs = [ pkgconfig perl python2 zip libffi readline icu zlib nspr ]; + + postUnpack = "sourceRoot=\${sourceRoot}/js/src"; + + preConfigure = '' + export CXXFLAGS="-fpermissive" + export LIBXUL_DIST=$out + export PYTHON="${python2.interpreter}" + ''; + + configureFlags = [ + "--enable-threadsafe" + "--with-system-ffi" + "--with-system-nspr" + "--with-system-zlib" + "--with-system-icu" + "--enable-readline" + + # enabling these because they're wanted by 0ad. They may or may + # not be good defaults for other uses. + "--enable-gcgenerational" + "--enable-shared-js" + ]; + + # This addresses some build system bug. It's quite likely to be safe + # to re-enable parallel builds if the source revision changes. + enableParallelBuilding = true; + + postFixup = '' + # The headers are symlinks to a directory that doesn't get put + # into $out, so they end up broken. Fix that by just resolving the + # symlinks. + for i in $(find $out -type l); do + cp --remove-destination "$(readlink "$i")" "$i"; + done + ''; + + meta = with stdenv.lib; { + description = "Mozilla's JavaScript engine written in C/C++"; + homepage = https://developer.mozilla.org/en/SpiderMonkey; + # TODO: MPL/GPL/LGPL tri-license. + + maintainers = [ maintainers.abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28a1c36fe2af..b6d14f153e8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5704,6 +5704,7 @@ in spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.nix { }; spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { }; + spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { }; spidermonkey = spidermonkey_31; supercollider = callPackage ../development/interpreters/supercollider { From 292bb8f4c3048b38b3a7e1804db6ecd433ffbc21 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 11 Nov 2016 01:32:22 +0300 Subject: [PATCH 0565/1749] zeroad: 0.0.20 -> 0.0.21 --- pkgs/games/0ad/data.nix | 4 ++-- pkgs/games/0ad/game.nix | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 6b4dface0e1c..68ef1fd53926 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "0ad-data-${version}"; - version = "0.0.20"; + version = "0.0.21"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"; - sha256 = "1lzl8chfqbgs1n9vpn0xaqd70kpwiibfk196iblyq6qkms3v6pnv"; + sha256 = "15xadyrpvq27lm9p1ny7bcmmv56m16h3xadbkdx69gfkzxc3razk"; }; installPhase = '' diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index e4d4e3cb8e4e..f038673f4c0b 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,5 +1,5 @@ { stdenv, lib, callPackage, perl, fetchurl, python2 -, pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng +, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2 , gloox, nvidia-texture-tools @@ -10,17 +10,17 @@ assert withEditor -> wxGTK != null; stdenv.mkDerivation rec { name = "0ad-${version}"; - version = "0.0.20"; + version = "0.0.21"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; - sha256 = "13n61xhjsawda3kl7112la41bqkbqmq4yhr3slydsz856z5xb5m3"; + sha256 = "1kw3hqnr737ipx4f03khz3hvsh3ha7r8iy9njppk2faa53j27gln"; }; nativeBuildInputs = [ python2 perl pkgconfig ]; buildInputs = [ - spidermonkey_31 boost icu libxml2 libpng libjpeg + spidermonkey_38 boost icu libxml2 libpng libjpeg zlib curl libogg libvorbis enet miniupnpc openal mesa xproto libX11 libXcursor nspr SDL2 gloox nvidia-texture-tools @@ -44,11 +44,16 @@ stdenv.mkDerivation rec { # Delete shipped libraries which we don't need. rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} + # Workaround invalid pkgconfig name for mozjs + mkdir pkgconfig + ln -s ${spidermonkey_38}/lib/pkgconfig/* pkgconfig/mozjs-38.pc + PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH" + # Update Makefiles pushd build/workspaces ./update-workspaces.sh \ --with-system-nvtt \ - --with-system-mozjs31 \ + --with-system-mozjs38 \ ${lib.optionalString withEditor "--enable-atlas"} \ --bindir="$out"/bin \ --libdir="$out"/lib/0ad \ From 59ba4276b771102dbe49ce58672a3c6bba5f863b Mon Sep 17 00:00:00 2001 From: montag451 Date: Mon, 21 Nov 2016 02:01:37 +0100 Subject: [PATCH 0566/1749] aptly: init at 0.9.7 --- pkgs/tools/misc/aptly/default.nix | 31 ++++ pkgs/tools/misc/aptly/deps.nix | 245 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 278 insertions(+) create mode 100644 pkgs/tools/misc/aptly/default.nix create mode 100644 pkgs/tools/misc/aptly/deps.nix diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix new file mode 100644 index 000000000000..b1dd71a8882f --- /dev/null +++ b/pkgs/tools/misc/aptly/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, gnupg1compat, bzip2, xz, graphviz }: + +buildGoPackage rec { + name = "aptly-${version}"; + version = "0.9.7"; + rev = "v${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "smira"; + repo = "aptly"; + sha256 = "0j1bmqdah4i83r2cf8zcq87aif1qg90yasgf82yygk3hj0gw1h00"; + }; + + goPackagePath = "github.com/smira/aptly"; + goDeps = ./deps.nix; + + postInstall = '' + rm $bin/bin/man + ''; + + propagatedUserEnvPkgs = [ gnupg1compat bzip2.bin xz.bin graphviz ]; + + meta = with stdenv.lib; { + homepage = https://www.aptly.info; + description = "Debian repository management tool"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.montag451 ]; + }; +} diff --git a/pkgs/tools/misc/aptly/deps.nix b/pkgs/tools/misc/aptly/deps.nix new file mode 100644 index 000000000000..f0163f34ae8b --- /dev/null +++ b/pkgs/tools/misc/aptly/deps.nix @@ -0,0 +1,245 @@ +[ + { + goPackagePath = "github.com/AlekSi/pointer"; + fetch = { + type = "git"; + url = https://github.com/AlekSi/pointer.git; + rev = "5f6d527dae3d678b46fbb20331ddf44e2b841943"; + sha256 = "127n71d8y1d8hxv9fq9z1midw3vk5xa6aq45gffjvwabx4cgha1l"; + }; + } + { + goPackagePath = "github.com/awalterschulze/gographviz"; + fetch = { + type = "git"; + url = https://github.com/awalterschulze/gographviz.git; + rev = "20d1f693416d9be045340150094aa42035a41c9e"; + sha256 = "1q4796nzanikqmz77jdc2xrq30n93w6ljcfsbhij3yj3s698bcaf"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = https://github.com/aws/aws-sdk-go.git; + rev = "a170e9cb76475a0da7c0326a13cc2b39e9244b3b"; + sha256 = "0z7pgb9q0msvdkrvjwi95cbl9k9w8f3n2liwkl6fli0nx9jyamqw"; + }; + } + { + goPackagePath = "github.com/cheggaaa/pb"; + fetch = { + type = "git"; + url = https://github.com/cheggaaa/pb.git; + rev = "2c1b74620cc58a81ac152ee2d322e28c806d81ed"; + sha256 = "148fv6a0ranzcc1lv4v5lmvgbfx05dhzpwsg8vxi9ggn51n496ny"; + }; + } + { + goPackagePath = "github.com/DisposaBoy/JsonConfigReader"; + fetch = { + type = "git"; + url = https://github.com/DisposaBoy/JsonConfigReader.git; + rev = "33a99fdf1d5ee1f79b5077e9c06f955ad356d5f4"; + sha256 = "1rq7hp1xk8lzvn9bv9jfkszw8p2qia8prvrx540gb2y93jw9i847"; + }; + } + { + goPackagePath = "github.com/gin-gonic/gin"; + fetch = { + type = "git"; + url = https://github.com/gin-gonic/gin.git; + rev = "b1758d3bfa09e61ddbc1c9a627e936eec6a170de"; + sha256 = "0y3v5vi68xafcvz9yz6ffww96xs2qalklnaab7vrwpax3brlkipk"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = https://github.com/go-ini/ini.git; + rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3"; + sha256 = "0xi8zr9qw38sdbv95c2ip31yczbm4axdvmj3ljyivn9xh2nbxfia"; + }; + } + { + goPackagePath = "github.com/jlaffaye/ftp"; + fetch = { + type = "git"; + url = https://github.com/jlaffaye/ftp.git; + rev = "fec71e62e457557fbe85cefc847a048d57815d76"; + sha256 = "08ivzsfswgl4xlr6wmqpbf77jclh8ivhwxlhj59allp27lic1kgm"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = https://github.com/jmespath/go-jmespath.git; + rev = "0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = https://github.com/julienschmidt/httprouter.git; + rev = "46807412fe50aaceb73bb57061c2230fd26a1640"; + sha256 = "0mvzjpzlb1gkb6lp0nwni3vid6fw33dkzl6s9gj7gp2wsbwzcdhd"; + }; + } + { + goPackagePath = "github.com/mattn/go-shellwords"; + fetch = { + type = "git"; + url = https://github.com/mattn/go-shellwords.git; + rev = "c7ca6f94add751566a61cf2199e1de78d4c3eee4"; + sha256 = "1714ca0p0mwijck0vxdssizxyjjjki1dpc5bl51ayw5sa7s6d4n2"; + }; + } + { + goPackagePath = "github.com/mkrautz/goar"; + fetch = { + type = "git"; + url = https://github.com/mkrautz/goar.git; + rev = "282caa8bd9daba480b51f1d5a988714913b97aad"; + sha256 = "0b6nmgyh5lmm8d1psm5yqqmshkqi87di1191c9q95z1gkkfi16b2"; + }; + } + { + goPackagePath = "github.com/mxk/go-flowrate"; + fetch = { + type = "git"; + url = https://github.com/mxk/go-flowrate.git; + rev = "cca7078d478f8520f85629ad7c68962d31ed7682"; + sha256 = "0zqs39923ja0yypdmiqk6x8pgmfs3ms5x5sl1dqv9z6zyx2xy541"; + }; + } + { + goPackagePath = "github.com/ncw/swift"; + fetch = { + type = "git"; + url = https://github.com/ncw/swift.git; + rev = "384ef27c70645e285f8bb9d02276bf654d06027e"; + sha256 = "1is9z6pbn55yr5b7iizfyi8y19nc9xprd87cwab4i54bxkqqp5hg"; + }; + } + { + goPackagePath = "github.com/smira/go-aws-auth"; + fetch = { + type = "git"; + url = https://github.com/smira/go-aws-auth.git; + rev = "0070896e9d7f4f9f2d558532b2d896ce2239992a"; + sha256 = "0ic7fgpgr8n1gvhwab1isbm82azy8kb9bzjxsch5i2dpvnz03rvh"; + }; + } + { + goPackagePath = "github.com/smira/go-xz"; + fetch = { + type = "git"; + url = https://github.com/smira/go-xz.git; + rev = "0c531f070014e218b21f3cfca801cc992d52726d"; + sha256 = "1wpgw8y6xjyf75dfcirx58cr1c277avdb6hr7xvcddhcfn01qzma"; + }; + } + { + goPackagePath = "github.com/smira/commander"; + fetch = { + type = "git"; + url = https://github.com/smira/commander.git; + rev = "f408b00e68d5d6e21b9f18bd310978dafc604e47"; + sha256 = "0gzhxjni17qq0z4zhakjrp98qd0qmf6wlyrx5xwwsqgh07nyzssa"; + }; + } + { + goPackagePath = "github.com/smira/flag"; + fetch = { + type = "git"; + url = https://github.com/smira/flag.git; + rev = "357ed3e599ffcbd4aeaa828e1d10da2df3ea5107"; + sha256 = "0wh77lz7z23rs9mbyi89l28i16gp1zx2312zxs4ngqdvjvinsiri"; + }; + } + { + goPackagePath = "github.com/smira/go-ftp-protocol"; + fetch = { + type = "git"; + url = https://github.com/smira/go-ftp-protocol.git; + rev = "066b75c2b70dca7ae10b1b88b47534a3c31ccfaa"; + sha256 = "1az9p44fa7bcw92ywcyrqch2j1781b96rpid2qggyp3nhjivx8rx"; + }; + } + { + goPackagePath = "github.com/smira/go-uuid"; + fetch = { + type = "git"; + url = https://github.com/smira/go-uuid.git; + rev = "ed3ca8a15a931b141440a7e98e4f716eec255f7d"; + sha256 = "1vasidfa2pqrawk4zm5bqsi5q7f3qx3xm159hs36r0h0kj0c7sz4"; + }; + } + { + goPackagePath = "github.com/smira/lzma"; + fetch = { + type = "git"; + url = https://github.com/smira/lzma.git; + rev = "7f0af6269940baa2c938fabe73e0d7ba41205683"; + sha256 = "0ka8mbyg2dj076aslbi1hiahw5n5gjyn7s4w3x4ws9ak5chw5zif"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = https://github.com/golang/snappy.git; + rev = "723cc1e459b8eea2dea4583200fd60757d40097a"; + sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"; + }; + } + { + goPackagePath = "github.com/syndtr/goleveldb"; + fetch = { + type = "git"; + url = https://github.com/syndtr/goleveldb.git; + rev = "917f41c560270110ceb73c5b38be2a9127387071"; + sha256 = "0ybpcizg2gn3ln9rycqbaqlclci3k2q8mipcwq7927ym113d7q32"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = https://github.com/ugorji/go.git; + rev = "71c2886f5a673a35f909803f38ece5810165097b"; + sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; + }; + } + { + goPackagePath = "github.com/vaughan0/go-ini"; + fetch = { + type = "git"; + url = https://github.com/vaughan0/go-ini.git; + rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; + sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + }; + } + { + goPackagePath = "github.com/wsxiaoys/terminal"; + fetch = { + type = "git"; + url = https://github.com/wsxiaoys/terminal.git; + rev = "5668e431776a7957528361f90ce828266c69ed08"; + sha256 = "0dirblp3lwijsrx590qfp8zn5xspkjzq7ihkv05806mpncg5ivxd"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = https://go.googlesource.com/crypto.git; + rev = "a7ead6ddf06233883deca151dffaef2effbf498f"; + sha256 = "0gyvja1kh6xkxy7mg5y72zpvmi6hfix34kmzg4sry1x7bycw3dfc"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65ad74c6ee0b..783da911ef90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -421,6 +421,8 @@ in apt-offline = callPackage ../tools/misc/apt-offline { }; + aptly = callPackage ../tools/misc/aptly { }; + apulse = callPackage ../misc/apulse { }; archivemount = callPackage ../tools/filesystems/archivemount { }; From fc10bf81a1aed60029de813940341aa6b02fd551 Mon Sep 17 00:00:00 2001 From: James Cook Date: Sun, 20 Nov 2016 19:48:28 -0800 Subject: [PATCH 0567/1749] Revert "riak-cs: add to nixpkgs" --- nixos/modules/misc/ids.nix | 2 - nixos/modules/module-list.nix | 1 - nixos/modules/services/databases/riak-cs.nix | 201 ------------------- pkgs/servers/nosql/riak-cs/2.1.1.nix | 67 ------- pkgs/top-level/all-packages.nix | 4 - 5 files changed, 275 deletions(-) delete mode 100644 nixos/modules/services/databases/riak-cs.nix delete mode 100644 pkgs/servers/nosql/riak-cs/2.1.1.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index b61c1f4799ec..47c140df2482 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -280,7 +280,6 @@ leaps = 260; ipfs = 261; stanchion = 262; - riak-cs = 263; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -531,7 +530,6 @@ leaps = 260; ipfs = 261; stanchion = 262; - riak-cs = 263; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d82f1fbc54fd..56f880fdbd38 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -159,7 +159,6 @@ ./services/databases/postgresql.nix ./services/databases/redis.nix ./services/databases/riak.nix - ./services/databases/riak-cs.nix ./services/databases/stanchion.nix ./services/databases/virtuoso.nix ./services/desktops/accountsservice.nix diff --git a/nixos/modules/services/databases/riak-cs.nix b/nixos/modules/services/databases/riak-cs.nix deleted file mode 100644 index 77717118c645..000000000000 --- a/nixos/modules/services/databases/riak-cs.nix +++ /dev/null @@ -1,201 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.riak-cs; - -in - -{ - - ###### interface - - options = { - - services.riak-cs = { - - enable = mkEnableOption "riak-cs"; - - package = mkOption { - type = types.package; - default = pkgs.riak-cs; - example = literalExample "pkgs.riak"; - description = '' - Riak package to use. - ''; - }; - - nodeName = mkOption { - type = types.string; - default = "riak-cs@127.0.0.1"; - description = '' - Name of the Erlang node. - ''; - }; - - anonymousUserCreation = mkOption { - type = types.bool; - default = false; - description = '' - Anonymous user creation. - ''; - }; - - riakHost = mkOption { - type = types.string; - default = "127.0.0.1:8087"; - description = '' - Name of riak hosting service. - ''; - }; - - listener = mkOption { - type = types.string; - default = "127.0.0.1:8080"; - description = '' - Name of Riak CS listening service. - ''; - }; - - stanchionHost = mkOption { - type = types.string; - default = "127.0.0.1:8085"; - description = '' - Name of stanchion hosting service. - ''; - }; - - stanchionSsl = mkOption { - type = types.bool; - default = true; - description = '' - Tell stanchion to use SSL. - ''; - }; - - distributedCookie = mkOption { - type = types.string; - default = "riak"; - description = '' - Cookie for distributed node communication. All nodes in the - same cluster should use the same cookie or they will not be able to - communicate. - ''; - }; - - dataDir = mkOption { - type = types.path; - default = "/var/db/riak-cs"; - description = '' - Data directory for Riak CS. - ''; - }; - - logDir = mkOption { - type = types.path; - default = "/var/log/riak-cs"; - description = '' - Log directory for Riak CS. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Additional text to be appended to riak-cs.conf. - ''; - }; - - extraAdvancedConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Additional text to be appended to advanced.config. - ''; - }; - }; - - }; - - ###### implementation - - config = mkIf cfg.enable { - - environment.systemPackages = [ cfg.package ]; - environment.etc."riak-cs/riak-cs.conf".text = '' - nodename = ${cfg.nodeName} - distributed_cookie = ${cfg.distributedCookie} - - platform_log_dir = ${cfg.logDir} - - riak_host = ${cfg.riakHost} - listener = ${cfg.listener} - stanchion_host = ${cfg.stanchionHost} - - anonymous_user_creation = ${if cfg.anonymousUserCreation then "on" else "off"} - - ${cfg.extraConfig} - ''; - - environment.etc."riak-cs/advanced.config".text = '' - ${cfg.extraAdvancedConfig} - ''; - - users.extraUsers.riak-cs = { - name = "riak-cs"; - uid = config.ids.uids.riak-cs; - group = "riak"; - description = "Riak CS server user"; - }; - - systemd.services.riak-cs = { - description = "Riak CS Server"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - path = [ - pkgs.utillinux # for `logger` - pkgs.bash - ]; - - environment.HOME = "${cfg.dataDir}"; - environment.RIAK_CS_DATA_DIR = "${cfg.dataDir}"; - environment.RIAK_CS_LOG_DIR = "${cfg.logDir}"; - environment.RIAK_CS_ETC_DIR = "/etc/riak"; - - preStart = '' - if ! test -e ${cfg.logDir}; then - mkdir -m 0755 -p ${cfg.logDir} - chown -R riak-cs ${cfg.logDir} - fi - - if ! test -e ${cfg.dataDir}; then - mkdir -m 0700 -p ${cfg.dataDir} - chown -R riak-cs ${cfg.dataDir} - fi - ''; - - serviceConfig = { - ExecStart = "${cfg.package}/bin/riak-cs console"; - ExecStop = "${cfg.package}/bin/riak-cs stop"; - StandardInput = "tty"; - User = "riak-cs"; - Group = "riak-cs"; - PermissionsStartOnly = true; - # Give Riak a decent amount of time to clean up. - TimeoutStopSec = 120; - LimitNOFILE = 65536; - }; - - unitConfig.RequiresMountsFor = [ - "${cfg.dataDir}" - "${cfg.logDir}" - "/etc/riak" - ]; - }; - }; -} diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix deleted file mode 100644 index 439af4da565b..000000000000 --- a/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak }: - -stdenv.mkDerivation rec { - name = "riak_cs-2.1.1"; - - buildInputs = [ - which unzip erlang pam git wget - ]; - - src = fetchurl { - url = "http://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz"; - sha256 = "115cac127aac6d759c1b429a52e0d18e491c0719a6530b1b88aa52c4efdbedd5"; - }; - - - postPatch = '' - sed -i deps/node_package/priv/base/env.sh \ - -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak-cs}@' \ - -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \ - -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \ - -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak-cs}@' \ - -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@' - - sed -i ./Makefile \ - -e 's@rel: deps compile@rel: deps compile-src@' - ''; - - preBuild = '' - patchShebangs . - ''; - - buildPhase = '' - runHook preBuild - - make locked-deps - make rel - - runHook postBuild - ''; - - doCheck = false; - - installPhase = '' - runHook preInstall - - mkdir $out - mv rel/riak-cs/etc rel/riak-cs/riak-etc - mkdir -p rel/riak-cs/etc - mv rel/riak-cs/riak-etc rel/riak-cs/etc/riak-cs - mv rel/riak-cs/* $out - - for prog in $out/bin/*; do - substituteInPlace $prog \ - --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \ - ". $out/lib/env.sh" - done - - runHook postInstall - ''; - - meta = with lib; { - description = "Dynamo inspired NoSQL DB by Basho with S3 compatibility"; - platforms = [ "x86_64-linux" ]; - license = licenses.asl20; - maintainer = with maintainers; [ mdaiter ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65ad74c6ee0b..c405b14d89cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10245,10 +10245,6 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; - riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { - erlang = erlang_basho_R16B03; - }; - stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { erlang = erlang_basho_R16B03; }; From 2e100a3e10e6bf6f7c829e6381fc06f32028e19e Mon Sep 17 00:00:00 2001 From: michael bishop Date: Sun, 20 Nov 2016 10:07:33 -0400 Subject: [PATCH 0568/1749] gogui: init at 1.4.9 --- pkgs/games/gogui/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/games/gogui/default.nix diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix new file mode 100644 index 000000000000..e89d16b788a6 --- /dev/null +++ b/pkgs/games/gogui/default.nix @@ -0,0 +1,28 @@ +{ fetchurl, stdenv, openjdk, unzip, makeWrapper }: + +let + version = "1.4.9"; +in stdenv.mkDerivation { + name = "gogui-${version}"; + buildInputs = [ unzip makeWrapper ]; + src = fetchurl { + url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip"; + sha256 = "0qk6p1bhi1816n638bg11ljyj6zxvm75jdf02aabzdmmd9slns1j"; + }; + dontConfigure = true; + installPhase = '' + mkdir -p $out/share/doc + mv -vi {bin,lib} $out/ + mv -vi doc $out/share/doc/gogui + for x in $out/bin/*; do + wrapProgram $x --prefix PATH ":" ${openjdk}/bin + done + ''; + meta = { + maintainers = [ stdenv.lib.maintainers.cleverca22 ]; + description = "A graphical user interface to programs that play the board game Go and support the Go Text Protocol such as GNU Go"; + homepage = http://gogui.sourceforge.net/; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f0077018461..f8fec048ba7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15649,6 +15649,8 @@ in gnugo = callPackage ../games/gnugo { }; + gogui = callPackage ../games/gogui {}; + gtypist = callPackage ../games/gtypist { }; gzdoom = callPackage ../games/gzdoom { }; From f4cf7638fdb29e04280a90cd641ed928b996034c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Nov 2016 11:34:48 +0100 Subject: [PATCH 0569/1749] 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/b21c267fad299853ba57f4cc4ac900a1bee62a52. --- .../haskell-modules/hackage-packages.nix | 704 ++++++++++++++---- 1 file changed, 549 insertions(+), 155 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dca97cf0ec2f..e585dd64a3d0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1697,8 +1697,8 @@ self: { }: mkDerivation { pname = "BlogLiterately"; - version = "0.8.4.1"; - sha256 = "58b1f32660e20f13b6b6ce6b0668099a8ed4acc7939468108dcde283d2fe4429"; + version = "0.8.4.2"; + sha256 = "f1d7a0e67ee04bc5c76596800369a9dc8d187b8b9d34081859d2d245fbd2b2f1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10565,8 +10565,8 @@ self: { }: mkDerivation { pname = "Lazy-Pbkdf2"; - version = "2.1.0"; - sha256 = "b431835541f5c22467b58862ffe4fe27a046e215fff8440cd0dbea331a3c7f82"; + version = "2.1.1"; + sha256 = "a79a0282997dfc4905314bded417f7631c6665802c9fa5103aad999e1832daa9"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base base16-bytestring binary bytestring cryptonite memory @@ -14330,15 +14330,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Rasterific_0_7" = callPackage + "Rasterific_0_7_1" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity , free, JuicyPixels, mtl, primitive, transformers, vector , vector-algorithms }: mkDerivation { pname = "Rasterific"; - version = "0.7"; - sha256 = "96c466c40237643354cf4aa29cc6694b716009a825e61af8263da96011c7bda1"; + version = "0.7.1"; + sha256 = "a3614c5d87c6aacbbd2aabc16d1258f559b03bf46537f47c375949438e7eb5ef"; + revision = "1"; + editedCabalFile = "6d38b54477eb7392b57e8082cc442a44ec34534a58f61bd09cf4d0b9cee7d089"; libraryHaskellDepends = [ base bytestring containers dlist FontyFruity free JuicyPixels mtl primitive transformers vector vector-algorithms @@ -17960,20 +17962,20 @@ self: { }) {}; "XSaiga" = callPackage - ({ mkDerivation, base, cgi, containers, hsparql, pretty, rdf4h - , text + ({ mkDerivation, base, cgi, containers, hsparql, network, pretty + , rdf4h, text }: mkDerivation { pname = "XSaiga"; - version = "1.4.0.1"; - sha256 = "f9eae0f1298cf4ab340b9a2761a1b4f80cffdf25a73ef8679c750008ba4316d2"; + version = "1.5.0.0"; + sha256 = "395e8e9710edac5a9c9355d52fc08cc293d76a6fbda12b7cc1d173d8d10f8e6c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers hsparql pretty rdf4h text + base containers hsparql network pretty rdf4h text ]; executableHaskellDepends = [ - base cgi containers hsparql pretty rdf4h text + base cgi containers hsparql network pretty rdf4h text ]; homepage = "http://hafiz.myweb.cs.uwindsor.ca/proHome.html"; description = "An implementation of a polynomial-time top-down parser suitable for NLP"; @@ -21475,8 +21477,8 @@ self: { }: mkDerivation { pname = "alsa-seq"; - version = "0.6.0.6"; - sha256 = "f5e58660f07943f0cc33eb2e1ada5e111c43d4114eeb4e0ac0251d72c43b7144"; + version = "0.6.0.7"; + sha256 = "06cda1e24993aaf0c3592b51a613cf1e187eea603dd77ad3a129a8a7b1e0b778"; libraryHaskellDepends = [ alsa-core array base bytestring data-accessor enumset extensible-exceptions poll transformers utility-ht @@ -24414,6 +24416,8 @@ self: { pname = "amby"; version = "0.2.1"; sha256 = "2430c8d5657af53a4bcc6d7856882375f0ffbcb7c360a2b8fd23cda6e2d33ffa"; + revision = "1"; + editedCabalFile = "0cf317eee0251e20650218b1f54fa76513536336ad033385510b9641837ad7be"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27016,6 +27020,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async_2_1_1" = callPackage + ({ mkDerivation, base, HUnit, stm, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "async"; + version = "2.1.1"; + sha256 = "24134b36921f9874abb73be90886b4c23a67a9b4990f2d8e32d08dbfa5f74f90"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-ajax" = callPackage ({ mkDerivation, async, base, ghcjs-ajax, text }: mkDerivation { @@ -30097,14 +30119,18 @@ self: { }) {}; "bench" = callPackage - ({ mkDerivation, base, criterion, silently, text, turtle }: + ({ mkDerivation, base, criterion, optparse-applicative, silently + , text, turtle + }: mkDerivation { pname = "bench"; - version = "1.0.1"; - sha256 = "b90b0789604d351aa97d736492c4b10be9bebaa369efc4145579f9f6d2eeb019"; + version = "1.0.2"; + sha256 = "9fac082305cc27d9ec7ee351ae1d301fc0a434c77cf1b121f51f2ca46d3a462e"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ base criterion silently text turtle ]; + executableHaskellDepends = [ + base criterion optparse-applicative silently text turtle + ]; homepage = "http://github.com/Gabriel439/bench"; description = "Command-line benchmark tool"; license = stdenv.lib.licenses.bsd3; @@ -30390,8 +30416,8 @@ self: { }: mkDerivation { pname = "bibdb"; - version = "0.5.2"; - sha256 = "afe2b25a3544994f32c62975f7eddeec5a690562e7ed234b9fb851aef0f7bc80"; + version = "0.5.3"; + sha256 = "8dcac183199d1bbfc7cd835f6d965ea9fedcc7874c9db458c221cede246ead12"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -40398,6 +40424,38 @@ self: { 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 + , mono-traversable, mono-traversable-instances, mtl + , mutable-containers, primitive, QuickCheck, safe-exceptions, say + , semigroups, stm, stm-chans, text, time, time-locale-compat + , transformers, transformers-base, unordered-containers, vector + , vector-instances + }: + mkDerivation { + pname = "classy-prelude"; + version = "1.0.1"; + sha256 = "a27cb14f5b8dfde02da08a2e7cce0d0f9ae59d7a42cdb838ef10584e5a42c993"; + 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 say semigroups stm stm-chans 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-conduit" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet @@ -40420,6 +40478,28 @@ self: { 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 + }: + mkDerivation { + pname = "classy-prelude-conduit"; + version = "1.0.1"; + sha256 = "1307d30366f8827f9226db01895db0b5aa0712aa07abb41754c992ac1fc0006c"; + 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-yesod" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types @@ -40440,6 +40520,26 @@ self: { 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 + }: + mkDerivation { + pname = "classy-prelude-yesod"; + version = "1.0.1"; + sha256 = "b7a0b195b9647fa49664dbaab4128c0e8f8b1a26f62063c0b6ed273c55e93b53"; + 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; + }) {}; + "classyplate" = callPackage ({ mkDerivation, base, template-haskell, type-list }: mkDerivation { @@ -41301,6 +41401,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark_0_5_4" = callPackage + ({ mkDerivation, base, bytestring, HUnit, text }: + mkDerivation { + pname = "cmark"; + version = "0.5.4"; + sha256 = "06f62f52870103be29c92eabfed84be96b4b38a12c3c0b96dffe61b3a0dfa807"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + 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 ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text }: @@ -41334,8 +41448,8 @@ self: { }: mkDerivation { pname = "cmark-sections"; - version = "0.1.0.1"; - sha256 = "4df6ea052023b545da67a38311b69c751e1372515799b6ff88163b12f38ddf00"; + version = "0.1.0.2"; + sha256 = "3617bb05d899ead54e1f58faa97fd30f6a9ec152112b6b962e26cdd02c34da57"; libraryHaskellDepends = [ base base-prelude cmark containers microlens split text ]; @@ -43491,6 +43605,35 @@ self: { 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 + , mwc-random, primitive, QuickCheck, resourcet, safe, silently + , text, transformers, transformers-base, unix, unix-compat, vector + , void + }: + mkDerivation { + pname = "conduit-combinators"; + version = "1.0.8.2"; + sha256 = "561cd11eef07fd400528e79186c1c57e43583d19e47b4f45216e154687cf5382"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-connection" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, HUnit , network, resourcet, test-framework, test-framework-hunit @@ -54729,6 +54872,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dmenu" = callPackage + ({ mkDerivation, base, containers, directory, lens, mtl, process + , transformers + }: + mkDerivation { + pname = "dmenu"; + version = "0.3.0.0"; + sha256 = "dee250a81b5ba065cec749cb260c0945b5f57cf13ef99b7b5b9d1dda189077fb"; + libraryHaskellDepends = [ + base containers directory lens mtl process transformers + ]; + homepage = "https://github.com/m0rphism/haskell-dmenu"; + description = "Complete bindings to the dmenu and dmenu2 command line tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dns" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-builder, conduit, conduit-extra, containers, doctest @@ -63262,8 +63421,8 @@ self: { }: mkDerivation { pname = "flaccuraterip"; - version = "0.3.6"; - sha256 = "7e7904030c86963c8a2a129a5d0f50a7872b80feaf26fea54f1508a0615469da"; + version = "0.3.7"; + sha256 = "b0cd908d8fe4cddc01e93cae85748717c41b183be5ce1a620ea6b4c776d4ba8f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -67481,15 +67640,15 @@ self: { }) {}; "geo-uk" = callPackage - ({ mkDerivation, array, base, binary, bytestring, template-haskell - , th-lift + ({ mkDerivation, array, base, binary, bytestring, bzlib + , template-haskell, th-lift }: mkDerivation { pname = "geo-uk"; - version = "0.1.0.1"; - sha256 = "a92648834307b9ac6dde2a581fbf291b36cbd8d005965e7e64512f8bdfb01e70"; + version = "0.1.0.2"; + sha256 = "feb2d70452d160a342670c56eebd8f6b135d83661dfa6860cd528248fa9f27ad"; libraryHaskellDepends = [ - array base binary bytestring template-haskell th-lift + array base binary bytestring bzlib template-haskell th-lift ]; homepage = "https://github.com/tolysz/geo-uk"; description = "High precision conversion between GPS and UK Grid"; @@ -70010,8 +70169,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20161111"; - sha256 = "d6ea2566b5883fce8cdbd498d5b6fc22c4ed042de6514622b8b4a59ea4564f45"; + version = "6.20161118"; + sha256 = "84d83b41ce671b29f7c718979bb06d2bb3e3a3f3a3536257f3c6a3da993e47ba"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -70245,13 +70404,13 @@ self: { }: mkDerivation { pname = "git-repair"; - version = "1.20161111"; - sha256 = "4ce6447c2a2b678b7fd3f677aa29b8f1b018d5d11822bf5488df83e6c9cbaf54"; + version = "1.20161118"; + sha256 = "d24c576c4a033f051d1f7a76a0e203ba00c9844bad1236d86974a136ebd25a6e"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base bytestring Cabal data-default directory exceptions filepath - hslogger IfElse MissingH process unix unix-compat + hslogger IfElse MissingH mtl process unix unix-compat ]; executableHaskellDepends = [ async base bytestring containers directory exceptions filepath @@ -70409,7 +70568,7 @@ self: { }) {}; "github-backup" = callPackage - ({ mkDerivation, base, bytestring, containers, directory + ({ mkDerivation, base, bytestring, Cabal, containers, directory , exceptions, filepath, git, github, hslogger, IfElse, MissingH , mtl, network, network-uri, optparse-applicative, pretty-show , process, text, transformers, unix, unix-compat, utf8-string @@ -70417,11 +70576,14 @@ self: { }: mkDerivation { pname = "github-backup"; - version = "1.20161110"; - sha256 = "a6d0e48a3e6300f6633106ce28e8a7140856e924d78ef5330675410a10dcc245"; + version = "1.20161118"; + sha256 = "5278f8f3502721cb677b4ac0de4df8c2954ddb0335ceb9e63c4b29e77912a21b"; isLibrary = false; isExecutable = true; - setupHaskellDepends = [ base hslogger MissingH ]; + setupHaskellDepends = [ + base bytestring Cabal directory exceptions filepath hslogger IfElse + MissingH mtl process unix unix-compat + ]; executableHaskellDepends = [ base bytestring containers directory exceptions filepath github hslogger IfElse MissingH mtl network network-uri @@ -71056,8 +71218,8 @@ self: { pname = "glirc"; version = "2.20.1.1"; sha256 = "63f0f8d82ea8d2f90103faf9ccd9fa301275b9400bbf1c3db62f8c51cbfa40fe"; - revision = "1"; - editedCabalFile = "883328945d2ac7c7e02b70aaeb3afbe1a23032d3ba073227a56411966d3afb0b"; + revision = "2"; + editedCabalFile = "1ffce4f6773283058717e61b7544579d002d258e904ca7e4d97b10a65e1b97a5"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -74549,8 +74711,8 @@ self: { }: mkDerivation { pname = "google-oauth2"; - version = "0.2.1"; - sha256 = "ff16b3d74d6b1d4b81dcabc07f40020d19d39c04956d0067c1fe111e9b8d14ca"; + version = "0.2.2"; + sha256 = "3230c41fc67242671c517e4483dfd9612f58495389ff2413f0f33444e0448058"; libraryHaskellDepends = [ aeson base bytestring HTTP http-conduit ]; @@ -74672,8 +74834,8 @@ self: { }: mkDerivation { pname = "gore-and-ash"; - version = "1.2.1.0"; - sha256 = "216c58cf971d991aedcdda7100da3dfda433371c6fa47404df9431357cd84f82"; + version = "1.2.2.0"; + sha256 = "4192efc2afac62ba0fb5d1b591a387e8bc4c346fdcd6ceb1f0d568cd8027cace"; libraryHaskellDepends = [ base containers deepseq exceptions hashable linear mtl parallel profunctors random semigroups time transformers @@ -74691,8 +74853,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-actor"; - version = "1.2.1.0"; - sha256 = "7769718f402328fb3ae3ea268d8da5398f897cd7c3702372b8a9a1f560cc9360"; + version = "1.2.2.0"; + sha256 = "0de7d9391e0760193904ea91d6cc3f499a155923bc31bb9130d3fe694eda9a10"; libraryHaskellDepends = [ base containers deepseq exceptions gore-and-ash hashable mtl resourcet transformers transformers-base unordered-containers @@ -74710,8 +74872,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-async"; - version = "1.1.0.0"; - sha256 = "8ed161f2d598e3f84c1ee3a2abe2ed0b8d41f4bcb526467bfbe00ba3cf6edf74"; + version = "1.1.1.0"; + sha256 = "ed0c0ee1404d68675b03cf133d0af8ecb9553ba2ce279e32c353db55957ebd18"; libraryHaskellDepends = [ async base containers deepseq exceptions gore-and-ash hashable mtl resourcet transformers transformers-base unordered-containers @@ -74735,8 +74897,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-demo"; - version = "1.1.0.0"; - sha256 = "08d6fa2861a03281dee03e0baa5c23a54e7366f1d5cb1390e921b90fe8c7ab3b"; + version = "1.2.0.0"; + sha256 = "73bfb46b00664c92376e3c2ffff7df7e54552b077c9c8ae146117d31d2465309"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -74758,8 +74920,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-glfw"; - version = "1.1.1.0"; - sha256 = "b65482130fba543d369383ceb5b8033d72debba728ea848d07c9af02068d9d4c"; + version = "1.1.2.0"; + sha256 = "43fc8a90e985baa99334c11f48f87c166145bc9b597c7751cce0e18b282a483e"; libraryHaskellDepends = [ base deepseq exceptions extra GLFW-b gore-and-ash hashable mtl transformers unordered-containers @@ -74769,6 +74931,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gore-and-ash-lambdacube" = callPackage + ({ mkDerivation, base, containers, deepseq, exceptions + , gore-and-ash, hashable, lambdacube-compiler, lambdacube-gl, mtl + , text, unordered-containers + }: + mkDerivation { + pname = "gore-and-ash-lambdacube"; + version = "0.2.0.0"; + sha256 = "62c2bd09408ecfc4f7140cb034b993822b4246c23df72bf17a708aa1b700407d"; + libraryHaskellDepends = [ + base containers deepseq exceptions gore-and-ash hashable + lambdacube-compiler lambdacube-gl mtl text unordered-containers + ]; + homepage = "https://github.com/TeaspotStudio/gore-and-ash-lambdacube#readme"; + description = "Core module for Gore&Ash engine that do something"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gore-and-ash-logging" = callPackage ({ mkDerivation, base, containers, deepseq, exceptions, extra , gore-and-ash, hashable, mtl, resourcet, text, text-show @@ -74776,8 +74956,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-logging"; - version = "2.0.0.0"; - sha256 = "a01fa0ba3867c791462f17f4910a155e5d814c113789b2b5d12766c399d65b93"; + version = "2.0.1.0"; + sha256 = "6ce12cadec13514b91593dd9cc33d3deb1cdd9bd13fec92b98d985934fa72149"; libraryHaskellDepends = [ base containers deepseq exceptions extra gore-and-ash hashable mtl resourcet text text-show transformers transformers-base @@ -74798,8 +74978,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-network"; - version = "1.3.2.0"; - sha256 = "7093854a9ceb887bd7b58cad8d79d46ed632609f54bdfb2c7a2dcefe7296f4d2"; + version = "1.4.0.0"; + sha256 = "d1bea115605525454c300419c1860168fd38e414a3760b2f6e1ef2793f5bfece"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions extra ghc-prim gore-and-ash gore-and-ash-logging hashable integer-gmp mtl network @@ -74819,8 +74999,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-sdl"; - version = "2.1.0.0"; - sha256 = "2c8ec109e234cbaef34ac6b72a7a5182437a0f0473006d033cd51102d868294d"; + version = "2.1.1.0"; + sha256 = "8bc3bac8c1297f9110481b4fe9b75e9817952521e12af6ccfde5cd1fd589618c"; libraryHaskellDepends = [ base containers deepseq exceptions gore-and-ash lens linear mtl resourcet sdl2 text transformers transformers-base @@ -74834,19 +75014,17 @@ self: { "gore-and-ash-sync" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, deepseq , exceptions, gore-and-ash, gore-and-ash-actor - , gore-and-ash-logging, gore-and-ash-network, hashable, mtl - , resourcet, text, transformers, transformers-base + , gore-and-ash-logging, gore-and-ash-network, hashable, mtl, text , unordered-containers }: mkDerivation { pname = "gore-and-ash-sync"; - version = "1.2.0.0"; - sha256 = "719827da28924991b85d8d3aca1ca5fe1ebdb77d3d32154bdfc1790928015769"; + version = "1.2.0.1"; + sha256 = "e4c919188198e1c6740cd17f782ddb08bfac928448e84b77fba4987e94f262dc"; libraryHaskellDepends = [ base bytestring cereal containers deepseq exceptions gore-and-ash gore-and-ash-actor gore-and-ash-logging gore-and-ash-network - hashable mtl resourcet text transformers transformers-base - unordered-containers + hashable mtl text unordered-containers ]; homepage = "https://github.com/Teaspot-Studio/gore-and-ash-sync"; description = "Gore&Ash module for high level network synchronization"; @@ -80779,8 +80957,10 @@ self: { }: mkDerivation { pname = "hashabler"; - version = "1.3.0"; - sha256 = "6bbd711b75f9c8fe72a1471ed99709e382ce7a58595a0088228aa39e74bf74ab"; + version = "2.0.0"; + sha256 = "6a2bd750238fb73bbef9572fc553aee6d0cc82326970a8598d9eb8b6ef923cf3"; + revision = "1"; + editedCabalFile = "c86a0c3e2fbc461ab3e75631a456f416ec9c57b7d48558ae0ad76fb4c48c3284"; libraryHaskellDepends = [ array base bytestring ghc-prim integer-gmp primitive template-haskell text @@ -81154,19 +81334,14 @@ self: { }) {}; "haskelisp" = callPackage - ({ mkDerivation, base, clock, containers, formatting - , logging-effect, mtl, protolude, text, turtle - }: + ({ mkDerivation, base, containers, mtl, protolude, text }: mkDerivation { pname = "haskelisp"; - version = "0.1.0.0"; - sha256 = "b1fee69e1862d115fc7f2755972e1b9c9e9ccc974b2447deb53b7550fa6bed1c"; - libraryHaskellDepends = [ - base clock containers formatting logging-effect mtl protolude text - turtle - ]; + version = "0.1.0.5"; + sha256 = "bc35b968ed448582b13dad1b5364eecd2f2bae27c1c859ed14fa151a5c02b949"; + libraryHaskellDepends = [ base containers mtl protolude text ]; homepage = "http://github.com/githubuser/haskelisp#readme"; - description = "Initial project template from stack"; + description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -82096,8 +82271,8 @@ self: { ({ mkDerivation, base, haskell-src-exts }: mkDerivation { pname = "haskell-src-exts-simple"; - version = "1.18.0.1.1"; - sha256 = "f331ae82547ebc4ee1dfce9265e101117ff6951682d0eea79c03a2994b9c061b"; + version = "1.19.0.0"; + sha256 = "41bc9166e7d08bb18b5309eb2af00ce122c70eeffd047da47e9e2d9db89a2406"; libraryHaskellDepends = [ base haskell-src-exts ]; homepage = "https://github.com/int-e/haskell-src-exts-simple"; description = "A simplified view on the haskell-src-exts AST"; @@ -86176,8 +86351,8 @@ self: { }: mkDerivation { pname = "heterocephalus"; - version = "0.1.0.0"; - sha256 = "fd9a5caaea40092400f6952e53cd0cda701e963732f434e14025daf683b8c4fd"; + version = "1.0.0"; + sha256 = "152db4b8297ed5eafb9c9f974806b39f790325b337d48e0a5724227360106b1b"; libraryHaskellDepends = [ base blaze-html blaze-markup containers parsec shakespeare template-haskell text @@ -88451,6 +88626,25 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "hledger-interest_1_5_1" = callPackage + ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time + }: + mkDerivation { + pname = "hledger-interest"; + version = "1.5.1"; + sha256 = "0a02354f4e8d53e75817e05b140c4760220ac4e414fbf9772abe4f20a9f90da6"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "hledger-irr" = callPackage ({ mkDerivation, base, Cabal, Decimal, hledger-lib, statistics , text, time @@ -88506,8 +88700,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.0.4"; - sha256 = "f45d4afe158924f59691885bb87e52816fe80525252400d2840761a2e0d4e64d"; + version = "1.0.5"; + sha256 = "ba859b4c1f8199413c30ddc0db2a7e11206d79ae235e6d9005de6d6cc1b98875"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92892,21 +93086,17 @@ self: { }) {}; "hscrtmpl" = callPackage - ({ mkDerivation, base, directory, process, regex-compat, time - , time-locale-compat - }: + ({ mkDerivation, base, directory, process, time }: mkDerivation { pname = "hscrtmpl"; - version = "1.4"; - sha256 = "31c642da0e9c90b961160214e4a91e6aba9acbd1253eec009f4d626e360be5ab"; + version = "1.5"; + sha256 = "808a80880f2880432fd6c27c99aeb841d325afdad36f0aae7a5a45f512206589"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ - base directory process regex-compat time time-locale-compat - ]; + executableHaskellDepends = [ base directory process time ]; homepage = "http://hub.darcs.net/dino/hscrtmpl"; description = "Haskell shell script template"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.isc; }) {}; "hscuid" = callPackage @@ -96304,8 +96494,8 @@ self: { }: mkDerivation { pname = "http-dispatch"; - version = "0.6.0.0"; - sha256 = "67a1cea38faec49d5e9708090e567b032e186e61fa391e15eb4b524ad14786e7"; + version = "0.6.2.0"; + sha256 = "8838082ba44fe02bda80830c74552e6f28093617ad75c6614e199168ea7677d3"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive http-client http-client-tls http-types @@ -103561,8 +103751,8 @@ self: { }: mkDerivation { pname = "jack"; - version = "0.7.1"; - sha256 = "9a92d0482acb2647e46955d6ad73ba7cd4a148cd9f6c5263a405296b87a5afd9"; + version = "0.7.1.1"; + sha256 = "d17b5d299154edf55f479b9fc4508b662f4852e545dc47afa60b166ca7306c40"; libraryHaskellDepends = [ array base bytestring enumset event-list explicit-exception midi non-negative transformers @@ -104931,8 +105121,8 @@ self: { }: mkDerivation { pname = "json-stream"; - version = "0.4.1.2"; - sha256 = "096be98bf0f8eb13a83388a455fc123d13c18c11a598fbde31506b610c78e976"; + version = "0.4.1.3"; + sha256 = "1e281cfddd1c71b40e8a4b8a75dbd0c1f16b1e349edcbc5e44e45c25241ff9dc"; libraryHaskellDepends = [ aeson base bytestring scientific text unordered-containers vector ]; @@ -105355,6 +105545,8 @@ self: { pname = "jwt"; version = "0.7.2"; sha256 = "17967413d21399596a236bc8169d9e030bb85e2b1c349c6e470543767cc20a31"; + revision = "1"; + editedCabalFile = "b5858c05476741b4dc7f9f075bb8c8aca128ed25a9f325d937d370aa3d4910e1"; libraryHaskellDepends = [ aeson base bytestring containers cryptonite data-default http-types memory network-uri scientific semigroups text time @@ -109308,6 +109500,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "leapseconds" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit, time }: + mkDerivation { + pname = "leapseconds"; + version = "1.0"; + sha256 = "c69b5acaf60b610ac6bc68e45c1f96161b920547dc89821220b6836ba8dfd11e"; + revision = "1"; + editedCabalFile = "4ffceb9290e689f9b707270ab393d57dacc9c69fc880252bfed608830a0b79d8"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ base tasty tasty-hunit time ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "leapseconds-announced" = callPackage ({ mkDerivation, base, QuickCheck, time }: mkDerivation { @@ -115646,6 +115851,31 @@ self: { 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 + , xss-sanitize + }: + mkDerivation { + pname = "markdown"; + version = "0.1.16"; + sha256 = "08b0b352e208316ddc99c6f161704c8ecaf248c2e51f506900e344c93757ed85"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "markdown-kate" = callPackage ({ mkDerivation, attoparsec, attoparsec-conduit, base, blaze-html , conduit, containers, data-default, highlighting-kate, hspec @@ -116592,8 +116822,8 @@ self: { ({ mkDerivation, base, heap, QuickCheck }: mkDerivation { pname = "median-stream"; - version = "0.3.0.0"; - sha256 = "579c8c60b7376f78e02fa5cdd950c1116198126114c610a3561109d3b2dd2b74"; + version = "0.6.0.0"; + sha256 = "bae6347b85b0914dee5a8a7c146b8af937bf450ce2aa09c5f62cee0811ff9a1d"; libraryHaskellDepends = [ base heap ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/caneroj1/median-stream#readme"; @@ -118532,6 +118762,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmorph_1_0_9" = callPackage + ({ mkDerivation, base, mtl, transformers, transformers-compat }: + mkDerivation { + pname = "mmorph"; + version = "1.0.9"; + sha256 = "e1f27d3881b254e2a87ffb21f33e332404abb180361f9d29092a85e321554563"; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + description = "Monad morphisms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmtl" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -126980,8 +127224,8 @@ self: { }: mkDerivation { pname = "ombra"; - version = "0.2.0.0"; - sha256 = "d2b256d023b9124176fc132860ba2338556ad6757ad2703bcc853d0c8bc318d9"; + version = "0.2.1.0"; + sha256 = "46add5581e4f4588ee409646372d7adf3e9248ca314c5c7f3319470c1b404d5c"; libraryHaskellDepends = [ base gl hashable hashtables transformers unordered-containers vect ]; @@ -127431,8 +127675,8 @@ self: { ({ mkDerivation, atomspace-cwrapper, base, transformers }: mkDerivation { pname = "opencog-atomspace"; - version = "0.1.0.6"; - sha256 = "2925f1fe014f33e003558db6692354b12368ee9fcad835f669470b74b9daab1a"; + version = "0.1.0.7"; + sha256 = "24bcde8b587dc6864b0eb450aea3a246a51d3e540bc186e3ba6ac83158a37a1b"; libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ atomspace-cwrapper ]; homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell"; @@ -128016,10 +128260,12 @@ self: { pname = "operational"; version = "0.2.3.4"; sha256 = "51cc8751432201f4cbef15a187ee668bca13d774eb0ef28c8e3d36f633866810"; + revision = "2"; + editedCabalFile = "8cff8abd98ae819678745b9d6071c51acaa281f386a13c166ef3c27161e372f1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl ]; - executableHaskellDepends = [ random ]; + executableHaskellDepends = [ base random ]; homepage = "http://wiki.haskell.org/Operational"; description = "Implementation of difficult monads made easy with operational semantics"; license = stdenv.lib.licenses.bsd3; @@ -134640,6 +134886,32 @@ self: { license = "GPL"; }) {}; + "plots" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, colour + , containers, data-default, diagrams-core, diagrams-lib, directory + , distributive, filepath, fingertree, hashable, intervals + , JuicyPixels, lens, linear, monoid-extras, mtl + , optparse-applicative, process, profunctors, semigroupoids + , semigroups, split, statistics, time, transformers, vector + }: + mkDerivation { + pname = "plots"; + version = "0.1.0.2"; + sha256 = "e5c1a5f858f2bbfb531d5d0af6a070ff8fa2bd936b3a4c30b6ca65838c16b64d"; + revision = "1"; + editedCabalFile = "3d45b5b973339a50d0686153d77b0f1e438c1a890e75c2274830e878e9fd78d8"; + libraryHaskellDepends = [ + adjunctions base base-orphans colour containers data-default + diagrams-core diagrams-lib directory distributive filepath + fingertree hashable intervals JuicyPixels lens linear monoid-extras + mtl optparse-applicative process profunctors semigroupoids + semigroups split statistics time transformers vector + ]; + homepage = "http://github.com/cchalmers/plots"; + description = "Diagrams based plotting library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plotserver-api" = callPackage ({ mkDerivation, base, curl, split }: mkDerivation { @@ -134948,6 +135220,8 @@ self: { pname = "pointful"; version = "1.0.9"; sha256 = "6a1881236419751beb5b2e4e495bd9093ea2dec3f3cbd44e2a62aaabe53cacd6"; + revision = "1"; + editedCabalFile = "5a0ac6eb52c232cca59759b25a34eff0d89f614332b088baaa8b11e27fb19c8e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137014,16 +137288,14 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, pretty-show, text }: mkDerivation { pname = "pretty-display"; - version = "0.1.8"; - sha256 = "51f0e12426755bddc82ed723ac53533138feb8a2455bbc4cc534cea21fe92eae"; - revision = "1"; - editedCabalFile = "f5a862770c5db22d591a92ecf1f5e9c2ed7da73312e1b69410160fab3040892f"; + version = "0.1.9"; + sha256 = "3913780e6e3aace5cd63d9b8dd8454ab8c08f6bf10d44ac19c70dc059341909c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base pretty-show text ]; executableHaskellDepends = [ ansi-wl-pprint base pretty-show ]; testHaskellDepends = [ base ]; - homepage = "https://github.com/jsermeno/pretty-display#readme"; + homepage = "https://github.com/githubuser/pretty-display#readme"; description = "Typeclass for human-readable display"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -137209,6 +137481,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primitive_0_6_2_0" = callPackage + ({ mkDerivation, base, ghc-prim, transformers }: + mkDerivation { + pname = "primitive"; + version = "0.6.2.0"; + sha256 = "b8e8d70213e22b3fab0e0d11525c02627489618988fdc636052ca0adce282ae1"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + testHaskellDepends = [ base ghc-prim ]; + homepage = "https://github.com/haskell/primitive"; + description = "Primitive memory-related operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "primitive-simd" = callPackage ({ mkDerivation, base, ghc-prim, primitive, vector }: mkDerivation { @@ -139245,6 +139531,7 @@ self: { HUnit mtl optparse-applicative parsec process protolude silently stm text time transformers transformers-compat utf8-string vector ]; + doCheck = false; homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.mit; @@ -139295,6 +139582,7 @@ self: { HUnit mtl optparse-applicative parsec process protolude silently stm text time transformers transformers-compat utf8-string vector ]; + doCheck = false; homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.bsd3; @@ -141585,7 +141873,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rasterific-svg_0_3_2" = callPackage + "rasterific-svg_0_3_2_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, FontyFruity, JuicyPixels, lens, linear, mtl , optparse-applicative, primitive, Rasterific, scientific, svg-tree @@ -141593,8 +141881,8 @@ self: { }: mkDerivation { pname = "rasterific-svg"; - version = "0.3.2"; - sha256 = "ab43e8e6d2800f88becc1c619691ce7b2b63f35ce6007a904c5119b8c1711d23"; + version = "0.3.2.1"; + sha256 = "717e87ea679f5fda726bfbbdbfafa40305bece2cce5ad137027e26eaeb57afdf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141818,10 +142106,8 @@ self: { ({ mkDerivation, base, bytestring, template-haskell, text }: mkDerivation { pname = "rawstring-qm"; - version = "0.2.2.2"; - sha256 = "e62f4f9bbb7e67b2cf1bf39e1765cce6ede6b9669ed17447e7531364b5307a40"; - revision = "1"; - editedCabalFile = "d856c4c9407a2bf37aa5c129a34109bdbeec1cecbdcd91f84be9efcb972ab954"; + version = "0.2.3.0"; + sha256 = "11a177bb7d685fb6a98390630196bd544e877b7460648e61a2905c21a71268fe"; libraryHaskellDepends = [ base bytestring template-haskell text ]; homepage = "https://github.com/tolysz/rawstring-qm"; description = "Simple raw string quotation and dictionary interpolation"; @@ -142142,8 +142428,8 @@ self: { }: mkDerivation { pname = "reactive-balsa"; - version = "0.2.0.1"; - sha256 = "42ea83a158dee24bbe3a031d4222e195cf0b1844cba5b63c82173b261bfc5a71"; + version = "0.3"; + sha256 = "40d188ec262613a445d7e2ac06fbbd281555c45985981efe7dae45a42b83fcc0"; libraryHaskellDepends = [ alsa-core alsa-seq base containers data-accessor data-accessor-transformers event-list extensible-exceptions midi @@ -142303,8 +142589,8 @@ self: { }: mkDerivation { pname = "reactive-jack"; - version = "0.2.0.1"; - sha256 = "8facc607ec889c7a871cd61975d7e4e0760b0064583ad1a0da938fe4fcd702cd"; + version = "0.3"; + sha256 = "c94b9ceda912e859146267cb418afcea0428039bffb1f8ac0ede9f2027d2645c"; libraryHaskellDepends = [ base containers data-accessor event-list explicit-exception extensible-exceptions jack midi non-negative random reactive-banana @@ -142323,8 +142609,8 @@ self: { }: mkDerivation { pname = "reactive-midyim"; - version = "0.2.1"; - sha256 = "3d8180f416b2efd948d067d9c5c1cdcb2c8b6933093435e55e02a7e63425669c"; + version = "0.3"; + sha256 = "dd1e2d69035249ff92d633a25d3c1393810fa5477b8e18731354be37ff558f25"; libraryHaskellDepends = [ base containers data-accessor data-accessor-transformers event-list midi non-negative random reactive-banana transformers utility-ht @@ -142582,6 +142868,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rebindable" = callPackage + ({ mkDerivation, base, data-default-class, indexed }: + mkDerivation { + pname = "rebindable"; + version = "0.1.2"; + sha256 = "e752ad9aa91d4c96d43865c1e3eefd93c767b8765b82c77be58e4142ca8ca17d"; + libraryHaskellDepends = [ base data-default-class indexed ]; + homepage = "https://github.com/sleexyz/rebindable"; + description = "A library to facilitate rebinding of Haskell syntax"; + license = stdenv.lib.licenses.mit; + }) {}; + "recaptcha" = callPackage ({ mkDerivation, base, HTTP, network, network-uri, xhtml }: mkDerivation { @@ -150432,8 +150730,8 @@ self: { ({ mkDerivation, base, containers, doctest, smallcheck }: mkDerivation { pname = "semiring-num"; - version = "0.3.0.0"; - sha256 = "75178637123f1d7bcef23346065aae3a4d57ac4a0aba7ad8fb9f78c98f0f08ec"; + version = "0.5.3.1"; + sha256 = "f61b090bad8407b1ba50a136a5f14fdac92e4eb69f1aa0ce2d67f318ab33df20"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest smallcheck ]; homepage = "https://github.com/oisdk/semiring-num"; @@ -154492,8 +154790,8 @@ self: { ({ mkDerivation, base, fast-logger, mtl, text }: mkDerivation { pname = "simple-logger"; - version = "0.0.1"; - sha256 = "01efbc3f3859deb175d157e983f3497a4db2eb00b7daf35da9431bcdf484f4eb"; + version = "0.0.3"; + sha256 = "5fb002bcf2eaf6aac949acea31d0ee65a08fc4d34f6baf222db4db05c8165ec1"; libraryHaskellDepends = [ base fast-logger mtl text ]; homepage = "https://github.com/agrafix/simple-logger#readme"; description = "A very simple but efficient logging framework"; @@ -157184,6 +157482,8 @@ self: { pname = "snaplet-sqlite-simple"; version = "1.0.0.2"; sha256 = "2d12f405b1a796d587a43646aa136c4a0e9e5761212cbdb84014e226bed360d7"; + revision = "1"; + editedCabalFile = "9c49f31dc5e4b6b10942502f2d57755fc028ff2924f2c94a32030e172d19493e"; libraryHaskellDepends = [ aeson base bytestring clientsession configurator direct-sqlite lens lifted-base monad-control mtl snap sqlite-simple text transformers @@ -157201,6 +157501,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "snaplet-sqlite-simple-jwt-auth" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bcrypt, bytestring + , clientsession, containers, directory, either, errors, jwt, lens + , mtl, snap, snap-core, snaplet-sqlite-simple, sqlite-simple, text + , time, unordered-containers + }: + mkDerivation { + pname = "snaplet-sqlite-simple-jwt-auth"; + version = "0.1.1.0"; + sha256 = "64afbefedfc6eda854c4b34e8bd8e69be84d2042aa81cfe0305d53ddf1b62fd2"; + libraryHaskellDepends = [ + aeson attoparsec base bcrypt bytestring clientsession containers + directory either errors jwt lens mtl snap snap-core + snaplet-sqlite-simple sqlite-simple text time unordered-containers + ]; + homepage = "https://github.com/nurpax/snaplet-sqlite-simple-jwt-auth#readme"; + description = "Snaplet for JWT authentication with snaplet-sqlite-simple"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "snaplet-stripe" = callPackage ({ mkDerivation, base, bytestring, configurator, heist , lens-family-core, mtl, snap, stripe, text, text-format @@ -157718,12 +158038,12 @@ self: { ({ mkDerivation, base, bytestring, lksctp-tools, socket }: mkDerivation { pname = "socket-sctp"; - version = "0.1.0.0"; - sha256 = "48ef7cae7ac4ed6674173716a598b611f704c38e14c1ac1006f1f730da60b9f5"; + version = "0.2.0.1"; + sha256 = "65944b69c49d176a9c542bb03a1762dae3428b97aab76825381e22dc37ada036"; libraryHaskellDepends = [ base bytestring socket ]; librarySystemDepends = [ lksctp-tools ]; testHaskellDepends = [ base bytestring socket ]; - homepage = "https://github.com/lpeterse/haskell-socket-sctp"; + homepage = "https://github.com/shlevy/haskell-socket-sctp"; description = "STCP socket extensions library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -158985,8 +159305,8 @@ self: { }: mkDerivation { pname = "sproxy"; - version = "0.9.8"; - sha256 = "255f78f65439ad2e8e0f05fe9df5d07b07863b433bda486b67c3a6c4e0a0311a"; + version = "0.9.9"; + sha256 = "161ba53469bb2b9c331ff678125ec5917a28de8cdd30084628219f89fbb1fb08"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159023,6 +159343,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sproxy2" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder + , bytestring, cereal, conduit, containers, cookie, docopt, entropy + , Glob, http-client, http-conduit, http-types + , interpolatedstring-perl6, network, postgresql-simple + , resource-pool, SHA, sqlite-simple, text, time, unix + , unordered-containers, wai, wai-conduit, warp, warp-tls, word8 + , yaml + }: + mkDerivation { + pname = "sproxy2"; + version = "1.90.0"; + sha256 = "6df57f02d8002e4f80cf0531adef08b6dc112b51861c2d5dec38afefa5582ef7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring cereal + conduit containers cookie docopt entropy Glob http-client + http-conduit http-types interpolatedstring-perl6 network + postgresql-simple resource-pool SHA sqlite-simple text time unix + unordered-containers wai wai-conduit warp warp-tls word8 yaml + ]; + description = "Secure HTTP proxy for authenticating users via OAuth2"; + license = stdenv.lib.licenses.mit; + }) {}; + "spsa" = callPackage ({ mkDerivation, base, hmatrix, HUnit, mtl, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -161018,8 +161364,8 @@ self: { }: mkDerivation { pname = "stm-supply"; - version = "0.1.0.0"; - sha256 = "ae8b2daff827522bb466a5d68bc91dc39d4632441c8b8b43540b8204c2997e2b"; + version = "0.2.0.0"; + sha256 = "f839ada6e5ac9549731086ed13fcf4c9f03a6ff93d64c0a857148820864f388c"; libraryHaskellDepends = [ base concurrent-supply ]; testHaskellDepends = [ async base QuickCheck random Unique ]; homepage = "https://github.com/caneroj1/stm-supply#readme"; @@ -164156,6 +164502,8 @@ self: { pname = "system-locale"; version = "0.1.0.0"; sha256 = "0df7815525b55d875e8c0393f22c3595655a90a0701b5208799f97e653686fab"; + revision = "1"; + editedCabalFile = "3681691c486cb637328329037f5ccb6bc266310cc4db7bb04072a7084328cfa4"; libraryHaskellDepends = [ base megaparsec process time ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/cocreature/system-locale"; @@ -164404,6 +164752,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tabl" = callPackage + ({ mkDerivation, base, safe, text }: + mkDerivation { + pname = "tabl"; + version = "0.1.0.0"; + sha256 = "4adb4507af71badd8cb5f076d8c996f9e26e8102e4c2361a93bad1ae303c9b2e"; + libraryHaskellDepends = [ base safe text ]; + homepage = "https://github.com/lovasko/tabl"; + description = "Table layout"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "table" = callPackage ({ mkDerivation, base, csv, optparse-applicative, process, split }: mkDerivation { @@ -167858,6 +168218,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-utils" = callPackage + ({ mkDerivation, base, HTF, text }: + mkDerivation { + pname = "text-utils"; + version = "0.1.0.0"; + sha256 = "63b6e0bc28907593a5a98c5e27be3ab22b44cdb66c4095461fe4dd683f262662"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base HTF text ]; + homepage = "https://github.com/agrafix/text-utils#readme"; + description = "Various text utilities"; + license = stdenv.lib.licenses.mit; + }) {}; + "text-xml-generic" = callPackage ({ mkDerivation, base, bytestring, containers, haskell98, mtl , not-in-base, split, syb, template-haskell, xml @@ -168242,8 +168615,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-inline-io-action"; - version = "0.1.0.0"; - sha256 = "8f7fa350547913e30a26930cad3560044be1f440ad0159ff19d9291bec887dfb"; + version = "0.1.0.1"; + sha256 = "78dae84932b62a5dd487cbcc803d519bab4ba1bec867271a234898e2fd73bd27"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/tolysz/inline-io-action"; description = "Simple inline IO action into compiled code using TH"; @@ -169282,14 +169655,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_6_0_1" = callPackage + "time_1_7" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, test-framework , test-framework-quickcheck2, unix }: mkDerivation { pname = "time"; - version = "1.6.0.1"; - sha256 = "ff69b46f38f4d226b171d078b200f8a5a1e8cfeadfa543eabade51355d7c7fcb"; + version = "1.7"; + sha256 = "a30e1ea20cc59f3bf6ee2d5fd0a0dfa58f1ec865681d762cf1bb1103562e2a7a"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck test-framework test-framework-quickcheck2 @@ -174873,6 +175246,8 @@ self: { pname = "unix"; version = "2.7.2.1"; sha256 = "fc05365594367779122465eee132162267c319c3679ff801f050ed30d18d099c"; + revision = "1"; + editedCabalFile = "3db1b6e8de36a36fc4f979e1045e82554f16c736961fa0392e42b7b3f4decfd4"; libraryHaskellDepends = [ base bytestring time ]; homepage = "https://github.com/haskell/unix"; description = "POSIX functionality"; @@ -175822,6 +176197,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "users-mysql-haskell" = callPackage + ({ mkDerivation, base, bytestring, io-streams, mysql-haskell, tasty + , tasty-hunit, text, time, transformers, users, uuid + }: + mkDerivation { + pname = "users-mysql-haskell"; + version = "0.5.2.0"; + sha256 = "a7f7a2d91860e2dc4594639776aaff06c981f01aaa356553c397d50a0f367930"; + libraryHaskellDepends = [ + base io-streams mysql-haskell text time transformers users uuid + ]; + testHaskellDepends = [ + base bytestring io-streams mysql-haskell tasty tasty-hunit text + time transformers users uuid + ]; + description = "A mysql-haskell backend for the users library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "users-persistent" = callPackage ({ mkDerivation, base, bytestring, esqueleto, hspec, monad-logger , mtl, persistent, persistent-sqlite, persistent-template @@ -176999,8 +177393,8 @@ self: { pname = "vector"; version = "0.11.0.0"; sha256 = "0a5320ed44c3f2b04b7f61e0f63f4fcd5b337524e601e01d5813ace3f5a432e4"; - revision = "1"; - editedCabalFile = "dfdf3252519ff35da59f977b7d37d6c5a6660673ce1234899af0111f7ece9c66"; + revision = "2"; + editedCabalFile = "2bfafd758ab4d80fa7a16b0a650aff60fb1be109728bed6ede144baf1f744ace"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base QuickCheck random template-haskell test-framework @@ -177499,12 +177893,12 @@ self: { ({ mkDerivation, async, attoparsec, base, cabal-file-th, containers , directory, doctest, fingertree, lens, lifted-base, mmorph, mtl , pipes, pipes-concurrency, process, QuickCheck, stm, tasty - , tasty-quickcheck, template-haskell, text, transformers, unix, vty + , tasty-quickcheck, text, transformers, unix, vty }: mkDerivation { pname = "vgrep"; - version = "0.1.4.0"; - sha256 = "353bd92260e225c892d26d6926e9668016187d8ef50311b8f80ae55fc82ed29b"; + version = "0.1.4.1"; + sha256 = "5362e0a156df7e01be495da161d63d62e9e31d82e8290ca2d1b02c5ec9c24cd9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177513,7 +177907,7 @@ self: { ]; executableHaskellDepends = [ async base cabal-file-th containers directory lens mtl pipes - pipes-concurrency process template-haskell text unix vty + pipes-concurrency process text unix vty ]; testHaskellDepends = [ base containers doctest lens QuickCheck tasty tasty-quickcheck text @@ -178113,7 +178507,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vty_5_12" = callPackage + "vty_5_13" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers , data-default, deepseq, directory, filepath, hashable, HUnit , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec @@ -178124,8 +178518,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.12"; - sha256 = "999cc0c66a6e08cada8810f91b0f08e33282361cc01182ea3774e96b13642a56"; + version = "5.13"; + sha256 = "1eabce0fa3ebfe22a4ff1324a5dc48d1fc1363bfe362b6df0b3801ca63b1f117"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178558,8 +178952,8 @@ self: { }: mkDerivation { pname = "wai-frontend-monadcgi"; - version = "3.0.0.2"; - sha256 = "c3e01b29a1a1c2a0934adc7e0c208454be525b2da1303a8b86391aa70c8ddc91"; + version = "3.0.0.3"; + sha256 = "b140ad372252e638dfa7a8d8d48ae84121b1b67dc6454801302a15bd8cf42729"; libraryHaskellDepends = [ base bytestring case-insensitive cgi containers http-types transformers wai @@ -183231,7 +183625,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "xml-conduit_1_4_0_1" = callPackage + "xml-conduit_1_4_0_2" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default, deepseq, hspec, HUnit, monad-control, resourcet @@ -183239,8 +183633,8 @@ self: { }: mkDerivation { pname = "xml-conduit"; - version = "1.4.0.1"; - sha256 = "7c9c171230bcb66b1ab6b0b201f6e5666c79ad4eb0747e68eb1d932591ab1700"; + version = "1.4.0.2"; + sha256 = "55f77ce489fd04a2602733a55e8b7487a565f9bbb877a7ce606f2fd6c1fbe318"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default deepseq monad-control @@ -186054,8 +186448,8 @@ self: { }: mkDerivation { pname = "yesod-markdown"; - version = "0.11.1"; - sha256 = "76ce2fbc55ed6e23c70fea32441c38a6466888695b8c48035471343c407efd2f"; + version = "0.11.2"; + sha256 = "28a1b1dbcc5a171ee88b8eb1850aef43cf17d03553b29116ca0934721c228ae3"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare texmath text xss-sanitize yesod-core yesod-form From 9cca22873a2656a484dabcd87258574eab746271 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 20 Nov 2016 09:24:38 -0500 Subject: [PATCH 0570/1749] git-annex: fixup sha256 for new version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4343adf084f4..f46735e55511 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -48,7 +48,7 @@ self: super: { src = pkgs.fetchFromGitHub { owner = "joeyh"; repo = "git-annex"; - sha256 = "0bi4ynhjx265yaryx7yd5wmwf44hav8bmhkj0knwynb6kpl92qp8"; + sha256 = "0yy4fdk0sp19hc838j82sls68l5wnrhr55zzs0gbqnagna77cxhd"; rev = drv.version; }; })).overrideScope (self: super: { From caa81f7bcf5dbb8cee441443ba8225ebae8b4b2c Mon Sep 17 00:00:00 2001 From: Travis Whitaker Date: Mon, 21 Nov 2016 04:13:09 -0500 Subject: [PATCH 0571/1749] ghcjs: Add ghc-8.0 stage2 packages, update shims. (#20564) --- pkgs/development/compilers/ghcjs/base.nix | 4 +- pkgs/development/compilers/ghcjs/head.nix | 2 +- .../compilers/ghcjs/head_shims.nix | 4 +- .../compilers/ghcjs/head_stage2.nix | 345 ++++++++++++++++++ 4 files changed, 351 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/compilers/ghcjs/head_stage2.nix diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index f342fffd63b5..f8b861311d60 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -86,6 +86,8 @@ "transformers" "unix" ] + +, stage2 ? import ./stage2.nix }: let inherit (bootPkgs) ghc; @@ -171,7 +173,7 @@ in mkDerivation (rec { inherit (ghcjsNodePkgs) "socket.io"; inherit stage1Packages; - mkStage2 = import ./stage2.nix { + mkStage2 = stage2 { inherit ghcjsBoot; }; }; diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index 96d2ee05f5a5..b191f9655d2a 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -46,5 +46,5 @@ bootPkgs.callPackage ./base.nix { "transformers" "unix" ]; + stage2 = import ./head_stage2.nix; } - diff --git a/pkgs/development/compilers/ghcjs/head_shims.nix b/pkgs/development/compilers/ghcjs/head_shims.nix index e321978f0bdc..68b03d057397 100644 --- a/pkgs/development/compilers/ghcjs/head_shims.nix +++ b/pkgs/development/compilers/ghcjs/head_shims.nix @@ -2,6 +2,6 @@ fetchFromGitHub { owner = "ghcjs"; repo = "shims"; - rev = "1f555d3ca072c61862cc35f92f5ac05f3b938a37"; - sha256 = "1pciyrlrp5i9s4s8ai4dvhihcahazva6fg0graxxxkjdvnl789ws"; + rev = "f67394c559ac921a768b12f141499119563b8bf3"; + sha256 = "1lz86qmkxkfch1yk9a62admw7jsd34sqcrskgpq28hbhjpgzf1lv"; } diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/head_stage2.nix new file mode 100644 index 000000000000..765a384bf634 --- /dev/null +++ b/pkgs/development/compilers/ghcjs/head_stage2.nix @@ -0,0 +1,345 @@ +{ ghcjsBoot }: { callPackage }: + +{ + async = callPackage + ({ mkDerivation, base, HUnit, stdenv, stm, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "async"; + version = "2.1.0"; + src = "${ghcjsBoot}/boot/async"; + doCheck = false; + libraryHaskellDepends = [ base stm ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + jailbreak = true; + homepage = "https://github.com/simonmar/async"; + description = "Run IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + }) {}; + aeson = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq + , dlist, fail, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific + , stdenv, syb, tagged, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "aeson"; + version = "0.11.2.0"; + src = "${ghcjsBoot}/boot/aeson"; + doCheck = false; + libraryHaskellDepends = [ + attoparsec base bytestring containers deepseq dlist fail ghc-prim + hashable mtl scientific syb tagged template-haskell text time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring containers ghc-prim HUnit QuickCheck + template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 text time unordered-containers vector + ]; + jailbreak = true; + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; + attoparsec = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , QuickCheck, quickcheck-unicode, scientific, stdenv + , test-framework, test-framework-quickcheck2, text, transformers + , vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.0.2"; + src = "${ghcjsBoot}/boot/attoparsec"; + doCheck = false; + libraryHaskellDepends = [ + array base bytestring containers deepseq scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring containers deepseq QuickCheck + quickcheck-unicode scientific test-framework + test-framework-quickcheck2 text transformers vector + ]; + jailbreak = true; + homepage = "https://github.com/bos/attoparsec"; + description = "Fast combinator parsing for bytestrings and text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + case-insensitive = callPackage + ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit, stdenv + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "case-insensitive"; + version = "1.2.0.6"; + src = "${ghcjsBoot}/boot/case-insensitive"; + doCheck = false; + libraryHaskellDepends = [ base bytestring deepseq hashable text ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit text + ]; + jailbreak = true; + homepage = "https://github.com/basvandijk/case-insensitive"; + description = "Case insensitive string comparison"; + license = stdenv.lib.licenses.bsd3; + }) {}; + dlist = callPackage + ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }: + mkDerivation { + pname = "dlist"; + version = "0.7.1.2"; + src = "${ghcjsBoot}/boot/dlist"; + doCheck = false; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + jailbreak = true; + homepage = "https://github.com/spl/dlist"; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + extensible-exceptions = callPackage + ({ mkDerivation, base, stdenv }: + mkDerivation { + pname = "extensible-exceptions"; + version = "0.1.1.4"; + src = "${ghcjsBoot}/boot/extensible-exceptions"; + doCheck = false; + libraryHaskellDepends = [ base ]; + jailbreak = true; + description = "Extensible exceptions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + hashable = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp + , QuickCheck, random, stdenv, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.2.4.0"; + src = "${ghcjsBoot}/boot/hashable"; + doCheck = false; + libraryHaskellDepends = [ + base bytestring ghc-prim integer-gmp text + ]; + testHaskellDepends = [ + base bytestring ghc-prim HUnit QuickCheck random test-framework + test-framework-hunit test-framework-quickcheck2 text unix + ]; + jailbreak = true; + homepage = "http://github.com/tibbe/hashable"; + description = "A class for types that can be converted to a hash value"; + license = stdenv.lib.licenses.bsd3; + }) {}; + mtl = callPackage + ({ mkDerivation, base, stdenv, transformers }: + mkDerivation { + pname = "mtl"; + version = "2.2.2"; + src = "${ghcjsBoot}/boot/mtl"; + doCheck = false; + libraryHaskellDepends = [ base transformers ]; + jailbreak = true; + homepage = "http://github.com/ekmett/mtl"; + description = "Monad classes, using functional dependencies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + old-time = callPackage + ({ mkDerivation, base, old-locale, stdenv }: + mkDerivation { + pname = "old-time"; + version = "1.1.0.3"; + src = "${ghcjsBoot}/boot/old-time"; + doCheck = false; + libraryHaskellDepends = [ base old-locale ]; + jailbreak = true; + description = "Time library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + parallel = callPackage + ({ mkDerivation, array, base, containers, deepseq, stdenv }: + mkDerivation { + pname = "parallel"; + version = "3.2.1.0"; + src = "${ghcjsBoot}/boot/parallel"; + doCheck = false; + libraryHaskellDepends = [ array base containers deepseq ]; + jailbreak = true; + description = "Parallel programming library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + scientific = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc-prim + , hashable, integer-gmp, QuickCheck, smallcheck, stdenv, tasty + , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck + , text, vector + }: + mkDerivation { + pname = "scientific"; + version = "0.3.4.7"; + src = "${ghcjsBoot}/boot/scientific"; + doCheck = false; + libraryHaskellDepends = [ + base binary bytestring containers deepseq ghc-prim hashable + integer-gmp text vector + ]; + testHaskellDepends = [ + base bytestring QuickCheck smallcheck tasty tasty-ant-xml + tasty-hunit tasty-quickcheck tasty-smallcheck text + ]; + jailbreak = true; + homepage = "https://github.com/basvandijk/scientific"; + description = "Numbers represented using scientific notation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + stm = callPackage + ({ mkDerivation, array, base, stdenv }: + mkDerivation { + pname = "stm"; + version = "2.4.4.1"; + src = "${ghcjsBoot}/boot/stm"; + doCheck = false; + libraryHaskellDepends = [ array base ]; + jailbreak = true; + description = "Software Transactional Memory"; + license = stdenv.lib.licenses.bsd3; + }) {}; + syb = callPackage + ({ mkDerivation, base, containers, HUnit, mtl, stdenv }: + mkDerivation { + pname = "syb"; + version = "0.6"; + src = "${ghcjsBoot}/boot/syb"; + doCheck = false; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base containers HUnit mtl ]; + jailbreak = true; + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + description = "Scrap Your Boilerplate"; + license = stdenv.lib.licenses.bsd3; + }) {}; + text = callPackage + ({ mkDerivation, array, base, binary, bytestring, deepseq, directory + , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode + , random, stdenv, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "text"; + version = "1.2.2.1"; + src = "${ghcjsBoot}/boot/text"; + doCheck = false; + libraryHaskellDepends = [ + array base binary bytestring deepseq ghc-prim integer-gmp + ]; + testHaskellDepends = [ + array base binary bytestring deepseq directory ghc-prim HUnit + integer-gmp QuickCheck quickcheck-unicode random test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + jailbreak = true; + homepage = "https://github.com/bos/text"; + description = "An efficient packed Unicode text type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + unordered-containers = callPackage + ({ mkDerivation, base, ChasingBottoms, containers, deepseq, hashable + , HUnit, QuickCheck, stdenv, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.7.0"; + src = "${ghcjsBoot}/boot/unordered-containers"; + doCheck = false; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + jailbreak = true; + homepage = "https://github.com/tibbe/unordered-containers"; + description = "Efficient hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + vector = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck + , random, stdenv, template-haskell, test-framework + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "vector"; + version = "0.11.0.0"; + src = "${ghcjsBoot}/boot/vector"; + doCheck = false; + libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; + testHaskellDepends = [ + base QuickCheck random template-haskell test-framework + test-framework-quickcheck2 transformers + ]; + jailbreak = true; + homepage = "https://github.com/haskell/vector"; + description = "Efficient Arrays"; + license = stdenv.lib.licenses.bsd3; + }) {}; + ghcjs-base = callPackage + ({ mkDerivation, aeson, array, attoparsec, base, bytestring + , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim + , hashable, HUnit, integer-gmp, primitive, QuickCheck + , quickcheck-unicode, random, scientific, stdenv, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "ghcjs-base"; + version = "0.2.0.0"; + src = "${ghcjsBoot}/ghcjs/ghcjs-base"; + doCheck = false; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers deepseq dlist ghc-prim + ghcjs-prim hashable integer-gmp primitive scientific text time + transformers unordered-containers vector + ]; + testHaskellDepends = [ + array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit + primitive QuickCheck quickcheck-unicode random test-framework + test-framework-hunit test-framework-quickcheck2 text + ]; + jailbreak = true; + homepage = "http://github.com/ghcjs/ghcjs-base"; + description = "Base library for GHCJS"; + license = stdenv.lib.licenses.mit; + }) {}; + Cabal = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, extensible-exceptions, filepath, HUnit + , old-time, pretty, process, QuickCheck, regex-posix, stdenv + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , time, unix + }: + mkDerivation { + pname = "Cabal"; + version = "1.24.0.0"; + src = "${ghcjsBoot}/boot/cabal/Cabal"; + doCheck = false; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + pretty process time unix + ]; + testHaskellDepends = [ + base bytestring containers directory extensible-exceptions filepath + HUnit old-time process QuickCheck regex-posix test-framework + test-framework-hunit test-framework-quickcheck2 unix + ]; + jailbreak = true; + homepage = "http://www.haskell.org/cabal/"; + description = "A framework for packaging Haskell software"; + license = stdenv.lib.licenses.bsd3; + }) {}; +} From 23b922c98a1941a37221104303a9201841e0c80c Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Sun, 20 Nov 2016 20:27:29 +0100 Subject: [PATCH 0572/1749] mc: Fix darwin build We remove linux specific packages from the darwin build of midnight commander. Also slang wouldn't build on darwin without libiconv. --- pkgs/development/libraries/slang/default.nix | 4 ++-- pkgs/tools/misc/mc/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index a55173a62b3c..c4db48248f33 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline }: +{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline, libiconv }: stdenv.mkDerivation rec { name = "slang-2.3.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i -e "s|-ltermcap|-lncurses|" ./configure ''; configureFlags = "--with-png=${libpng.dev} --with-z=${zlib.dev} --with-pcre=${pcre.dev} --with-readline=${readline.dev}"; - buildInputs = [ pcre libpng zlib readline ]; + buildInputs = [ pcre libpng zlib readline ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ]; propagatedBuildInputs = [ ncurses ]; postInstall = '' diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index e840aa15ec20..0c9ac20fcc3e 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1kmysm1x7smxs9k483nin6bx1rx0av8xrqjx9yf73hc7r4anhqzp"; }; - buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs - libssh2 openssl ]; + buildInputs = [ pkgconfig perl glib slang zip unzip file gettext libX11 libICE + libssh2 openssl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; configureFlags = [ "--enable-vfs-smb" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { repositories.git = git://github.com/MidnightCommander/mc.git; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; updateWalker = true; }; } From 709631b47fce176a42ec52e36809fdfae4722de4 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Mon, 21 Nov 2016 12:07:06 +0100 Subject: [PATCH 0573/1749] stanchion: changed default option to defaultText --- nixos/modules/services/databases/stanchion.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/stanchion.nix b/nixos/modules/services/databases/stanchion.nix index af44e17ee58c..f44434f8ed5a 100644 --- a/nixos/modules/services/databases/stanchion.nix +++ b/nixos/modules/services/databases/stanchion.nix @@ -20,7 +20,7 @@ in package = mkOption { type = types.package; - default = pkgs.stanchion; + defaultText = "pkgs.stanchion"; example = literalExample "pkgs.stanchion"; description = '' Stanchion package to use. From ab43f932ceaf2fb55351ac8b5c0ba87c1d630f5f Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Mon, 21 Nov 2016 12:15:29 +0100 Subject: [PATCH 0574/1749] riak: add defaultText to service riak: add default to service --- nixos/modules/services/databases/riak.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix index 4477904f78c6..d592d2e8ffdd 100644 --- a/nixos/modules/services/databases/riak.nix +++ b/nixos/modules/services/databases/riak.nix @@ -20,6 +20,8 @@ in package = mkOption { type = types.package; + default = pkgs.riak; + defaultText = "pkgs.riak"; example = literalExample "pkgs.riak"; description = '' Riak package to use. From 68827cd79af0360068f6d9c841ec2f0b1967246b Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Thu, 3 Nov 2016 18:20:08 +0100 Subject: [PATCH 0575/1749] riak-cs: init at 2.1.1 riak-cs: added to all-packages Added Riak CS nix file to pkgs Added service file for Riak CS Removed Erlang_basho specific bindings from the Riak CS repo riak-cs: changed description riak-cs: added license riak-cs: added maintainer riak_cs: chgned indentations riak-cs: removed overly complex srcs mechanism riak-cs: added systemd module riak-cs: changed Erlang module to Basho-specific version riak-cs: made modular form riak-cs: Added a default package in service options riak-cs: Fixed default package in service options riak-cs: Patched Makefile riak_cs: added to module-list riak_cs: changed from string to actual package in modules riak-cs: changed example riak-cs: removed default riak-cs: changed to defaultText stanchion: changed default option to defaultText riak-cs: added defaults; changed types to str --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/databases/riak-cs.nix | 202 ++++++++++++++++++ .../modules/services/databases/stanchion.nix | 2 +- pkgs/servers/nosql/riak-cs/2.1.1.nix | 67 ++++++ pkgs/top-level/all-packages.nix | 4 + 6 files changed, 277 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/databases/riak-cs.nix create mode 100644 pkgs/servers/nosql/riak-cs/2.1.1.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 47c140df2482..b61c1f4799ec 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -280,6 +280,7 @@ leaps = 260; ipfs = 261; stanchion = 262; + riak-cs = 263; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -530,6 +531,7 @@ leaps = 260; ipfs = 261; stanchion = 262; + riak-cs = 263; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 56f880fdbd38..d82f1fbc54fd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -159,6 +159,7 @@ ./services/databases/postgresql.nix ./services/databases/redis.nix ./services/databases/riak.nix + ./services/databases/riak-cs.nix ./services/databases/stanchion.nix ./services/databases/virtuoso.nix ./services/desktops/accountsservice.nix diff --git a/nixos/modules/services/databases/riak-cs.nix b/nixos/modules/services/databases/riak-cs.nix new file mode 100644 index 000000000000..198efc29222a --- /dev/null +++ b/nixos/modules/services/databases/riak-cs.nix @@ -0,0 +1,202 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.riak-cs; + +in + +{ + + ###### interface + + options = { + + services.riak-cs = { + + enable = mkEnableOption "riak-cs"; + + package = mkOption { + type = types.package; + default = pkgs.riak-cs; + defaultText = "pkgs.riak-cs"; + example = literalExample "pkgs.riak-cs"; + description = '' + Riak package to use. + ''; + }; + + nodeName = mkOption { + type = types.str; + default = "riak-cs@127.0.0.1"; + description = '' + Name of the Erlang node. + ''; + }; + + anonymousUserCreation = mkOption { + type = types.bool; + default = false; + description = '' + Anonymous user creation. + ''; + }; + + riakHost = mkOption { + type = types.str; + default = "127.0.0.1:8087"; + description = '' + Name of riak hosting service. + ''; + }; + + listener = mkOption { + type = types.str; + default = "127.0.0.1:8080"; + description = '' + Name of Riak CS listening service. + ''; + }; + + stanchionHost = mkOption { + type = types.str; + default = "127.0.0.1:8085"; + description = '' + Name of stanchion hosting service. + ''; + }; + + stanchionSsl = mkOption { + type = types.bool; + default = true; + description = '' + Tell stanchion to use SSL. + ''; + }; + + distributedCookie = mkOption { + type = types.str; + default = "riak"; + description = '' + Cookie for distributed node communication. All nodes in the + same cluster should use the same cookie or they will not be able to + communicate. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/db/riak-cs"; + description = '' + Data directory for Riak CS. + ''; + }; + + logDir = mkOption { + type = types.path; + default = "/var/log/riak-cs"; + description = '' + Log directory for Riak CS. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional text to be appended to riak-cs.conf. + ''; + }; + + extraAdvancedConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional text to be appended to advanced.config. + ''; + }; + }; + + }; + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ cfg.package ]; + environment.etc."riak-cs/riak-cs.conf".text = '' + nodename = ${cfg.nodeName} + distributed_cookie = ${cfg.distributedCookie} + + platform_log_dir = ${cfg.logDir} + + riak_host = ${cfg.riakHost} + listener = ${cfg.listener} + stanchion_host = ${cfg.stanchionHost} + + anonymous_user_creation = ${if cfg.anonymousUserCreation then "on" else "off"} + + ${cfg.extraConfig} + ''; + + environment.etc."riak-cs/advanced.config".text = '' + ${cfg.extraAdvancedConfig} + ''; + + users.extraUsers.riak-cs = { + name = "riak-cs"; + uid = config.ids.uids.riak-cs; + group = "riak"; + description = "Riak CS server user"; + }; + + systemd.services.riak-cs = { + description = "Riak CS Server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + path = [ + pkgs.utillinux # for `logger` + pkgs.bash + ]; + + environment.HOME = "${cfg.dataDir}"; + environment.RIAK_CS_DATA_DIR = "${cfg.dataDir}"; + environment.RIAK_CS_LOG_DIR = "${cfg.logDir}"; + environment.RIAK_CS_ETC_DIR = "/etc/riak"; + + preStart = '' + if ! test -e ${cfg.logDir}; then + mkdir -m 0755 -p ${cfg.logDir} + chown -R riak-cs ${cfg.logDir} + fi + + if ! test -e ${cfg.dataDir}; then + mkdir -m 0700 -p ${cfg.dataDir} + chown -R riak-cs ${cfg.dataDir} + fi + ''; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/riak-cs console"; + ExecStop = "${cfg.package}/bin/riak-cs stop"; + StandardInput = "tty"; + User = "riak-cs"; + Group = "riak-cs"; + PermissionsStartOnly = true; + # Give Riak a decent amount of time to clean up. + TimeoutStopSec = 120; + LimitNOFILE = 65536; + }; + + unitConfig.RequiresMountsFor = [ + "${cfg.dataDir}" + "${cfg.logDir}" + "/etc/riak" + ]; + }; + }; +} diff --git a/nixos/modules/services/databases/stanchion.nix b/nixos/modules/services/databases/stanchion.nix index af44e17ee58c..f44434f8ed5a 100644 --- a/nixos/modules/services/databases/stanchion.nix +++ b/nixos/modules/services/databases/stanchion.nix @@ -20,7 +20,7 @@ in package = mkOption { type = types.package; - default = pkgs.stanchion; + defaultText = "pkgs.stanchion"; example = literalExample "pkgs.stanchion"; description = '' Stanchion package to use. diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix new file mode 100644 index 000000000000..439af4da565b --- /dev/null +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak }: + +stdenv.mkDerivation rec { + name = "riak_cs-2.1.1"; + + buildInputs = [ + which unzip erlang pam git wget + ]; + + src = fetchurl { + url = "http://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz"; + sha256 = "115cac127aac6d759c1b429a52e0d18e491c0719a6530b1b88aa52c4efdbedd5"; + }; + + + postPatch = '' + sed -i deps/node_package/priv/base/env.sh \ + -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak-cs}@' \ + -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \ + -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \ + -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak-cs}@' \ + -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@' + + sed -i ./Makefile \ + -e 's@rel: deps compile@rel: deps compile-src@' + ''; + + preBuild = '' + patchShebangs . + ''; + + buildPhase = '' + runHook preBuild + + make locked-deps + make rel + + runHook postBuild + ''; + + doCheck = false; + + installPhase = '' + runHook preInstall + + mkdir $out + mv rel/riak-cs/etc rel/riak-cs/riak-etc + mkdir -p rel/riak-cs/etc + mv rel/riak-cs/riak-etc rel/riak-cs/etc/riak-cs + mv rel/riak-cs/* $out + + for prog in $out/bin/*; do + substituteInPlace $prog \ + --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \ + ". $out/lib/env.sh" + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Dynamo inspired NoSQL DB by Basho with S3 compatibility"; + platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + maintainer = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c405b14d89cc..65ad74c6ee0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10245,6 +10245,10 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; + riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { + erlang = erlang_basho_R16B03; + }; + stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { erlang = erlang_basho_R16B03; }; From c51847e121d0c6ffbf1ca0b8563032e5843b1882 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Mon, 21 Nov 2016 12:35:08 +0100 Subject: [PATCH 0576/1749] stanchion: added default --- nixos/modules/services/databases/stanchion.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/databases/stanchion.nix b/nixos/modules/services/databases/stanchion.nix index f44434f8ed5a..f2dbb78b5c4b 100644 --- a/nixos/modules/services/databases/stanchion.nix +++ b/nixos/modules/services/databases/stanchion.nix @@ -20,6 +20,7 @@ in package = mkOption { type = types.package; + default = pkgs.stanchion; defaultText = "pkgs.stanchion"; example = literalExample "pkgs.stanchion"; description = '' From 1d71ae259ffa11922ef0fd77dee7041e26213e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 21 Nov 2016 12:42:44 +0100 Subject: [PATCH 0577/1749] elm: be able to install everything inside a profile to fix #19943 --- pkgs/development/compilers/elm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 950caeedf53b..e125a050b249 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -80,9 +80,9 @@ let }; }; in hsPkgs.elmPkgs // { - elm = buildEnv { + elm = lib.hiPrio (buildEnv { name = "elm-${hsPkgs.elmVersion}"; paths = lib.mapAttrsToList (name: pkg: pkg) hsPkgs.elmPkgs; pathsToLink = [ "/bin" ]; - }; + }); } From 0755d4becb60da09b072638054189ad93a95f9e9 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Mon, 21 Nov 2016 13:41:05 +0100 Subject: [PATCH 0578/1749] gem-config: add uuid4r (#20603) --- pkgs/development/ruby-modules/gem-config/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 21cc80ea6bae..acd04ee3bf5a 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,7 +21,7 @@ , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl -, libmsgpack, qt48, libsodium, snappy +, libmsgpack, qt48, libsodium, snappy, libossp_uuid }@args: let @@ -202,6 +202,10 @@ in --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; }; + + uuid4r = attrs: { + buildInputs = [ which libossp_uuid ]; + }; xapian-ruby = attrs: { # use the system xapian From e9549d293cef520a5f74ca8203778d89911f1400 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Nov 2016 14:27:31 +0100 Subject: [PATCH 0579/1749] wireshark: 2.2.0 -> 2.2.2 See releases announcements: - https://www.wireshark.org/docs/relnotes/wireshark-2.2.1.html - https://www.wireshark.org/docs/relnotes/wireshark-2.2.2.html wireshark-2.2.1 fixes the following vulnerabilities: - CVE-2016-7957 - CVE-2016-7958 wireshard-2.2.2 fixes the following vulnerabilities: - CVE-2016-9372 - CVE-2016-9374 - CVE-2016-9376 - CVE-2016-9373 - CVE-2016-9375 --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 99df01afa6a4..aaf4ff1f386a 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -11,7 +11,7 @@ assert withQt -> !withGtk && qt4 != null; with stdenv.lib; let - version = "2.2.0"; + version = "2.2.2"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2"; - sha256 = "010i7wpsv2231pwb1xdqs0xfwywi3514siidv6wnrfpw3rs7x156"; + sha256 = "1csm035ayfzn1xzzsmzcjk2ixx39d70aykr4nh0a88chk9gfzb7r"; }; buildInputs = [ From 3897b344f383597082ad49dab1cdd3ed79c4fae6 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Mon, 21 Nov 2016 14:51:39 +0100 Subject: [PATCH 0580/1749] cudnn51_cudatoolkit80: Init at 5.1-8.0 --- .../science/math/cudnn/8.0-5.1/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix new file mode 100644 index 000000000000..0820897b81db --- /dev/null +++ b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, requireFile +, cudatoolkit +, fetchurl +}: + +stdenv.mkDerivation rec { + version = "5.1"; + cudatoolkit_version = "8.0"; + + name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; + + src = fetchurl { + url = "http://developer.download.nvidia.com/compute/redist/cudnn/v5.1/cudnn-8.0-linux-x64-v5.1.tgz"; + sha256 = "a87cb2df2e5e7cc0a05e266734e679ee1a2fadad6f06af82a76ed81a23b102c8"; + }; + + installPhase = '' + function fixRunPath { + p=$(patchelf --print-rpath $1) + patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + } + fixRunPath lib64/libcudnn.so + + mkdir -p $out + cp -a include $out/include + cp -a lib64 $out/lib64 + ''; + + propagatedBuildInputs = [ + cudatoolkit + ]; + + meta = with stdenv.lib; { + description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; + homepage = "https://developer.nvidia.com/cudnn"; + license = stdenv.lib.licenses.unfree; + maintainers = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c12fef44ad45..abda8e7635b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1312,6 +1312,10 @@ in cudatoolkit = cudatoolkit8; }; + cudnn51_cudatoolkit80 = callPackage ../development/libraries/science/math/cudnn/8.0-5.1 { + cudatoolkit = cudatoolkit8; + }; + curlFull = curl.override { idnSupport = true; ldapSupport = true; From a6bb468acf48e2dd9dddbd54d911f9e5919b70a3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Nov 2016 14:51:57 +0100 Subject: [PATCH 0581/1749] mkIf: Check whether the condition is a Boolean MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This gives a nicer error message than (say) while evaluating the option `fileSystems': while evaluating the attribute ‘isDefined’ at /nix/store/r8z4vvl2qzg31zm4ra6awlx5b22k7gf9-nixos-16.09.tar.gz/lib/modules.nix:323:5: while evaluating ‘filterOverrides’ at /nix/store/r8z4vvl2qzg31zm4ra6awlx5b22k7gf9-nixos-16.09.tar.gz/lib/modules.nix:395:21, called from /nix/store/r8z4vvl2qzg31zm4ra6awlx5b22k7gf9-nixos-16.09.tar.gz/lib/modules.nix:307:18: while evaluating ‘concatMap’ at /nix/store/r8z4vvl2qzg31zm4ra6awlx5b22k7gf9-nixos-16.09.tar.gz/lib/lists.nix:79:18, called from /nix/store/r8z4vvl2qzg31zm4ra6awlx5b22k7gf9-nixos-16.09.tar.gz/lib/modules.nix:401:8: while evaluating ‘concatMap’ at /nix/store/r8z4vvl2qzg31zm4ra6awlx5b22k7gf9-nixos-16.09.tar.gz/lib/lists.nix:79:18, called from /nix/store/r8z4vvl2qzg31zm4ra6awlx5b22k7gf9-nixos-16.09.tar.gz/lib/modules.nix:302:17: while evaluating anonymous function at /nix/store/r8z4vvl2qzg31zm4ra6awlx5b22k7gf9-nixos-16.09.tar.gz/lib/modules.nix:302:28, called from undefined position: while evaluating ‘dischargeProperties’ at /nix/store/r8z4vvl2qzg31zm4ra6awlx5b22k7gf9-nixos-16.09.tar.gz/lib/modules.nix:365:25, called from /nix/store/r8z4vvl2qzg31zm4ra6awlx5b22k7gf9-nixos-16.09.tar.gz/lib/modules.nix:303:62: value is a list while a Boolean was expected --- lib/modules.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index e66d6a6926cb..256d49ba27d8 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -375,10 +375,13 @@ rec { if def._type or "" == "merge" then concatMap dischargeProperties def.contents else if def._type or "" == "if" then - if def.condition then - dischargeProperties def.content + if isBool def.condition then + if def.condition then + dischargeProperties def.content + else + [ ] else - [ ] + throw "‘mkIf’ called with a non-Boolean condition" else [ def ]; From 44808cac65a8b323549fdbf3f1ca35c0bf746fe8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 21 Nov 2016 17:16:22 +0300 Subject: [PATCH 0582/1749] bumblebee service: fix service dependencies --- nixos/modules/hardware/video/bumblebee.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index 76d122ab2124..8b40e22d676b 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -70,8 +70,8 @@ in systemd.services.bumblebeed = { description = "Bumblebee Hybrid Graphics Switcher"; - wantedBy = [ "display-manager.service" ]; - path = [ kernel.bbswitch bumblebee ]; + wantedBy = [ "multi-user.target" ]; + before = [ "display-manager.service" ]; serviceConfig = { ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver}"; }; From f10ec922e06c99a89a65bfcbff8e2c5a399ee5bf Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 21 Nov 2016 17:16:35 +0300 Subject: [PATCH 0583/1749] bumblebee service: make bbswitch optional --- nixos/modules/hardware/video/bumblebee.nix | 82 +++++++++++++--------- 1 file changed, 47 insertions(+), 35 deletions(-) diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index 8b40e22d676b..34571b344e56 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -22,49 +22,61 @@ in { options = { - hardware.bumblebee.enable = mkOption { - default = false; - type = types.bool; - description = '' - Enable the bumblebee daemon to manage Optimus hybrid video cards. - This should power off secondary GPU until its use is requested - by running an application with optirun. + hardware.bumblebee = { - Only nvidia driver is supported so far. - ''; - }; - hardware.bumblebee.group = mkOption { - default = "wheel"; - example = "video"; - type = types.str; - description = ''Group for bumblebee socket''; - }; + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enable the bumblebee daemon to manage Optimus hybrid video cards. + This should power off secondary GPU until its use is requested + by running an application with optirun. + ''; + }; - hardware.bumblebee.connectDisplay = mkOption { - default = false; - type = types.bool; - description = '' - Set to true if you intend to connect your discrete card to a - monitor. This option will set up your Nvidia card for EDID - discovery and to turn on the monitor signal. + group = mkOption { + default = "wheel"; + example = "video"; + type = types.str; + description = ''Group for bumblebee socket''; + }; - Only nvidia driver is supported so far. - ''; - }; + connectDisplay = mkOption { + default = false; + type = types.bool; + description = '' + Set to true if you intend to connect your discrete card to a + monitor. This option will set up your Nvidia card for EDID + discovery and to turn on the monitor signal. + + Only nvidia driver is supported so far. + ''; + }; + + driver = mkOption { + default = "nvidia"; + type = types.enum [ "nvidia" "nouveau" ]; + description = '' + Set driver used by bumblebeed. Supported are nouveau and nvidia. + ''; + }; + + bbswitch = mkOption { + default = true; + type = types.bool; + description = '' + Set to true if you want to use bbswitch for power management of + unused card. + ''; + }; - hardware.bumblebee.driver = mkOption { - default = "nvidia"; - type = types.enum [ "nvidia" "nouveau" ]; - description = '' - Set driver used by bumblebeed. Supported are nouveau and nvidia. - ''; }; }; - config = mkIf config.hardware.bumblebee.enable { + config = mkIf cfg.enable { boot.blacklistedKernelModules = [ "nvidia-drm" "nvidia" "nouveau" ]; - boot.kernelModules = [ "bbswitch" ]; - boot.extraModulePackages = [ kernel.bbswitch ] ++ optional useNvidia kernel.nvidia_x11; + boot.kernelModules = optional cfg.bbswitch [ "bbswitch" ]; + boot.extraModulePackages = optional cfg.bbswitch kernel.bbswitch ++ optional useNvidia kernel.nvidia_x11; environment.systemPackages = [ bumblebee primus ]; From f11899798ed15863ef2bd40c74d7153d57ddf8aa Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Mon, 21 Nov 2016 15:46:04 +0100 Subject: [PATCH 0584/1749] riak: added extraAdvancedConfig option to service module --- nixos/modules/services/databases/riak.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix index d592d2e8ffdd..e0ebf164aef0 100644 --- a/nixos/modules/services/databases/riak.nix +++ b/nixos/modules/services/databases/riak.nix @@ -70,6 +70,14 @@ in ''; }; + extraAdvancedConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional text to be appended to advanced.config. + ''; + }; + }; }; @@ -90,6 +98,10 @@ in ${cfg.extraConfig} ''; + environment.etc."riak/advanced.config".text = '' + ${cfg.extraAdvancedConfig} + ''; + users.extraUsers.riak = { name = "riak"; uid = config.ids.uids.riak; From 6e08a5547403c28aa53c97c1509298995f2f7200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 21 Nov 2016 15:56:42 +0100 Subject: [PATCH 0585/1749] create-amis.sh: another dep needed for EBS images --- nixos/maintainers/scripts/ec2/create-amis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 8b7db7b30a64..b6db508aca0f 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p qemu awscli ec2_ami_tools jq +#! nix-shell -i bash -p qemu awscli ec2_ami_tools jq ec2_api_tools # To start with do: nix-shell -p awscli --run "aws configure" From d69dce080daf2c7004a79950e73dba6545b9097e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Nov 2016 16:17:35 +0100 Subject: [PATCH 0586/1749] Fix setting programs.ssh.setXAuthLocation The configuration { services.openssh.enable = true; services.openssh.forwardX11 = false; } caused programs.ssh.setXAuthLocation to be set to false, which was not the intent. The intent is that programs.ssh.setXAuthLocation should be automatically enabled if needed or if xauth is already available. --- nixos/modules/programs/ssh.nix | 2 +- nixos/modules/services/networking/ssh/sshd.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index b6fd9868f98f..5f4d4dc9475e 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -165,7 +165,7 @@ in config = { programs.ssh.setXAuthLocation = - mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11); + mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 || config.services.openssh.forwardX11); assertions = [ { assertion = cfg.forwardX11 -> cfg.setXAuthLocation; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 81941ce1cfb6..073391ffdbbc 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -228,8 +228,6 @@ in config = mkIf cfg.enable { - programs.ssh.setXAuthLocation = mkForce cfg.forwardX11; - users.extraUsers.sshd = { isSystemUser = true; description = "SSH privilege separation user"; From f9f354faadb32ae2f0ac11eab0d824cc40f1d56c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 21 Nov 2016 16:26:03 +0100 Subject: [PATCH 0587/1749] nixos/modules: use defaultText where applicable Primarily to fix rendering of these default values in the manual but it's also nice to avoid having to eval these things just to build the manual. --- nixos/modules/config/i18n.nix | 1 + nixos/modules/programs/java.nix | 1 + .../services/continuous-integration/gocd-agent/default.nix | 1 + .../services/continuous-integration/gocd-server/default.nix | 1 + nixos/modules/services/misc/dictd.nix | 3 ++- nixos/modules/services/misc/disnix.nix | 1 + nixos/modules/services/misc/gitlab.nix | 3 +++ nixos/modules/services/networking/flannel.nix | 1 + nixos/modules/services/networking/quassel.nix | 3 ++- nixos/modules/services/search/hound.nix | 2 ++ nixos/modules/services/torrent/opentracker.nix | 1 + nixos/modules/services/web-apps/quassel-webserver.nix | 2 ++ nixos/modules/services/x11/compton.nix | 1 + nixos/modules/system/boot/plymouth.nix | 4 ++++ 14 files changed, 23 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index e341931aacce..d7fd38ebed9a 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -44,6 +44,7 @@ in consolePackages = mkOption { type = types.listOf types.package; default = with pkgs.kbdKeymaps; [ dvp neo ]; + defaultText = ''with pkgs.kbdKeymaps; [ dvp neo ]''; description = '' List of additional packages that provide console fonts, keymaps and other resources. diff --git a/nixos/modules/programs/java.nix b/nixos/modules/programs/java.nix index 3292aa369d28..d31698c3b392 100644 --- a/nixos/modules/programs/java.nix +++ b/nixos/modules/programs/java.nix @@ -34,6 +34,7 @@ in package = mkOption { default = pkgs.jdk; + defaultText = "pkgs.jdk"; description = '' Java package to install. Typical values are pkgs.jdk or pkgs.jre. ''; diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix index d60b55e83d11..05adb18fbe91 100644 --- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -37,6 +37,7 @@ in { packages = mkOption { default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]; + defaultText = "[ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]"; type = types.listOf types.package; description = '' Packages to add to PATH for the Go.CD agent process. diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 4bb792055d25..07e00f17f1e8 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -68,6 +68,7 @@ in { packages = mkOption { default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]; + defaultText = "[ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]"; type = types.listOf types.package; description = '' Packages to add to PATH for the Go.CD server's process. diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix index 24dca15dd913..7e3b6431a133 100644 --- a/nixos/modules/services/misc/dictd.nix +++ b/nixos/modules/services/misc/dictd.nix @@ -25,7 +25,8 @@ in DBs = mkOption { type = types.listOf types.package; default = with pkgs.dictdDBs; [ wiktionary wordnet ]; - example = [ pkgs.dictdDBs.nld2eng ]; + defaultText = "with pkgs.dictdDBs; [ wiktionary wordnet ]"; + example = literalExample "[ pkgs.dictdDBs.nld2eng ]"; description = ''List of databases to make available.''; }; diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index e5a125ad3245..e96645c79c77 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -41,6 +41,7 @@ in type = types.path; description = "The Disnix package"; default = pkgs.disnix; + defaultText = "pkgs.disnix"; }; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 3e4584c7a512..cb8fa901bbd2 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -164,18 +164,21 @@ in { packages.gitlab = mkOption { type = types.package; default = pkgs.gitlab; + defaultText = "pkgs.gitlab"; description = "Reference to the gitlab package"; }; packages.gitlab-shell = mkOption { type = types.package; default = pkgs.gitlab-shell; + defaultText = "pkgs.gitlab-shell"; description = "Reference to the gitlab-shell package"; }; packages.gitlab-workhorse = mkOption { type = types.package; default = pkgs.gitlab-workhorse; + defaultText = "pkgs.gitlab-workhorse"; description = "Reference to the gitlab-workhorse package"; }; diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index 28b6c4f657dd..ca47a18bc1f6 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -20,6 +20,7 @@ in { description = "Package to use for flannel"; type = types.package; default = pkgs.flannel.bin; + defaultText = "pkgs.flannel.bin"; }; publicIp = mkOption { diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index 3f0906fdb80d..edcc12170b20 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -26,10 +26,11 @@ in package = mkOption { type = types.package; default = pkgs.kde4.quasselDaemon; + defaultText = "pkgs.kde4.quasselDaemon"; description = '' The package of the quassel daemon. ''; - example = pkgs.quasselDaemon; + example = literalExample "pkgs.quasselDaemon"; }; interfaces = mkOption { diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix index 1226cba682ec..a94a851e80ec 100644 --- a/nixos/modules/services/search/hound.nix +++ b/nixos/modules/services/search/hound.nix @@ -50,6 +50,8 @@ in { package = mkOption { default = pkgs.hound; + defaultText = "pkgs.hound"; + type = types.package; description = '' Package for running hound. ''; diff --git a/nixos/modules/services/torrent/opentracker.nix b/nixos/modules/services/torrent/opentracker.nix index d86b9fea2d79..74f443381d92 100644 --- a/nixos/modules/services/torrent/opentracker.nix +++ b/nixos/modules/services/torrent/opentracker.nix @@ -13,6 +13,7 @@ in { opentracker package to use ''; default = pkgs.opentracker; + defaultText = "pkgs.opentracker"; }; extraOptions = mkOption { diff --git a/nixos/modules/services/web-apps/quassel-webserver.nix b/nixos/modules/services/web-apps/quassel-webserver.nix index 7de9480d4c46..d19e4bc58277 100644 --- a/nixos/modules/services/web-apps/quassel-webserver.nix +++ b/nixos/modules/services/web-apps/quassel-webserver.nix @@ -31,6 +31,8 @@ in { }; pkg = mkOption { default = pkgs.quassel-webserver; + defaultText = "pkgs.quassel-webserver"; + type = types.package; description = "The quassel-webserver package"; }; quasselCoreHost = mkOption { diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index bda4eec01026..7cbca1dcddfd 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -188,6 +188,7 @@ in { package = mkOption { type = types.package; default = pkgs.compton; + defaultText = "pkgs.compton"; example = literalExample "pkgs.compton"; description = '' Compton derivation to use. diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 60a587af8e9f..d45b1686c1ea 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -51,6 +51,10 @@ in url = "https://nixos.org/logo/nixos-hires.png"; sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si"; }; + defaultText = ''pkgs.fetchurl { + url = "https://nixos.org/logo/nixos-hires.png"; + sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si"; + }''; description = '' Logo which is displayed on the splash screen. ''; From 1944c984c3f030bf65cbaf49487b4180e82212b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 21 Nov 2016 16:43:03 +0100 Subject: [PATCH 0588/1749] create-amis: order matters --- nixos/maintainers/scripts/ec2/create-amis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index b6db508aca0f..609d4941af30 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p qemu awscli ec2_ami_tools jq ec2_api_tools +#! nix-shell -i bash -p qemu ec2_ami_tools jq ec2_api_tools awscli # To start with do: nix-shell -p awscli --run "aws configure" From 04c6e3b115405b036bd9f99e72d98c12808ad089 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 20 Nov 2016 19:11:52 +0100 Subject: [PATCH 0589/1749] go-font: init at 2016-11-17 --- pkgs/data/fonts/go-font/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/data/fonts/go-font/default.nix diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix new file mode 100644 index 000000000000..df96241542de --- /dev/null +++ b/pkgs/data/fonts/go-font/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "go-font-${version}"; + version = "2016-11-17"; + + src = fetchgit { + url = "https://go.googlesource.com/image"; + rev = "d2f07f8aaaa906f1a64eee0e327fc681cdb2944f"; + sha256 = "1kmsipa4cyrwx86acc695c281hchrz9k9ni8r7giyggvdi577iga"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/go-font + cp font/gofont/ttfs/* $out/share/fonts/truetype + mv $out/share/fonts/truetype/README $out/share/doc/go-font/LICENSE + ''; + + meta = with stdenv.lib; { + homepage = https://blog.golang.org/go-fonts; + description = "The Go font family"; + license = licenses.bsd3; + maintainers = with maintainers; [ sternenseemann ]; + platforms = stdenv.lib.platforms.all; + hydraPlatforms = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 726f5eb53363..47720b50f045 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11774,6 +11774,8 @@ in inherit (gnome3) gsettings_desktop_schemas; + go-font = callPackage ../data/fonts/go-font { }; + gyre-fonts = callPackage ../data/fonts/gyre {}; hack-font = callPackage ../data/fonts/hack { }; From d662063a11582e06a29e3665f6595b5b827687e8 Mon Sep 17 00:00:00 2001 From: Guillaume Koenig Date: Tue, 15 Nov 2016 13:26:16 +0100 Subject: [PATCH 0590/1749] firefox: fix geolocation feature (#20425) Firefox uses a google API to perform geolocation. This API requires a key which must be given at build time. This commit adds the key from Chromium's derivation to Firefox. --- pkgs/applications/networking/browsers/firefox/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 5c3749f83fa1..e0689206382c 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -70,6 +70,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { "--enable-jemalloc" "--disable-gconf" "--enable-default-toolkit=cairo-gtk2" + "--with-google-api-keyfile=ga" ] ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] @@ -85,6 +86,11 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { configureScript="$(realpath ./configure)" mkdir ../objdir cd ../objdir + + # Google API key used by Chromium and Firefox. + # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, + # please get your own set of keys. + echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" >ga ''; preInstall = From bbb32994094021162495253fb9cb027536a2c991 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Mon, 21 Nov 2016 18:13:49 +0100 Subject: [PATCH 0591/1749] erlang: added dirty scheduler support erlang: formatting --- pkgs/development/interpreters/erlang/R18.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 10e5313ce8bb..f9b6edc3fa4b 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -6,6 +6,7 @@ , javacSupport ? false, openjdk ? null , enableHipe ? true , enableDebugInfo ? false +, enableDirtySchedulers ? false }: assert wxSupport -> (if stdenv.isDarwin @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { configureFlags= [ "--with-ssl=${openssl.dev}" ] ++ optional enableHipe "--enable-hipe" + ++ optional enableDirtySchedulers "--enable-dirty-schedulers" ++ optional wxSupport "--enable-wx" ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional javacSupport "--with-javac" From fd0f247658c123faa9fd90b882420ab17e703019 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Mon, 21 Nov 2016 18:18:45 +0100 Subject: [PATCH 0592/1749] erlang17: enable dirty schedulers --- pkgs/development/interpreters/erlang/R17.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 56b4626a2127..57323a587f81 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -6,6 +6,7 @@ , javacSupport ? false, openjdk ? null , enableHipe ? true , enableDebugInfo ? false +, enableDirtySchedulers ? false }: assert wxSupport -> (if stdenv.isDarwin @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { configureFlags= [ "--with-ssl=${openssl.dev}" ] ++ optional enableHipe "--enable-hipe" + ++ optional enableDirtySchedulers "--enable-dirty-schedulers" ++ optional wxSupport "--enable-wx" ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional javacSupport "--with-javac" From 89ca3425b071ce7ae1404e91a6175d7eafbfb795 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Mon, 21 Nov 2016 18:23:15 +0100 Subject: [PATCH 0593/1749] erlang19: enable dirty schedulers --- pkgs/development/interpreters/erlang/R19.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 02a84580850d..824c68688803 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -6,6 +6,7 @@ , javacSupport ? false, openjdk ? null , enableHipe ? true , enableDebugInfo ? false +, enableDirtySchedulers ? false }: assert wxSupport -> (if stdenv.isDarwin @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { configureFlags= [ "--with-ssl=${openssl.dev}" ] ++ optional enableHipe "--enable-hipe" + ++ optional enableDirtySchedulers "--enable-dirty-schedulers" ++ optional wxSupport "--enable-wx" ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional javacSupport "--with-javac" From ba51ba1bbeebf120c40fca55880dc6a731e150cd Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 11:37:14 +0100 Subject: [PATCH 0594/1749] jackline: init at 2016-11-18 --- .../instant-messengers/jackline/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/jackline/default.nix diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix new file mode 100644 index 000000000000..bbeb6c4aa4a3 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchFromGitHub, ocamlPackages, opam}: + +assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; + +stdenv.mkDerivation rec { + version = "2016-11-18"; + name = "jackline-${version}"; + + src = fetchFromGitHub { + owner = "hannesm"; + repo = "jackline"; + rev = "cab34acab004023911997ec9aee8b00a976af7e4"; + sha256 = "0h7wdsic4v6ys130w61zvxm5s2vc7y574hn7zby12rq88lhhrjh7"; + }; + + buildInputs = with ocamlPackages; [ + ocaml ocamlbuild findlib topkg ppx_sexp_conv + erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring + ptime notty sexplib_p4 hex uutf opam + ]; + + buildPhase = with ocamlPackages; + "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build --pinned true"; + + installPhase = "opam-installer --prefix=$out --script | sh"; + + meta = with stdenv.lib; { + homepage = https://github.com/hannesm/jackline; + description = "Terminal-based XMPP client in OCaml"; + license = licenses.bsd2; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abda8e7635b1..cb471c5b7865 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13328,6 +13328,10 @@ in hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; }; hyperterm = self.hyper; + jackline = callPackage ../applications/networking/instant-messengers/jackline { + ocamlPackages = ocaml-ng.ocamlPackages_4_02; + }; + slack = callPackage ../applications/networking/instant-messengers/slack { }; singularity = callPackage ../applications/virtualization/singularity { }; From 20486458e681298eb8a59f0ad91559f4cbdc659b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 21 Nov 2016 19:17:16 +0100 Subject: [PATCH 0595/1749] ocamlPackages.merlin: 2.5.1 -> 2.5.2 --- pkgs/development/tools/ocaml/merlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 3c99c3b9580b..2aa2321ef6ac 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -8,10 +8,10 @@ let then "2.3.1" else - "2.5.1"; + "2.5.2"; hashes = { "2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn"; - "2.5.1" = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8"; + "2.5.2" = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc"; }; in From e1c1fa695a6794cd6003765ac1d34a00c5a47768 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 21 Nov 2016 12:39:12 -0600 Subject: [PATCH 0596/1749] pugixml: fix darwin build --- .../development/libraries/pugixml/default.nix | 5 ++++- .../libraries/pugixml/no-long-long.patch | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/pugixml/no-long-long.patch diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 6ce2d9e2ffe0..ebb62459091e 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -20,11 +20,14 @@ stdenv.mkDerivation rec { sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' ../src/pugiconfig.hpp ''; + patches = [] + ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-long-long.patch ]; + meta = with stdenv.lib; { description = "Light-weight, simple and fast XML parser for C++ with XPath support"; homepage = http://pugixml.org/; license = licenses.mit; maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/pugixml/no-long-long.patch b/pkgs/development/libraries/pugixml/no-long-long.patch new file mode 100644 index 000000000000..46c54e85a1d0 --- /dev/null +++ b/pkgs/development/libraries/pugixml/no-long-long.patch @@ -0,0 +1,19 @@ +Get rid of long-long feature. This breaks on AppleClang compilers. +--- +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 40a7ab0..c84f0f7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,9 +26,9 @@ else() + endif() + + # Enable C++11 long long for compilers that are capable of it +-if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1) +- target_compile_features(pugixml PUBLIC cxx_long_long_type) +-endif() ++# if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1) ++# target_compile_features(pugixml PUBLIC cxx_long_long_type) ++# endif() + + set_target_properties(pugixml PROPERTIES VERSION 1.7 SOVERSION 1) + From dc4161a2a92c758e29d234f770c496bdf6c1967e Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Mon, 21 Nov 2016 20:08:25 +0100 Subject: [PATCH 0597/1749] glances: fix license --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 341f5192dc61..172e942ff575 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11933,7 +11933,7 @@ in { meta = { homepage = "http://nicolargo.github.io/glances/"; description = "Cross-platform curses-based monitoring tool"; - license = licenses.lgpl2; + license = licenses.lgpl3; maintainers = with maintainers; [ koral ]; }; }; From 8f6218572c7eca3f80b607344e331947349aed69 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 21 Nov 2016 13:28:42 -0600 Subject: [PATCH 0598/1749] kdeWrapper: set meta attribute Fixes #20445. --- pkgs/development/libraries/kde-frameworks/kde-wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix index 2dc5cc91128b..3591e20d11fb 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix @@ -5,7 +5,7 @@ drv: { targets, paths ? [] }: stdenv.mkDerivation { - inherit (drv) name; + inherit (drv) name meta; paths = builtins.map lib.getBin ([drv] ++ paths); inherit drv targets; From de2f9d67196c05ac9b4efedc7cc880ea1315f7bf Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Mon, 21 Nov 2016 19:51:59 +0000 Subject: [PATCH 0599/1749] haskellPackages.ghcjs-dom: Add overrides (#20474) --- .../haskell-modules/configuration-ghcjs.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 7c8541c5b47c..894022c176be 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -96,10 +96,15 @@ self: super: }) {}; ghcjs-dom = overrideCabal super.ghcjs-dom (drv: { - libraryHaskellDepends = [ self.ghcjs-base ] ++ - removeLibraryHaskellDepends [ - "glib" "gtk" "gtk3" "webkitgtk" "webkitgtk3" - ] drv.libraryHaskellDepends; + libraryHaskellDepends = with self; [ + ghcjs-base ghcjs-dom-jsffi text transformers + ]; + configureFlags = [ "-fjsffi" "-f-webkit" ]; + }); + + ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: { + libraryHaskellDepends = [ self.ghcjs-base self.text ]; + isLibrary = true; }); ghc-paths = overrideCabal super.ghc-paths (drv: { @@ -153,13 +158,12 @@ self: super: }); semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ]; - # triggers an internal pattern match failure in haddock - # https://github.com/haskell/haddock/issues/553 - wai = dontHaddock super.wai; transformers-compat = overrideCabal super.transformers-compat (drv: { configureFlags = []; }); - + # triggers an internal pattern match failure in haddock + # https://github.com/haskell/haddock/issues/553 + wai = dontHaddock super.wai; } From bc2fb9b2feae65049215720cba9b2cce22eb4f92 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 21 Nov 2016 21:14:19 +0100 Subject: [PATCH 0600/1749] mesa_noglu: Fix search paths for libvulkan_intel.so --- pkgs/development/libraries/mesa/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index e923f87722ae..2b31405980b0 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -132,12 +132,17 @@ stdenv.mkDerivation { $out/lib/vdpau \ $out/lib/bellagio \ $out/lib/libxatracker* \ - $out/lib/libvulkan_* \ + $out/lib/libvulkan_* # move share/vulkan/icd.d/ mv $out/share/ $drivers/ + # Update search path used by Vulkan (it's pointing to $out but + # drivers are in $drivers) + for js in $drivers/share/vulkan/icd.d/*.json; do + substituteInPlace "$js" --replace "$out" "$drivers" + done - mv $out/lib/dri/* $drivers/lib/dri + mv $out/lib/dri/* $drivers/lib/dri # */ rmdir "$out/lib/dri" # move libOSMesa to $osmesa, as it's relatively big From f940d65b2d98de73d0d2e2287e67eaec2be16642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 21 Nov 2016 21:26:11 +0100 Subject: [PATCH 0601/1749] create-amis: add us-east-2 --- nixos/maintainers/scripts/ec2/create-amis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 609d4941af30..d3c7d5ada2df 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -19,7 +19,7 @@ rm -f ec2-amis.nix types="hvm pv" stores="ebs s3" -regions="eu-west-1 eu-central-1 us-east-1 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" +regions="eu-west-1 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" for type in $types; do link=$stateDir/$type From 516e177d9894c091a374e589a94f4577ccde9aba Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Nov 2016 21:54:15 +0100 Subject: [PATCH 0602/1749] ktorrent: Add 5.0.1 --- .../networking/p2p/ktorrent/5.nix | 41 +++++++++++++++++++ pkgs/desktops/kde-5/applications/default.nix | 2 + .../libraries/kde-frameworks/default.nix | 1 + pkgs/development/libraries/libktorrent/5.nix | 29 +++++++++++++ .../libraries/libktorrent/default.nix | 2 +- 5 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/p2p/ktorrent/5.nix create mode 100644 pkgs/development/libraries/libktorrent/5.nix diff --git a/pkgs/applications/networking/p2p/ktorrent/5.nix b/pkgs/applications/networking/p2p/ktorrent/5.nix new file mode 100644 index 000000000000..7e47838c4f98 --- /dev/null +++ b/pkgs/applications/networking/p2p/ktorrent/5.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, cmake +, ecm, qtbase, qtscript +, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support +, libktorrent, boost, taglib +}: + +stdenv.mkDerivation rec { + name = pname + "-" + version; + + pname = "ktorrent"; + version = "5.0.1"; + + src = fetchurl { + url = http://download.kde.org/stable/ktorrent/5.0/ktorrent-5.0.1.tar.xz; + sha256 = "1rbr932djmn1la6vs2sy1zdf39fmla8vwzfn76h7csncbp5fw3yh"; + }; + + patches = + [ (fetchurl { + url = https://cgit.kde.org/ktorrent.git/patch/?id=f48acc22f0105ce6bac63294d248873ae231c6cc; + sha256 = "0jm4y35w2ypbjzf165rnjr224nq4w651ydnpd9zdn3inxh8r4s0v"; + }) + ]; + + nativeBuildInputs = [ kdoctools ecm ]; + + buildInputs = + [ cmake qtbase qtscript + ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support + libktorrent taglib + ]; + + enableParallelBuilding = true; + + meta = { + description = "KDE integrated BtTorrent client"; + homepage = https://www.kde.org/applications/internet/ktorrent/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index 942bd5eb9779..91f43545b310 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -67,6 +67,8 @@ let # External packages kipi-plugins = callPackage ../../../applications/graphics/kipi-plugins/5.x.nix {}; + ktorrent = callPackage ../../../applications/networking/p2p/ktorrent/5.nix { }; + libktorrent = callPackage ../../../development/libraries/libktorrent/5.nix { }; }; in packages diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 1ef8207e50a0..397d59f8b246 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -64,6 +64,7 @@ let baloo = callPackage ./baloo.nix {}; bluez-qt = callPackage ./bluez-qt.nix {}; breeze-icons = callPackage ./breeze-icons.nix {}; + # FIXME: this collides with the "ecm" package. ecm = let drv = { cmake, ecmNoHooks, pkgconfig, qtbase, qttools }: makeSetupHook diff --git a/pkgs/development/libraries/libktorrent/5.nix b/pkgs/development/libraries/libktorrent/5.nix new file mode 100644 index 000000000000..e5406d3a2a58 --- /dev/null +++ b/pkgs/development/libraries/libktorrent/5.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, cmake, ecm +, karchive, kcrash, ki18n, kio, solid +, boost, gmp, qca-qt5, libgcrypt +}: + +stdenv.mkDerivation rec { + name = "libktorrent-2.0.1"; + + src = fetchurl { + url = http://download.kde.org/stable/ktorrent/5.0/libktorrent-2.0.1.tar.xz; + sha256 = "0hiz4wm8jkymp24r6f1g8svj3pw9qspbjajf512m3j8s3bhrw3f7"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ecm ]; + buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ]; + + propagatedBuildInputs = [ gmp boost ]; + + enableParallelBuilding = true; + + meta = { + description = "A BitTorrent library used by KTorrent"; + homepage = https://www.kde.org/applications/internet/ktorrent/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index db07775d45ed..9e7fb0a0b3d5 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "A BiTtorrent library used by KTorrent"; + description = "A BitTorrent library used by KTorrent"; homepage = http://ktorrent.pwsp.net; inherit (kdelibs.meta) platforms; }; From db66a95e5b704b8c1e9c55f186f1dccbfb6ce580 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 21 Nov 2016 22:49:02 +0100 Subject: [PATCH 0603/1749] ntp: 4.2.8p8 -> 4.2.8p9 Includes fixes for 10 CVEs and contains other fixes. See http://support.ntp.org/bin/view/Main/SecurityNotice#November_2016_ntp_4_2_8p9_NTP_Se. --- pkgs/tools/networking/ntp/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 4c42771be170..07602fec6ae9 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -3,16 +3,18 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "ntp-4.2.8p8"; + name = "ntp-4.2.8p9"; src = fetchurl { url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "1vlpgd0dk2wkpmmf869sfxi8f46sfnmjgk51vl8n6vj5y2sx1cra"; + sha256 = "0whbyf82lrczbri4adbsa4hg1ppfa6c7qcj7nhjwdfp1g1vjh95p"; }; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" + "--with-openssl-libdir=${openssl.out}/lib" + "--with-openssl-incdir=${openssl.dev}/include" "--enable-ignore-dns-errors" ] ++ stdenv.lib.optional (libcap != null) "--enable-linuxcaps"; From 67fd21a170daac003c8b87c43b3eeeb5a81f28ac Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 21 Nov 2016 23:11:05 +0100 Subject: [PATCH 0604/1749] ntp: use seccomp on linux --- pkgs/tools/networking/ntp/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 07602fec6ae9..445cb1fb3931 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, autoreconfHook, libcap ? null, openssl ? null }: +{ stdenv, fetchurl, openssl, libcap ? null, libseccomp ? null }: assert stdenv.isLinux -> libcap != null; +assert stdenv.isLinux -> libseccomp != null; stdenv.mkDerivation rec { name = "ntp-4.2.8p9"; @@ -16,10 +17,12 @@ stdenv.mkDerivation rec { "--with-openssl-libdir=${openssl.out}/lib" "--with-openssl-incdir=${openssl.dev}/include" "--enable-ignore-dns-errors" - ] ++ stdenv.lib.optional (libcap != null) "--enable-linuxcaps"; + ] ++ stdenv.lib.optionals stdenv.isLinux [ + "--enable-linuxcaps" + "--enable-libseccomp" + ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libcap openssl ]; + buildInputs = [ libcap openssl libseccomp ]; hardeningEnable = [ "pie" ]; From 96194467e6200baabf072fe4fd4d0ceecdeb5e1c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 21 Nov 2016 23:14:00 +0100 Subject: [PATCH 0605/1749] grsecurity: 4.8.8-201611150756 -> 4.8.10-201611210813 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index e6e26a4ae5a9..e0e8fbaf95e8 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.8"; + version = "4.8.10"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0hm60zjsp22rbh8jz4d8rpwsj6bysmlcm0c5m1cxpnfj6cqcjp7w"; + sha256 = "1i3hydxjl3zz4i3v2spnv5y5pidmwgiyc10q6rlwvf0bs8aynh53"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index db1ce8c38013..489212f612f4 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.8"; - grrev = "201611150756"; - sha256 = "04sankbjlrji3hrhgwfvmgkrh5ypblb706i0hch4sn3vcc0dq87b"; + { kver = "4.8.10"; + grrev = "201611210813"; + sha256 = "1an1fqzmh133hr6r9y4y9b5qkaf8xwlfgymg97ygbwqdygjvp81b"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 009e37d277328b8d28d85db149f996100486c72b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 21 Nov 2016 23:19:04 +0100 Subject: [PATCH 0606/1749] ntp: fix ntp-wait script, depends on perl --- pkgs/tools/networking/ntp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 445cb1fb3931..a37b1bdbd98a 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libcap ? null, libseccomp ? null }: +{ stdenv, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }: assert stdenv.isLinux -> libcap != null; assert stdenv.isLinux -> libseccomp != null; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--enable-libseccomp" ]; - buildInputs = [ libcap openssl libseccomp ]; + buildInputs = [ libcap openssl libseccomp perl ]; hardeningEnable = [ "pie" ]; From 48fad82911c212ca229723b9f7ea1faf8c662b8f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 21 Nov 2016 18:06:27 -0500 Subject: [PATCH 0607/1749] atom: 1.12.4 -> 1.12.5 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index a90d05cadcb3..03b858c896cc 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.12.4"; + version = "1.12.5"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1q6damahkh8y4mq9ipzav3np41l7h8mbd974pp299df3jsli8a05"; + sha256 = "0bxv9j6v77g9sjlg6vjcxjdsgbh10v3c8f0qp5fpzr7dzk7k9w41"; name = "${name}.deb"; }; From d62069aca47e104632171fc27b5b5a828447131a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 21 Nov 2016 18:06:57 -0500 Subject: [PATCH 0608/1749] linux: 4.4.33 -> 4.4.34 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 6e2b1f24645e..0fad9a578eff 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.33"; + version = "4.4.34"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0w0ygcmfi2jyrya5nj39xviwninzdv5aiz6nimbsw8vvycc2xgr5"; + sha256 = "1xrk7adgapr4wpid6l6s05cypy3r28skynajy2h73xciradaqs9b"; }; kernelPatches = args.kernelPatches; From e4a1b76457d6c078cd60f8df84fea89a26dedd7b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 21 Nov 2016 18:07:17 -0500 Subject: [PATCH 0609/1749] linux: 4.8.9 -> 4.8.10 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index 22881fd80767..e0e8fbaf95e8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.9"; + version = "4.8.10"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0z8xdr3gqmi295a76rbzngilf49kxxm6ffhr89lbfxnsffyy6m68"; + sha256 = "1i3hydxjl3zz4i3v2spnv5y5pidmwgiyc10q6rlwvf0bs8aynh53"; }; kernelPatches = args.kernelPatches; From 42a180352fb3c9e069fd6e41a6387cb548a054c2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 22 Nov 2016 02:33:39 +0300 Subject: [PATCH 0610/1749] bumblebee service: replace bbswitch option with pmMethod I added this option just today, so I don't think this needs a rename entry. --- nixos/modules/hardware/video/bumblebee.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index 34571b344e56..3ce97ad31c22 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -13,6 +13,8 @@ let useDisplayDevice = cfg.connectDisplay; }; + useBbswitch = cfg.pmMethod == "bbswitch"; + primus = pkgs.primus.override { inherit useNvidia; }; @@ -61,12 +63,11 @@ in ''; }; - bbswitch = mkOption { - default = true; - type = types.bool; + pmMethod = mkOption { + default = "auto"; + type = types.enum [ "auto" "bbswitch" "nouveau" "switcheroo" "none" ]; description = '' - Set to true if you want to use bbswitch for power management of - unused card. + Set preferred power management method for unused card. ''; }; @@ -75,8 +76,8 @@ in config = mkIf cfg.enable { boot.blacklistedKernelModules = [ "nvidia-drm" "nvidia" "nouveau" ]; - boot.kernelModules = optional cfg.bbswitch [ "bbswitch" ]; - boot.extraModulePackages = optional cfg.bbswitch kernel.bbswitch ++ optional useNvidia kernel.nvidia_x11; + boot.kernelModules = optional useBbswitch [ "bbswitch" ]; + boot.extraModulePackages = optional useBbswitch kernel.bbswitch ++ optional useNvidia kernel.nvidia_x11; environment.systemPackages = [ bumblebee primus ]; @@ -85,7 +86,7 @@ in wantedBy = [ "multi-user.target" ]; before = [ "display-manager.service" ]; serviceConfig = { - ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver}"; + ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver} --pm-method ${cfg.pmMethod}"; }; }; }; From 3800b21be96f45d3afabcddf9085be5db22bb6b5 Mon Sep 17 00:00:00 2001 From: Jan Bessai Date: Tue, 22 Nov 2016 01:54:14 +0100 Subject: [PATCH 0611/1749] pidgin-skypeweb: 1.2.1 -> 1.2.2 (#20559) --- .../pidgin-plugins/pidgin-skypeweb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 533c0ba48ba7..f68b8306fc84 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pidgin-skypeweb-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "EionRobb"; repo = "skype4pidgin"; rev = "${version}"; - sha256 = "0qmqf1r9kc7r6rgzz0byyq7yf5spsl2iima0cvxafs43gn4hnc2z"; + sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2"; }; sourceRoot = "skype4pidgin-${version}-src/skypeweb"; From 49d608ac0066198a88eede8dd314bc8bd75e5b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 22 Nov 2016 01:59:40 +0100 Subject: [PATCH 0612/1749] create-amis: use jq instead of json --- nixos/maintainers/scripts/ec2/create-amis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index d3c7d5ada2df..0750a1b18c99 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -61,7 +61,7 @@ for type in $types; do ami=$(aws ec2 copy-image \ --region "$region" \ --source-region "$prevRegion" --source-image-id "$prevAmi" \ - --name "$name" --description "$description" | json -q .ImageId) + --name "$name" --description "$description" | jq -r '.ImageId') if [ "$ami" = null ]; then break; fi else From 35ecef2c6d0afebf09ab6504a00b6af14ca24973 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Tue, 22 Nov 2016 02:11:33 +0100 Subject: [PATCH 0613/1749] containers module: Add tmpfs options (#20557) Allows one or more directories to be mounted as a read-only file system. This makes it convenient to run volatile containers that do not retain application state. --- lib/maintainers.nix | 1 + nixos/modules/virtualisation/containers.nix | 18 ++++- nixos/tests/containers-tmpfs.nix | 79 +++++++++++++++++++++ 3 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/containers-tmpfs.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 79c581159523..7e4a7168effb 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -88,6 +88,7 @@ chris-martin = "Chris Martin "; chrisjefferson = "Christopher Jefferson "; christopherpoole = "Christopher Mark Poole "; + ckampka = "Christian Kampka "; cko = "Christine Koppelt "; cleverca22 = "Michael Bishop "; cmcdragonkai = "Roger Qiu "; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index aa28a25be7ac..cfc1065b7294 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -129,9 +129,12 @@ let --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \ --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \ --setenv PATH="$PATH" \ - ${if cfg.additionalCapabilities != null then + ${if cfg.additionalCapabilities != null && cfg.additionalCapabilities != [] then ''--capability="${concatStringsSep " " cfg.additionalCapabilities}"'' else "" } \ + ${if cfg.tmpfs != null && cfg.tmpfs != [] then + ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' else "" + } \ ${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" ''; @@ -367,6 +370,7 @@ let hostAddress6 = null; localAddress = null; localAddress6 = null; + tmpfs = null; }; in @@ -510,6 +514,18 @@ in ''; }; + tmpfs = mkOption { + type = types.listOf types.str; + default = []; + example = [ "/var" ]; + description = '' + Mounts a set of tmpfs file systems into the container. + Multiple paths can be specified. + Valid items must conform to the --tmpfs argument + of systemd-nspawn. See systemd-nspawn(1) for details. + ''; + }; + } // networkOptions; config = mkMerge diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix new file mode 100644 index 000000000000..564831fa2737 --- /dev/null +++ b/nixos/tests/containers-tmpfs.nix @@ -0,0 +1,79 @@ +# Test for NixOS' container support. + +import ./make-test.nix ({ pkgs, ...} : { + name = "containers-bridge"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ckampka ]; + }; + + machine = + { config, pkgs, ... }: + { imports = [ ../modules/installer/cd-dvd/channel.nix ]; + virtualisation.writableStore = true; + virtualisation.memorySize = 768; + + containers.tmpfs = + { + autoStart = true; + tmpfs = [ + # Mount var as a tmpfs + "/var" + + # Add a nested mount inside a tmpfs + "/var/log" + + # Add a tmpfs on a path that does not exist + "/some/random/path" + ]; + config = { }; + }; + + virtualisation.pathsInNixDB = [ pkgs.stdenv ]; + }; + + testScript = + '' + $machine->waitForUnit("default.target"); + $machine->succeed("nixos-container list") =~ /tmpfs/ or die; + + # Start the tmpfs container. + #$machine->succeed("nixos-container status tmpfs") =~ /up/ or die; + + # Verify that /var is mounted as a tmpfs + #$machine->succeed("nixos-container run tmpfs -- systemctl status var.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die; + $machine->succeed("nixos-container run tmpfs -- mountpoint -q /var 2>/dev/null"); + + # Verify that /var/log is mounted as a tmpfs + $machine->succeed("nixos-container run tmpfs -- systemctl status var-log.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die; + $machine->succeed("nixos-container run tmpfs -- mountpoint -q /var/log 2>/dev/null"); + + # Verify that /some/random/path is mounted as a tmpfs + $machine->succeed("nixos-container run tmpfs -- systemctl status some-random-path.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die; + $machine->succeed("nixos-container run tmpfs -- mountpoint -q /some/random/path 2>/dev/null"); + + # Verify that files created in the container in a non-tmpfs directory are visible on the host. + # This establishes legitimacy for the following tests + $machine->succeed("nixos-container run tmpfs -- touch /root/test.file 2>/dev/null"); + $machine->succeed("nixos-container run tmpfs -- ls -l /root | grep -q test.file 2>/dev/null"); + $machine->succeed("test -e /var/lib/containers/tmpfs/root/test.file"); + + + # Verify that /some/random/path is writable and that files created there + # are not in the hosts container dir but in the tmpfs + $machine->succeed("nixos-container run tmpfs -- touch /some/random/path/test.file 2>/dev/null"); + $machine->succeed("nixos-container run tmpfs -- test -e /some/random/path/test.file 2>/dev/null"); + + $machine->fail("test -e /var/lib/containers/tmpfs/some/random/path/test.file"); + + # Verify that files created in the hosts container dir in a path where a tmpfs file system has been mounted + # are not visible to the container as the do not exist in the tmpfs + $machine->succeed("touch /var/lib/containers/tmpfs/var/test.file"); + + $machine->succeed("test -e /var/lib/containers/tmpfs/var/test.file"); + $machine->succeed("ls -l /var/lib/containers/tmpfs/var/ | grep -q test.file 2>/dev/null"); + + $machine->fail("nixos-container run tmpfs -- ls -l /var | grep -q test.file 2>/dev/null"); + + ''; + +}) From db50ae78d0f2a4e9b92181424febbd618d0c8003 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Sun, 20 Nov 2016 22:38:14 +0000 Subject: [PATCH 0614/1749] boinc service: init --- .../services/computing/boinc/client.nix | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 nixos/modules/services/computing/boinc/client.nix diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix new file mode 100644 index 000000000000..5e73638913de --- /dev/null +++ b/nixos/modules/services/computing/boinc/client.nix @@ -0,0 +1,88 @@ +{config, lib, pkgs, ...}: + +with lib; + +let + cfg = config.services.boinc; + allowRemoteGuiRpcFlag = optionalString cfg.allowRemoteGuiRpc "--allow_remote_gui_rpc"; + +in + { + options.services.boinc = { + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to enable the BOINC distributed computing client. If this + option is set to true, the boinc_client daemon will be run as a + background service. The boinccmd command can be used to control the + daemon. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.boinc; + defaultText = "pkgs.boinc"; + description = '' + Which BOINC package to use. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/boinc"; + description = '' + The directory in which to store BOINC's configuration and data files. + ''; + }; + + allowRemoteGuiRpc = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + If set to true, any remote host can connect to and control this BOINC + client (subject to password authentication). If instead set to false, + only the hosts listed in dataDir/remote_hosts.cfg will be allowed to + connect. + + See also: + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [cfg.package]; + + users.users.boinc = { + createHome = false; + description = "BOINC Client"; + home = cfg.dataDir; + isSystemUser = true; + }; + + systemd.services.boinc = { + description = "BOINC Client"; + after = ["network.target" "local-fs.target"]; + wantedBy = ["multi-user.target"]; + preStart = '' + mkdir -p ${cfg.dataDir} + chown boinc ${cfg.dataDir} + ''; + script = '' + ${cfg.package}/bin/boinc_client --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag} + ''; + serviceConfig = { + PermissionsStartOnly = true; # preStart must be run as root + User = "boinc"; + Nice = 10; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [kierdavis]; + }; + } From cc925a016296ad319b73f9228c1d143390a22444 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 22 Nov 2016 03:16:22 +0100 Subject: [PATCH 0615/1749] stunnel: 5.36 -> 5.37 --- pkgs/tools/networking/stunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index a01c39743fe6..6bcf2b80a136 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.36"; + version = "5.37"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "1smmwkzr0i6w4jwrjxazbyf82jq1qlg8x9zil5b51pzwzpy552gb"; + sha256 = "0hfjs3f2crdvqsalismrsf5nnz4ksj8igiwjqzg4zipz7q757qyh"; }; buildInputs = [ openssl ]; From 91d2071e7a0255b4d396df9a220ad2c288f16db6 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Tue, 22 Nov 2016 12:45:09 +1000 Subject: [PATCH 0616/1749] openntpd: 5.7p4 -> 6.0p1 (#20602) --- pkgs/tools/networking/openntpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 202cb4c6ba61..47d1dbbcbe69 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "openntpd-${version}"; - version = "5.7p4"; + version = "6.0p1"; src = fetchurl { url = "mirror://openbsd/OpenNTPD/${name}.tar.gz"; - sha256 = "08ybpi351284wj53qqrmg13j8l7md397yrqsmg0aqxg3frcxk4x9"; + sha256 = "1s3plmxmybwpfrimq6sc54wxnn6ca7rb2g5k2bdjm4c88w4q1axi"; }; configureFlags = [ From d212fc99f4246956fc90e1566d04234850fd2052 Mon Sep 17 00:00:00 2001 From: montag451 Date: Tue, 22 Nov 2016 03:46:26 +0100 Subject: [PATCH 0617/1749] git-remote-gcrypt: 20140715 -> 1.0.0 (#20623) --- .../git-remote-gcrypt/default.nix | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index 2ee34d3c6e3f..ba2b71138067 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchgit, docutils }: +{ stdenv, fetchFromGitHub, docutils, makeWrapper, gnupg1compat, curl, rsync }: -stdenv.mkDerivation { - name = "git-remote-gcrypt-20140715"; +stdenv.mkDerivation rec { + name = "git-remote-gcrypt-${version}"; + version = "1.0.0"; + rev = version; - # Use joeyh's branch that works better with git-annex - src = fetchgit { - url = "https://github.com/joeyh/git-remote-gcrypt.git"; - rev = "5dcc77f507d497fe4023e94a47b6a7a1f1146bce"; - sha256 = "d509efde143cfec4898872b5bb423d52d5d1c940b6a1e21b8444c904bdb250c2"; + src = fetchFromGitHub { + inherit rev; + owner = "spwhitton"; + repo = "git-remote-gcrypt"; + sha256 = "0c8ig1pdqj7wjwldnf62pmm2x29ri62x6b24mbsl2nxzkqbwh379"; }; - # Required for rst2man.py - buildInputs = [ docutils ]; + outputs = [ "out" "man" ]; + + buildInputs = [ docutils makeWrapper ]; # The install.sh script expects rst2man, but here it's named rst2man.py patchPhase = '' @@ -20,13 +23,15 @@ stdenv.mkDerivation { installPhase = '' prefix="$out" ./install.sh + wrapProgram "$out/bin/git-remote-gcrypt" \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat curl rsync ]}" ''; - meta = { - homepage = "https://github.com/joeyh/git-remote-gcrypt"; - description = "GNU Privacy Guard-encrypted git remote"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ ellis ]; - platforms = with stdenv.lib.platforms; unix; + meta = with stdenv.lib; { + homepage = https://spwhitton.name/tech/code/git-remote-gcrypt; + description = "A git remote helper for GPG-encrypted remotes"; + license = licenses.gpl3; + maintainers = with maintainers; [ ellis montag451 ]; + platforms = platforms.unix; }; } From 3bfed00e64d26979227e4706b644cdb7f5d7c2d3 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 22 Nov 2016 10:02:06 +0100 Subject: [PATCH 0618/1749] dico: 2.3 -> 2.4 --- pkgs/servers/dico/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index 7c2af1dd25e7..c530929f79e4 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -2,11 +2,11 @@ , guile, python, pcre, libffi, groff }: stdenv.mkDerivation rec { - name = "dico-2.3"; + name = "dico-2.4"; src = fetchurl { url = "mirror://gnu/dico/${name}.tar.xz"; - sha256 = "13by0zimx90v2j8v7n4k9y3xwmh4q9jdc2f4f8yjs3x7f5bzm2pk"; + sha256 = "13m7vahfbdj7hb38bjgd4cmfswavvxrcpppj9n4m4rar3wyzg52g"; }; hardeningDisable = [ "format" ]; From 5267f3784995e4452429b049f2aadfa8631e09cd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 21 Nov 2016 19:20:25 +0100 Subject: [PATCH 0619/1749] ocamlPackages.ssl: 0.5.2 -> 0.5.3 --- pkgs/development/ocaml-modules/ssl/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index e25b17fb6567..81b8c28b4524 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -1,13 +1,12 @@ -{stdenv, fetchurl, which, openssl, ocaml, findlib}: +{ stdenv, fetchzip, which, openssl, ocaml, findlib }: stdenv.mkDerivation rec { - name = "ocaml-ssl-${version}"; - version = "0.5.2"; + name = "ocaml${ocaml.version}-ssl-${version}"; + version = "0.5.3"; - src = fetchurl { - url = "mirror://sourceforge/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz"; - - sha256 = "0341rm8aqrckmhag1lrqfnl17v6n4ci8ibda62ahkkn5cxd58cpp"; + src = fetchzip { + url = "https://github.com/savonet/ocaml-ssl/releases/download/0.5.3/ocaml-ssl-${version}.tar.gz"; + sha256 = "0h2k19zpdvq1gqwrmmgkibw4j48l71vv6ajzxs0wi71y80c1vhwm"; }; buildInputs = [which ocaml findlib]; From bfe0f29277e1357a9d05aa54631af44c7b10d4f1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 21 Nov 2016 19:20:43 +0100 Subject: [PATCH 0620/1749] ocamlPackages.lwt: 2.5.2 -> 2.6.0 --- .../development/ocaml-modules/lwt/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 9eeed1285dcc..d3a373ab4dbc 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: - -let - inherit (stdenv.lib) optional getVersion versionAtLeast; -in +{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 +, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib +, ppx_tools, result +, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" +}: stdenv.mkDerivation rec { name = "ocaml-lwt-${version}"; - version = "2.5.2"; + version = "2.6.0"; src = fetchzip { url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; - sha256 = "0gmhm282r8yi0gwcv0g2s7qchkfjmhqbqf4j9frlyv665ink9kxl"; + sha256 = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; }; - buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ppx_tools ]; + buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ] + ++ stdenv.lib.optional ppxSupport ppx_tools; - propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ]; + propagatedBuildInputs = [ result ocaml_react ocaml_ssl libev ]; - configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4"] - ++ [ (if versionAtLeast ocaml.version "4.02" then "--enable-ppx" else "--disable-ppx") ]; + configureScript = "ocaml setup.ml -configure"; + prefixKey = "--prefix "; + configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4" ] + ++ [ (if ppxSupport then "--enable-ppx" else "--disable-ppx") ]; createFindlibDestdir = true; From efec7d9787f2642030c1a46acbab8a4d50c6493e Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Fri, 14 Oct 2016 16:05:46 +1100 Subject: [PATCH 0621/1749] dante: init at 1.4.1 --- pkgs/servers/dante/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/servers/dante/default.nix diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix new file mode 100644 index 000000000000..044d4fa50ab2 --- /dev/null +++ b/pkgs/servers/dante/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation (rec { + name = "dante-${version}"; + version = "1.4.1"; + + src = fetchurl { + url = "https://www.inet.no/dante/files/${name}.tar.gz"; + sha256 = "0lsg3hk8zd2h9f08s13bn4l4pvyyzkj4gr4ppwa7vj7gdyyk5lmn"; + }; + + configureFlags = [ + "--with-libc=libc.so.6" + ]; + + meta = { + description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity."; + homepage = "https://www.inet.no/dante/"; + maintainers = [ stdenv.lib.maintainers.arobyn ]; + license = stdenv.lib.licenses.bsdOriginal; + platforms = stdenv.lib.platforms.linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90ce4488c77d..55b7ab737d7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -787,6 +787,8 @@ in daemontools = callPackage ../tools/admin/daemontools { }; + dante = callPackage ../servers/dante { }; + datamash = callPackage ../tools/misc/datamash { }; datefudge = callPackage ../tools/system/datefudge { }; From 49d679d7a8f5875be21f36cf64d16531e3dd81ee Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Fri, 14 Oct 2016 16:07:59 +1100 Subject: [PATCH 0622/1749] dante service: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/dante.nix | 61 +++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 nixos/modules/services/networking/dante.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0c930eb2eb0c..7c3930afa52a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -346,6 +346,7 @@ ./services/networking/connman.nix ./services/networking/consul.nix ./services/networking/coturn.nix + ./services/networking/dante.nix ./services/networking/ddclient.nix ./services/networking/dhcpcd.nix ./services/networking/dhcpd.nix diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix new file mode 100644 index 000000000000..8f4e15223ab0 --- /dev/null +++ b/nixos/modules/services/networking/dante.nix @@ -0,0 +1,61 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.services.dante; + confFile = pkgs.writeText "dante-sockd.conf" '' + user.privileged: root + user.unprivileged: dante + + ${cfg.config} + ''; +in + +{ + meta = { + maintainers = with maintainers; [ arobyn ]; + }; + + options = { + services.dante = { + enable = mkEnableOption "Dante SOCKS proxy"; + + config = mkOption { + default = null; + type = types.str; + description = '' + Contents of Dante's configuration file + NOTE: user.privileged/user.unprivileged are set by the service + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { assertion = cfg.config != null; + message = "please provide Dante configuration file contents"; + } + ]; + + users.users.dante = { + description = "Dante SOCKS proxy daemon user"; + isSystemUser = true; + group = "dante"; + }; + users.groups.dante = {}; + + systemd.services.dante = { + description = "Dante SOCKS v4 and v5 compatible proxy server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.dante}/bin/sockd -f ${confFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + Restart = "always"; + }; + }; + }; +} From 35032ef15f3d14169a6cd399a72713d2d5d1b836 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Tue, 22 Nov 2016 13:40:57 +0100 Subject: [PATCH 0623/1749] 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 bffae65060dad819df7c3a6e8901b6fbfdca5b47 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 22 Nov 2016 07:53:21 -0500 Subject: [PATCH 0624/1749] rabbitmq-server: 3.5.6 -> 3.5.8 for unallocated CVEs: https://github.com/rabbitmq/rabbitmq-server/releases/tag/rabbitmq_v3_5_8 --- pkgs/servers/amqp/rabbitmq-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 7725a7272edd..62814b351b6b 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.5.6"; + version = "3.5.8"; src = fetchurl { - url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz"; - sha256 = "07v7c6ippngkq269jmrf3gji389czcmz6phc3qwxn4j14cri9gi4"; + url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_8/rabbitmq-server-3.5.8.tar.gz"; + sha256 = "0f373zxz15smb0jvfdfsbb924fl2qmp1z2jy3y50gv6b3xsdyqmr"; }; buildInputs = From 5d7f2a40a89d9f43bcbc8eca1f2d5808b93e0ddb Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 22 Nov 2016 07:53:33 -0500 Subject: [PATCH 0625/1749] cvs: disable fortify hardening --- pkgs/applications/version-management/cvs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 3aace6b7e021..74a2267043cb 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { patches = [ ./getcwd-chroot.patch ]; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "fortify" "format" ]; preConfigure = '' # Apply the Debian patches. From 9575eeae108ca23f7af49f0a1566706feef83cb4 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Tue, 22 Nov 2016 14:56:04 +0100 Subject: [PATCH 0626/1749] jenkins: 2.13 -> 2.33 (#20630) --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 01d1c97ba968..6a752d08cff0 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.13"; + version = "2.33"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "0rb3spml2c7cd34zjjc5mwsdcnwmcbcdc784nl8cczayiwz8nq3p"; + sha256 = "1x1m4d7r128v6i0gpa4z07db6vdw1x9ik0p4a8gsnj6g15fzkdzy"; }; buildCommand = '' From 2f1be760da992568fe0e8be21200eea99ea9897e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 22 Nov 2016 15:04:52 +0100 Subject: [PATCH 0627/1749] nixos/release: add containers-tmpfs test cc #20557 --- nixos/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release.nix b/nixos/release.nix index 639ee45b38d6..4fd48bc2477f 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -228,6 +228,7 @@ in rec { tests.containers-imperative = callTest tests/containers-imperative.nix {}; tests.containers-extra_veth = callTest tests/containers-extra_veth.nix {}; tests.containers-physical_interfaces = callTest tests/containers-physical_interfaces.nix {}; + tests.containers-tmpfs = callTest tests/containers-tmpfs.nix {}; tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; }; tests.ecryptfs = callTest tests/ecryptfs.nix {}; From 2b1d67a275a49bac3264cdfc0c0a5e2c540c9a34 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Tue, 22 Nov 2016 23:15:02 +0900 Subject: [PATCH 0628/1749] manual: reviewing contributions nixos -> nixpkgs (#20626) --- doc/manual.xml | 1 + .../doc/manual/development => doc}/reviewing-contributions.xml | 0 nixos/doc/manual/development/development.xml | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) rename {nixos/doc/manual/development => doc}/reviewing-contributions.xml (100%) diff --git a/doc/manual.xml b/doc/manual.xml index 32e94e8e59c5..6ad66d486525 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -20,6 +20,7 @@ + diff --git a/nixos/doc/manual/development/reviewing-contributions.xml b/doc/reviewing-contributions.xml similarity index 100% rename from nixos/doc/manual/development/reviewing-contributions.xml rename to doc/reviewing-contributions.xml diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index b0364b346577..47343d93cde9 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -18,7 +18,6 @@ NixOS. - From 7a6185d9a1eb18fa09892fdef01a5193968cf704 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 22 Nov 2016 11:00:36 +0100 Subject: [PATCH 0629/1749] gstreamer: 1.8.2 -> 1.10.1 Fixes CVE-2016-9445, CVE-2016-9446, CVE-2016-9447. --- .../libraries/gstreamer/bad/default.nix | 4 ++-- .../libraries/gstreamer/base/default.nix | 4 ++-- .../libraries/gstreamer/core/default.nix | 4 ++-- .../libraries/gstreamer/ges/default.nix | 4 ++-- .../libraries/gstreamer/good/default.nix | 4 ++-- .../libraries/gstreamer/gstreamermm/default.nix | 6 +++--- .../libraries/gstreamer/libav/default.nix | 4 ++-- .../libraries/gstreamer/python/default.nix | 4 ++-- .../libraries/gstreamer/ugly/default.nix | 4 ++-- .../libraries/gstreamer/vaapi/default.nix | 15 ++++++++------- .../libraries/gstreamer/validate/default.nix | 8 ++++---- 11 files changed, 31 insertions(+), 30 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index a91acdbb0086..4e18e4d16b2c 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -14,7 +14,7 @@ let inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.8.2"; + name = "gst-plugins-bad-1.10.1"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97"; + sha256 = "07cjra4fclrk6lpdm5hrsgp79aqpklx3v3l9scain091zvchwghk"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 00aa893bd33e..319f7c75a750 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.8.2"; + name = "gst-plugins-base-1.10.1"; meta = { description = "Base plugins and helper libraries"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "9d7109c8fb0a5dec8edb17b0053c59a46aba7ddf48dc48ea822ebbbd4339d38d"; + sha256 = "1jbnr6vbklzli493xdd8y5sflm32r90lifpacxw9vbvs9hlyxkv6"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index da6a8c7a74a4..55da05c4c971 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.8.2"; + name = "gstreamer-1.10.1"; meta = { description = "Open source multimedia framework"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "9dbebe079c2ab2004ef7f2649fa317cabea1feb4fb5605c24d40744b90918341"; + sha256 = "1npnpyrw8603ivi5g3ziglvh3hq2shypid2vjcmki6g6w2bgk3gn"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 5f60b9c03a31..06776de9340c 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.8.2"; + name = "gstreamer-editing-services-1.10.1"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "a1d57ff9461407cca1f6e7a9f31a5bdb73f73f33c488a3e3318b27e10a4332ae"; + sha256 = "048dxpbzmidbl1sb902nx8rkg8m0z69f3dn7vfhs1ai68x2hzip9"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index a44bdbcd08c4..ba6f79c138ab 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -10,7 +10,7 @@ let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.8.2"; + name = "gst-plugins-good-1.10.1"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "8d7549118a3b7a009ece6bb38a05b66709c551d32d2adfd89eded4d1d7a23944"; + sha256 = "1hkcap9l2603266gyi6jgvx7frbvfmb7xhfhjizbczy1wykjwr57"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 176e19000e91..a1e28efbff46 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1 }: let - ver_maj = "1.4"; - ver_min = "3"; + ver_maj = "1.8"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "gstreamermm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gstreamermm/${ver_maj}/${name}.tar.xz"; - sha256 = "0bj6and9b26d32bq90l8nx5wqh2ikkh8dm7qwxyxfdvmrzhixhgi"; + sha256 = "0i4sk6ns4dyi4szk45bkm4kvl57l52lgm15p2wg2rhx2gr2w3qry"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 788aacf03ec6..7ae10f50c4d6 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,7 +9,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.8.2"; + name = "gst-libav-1.10.1"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "b5f3c7a27b39b5f5c2f0bfd546b0c655020faf6b38d27b64b346c43e5ebf687a"; + sha256 = "1ivjbh5g0l5ykfpc16kq5x2jz8d4ignyha14jpiz3pz6w26qpci7"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 9d6fa94cf3ae..78127e3ce98a 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -6,14 +6,14 @@ let inherit (pythonPackages) python pygobject3; in stdenv.mkDerivation rec { - name = "gst-python-1.8.2"; + name = "gst-python-1.10.1"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "15sdfa6lq5pswvi09vk51cs30yf8wr2rlm9myhb4q0c2jhiial2g"; + sha256 = "04xhh0z0c0s6aq7kvmfs4r6yl1pjnqz0krp05pbjy62ayx5b61ak"; }; patches = [ ./different-path-with-pygobject.patch ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index ab6e1f9f4f17..df5b682a2371 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.8.2"; + name = "gst-plugins-ugly-1.10.1"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "9c5b33a2a98fc1d6d6c99a1b536b1fb2de45f53cc8bf8ab85a8b8141fed1a8ac"; + sha256 = "1hl385fys7hfx5ffipavvhciq6hwm731rs4d6r9fn7h9qagxbv55"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 9972468f1b7f..f18b9fc214dc 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,24 +1,25 @@ { stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva, wayland , libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm -, libvpx +, libvpx, python }: stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "0.7.0"; + version = "1.10.1"; src = fetchurl { - url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2"; - sha256 = "14jal2g5mf8r59w8420ixl3kg50vcmy56446ncwd0xrizd6yms5b"; + url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; + sha256 = "0d6sw5j7x3ah7zlcipy7w3fwag0fqxyfgc8q4phnazgk16kcmblr"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ]; + nativeBuildInputs = [ pkgconfig bzip2 ]; buildInputs = [ gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev - xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM xorg.libICE mesa nasm libvpx + xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM + xorg.libICE mesa nasm libvpx python ]; preConfigure = " @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0"; meta = { - homepage = "http://www.freedesktop.org"; + homepage = "http://gstreamer.freedesktop.org"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 2de3955ab06a..2f5ba2372ce7 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base -, python, gobjectIntrospection +, python, gobjectIntrospection, json_glib }: stdenv.mkDerivation rec { - name = "gst-validate-1.8.2"; + name = "gst-validate-1.10.1"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "33c5b585c5ca1659fe6c09fdf02e45d8132c0d386b405bf527b14ab481a0bafe"; + sha256 = "0x9z0kizi44swsrx8mdc6xlmn9dksdfifchp5h6liibp7qd6gbh7"; }; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python + python json_glib ]; propagatedBuildInputs = [ gstreamer gst-plugins-base ]; From 9bcec8dcd0b07481634c86e3ab994360a587409c Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 22 Nov 2016 10:43:31 -0400 Subject: [PATCH 0630/1749] glfw: 3.2 -> 3.2.1 (#20625) --- pkgs/development/libraries/glfw/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 3b015532ca8b..feb769229c02 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "3.2"; + version = "3.2.1"; name = "glfw-${version}"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = "${version}"; - sha256 = "0knqf40jij2z1mia091xqyky5r11r4qyh7b8172blrmgm9q23sl9"; + sha256 = "0gq6ad38b3azk0w2yy298yz2vmg2jmf9g0ydidqbmiswpk25ills"; }; enableParallelBuilding = true; From 7d5abdca118f3bc3923067855ffebe3371c4bf49 Mon Sep 17 00:00:00 2001 From: montag451 Date: Tue, 22 Nov 2016 17:02:32 +0100 Subject: [PATCH 0631/1749] aptly: use wrapProgram instead of propagatedUserEnvPkgs (#20622) --- pkgs/tools/misc/aptly/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index b1dd71a8882f..a39b4247109b 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, gnupg1compat, bzip2, xz, graphviz }: +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg1compat, bzip2, xz, graphviz }: buildGoPackage rec { name = "aptly-${version}"; @@ -15,12 +15,14 @@ buildGoPackage rec { goPackagePath = "github.com/smira/aptly"; goDeps = ./deps.nix; + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' rm $bin/bin/man + wrapProgram "$bin/bin/aptly" \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat bzip2 xz graphviz ]}" ''; - propagatedUserEnvPkgs = [ gnupg1compat bzip2.bin xz.bin graphviz ]; - meta = with stdenv.lib; { homepage = https://www.aptly.info; description = "Debian repository management tool"; From 682bb54cc45dc3b9f973e9ba594d25680b9f8e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 22 Nov 2016 17:33:12 +0100 Subject: [PATCH 0632/1749] phrasendrescher: init at 1.0 It's a cracking tool that finds passphrases of SSH keys. --- .../security/phrasendrescher/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/security/phrasendrescher/default.nix diff --git a/pkgs/tools/security/phrasendrescher/default.nix b/pkgs/tools/security/phrasendrescher/default.nix new file mode 100644 index 000000000000..814bc0d85302 --- /dev/null +++ b/pkgs/tools/security/phrasendrescher/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, openssl }: + +stdenv.mkDerivation rec { + name = "phrasendrescher-${version}"; + version = "1.0"; + + src = fetchurl { + url = "http://leidecker.info/projects/phrasendrescher/${name}.tar.gz"; + sha256 = "1r0j7ms3i324p6if9cg8i0q900zqfjpvfr8pwj181x8ascysbbf2"; + }; + + buildInputs = [ openssl ]; + + meta = with stdenv.lib; { + description = "Cracking tool that finds passphrases of SSH keys"; + homepage = "http://leidecker.info/projects/phrasendrescher.shtml"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26ad019bbac6..d014e4e87f0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14169,6 +14169,8 @@ in phototonic = qt5.callPackage ../applications/graphics/phototonic { }; + phrasendrescher = callPackage ../tools/security/phrasendrescher { }; + phwmon = callPackage ../applications/misc/phwmon { }; pianobar = callPackage ../applications/audio/pianobar { }; From 113986f07a9786a58caeb232491463a4870dcf0c Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 22 Nov 2016 09:00:11 -0800 Subject: [PATCH 0633/1749] gnupg21: Add -lintl on Darwin systems --- pkgs/tools/security/gnupg/21.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 51f45f8469d5..a4b47843583f 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { readline libusb gnutls adns openldap zlib bzip2 ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + patches = [ ./fix-libusb-include-path.patch ]; postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c From f731ca3cca14ff9fc8b7677315bc3572af5c485d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 22 Nov 2016 11:36:54 -0600 Subject: [PATCH 0634/1749] kde5.plasma: 5.8.3 -> 5.8.4 --- pkgs/desktops/kde-5/plasma/fetch.sh | 2 +- pkgs/desktops/kde-5/plasma/srcs.nix | 320 ++++++++++++++-------------- 2 files changed, 161 insertions(+), 161 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh index 0809f2d66930..60928c3900d0 100644 --- a/pkgs/desktops/kde-5/plasma/fetch.sh +++ b/pkgs/desktops/kde-5/plasma/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.3/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix index 08daf740183d..75f44f47becf 100644 --- a/pkgs/desktops/kde-5/plasma/srcs.nix +++ b/pkgs/desktops/kde-5/plasma/srcs.nix @@ -3,323 +3,323 @@ { bluedevil = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/bluedevil-5.8.3.tar.xz"; - sha256 = "1d05bzy1za7s9mlsh1drhlgjbb7z78jayhqml3zym05igs517la6"; - name = "bluedevil-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/bluedevil-5.8.4.tar.xz"; + sha256 = "1c49f35574948q541q25wsalhdz0yji9x18hpg7lc9mb117114fq"; + name = "bluedevil-5.8.4.tar.xz"; }; }; breeze = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/breeze-5.8.3.tar.xz"; - sha256 = "0apim1byibkbqkxb1f5ra53wfr4cwmrkdsx4ls7mph4iknr5wdwp"; - name = "breeze-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/breeze-5.8.4.tar.xz"; + sha256 = "0jxlvr9yf7pilwjvzzhhx8di6a2gx8812hl08fh4lszbkdia69yw"; + name = "breeze-5.8.4.tar.xz"; }; }; breeze-grub = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/breeze-grub-5.8.3.tar.xz"; - sha256 = "01yyhwccxrkmxi95rsg9645fd0i2ca97j425q0pxci9fg93bwl8k"; - name = "breeze-grub-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/breeze-grub-5.8.4.tar.xz"; + sha256 = "1sysdw3agm568l8mc6bv7g2vhxny34h1b4k9wm36c1x1xyac72cm"; + name = "breeze-grub-5.8.4.tar.xz"; }; }; breeze-gtk = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/breeze-gtk-5.8.3.tar.xz"; - sha256 = "1wm8v4fav9crk3wn3azsylymvcg67cgncv4zx1fy8rmblikp080g"; - name = "breeze-gtk-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/breeze-gtk-5.8.4.tar.xz"; + sha256 = "127hhlxicc3rsxxi9cwcqj32w3yyi20p1sfmfk7gjnklm6zv8b0a"; + name = "breeze-gtk-5.8.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/breeze-plymouth-5.8.3.tar.xz"; - sha256 = "0gdl603kjxfrvcardinfq710j5gzzc6ky8ypzmr7myk5kl4i9gf3"; - name = "breeze-plymouth-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/breeze-plymouth-5.8.4.tar.xz"; + sha256 = "0lsdincygh75yib1nfyqnwghnpi3pwjyjvkgyza142s49vynkdkj"; + name = "breeze-plymouth-5.8.4.tar.xz"; }; }; discover = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/discover-5.8.3.tar.xz"; - sha256 = "18fqr15jw3hfbpq6ma3md89lqzmlilfbic6zd0pm9mvpmwawbjxh"; - name = "discover-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/discover-5.8.4.tar.xz"; + sha256 = "1wkwkk0cqyz9d68d9s651cjahimb9phwr7k55g6mkigdkljd18fx"; + name = "discover-5.8.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kactivitymanagerd-5.8.3.tar.xz"; - sha256 = "18nkg64i7znyk29km8clcmpg5wrd60a0nbgdb6n0cnjjyra2ljfj"; - name = "kactivitymanagerd-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kactivitymanagerd-5.8.4.tar.xz"; + sha256 = "0rb9gc584lhbqfn9q31rl1h0aqiv90b1cb5pd5rcsq6s2yz0g8i2"; + name = "kactivitymanagerd-5.8.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kde-cli-tools-5.8.3.tar.xz"; - sha256 = "02sa4l6mx6bfys44wcaf9mpfk3vrw65zzd1jx466xy0dda43kw9b"; - name = "kde-cli-tools-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kde-cli-tools-5.8.4.tar.xz"; + sha256 = "0vzb5gq94hwyzz32z5gvdrpzj3ysvsqb6k25cfc3sy93hwla3a14"; + name = "kde-cli-tools-5.8.4.tar.xz"; }; }; kdecoration = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kdecoration-5.8.3.tar.xz"; - sha256 = "0d7q16ms3vrsrwc7fql3ly7hmbyx0v35llj9z8h1k642j3ci8jca"; - name = "kdecoration-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kdecoration-5.8.4.tar.xz"; + sha256 = "06ch3871yifkimqs67z3j7rv673qw6wa01x6qnc6899rckg1kdl4"; + name = "kdecoration-5.8.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kde-gtk-config-5.8.3.tar.xz"; - sha256 = "0y3xykz8db3y92mnhbwld2wcsh4sqxacnmx899ig5xy08chqym3d"; - name = "kde-gtk-config-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kde-gtk-config-5.8.4.tar.xz"; + sha256 = "15jw7wvk3jl9rbcm2f3vx6i5mjqzibj87l85r9cr33cxaq06wdn4"; + name = "kde-gtk-config-5.8.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kdeplasma-addons-5.8.3.tar.xz"; - sha256 = "1ssk70rvfzi3a9mx514qsh5hld2v12kz3m4n7vpl9sq1fc5hq8k3"; - name = "kdeplasma-addons-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kdeplasma-addons-5.8.4.tar.xz"; + sha256 = "0f1956dppgyx313ihjv8f21lql387rzzkvmg9y9lh7yidl75gfz4"; + name = "kdeplasma-addons-5.8.4.tar.xz"; }; }; kgamma5 = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kgamma5-5.8.3.tar.xz"; - sha256 = "038i3dm6lxvlb5s6faxr5h6cw6xhymq71fnbphhbcbc1v08sa065"; - name = "kgamma5-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kgamma5-5.8.4.tar.xz"; + sha256 = "1r5mzdk2givjmq5j374hgbf17jni4n7836pli2vka4qbjbrlzfg1"; + name = "kgamma5-5.8.4.tar.xz"; }; }; khotkeys = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/khotkeys-5.8.3.tar.xz"; - sha256 = "0lqwsdbr38qhz79sgdg3m3wx70f6ys4bv8mhnczfs06mchzm6zy9"; - name = "khotkeys-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/khotkeys-5.8.4.tar.xz"; + sha256 = "1q766aaq1l6ihgvjxlw69kpm91ai8nbcc9qc6xnz1924p9957nl3"; + name = "khotkeys-5.8.4.tar.xz"; }; }; kinfocenter = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kinfocenter-5.8.3.tar.xz"; - sha256 = "1hs9yg15rhhm2lra472wq9f1ca7aj6wsd6drb538mdma53mz21pv"; - name = "kinfocenter-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kinfocenter-5.8.4.tar.xz"; + sha256 = "1mnvp4bkhvmpqfqjag46fcx0kr7w8mq29djqlfd9akypqmzszbvd"; + name = "kinfocenter-5.8.4.tar.xz"; }; }; kmenuedit = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kmenuedit-5.8.3.tar.xz"; - sha256 = "06zji52iw8d18nda87xh54d7q94aqddrfgp3i9lsir50bgabqnc7"; - name = "kmenuedit-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kmenuedit-5.8.4.tar.xz"; + sha256 = "0wm40swxarnzv7hs11r1wmj6b0yjby3sxk8n59z6s2zza64n6n8h"; + name = "kmenuedit-5.8.4.tar.xz"; }; }; kscreen = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kscreen-5.8.3.tar.xz"; - sha256 = "07mldxxxna1y8ngam8l2h3bs1plvfgqhzj95ryprsfypls7pj1ny"; - name = "kscreen-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kscreen-5.8.4.tar.xz"; + sha256 = "1j43gzxv9j4fjszc839968vmlsrqg7bapwvjnwfc3mc8z2w7a6hl"; + name = "kscreen-5.8.4.tar.xz"; }; }; kscreenlocker = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kscreenlocker-5.8.3.tar.xz"; - sha256 = "039i01c48g3grfm6vn5zmgaazlv4lln8w3rx8d107rlfqslfq4gv"; - name = "kscreenlocker-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kscreenlocker-5.8.4.tar.xz"; + sha256 = "1n4wbzfi2h9lxj8g1qii43q205by1bqv48xxyr871mmmikxrk6qv"; + name = "kscreenlocker-5.8.4.tar.xz"; }; }; ksshaskpass = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/ksshaskpass-5.8.3.tar.xz"; - sha256 = "0kvfnzbq6y9vs1a9yn3hf0cxbwdfs0mw440gsgjgbpmamnv4xpkj"; - name = "ksshaskpass-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/ksshaskpass-5.8.4.tar.xz"; + sha256 = "033mjmry0hbz2daa9w0i2drxrdjyraynxhlnq0b331b6klxhzczc"; + name = "ksshaskpass-5.8.4.tar.xz"; }; }; ksysguard = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/ksysguard-5.8.3.tar.xz"; - sha256 = "0a1mfm0gfsi1b79c7m62rk8pp6fsbvrqhv5b07rasapn53zwr6zd"; - name = "ksysguard-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/ksysguard-5.8.4.tar.xz"; + sha256 = "1hmj32c2jzvk6fwbvdh3ij1651bfslfqhy52y79mc6q816wm7fv3"; + name = "ksysguard-5.8.4.tar.xz"; }; }; kwallet-pam = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kwallet-pam-5.8.3.tar.xz"; - sha256 = "1lbmzi0pimp2pw4g0dmrw0vpb2mmm64akzjzv0l72i6f4sylsqpd"; - name = "kwallet-pam-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kwallet-pam-5.8.4.tar.xz"; + sha256 = "149qwri47yjv85abfv48232ldvl464df4id9gz0kwjp3cd5n12cn"; + name = "kwallet-pam-5.8.4.tar.xz"; }; }; kwayland-integration = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kwayland-integration-5.8.3.tar.xz"; - sha256 = "1w717601ivpnfvjprlyh0qvcj61m8nh9qpsqmhsy7993jvm8wal4"; - name = "kwayland-integration-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kwayland-integration-5.8.4.tar.xz"; + sha256 = "1s3jy3bb15v49w9ym5d9x352lf57dsg72xqmw3w2jbvmmyacg2a7"; + name = "kwayland-integration-5.8.4.tar.xz"; }; }; kwin = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kwin-5.8.3.tar.xz"; - sha256 = "0a3z17f1ma6yspbs4wyj1cp17hglf4xj1pmwya6nbf08d6gbxq1w"; - name = "kwin-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kwin-5.8.4.tar.xz"; + sha256 = "1zglmz2c2aiw46vm813m5hznqjx1phs90djlva9vcvv5rvz7y3fn"; + name = "kwin-5.8.4.tar.xz"; }; }; kwrited = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/kwrited-5.8.3.tar.xz"; - sha256 = "0s2fsxyw6x664pirbvkd5zf0zazhx9yxzv2xk8d8cb8gfbj32cc9"; - name = "kwrited-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/kwrited-5.8.4.tar.xz"; + sha256 = "055054i96yxi2pb5lg42d6yjhvwqc5vgqnrczh8f5g6j3ykl6p7s"; + name = "kwrited-5.8.4.tar.xz"; }; }; libkscreen = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/libkscreen-5.8.3.tar.xz"; - sha256 = "09jakk3yrnp0vf2dihalm08lndcvp18c6c4qjr1bg65cjij9fvx7"; - name = "libkscreen-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/libkscreen-5.8.4.tar.xz"; + sha256 = "1vrh4ympdgnvnrl7c4l3hizxza05y0dr4ii6h109r8iqfhbis56p"; + name = "libkscreen-5.8.4.tar.xz"; }; }; libksysguard = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/libksysguard-5.8.3.tar.xz"; - sha256 = "11601hlrm6lm0vrw2icx2778g6yzd9fsgpa8s8rdwr0qw9i0wacy"; - name = "libksysguard-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/libksysguard-5.8.4.tar.xz"; + sha256 = "0mc045qvkzsk1rhvasysbjcqvsm9nvmgha6ljsfn61gnwpb3fjzq"; + name = "libksysguard-5.8.4.tar.xz"; }; }; milou = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/milou-5.8.3.tar.xz"; - sha256 = "03vr8ndr14ak111gq0hwlq4b5g1hwhbh3vk5b3xrk13bhxg6nfsl"; - name = "milou-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/milou-5.8.4.tar.xz"; + sha256 = "169bcdgbqddmfzz39wdy5cbqqm8djayr3bxn8j28pjkc4l8i93c8"; + name = "milou-5.8.4.tar.xz"; }; }; oxygen = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/oxygen-5.8.3.tar.xz"; - sha256 = "0ircd8v5khgmpigazxy7pykiqk8maah28ypsh3z66aim0ni4h3jg"; - name = "oxygen-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/oxygen-5.8.4.tar.xz"; + sha256 = "1g8zm71k31smyzxc1kmvcl889ljfv6l0ks6g9888qyyzhbqps2p4"; + name = "oxygen-5.8.4.tar.xz"; }; }; plasma-desktop = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-desktop-5.8.3.tar.xz"; - sha256 = "0pkjkhwqgin203dkl5clnvc9l9jnk7dqaxh7h7rbc8d5bfjiwzg7"; - name = "plasma-desktop-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-desktop-5.8.4.tar.xz"; + sha256 = "07dw8x74j0am52rxvig0jcwhlk3kx762hfw3vk6innjfcrkjx43q"; + name = "plasma-desktop-5.8.4.tar.xz"; }; }; plasma-integration = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-integration-5.8.3.tar.xz"; - sha256 = "196gxymfbrdjravgqk2ia2fpanim4l08a0vh5r13ppm7q7vzwz23"; - name = "plasma-integration-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-integration-5.8.4.tar.xz"; + sha256 = "18w4ws0ydqf0lfd16svgs1sbf2q6rc1zkzfhxwj2jzdhqjqwdikn"; + name = "plasma-integration-5.8.4.tar.xz"; }; }; plasma-nm = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-nm-5.8.3.tar.xz"; - sha256 = "1rsj0gl9plza7ykkp161ipvxlax67vdvns0fnq34sk9hg7s5ckb7"; - name = "plasma-nm-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-nm-5.8.4.tar.xz"; + sha256 = "0dzk6wa6dsw9mlwxvhyhq8dmk88ia9paavcnw0am165ahpmkpzjq"; + name = "plasma-nm-5.8.4.tar.xz"; }; }; plasma-pa = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-pa-5.8.3.tar.xz"; - sha256 = "1l3xdcrkvjpmmbzvyhqrs6y8xhkz5k1xkxlm3d3bx4x0mn24qmq4"; - name = "plasma-pa-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-pa-5.8.4.tar.xz"; + sha256 = "1p7f7ahr4xc50cn9iawkpq0xna7s7zar8vlkvizgji566sp1yf4i"; + name = "plasma-pa-5.8.4.tar.xz"; }; }; plasma-sdk = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-sdk-5.8.3.tar.xz"; - sha256 = "1jgv6yf7m9x2869cprbg2r9ka56ypmprvvznagb4zrjnjfdnqrm7"; - name = "plasma-sdk-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-sdk-5.8.4.tar.xz"; + sha256 = "0nkrppv15l4v2f9g3ihixmgya1ky2zrih1ynak7kqkv43d4827s9"; + name = "plasma-sdk-5.8.4.tar.xz"; }; }; plasma-tests = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-tests-5.8.3.tar.xz"; - sha256 = "1aidrc3wi3z7lap5m193xqcahl0p2pdg9hddygzq6dr46r1ipbi4"; - name = "plasma-tests-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-tests-5.8.4.tar.xz"; + sha256 = "0hh8rp7sw8lyc61pizhc64138sv41iv9gnn0flbblvd912990i6k"; + name = "plasma-tests-5.8.4.tar.xz"; }; }; plasma-workspace = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-5.8.3.tar.xz"; - sha256 = "16h5flf346lwrdl35clkq0qv3i0fa4clxyyn3dvpsp9mvxdlabwb"; - name = "plasma-workspace-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-5.8.4.tar.xz"; + sha256 = "1hwdrwc43s0mfy86ywws2myr1byf4d1j7x685z05cvyg3ha2wwwd"; + name = "plasma-workspace-5.8.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-wallpapers-5.8.3.tar.xz"; - sha256 = "0dy3w60d4wbm571kbv6qshmrqf6r30j53hz92kkyiwgqja18ysg2"; - name = "plasma-workspace-wallpapers-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-wallpapers-5.8.4.tar.xz"; + sha256 = "088vmni3krybg5j6bd0amfqn806pxqjnyb0pvlwbakw53yjbsva3"; + name = "plasma-workspace-wallpapers-5.8.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.8.3"; + version = "1-5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/polkit-kde-agent-1-5.8.3.tar.xz"; - sha256 = "04llryjkjzkzccfjwdhwcbkvp8wfgjfw4yabbq4kl1i2girimw0z"; - name = "polkit-kde-agent-1-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/polkit-kde-agent-1-5.8.4.tar.xz"; + sha256 = "0jh1msiaig47114ccdpxf3zl77vgs5wvbsl2vibc05i19alr99jg"; + name = "polkit-kde-agent-1-5.8.4.tar.xz"; }; }; powerdevil = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/powerdevil-5.8.3.tar.xz"; - sha256 = "1im9sxzb4c3cplplzizfxdlyg1knm94y2hj9ssllxfggy5d38ps1"; - name = "powerdevil-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/powerdevil-5.8.4.tar.xz"; + sha256 = "1b1cy98zjdc9w8jd0hqrzmvmvfxg5v6imd4pvnlgfix9bm0gcmcy"; + name = "powerdevil-5.8.4.tar.xz"; }; }; sddm-kcm = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/sddm-kcm-5.8.3.tar.xz"; - sha256 = "1cs29rb259zz06qwfhnjxzy2xzzqvfwpphz4whbyl5kn07bzah8d"; - name = "sddm-kcm-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/sddm-kcm-5.8.4.tar.xz"; + sha256 = "03d2x6hvjvwdmpcs04vs7jqp4nnvw1gmiwfra5xk432argf0nxyx"; + name = "sddm-kcm-5.8.4.tar.xz"; }; }; systemsettings = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/systemsettings-5.8.3.tar.xz"; - sha256 = "0shac5659h928p2kq053kllw66j3sw6a06kczgck5lq28kxwh3mm"; - name = "systemsettings-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/systemsettings-5.8.4.tar.xz"; + sha256 = "1j45yvvm8lx1nvwzq2x979s5x3k4i3phjcw73hxyqv9x7y0pnchv"; + name = "systemsettings-5.8.4.tar.xz"; }; }; user-manager = { - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.3/user-manager-5.8.3.tar.xz"; - sha256 = "0kh9knr2rfrhakzdyf94cap19v21ciglammdp4svyql7drwfvq8v"; - name = "user-manager-5.8.3.tar.xz"; + url = "${mirror}/stable/plasma/5.8.4/user-manager-5.8.4.tar.xz"; + sha256 = "0m2yv7qlj0y95z5x3f008aww3jzrs5lf32k9czqia3fyy9szpa1d"; + name = "user-manager-5.8.4.tar.xz"; }; }; } From 4bd96a475e28a4d3941ed626ddb59655699e4326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20G=C3=B6tz?= Date: Tue, 22 Nov 2016 20:23:26 +0100 Subject: [PATCH 0635/1749] youtube-dl: 2016.11.14.1 -> 2016.11.22 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index fe6838d52000..70719bdfdf1f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.11.14.1"; + version = "2016.11.22"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "d96b5e5fe7de67ea01c2be746c00dc78ffbf3f74654aa989db8baaf153243537"; + sha256 = "e8d599c512ce56a6ea46955e2bb8f4471ae8a6f757183212cc49b6dd48d9a282"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From f00f4b59b0cd743db10bf0a9c89aba404841c14e Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Mon, 21 Nov 2016 21:02:47 +0100 Subject: [PATCH 0636/1749] magic-wormhole: init at 0.8.1 --- lib/maintainers.nix | 1 + pkgs/tools/misc/magic-wormhole/default.nix | 24 +++++++++++ pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/python-packages.nix | 47 +++++++++++++++++++++- 4 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/misc/magic-wormhole/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7e4a7168effb..b908a261b1fa 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -48,6 +48,7 @@ aske = "Kirill Boltaev "; asppsa = "Alastair Pharo "; astsmtl = "Alexander Tsamutali "; + asymmetric = "Lorenzo Manacorda "; aszlig = "aszlig "; auntie = "Jonathan Glines "; avnik = "Alexander V. Nikolaev "; diff --git a/pkgs/tools/misc/magic-wormhole/default.nix b/pkgs/tools/misc/magic-wormhole/default.nix new file mode 100644 index 000000000000..c35d3b666acb --- /dev/null +++ b/pkgs/tools/misc/magic-wormhole/default.nix @@ -0,0 +1,24 @@ +{ 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 d014e4e87f0a..ecb48fd70887 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -920,6 +920,7 @@ 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 172e942ff575..452ca3205410 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12472,6 +12472,28 @@ in { }; }; + hkdf = buildPythonPackage rec { + name = "hkdf-${version}"; + version = "0.0.3"; + + src = pkgs.fetchurl { + url = "mirror://pypi/h/hkdf/${name}.tar.gz"; + sha256 = "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2"; + }; + + buildInputs = with self; [ nose ]; + + checkPhase = '' + nosetests + ''; + + meta = { + description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"; + homepage = "https://github.com/casebeer/python-hkdf"; + license = licenses.bsd2; + }; + }; + httpretty = buildPythonPackage rec { name = "httpretty-${version}"; version = "0.8.10"; @@ -13784,7 +13806,6 @@ in { }; }; - m2crypto = buildPythonPackage rec { version = "0.24.0"; name = "m2crypto-${version}"; @@ -23129,6 +23150,30 @@ in { }; }; + spake2 = buildPythonPackage rec { + name = "spake2-${version}"; + version = "0.7"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/spake2/${name}.tar.gz"; + sha256 = "0rmplicbbid41qrvwc1ckyp211ban01ardms5yqqq16ixrc18a6j"; + }; + + buildInputs = with self; [ pytest ]; + + propagatedBuildInputs = with self; [ hkdf ]; + + checkPhase = '' + py.test $out + ''; + + meta = { + description = "SPAKE2 password-authenticated key exchange library"; + homepage = "http://github.com/warner/python-spake2"; + license = licenses.mit; + }; + }; + sqlite3dbm = buildPythonPackage rec { name = "sqlite3dbm-0.1.4"; disabled = isPy3k; From 1fb5a9b708a94de3c6e23403581318d16ccba463 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Mon, 21 Nov 2016 20:59:05 +0100 Subject: [PATCH 0637/1749] qt5: Add qtwebengine and qtwebchannel to qt5.full --- pkgs/development/libraries/qt-5/5.6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 0e40a7ac96d2..8b4e924a7339 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -106,7 +106,7 @@ let qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland - qtwebsockets qtx11extras qtxmlpatterns + qtwebchannel qtwebengine qtwebsockets qtx11extras qtxmlpatterns ]; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; From 38d77bc86b83f01ef6cd91fa4b6090f5373bc692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 22 Nov 2016 23:47:12 +0100 Subject: [PATCH 0638/1749] idea.idea-{community,ultimate}: 2016.2.5 -> 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 4a3e8b4c6805..a768ecb7c8a6 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -156,12 +156,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2016.2.5"; + version = "2016.3"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0d1pssnrn36fibwsyjh30fsd5hn7qw3nljdnwg40q52skilcdk0v"; + sha256 = "1bp2a1x8nl5flklf160n7ka5clnb0xx9gwv5zd9li2bsf04zlzf3"; }; wmClass = "jetbrains-idea-ce"; }; @@ -192,12 +192,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2016.2.5"; + version = "2016.3"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "0g8v3fw3610gyi25x489vlb72200rgb3b4rwh0igr4w35gwdv91h"; + sha256 = "1sax3sjhsyvb9qfnn0gc74p3ym6j5f30mmapd4irq9fk4bsl8c31"; }; wmClass = "jetbrains-idea"; }; From 589cc65306229223176010d0b512fd676c491df6 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 22 Nov 2016 22:48:18 +0100 Subject: [PATCH 0639/1749] 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 0640/1749] 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 0641/1749] 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 0642/1749] 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 0643/1749] 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 0644/1749] 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 0645/1749] 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 0646/1749] 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 0647/1749] 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 0648/1749] 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 0649/1749] 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 0650/1749] 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 0a309311ddf4d4ae0539c75eea036775f3d54faa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 23 Nov 2016 04:20:51 +0100 Subject: [PATCH 0651/1749] ocamlPackages.topkg: make the installPhase independent of the package name It can then be reused as-is in other derivations (e.g., uucd). --- pkgs/development/ocaml-modules/topkg/default.nix | 11 +++-------- pkgs/development/ocaml-modules/uucd/default.nix | 8 +------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index 1b1a127c5361..23bcc2670661 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -1,9 +1,7 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opam }: -let ocaml-version = stdenv.lib.getVersion ocaml; in - stdenv.mkDerivation rec { - name = "ocaml${ocaml-version}-topkg-${version}"; + name = "ocaml${ocaml.version}-topkg-${version}"; version = "0.7.8"; src = fetchurl { @@ -16,12 +14,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ result ]; unpackCmd = "tar xjf ${src}"; - buildPhase = "ocaml -I ${findlib}/lib/ocaml/${ocaml-version}/site-lib/ pkg/pkg.ml build"; + buildPhase = "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build"; createFindlibDestdir = true; - installPhase = '' - opam-installer --script --prefix=$out topkg.install | sh - mv $out/lib/topkg $out/lib/ocaml/${ocaml-version}/site-lib/ - ''; + installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; meta = { homepage = http://erratique.ch/software/topkg; diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 73a0ccdacfe7..d44309b266a5 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -19,13 +19,7 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf $src"; - inherit (topkg) buildPhase; - - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install > install.sh - sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; + inherit (topkg) buildPhase installPhase; propagatedBuildInputs = [ xmlm ]; From 66b9602a2fb61cc4ed2181ba43476fcc1740ce96 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 25 Oct 2016 19:19:35 +0200 Subject: [PATCH 0652/1749] ocamlPackages.fmt: init at 0.8.0 fmt is an OCaml library of Format pretty-printer combinators. Homepage: http://erratique.ch/software/fmt --- .../development/ocaml-modules/fmt/default.nix | 26 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/fmt/default.nix diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix new file mode 100644 index 000000000000..9994d156a4c2 --- /dev/null +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, cmdliner }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-fmt-0.8.0"; + + src = fetchurl { + url = http://erratique.ch/software/fmt/releases/fmt-0.8.0.tbz; + sha256 = "16y7ibndnairb53j8a6qgipyqwjxncn4pl9jiw5bxjfjm59108px"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib ocamlbuild opam topkg cmdliner ]; + + inherit (topkg) buildPhase installPhase; + + createFindlibDestdir = true; + + meta = { + homepage = http://erratique.ch/software/fmt; + license = stdenv.lib.licenses.isc; + description = "OCaml Format pretty-printer combinators"; + inherit (ocaml.meta) platforms; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 391e2c80a57f..46f1ce4b023f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -176,6 +176,8 @@ let fix = callPackage ../development/ocaml-modules/fix { }; + fmt = callPackage ../development/ocaml-modules/fmt { }; + fontconfig = callPackage ../development/ocaml-modules/fontconfig { inherit (pkgs) fontconfig; }; From dd45d2552fd950dbaa3ec7c8eaf3fc5f8188aea1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 25 Oct 2016 19:32:16 +0200 Subject: [PATCH 0653/1749] ocamlPackages.alcotest: 0.4.5 -> 0.7.2 --- .../ocaml-modules/alcotest/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index ddc710bc7ed2..bf0ae24ff03d 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,15 +1,21 @@ -{ stdenv, buildOcaml, fetchzip, cmdliner, stringext }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, opam, cmdliner, astring, fmt, result }: -buildOcaml rec { - name = "alcotest"; - version = "0.4.5"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-alcotest-${version}"; + version = "0.7.2"; src = fetchzip { url = "https://github.com/mirage/alcotest/archive/${version}.tar.gz"; - sha256 = "1wcn9hkjf4cbnrz99w940qfjpi0lvd8v63yxwpnafkff871dwk6k"; + sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; }; - propagatedBuildInputs = [ cmdliner stringext ]; + buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + + propagatedBuildInputs = [ cmdliner astring fmt result ]; + + inherit (topkg) buildPhase installPhase; + + createFindlibDestdir = true; meta = with stdenv.lib; { homepage = https://github.com/mirage/alcotest; From b4077f32101d7f98ff0e0fe19b91ff23db15de28 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 23 Nov 2016 07:30:00 -0200 Subject: [PATCH 0654/1749] 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 0655/1749] 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 0656/1749] 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 0657/1749] 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 0658/1749] 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 0659/1749] 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 0660/1749] 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 0661/1749] 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 0662/1749] 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 d753527bd4bc1b88c8145f847367e79856407b26 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 21 Nov 2016 21:03:52 +0100 Subject: [PATCH 0663/1749] fakeroute: init at 0.3 --- pkgs/tools/networking/fakeroute/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/networking/fakeroute/default.nix diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/tools/networking/fakeroute/default.nix new file mode 100644 index 000000000000..1cb614e88c03 --- /dev/null +++ b/pkgs/tools/networking/fakeroute/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "fakeroute-${version}"; + version = "0.3"; + + src = fetchurl { + url = "https://moxie.org/software/fakeroute/${name}.tar.gz"; + sha256 = "1sp342rxgm1gz4mvi5vvz1knz7kn9px9s39ii3jdjp4ks7lr5c8f"; + }; + + meta = with stdenv.lib; { + description = '' + Makes your machine appear to be anywhere on the internet + to any host running a (UDP) unix traceroute + ''; + homepage = https://moxie.org/software/fakeroute/; + license = licenses.bsd3; + platform = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f7663e6d9e0..622f2ca5a656 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1603,6 +1603,8 @@ in fakeroot = callPackage ../tools/system/fakeroot { }; + fakeroute = callPackage ../tools/networking/fakeroute { }; + fakechroot = callPackage ../tools/system/fakechroot { }; fast-neural-doodle = callPackage ../tools/graphics/fast-neural-doodle { From 7eb9a03221be0e210d934acc38c281a94122f5b4 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 21 Nov 2016 21:04:46 +0100 Subject: [PATCH 0664/1749] fakeroute: add service --- nixos/modules/module-list.nix | 1 + .../modules/services/networking/fakeroute.nix | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 nixos/modules/services/networking/fakeroute.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0c930eb2eb0c..e74e60f00ad4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -354,6 +354,7 @@ ./services/networking/dnsmasq.nix ./services/networking/ejabberd.nix ./services/networking/fan.nix + ./services/networking/fakeroute.nix ./services/networking/ferm.nix ./services/networking/firefox/sync-server.nix ./services/networking/firewall.nix diff --git a/nixos/modules/services/networking/fakeroute.nix b/nixos/modules/services/networking/fakeroute.nix new file mode 100644 index 000000000000..82a9fb729d84 --- /dev/null +++ b/nixos/modules/services/networking/fakeroute.nix @@ -0,0 +1,63 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.fakeroute; + routeConf = pkgs.writeText "route.conf" (concatStringsSep "\n" cfg.route); + +in + +{ + + ###### interface + + options = { + + services.fakeroute = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the fakeroute service. + ''; + }; + + route = mkOption { + type = types.listOf types.str; + default = []; + example = [ + "216.102.187.130" + "4.0.1.122" + "198.116.142.34" + "63.199.8.242" + ]; + description = '' + Fake route that will appear after the real + one to any host running a traceroute. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + systemd.services.fakeroute = { + description = "Fakeroute Daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "forking"; + User = "root"; + ExecStart = "${pkgs.fakeroute}/bin/fakeroute -f ${routeConf}"; + }; + }; + + }; + +} From 54f8379321d3e44c9d286d29d756c756f3a59f42 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 23 Nov 2016 16:15:45 +0100 Subject: [PATCH 0665/1749] 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 0666/1749] 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 0667/1749] 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 0668/1749] 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 0669/1749] 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 0670/1749] 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 0671/1749] 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 0672/1749] 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 0673/1749] 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 0674/1749] 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 0675/1749] 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 f13f3e7f7ab4ac3b848e5f783e5e946593a5ddb2 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Wed, 23 Nov 2016 18:22:24 +0100 Subject: [PATCH 0676/1749] opencv3: added CUDA 8.0 specific patches opencv3: added informative comments --- pkgs/development/libraries/opencv/3.x.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index aa2a1660d6fa..5d6221ad8777 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, unzip +{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, cmake, pkgconfig, unzip , zlib , enableIpp ? false , enableContrib ? false @@ -14,7 +14,7 @@ , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableEigen ? false, eigen -, enableCuda ? false, cudatoolkit, gcc49 +, enableCuda ? false, cudatoolkit, gcc5 }: let @@ -42,6 +42,17 @@ stdenv.mkDerivation rec { sha256 = "1l0w12czavgs0wzw1c594g358ilvfg2fn32cn8z7pv84zxj4g429"; }; + patches = [ + (fetchpatch { # Patch for CUDA 8 compatibility + url = "https://github.com/opencv/opencv/commit/10896129b39655e19e4e7c529153cb5c2191a1db.patch"; + sha256 = "0jka3kxxywgs3prqqgym5kav6p73rrblwj50k1nf3fvfpk194ah1"; + }) + (fetchpatch { # Patch to add CUDA Compute Capability compilation targets up to 6.0 + url = "https://github.com/opencv/opencv/commit/d76f258aebdf63f979a205cabe6d3e81700a7cd8.patch"; + sha256 = "00b3msfgrcw7laij6qafn4b18c1dl96xxpzwx05wxzrjldqb6kqg"; + }) + ]; + preConfigure = let ippicvVersion = "20151201"; ippicvPlatform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux" @@ -75,7 +86,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen - ++ lib.optional enableCuda [ cudatoolkit gcc49 ] + ++ lib.optional enableCuda [ cudatoolkit gcc5 ] ; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; From 278196e854a92ac79f77051436ef7df246a05a7d Mon Sep 17 00:00:00 2001 From: montag451 Date: Wed, 23 Nov 2016 21:01:40 +0100 Subject: [PATCH 0677/1749] 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 0678/1749] 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 0679/1749] 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 0680/1749] 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 0681/1749] 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 0682/1749] 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 0683/1749] 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 0684/1749] 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 0685/1749] 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 0686/1749] 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 0687/1749] 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 0688/1749] 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 0689/1749] 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 0690/1749] 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 0691/1749] 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 0692/1749] 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 0693/1749] 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 0694/1749] 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 0695/1749] 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 0696/1749] 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 0697/1749] 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 0698/1749] 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 0699/1749] 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 0700/1749] 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 0701/1749] 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 0702/1749] 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 0703/1749] 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 0704/1749] 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 0705/1749] 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 0706/1749] 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 0707/1749] 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 0708/1749] 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 0709/1749] 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 0710/1749] 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 0711/1749] 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 0712/1749] 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 0713/1749] 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 0714/1749] 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 0715/1749] 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 0716/1749] 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 0717/1749] 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 0718/1749] 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 0719/1749] 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 b808dabea049ee1559fef4b37b182ee58d85cc6d Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 23 Nov 2016 23:53:07 +0100 Subject: [PATCH 0720/1749] delve: init at 0.11.0-alpha Signed-off-by: Vincent Demeester --- pkgs/development/tools/delve/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/delve/default.nix diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix new file mode 100644 index 000000000000..0276b3f96013 --- /dev/null +++ b/pkgs/development/tools/delve/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "delve-${version}"; + version = "0.11.0-alpha"; + + goPackagePath = "github.com/derekparker/delve"; + excludedPackages = "_fixtures"; + + src = fetchFromGitHub { + owner = "derekparker"; + repo = "delve"; + rev = "v${version}"; + sha256 = "10axxlvqpa6gx6pz2djp8bb08b83rdj1pavay0nqdd2crsb6rvgd"; + }; + + meta = { + description = "debugger for the Go programming language"; + homepage = "https://github.com/derekparker/delve"; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 551b8eaba85c..bf2621c66e40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11304,6 +11304,8 @@ in inherit (gnome2) gtk gtkmm; }; + delve = callPackage ../development/tools/delve { }; + go-bindata = callPackage ../development/tools/go-bindata { }; go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; From 714cf7803c8c0ac3785b6486eeb30b79d7a10e17 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 24 Nov 2016 02:51:51 +0300 Subject: [PATCH 0721/1749] 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 0722/1749] 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 0723/1749] 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 0724/1749] 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 0725/1749] 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 0726/1749] 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 0727/1749] 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 0728/1749] 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 0729/1749] 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 0730/1749] 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 0731/1749] 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 0732/1749] 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 0733/1749] 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 0734/1749] 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 0735/1749] 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 0736/1749] 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 0737/1749] 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 0738/1749] 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 0739/1749] 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 0740/1749] 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 0741/1749] 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 0742/1749] 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 0743/1749] 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 0744/1749] 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 0745/1749] 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 0746/1749] 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 0747/1749] 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 0748/1749] 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 0749/1749] 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 0a77d463223316048858ab55a57245a344507053 Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Thu, 24 Nov 2016 16:40:52 +0200 Subject: [PATCH 0750/1749] flow: 0.34.0 -> 0.36.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 213222577d3f..1b59285674c4 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.34.0"; + version = "0.36.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "0fydrxp1aq4nmjkqya3j4z4zjbjvqx575qdgjzvkxq71akg56hqv"; + sha256 = "1371dcn2dy13pm8mb43p61xb2qlyylkiq1hwr0x42lhv1gwdlcnw"; }; installPhase = '' 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 0751/1749] 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 0752/1749] 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 ceda8cb20363dd57aee8a6fe9b0e4578485bf261 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 0753/1749] 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 4438ea18fb4beace6cbce2e824abb8f6b274ce5b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 24 Nov 2016 12:22:23 -0500 Subject: [PATCH 0754/1749] 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 0755/1749] 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 c93c0a438e66316609e2e9b11894c151068ca436 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:05:53 +0100 Subject: [PATCH 0756/1749] farsight2: use python2 --- pkgs/development/libraries/farsight2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix index 50f90c9d88ac..b7a17c82bebd 100644 --- a/pkgs/development/libraries/farsight2/default.nix +++ b/pkgs/development/libraries/farsight2/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst_plugins_base +{ stdenv, fetchurl, libnice, pkgconfig, python2Packages, gstreamer, gst_plugins_base , gst_python, gupnp_igd }: let - inherit (pythonPackages) python pygobject2; + inherit (python2Packages) python pygobject2; in stdenv.mkDerivation rec { name = "farsight2-0.0.31"; From 051dfa55f7f7ea53950843fce03fa3d9bcdb9989 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:07:49 +0100 Subject: [PATCH 0757/1749] mod_python: use python2 --- pkgs/servers/http/apache-modules/mod_python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index bbd74de773ad..f947bf535cc9 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheHttpd, python }: +{ stdenv, fetchurl, apacheHttpd, python2 }: stdenv.mkDerivation rec { name = "mod_python-3.5.0"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { passthru = { inherit apacheHttpd; }; - buildInputs = [ apacheHttpd python ]; + buildInputs = [ apacheHttpd python2 ]; meta = { homepage = http://modpython.org/; From e84b9e2b209c9447853dfa6c0bfaada8474ed982 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:09:00 +0100 Subject: [PATCH 0758/1749] asn2quickder: use python2 --- pkgs/development/tools/asn2quickder/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index 69051714ab4c..812053902a57 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }: +{ stdenv, fetchFromGitHub, python2Packages, makeWrapper }: stdenv.mkDerivation rec { pname = "asn2quickder"; @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { repo = "${pname}"; }; - propagatedBuildInputs = with pythonPackages; [ pyparsing makeWrapper ]; + propagatedBuildInputs = with python2Packages; [ pyparsing makeWrapper ]; - patchPhase = with pythonPackages; '' + patchPhase = with python2Packages; '' substituteInPlace Makefile \ - --replace '..' '..:$(DESTDIR)/${python.sitePackages}:${pythonPackages.pyparsing}/${python.sitePackages}' \ + --replace '..' '..:$(DESTDIR)/${python.sitePackages}:${python2Packages.pyparsing}/${python.sitePackages}' \ ''; installPhase = '' - mkdir -p $out/${pythonPackages.python.sitePackages}/ + mkdir -p $out/${python2Packages.python.sitePackages}/ mkdir -p $out/bin $out/lib $out/sbin $out/man make DESTDIR=$out PREFIX=/ all make DESTDIR=$out PREFIX=/ install From fcfe7cf955375311199ce615673de0768abf66ab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:09:51 +0100 Subject: [PATCH 0759/1749] apitrace: use python2 --- pkgs/applications/graphics/apitrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index e130b23a8aaa..a9b2eb1163af 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, libdwarf, qtbase, qtwebkit }: +{ stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit }: stdenv.mkDerivation rec { name = "apitrace-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # LD_PRELOAD wrappers need to be statically linked to work against all kinds # of games -- so it's fine to use e.g. bundled snappy. - buildInputs = [ libX11 procps python libdwarf qtbase qtwebkit ]; + buildInputs = [ libX11 procps python2 libdwarf qtbase qtwebkit ]; nativeBuildInputs = [ cmake ]; From 90d0bde89ad1f3337bf4d93d4757e45774ed5795 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:11:09 +0100 Subject: [PATCH 0760/1749] bareos: use python2 --- pkgs/tools/backup/bareos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index ffa119b3c53b..c32567138322 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex -, readline ? null, openssl ? null, python ? null, ncurses ? null, rocksdb +, readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb , sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? null , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - nettools gettext readline openssl python flex ncurses sqlite postgresql + nettools gettext readline openssl python2 flex ncurses sqlite postgresql libmysql zlib lzo jansson acl glusterfs libceph libcap rocksdb ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { "--enable-sql-pooling" "--enable-scsi-crypto" ] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline.dev}" ] - ++ optional (python != null) "--with-python=${python}" + ++ optional (python2 != null) "--with-python=${python2}" ++ optional (openssl != null) "--with-openssl=${openssl.dev}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}" From 0fbbf411b3901483f9202f18ca1dea2397c1caac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:15:15 +0100 Subject: [PATCH 0761/1749] cxxtest: use python2 --- pkgs/development/libraries/cxxtest/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index ebf21c13010e..d24ebf7739a8 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchFromGitHub, pythonPackages}: +{ stdenv, fetchFromGitHub, python2Packages}: -stdenv.mkDerivation rec { +let + inherit (python2Packages) python wrapPython; +in stdenv.mkDerivation rec { version = "4.4"; name = "cxxtest"; @@ -11,11 +13,11 @@ stdenv.mkDerivation rec { sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17"; }; - buildInputs = with pythonPackages; [ python wrapPython ]; + buildInputs = [ python wrapPython ]; installPhase = '' cd python - python setup.py install --prefix=$out + ${python.interpreter} setup.py install --prefix=$out cd .. mkdir -p $out/include From 6068431f8f0b6eedbb2aa607a86952326d9e7f44 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:24:32 +0100 Subject: [PATCH 0762/1749] cxxtest: use buildPythonApplication --- .../development/libraries/cxxtest/default.nix | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index d24ebf7739a8..91fb94ec048a 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -1,30 +1,19 @@ { stdenv, fetchFromGitHub, python2Packages}: let - inherit (python2Packages) python wrapPython; -in stdenv.mkDerivation rec { + pname = "cxxtest"; version = "4.4"; - name = "cxxtest"; +in python2Packages.buildPythonApplication rec { + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CxxTest"; - repo = name; + repo = pname; rev = version; sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17"; }; - buildInputs = [ python wrapPython ]; - - installPhase = '' - cd python - ${python.interpreter} setup.py install --prefix=$out - cd .. - - mkdir -p $out/include - cp -R cxxtest $out/include/ - - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; + sourceRoot = "${name}-src/python"; meta = with stdenv.lib; { homepage = "http://cxxtest.com"; From 1e52bed8a3361aedbde679d2d657ebe68c1238c8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:25:42 +0100 Subject: [PATCH 0763/1749] createrepo_c: use python2 --- pkgs/tools/package-management/createrepo_c/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index 8d27dc8aef03..ed46b2d302aa 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python2, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: stdenv.mkDerivation rec { rev = "0.10.0"; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { "set (BASHCOMP_DIR "$out/share/bash-completion/completions")" substituteInPlace src/python/CMakeLists.txt \ - --replace 'EXECUTE_PROCESS(COMMAND ''${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)' \ - "set (PYTHON_INSTALL_DIR "$out/${python.sitePackages}")" + --replace 'EXECUTE_PROCESS(COMMAND ''${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python2_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)' \ + "set (PYTHON_INSTALL_DIR "$out/${python2.sitePackages}")" ''; - buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python rpm openssl sqlite file xz pcre bash-completion ]; + buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python2 rpm openssl sqlite file xz pcre bash-completion ]; meta = with stdenv.lib; { description = "C implementation of createrepo"; From 24a495b7a674b246eaad5b43089dbc6fc98c5a7d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:27:22 +0100 Subject: [PATCH 0764/1749] cvs2svn: use python2 --- pkgs/applications/version-management/cvs2svn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 2bfde38af29d..90a9f26045f3 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, python, cvs, makeWrapper}: +{stdenv, lib, fetchurl, python2, cvs, makeWrapper}: stdenv.mkDerivation rec { name = "cvs2svn-2.4.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "05piyrcp81a1jgjm66xhq7h1sscx42ccjqaw30h40dxlwz1pyrx6"; }; - buildInputs = [python makeWrapper]; + buildInputs = [python2 makeWrapper]; dontBuild = true; installPhase = '' From a881da7548fcbb60786716f72ac15c8c7a2b1aab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:30:16 +0100 Subject: [PATCH 0765/1749] euca2ools: use python2 --- pkgs/tools/virtualization/euca2ools/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index 7a1d56435aa7..dce806cf6e34 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchgit, which, pythonPackages }: +{ stdenv, fetchgit, which, python2Packages }: -pythonPackages.buildPythonApplication rec { +let + inherit (python2Packages) buildPythonApplication boto m2crypto; +in buildPythonApplication rec { name = "euca2ools-2.1.4"; namePrefix = ""; @@ -10,7 +12,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0grsgn5gbvk1hlfa8qx7ppz7iyfyi2pdhxy8njr8lm60w4amfiyq"; }; - pythonPath = [ pythonPackages.boto pythonPackages.m2crypto ]; + propagatedBuildInputs = [ boto m2crypto ]; meta = { homepage = http://open.eucalyptus.com/downloads; From a99272d6722de4da66e1ecbf503eeaa5a4978a50 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:31:58 +0100 Subject: [PATCH 0766/1749] ffado: use python2 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecb48fd70887..3c43b7cfe202 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10751,7 +10751,7 @@ in fatrace = callPackage ../os-specific/linux/fatrace { }; ffadoFull = callPackage ../os-specific/linux/ffado { - inherit (pythonPackages) python pyqt4 dbus-python; + inherit (python2Packages) python pyqt4 dbus-python; }; libffado = ffadoFull.override { prefix = "lib"; }; From 434f09c55f9cdd03e4974826f15b17eb8fd256a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:33:10 +0100 Subject: [PATCH 0767/1749] fomp: use python2 --- pkgs/applications/audio/fomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index 00b6c3e0c677..bdac87aaf374 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkgconfig, python }: +{ stdenv, fetchurl, lv2, pkgconfig, python2 }: stdenv.mkDerivation rec { name = "fomp-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5"; }; - buildInputs = [ lv2 pkgconfig python ]; + buildInputs = [ lv2 pkgconfig python2 ]; installPhase = '' python waf configure --prefix=$out From bea967016ea8acd276d0e0d2e826e2704bc3d63a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:36:17 +0100 Subject: [PATCH 0768/1749] git-hub: use python2 --- .../version-management/git-and-tools/git-hub/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index d561f751cc97..f67d575b5b3a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, docutils, python2 }: +{ stdenv, fetchFromGitHub, docutils, python2Packages }: stdenv.mkDerivation rec { name = "git-hub-${version}"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { owner = "sociomantic-tsunami"; }; - buildInputs = [ python2 ]; - nativeBuildInputs = [ docutils ]; + buildInputs = [ python2Packages.python ]; + nativeBuildInputs = [ python2Packages.docutils ]; postPatch = '' substituteInPlace Makefile --replace rst2man rst2man.py From 643b12221a2d1d09ef68e55f4a895afd29a05873 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:38:21 +0100 Subject: [PATCH 0769/1749] stgit: use python2 --- .../version-management/git-and-tools/stgit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index f572dbcf9238..955fe90ff119 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, git }: +{ stdenv, fetchurl, python2, git }: let name = "stgit-0.17.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1pka0ns9x0kabn036zsf0mwmwiynckhnva51kgxsch9fqah6acyl"; }; - buildInputs = [ python git ]; + buildInputs = [ python2 git ]; makeFlags = "prefix=$$out"; From f1fbf0416280d05616a12295908bd6f3d9dac88a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:39:16 +0100 Subject: [PATCH 0770/1749] gitinspector: use python2 --- pkgs/applications/version-management/gitinspector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index 664f4d5147be..eea5242e6bcc 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, pythonPackages}: +{ stdenv, fetchzip, python2Packages}: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "gitinspector-${version}"; version = "0.4.4"; namePrefix = ""; From fe24e93df85f4e41a37818c53f3a6b0146b9e069 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:52:53 +0100 Subject: [PATCH 0771/1749] rawdog: use python2 --- pkgs/applications/networking/feedreaders/rawdog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index eca53ccf2ec0..39543f256fa2 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "rawdog-${version}"; version = "2.21"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0f5z7b70pyhjl6s28hgxninsr86s4dj5ycd50sv6bfz4hm1c2030"; }; - propagatedBuildInputs = with pythonPackages; [ feedparser ]; + propagatedBuildInputs = with python2Packages; [ feedparser ]; namePrefix = ""; From c355a73e2cac7ab379cd843e3e97884376f249d3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:56:02 +0100 Subject: [PATCH 0772/1749] s3cmd: use python2 --- pkgs/tools/networking/s3cmd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index ec464438553f..887cd09b6eb3 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "s3cmd-${version}"; version = "1.6.1"; @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0aan6v1qj0pdkddhhkbaky44d54irm1pa8mkn52i2j86nb2rkcf9"; }; - propagatedBuildInputs = with pythonPackages; [ python_magic dateutil ]; + propagatedBuildInputs = with python2Packages; [ python_magic dateutil ]; meta = with stdenv.lib; { homepage = http://s3tools.org/; From 8b3d725cc3fce49fad81290d94a7e07900900b12 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:59:05 +0100 Subject: [PATCH 0773/1749] Fabric: use python2 version --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c43b7cfe202..475d8e2b6168 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1606,7 +1606,7 @@ in f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; - Fabric = pythonPackages.Fabric; + Fabric = python2Packages.Fabric; fail2ban = callPackage ../tools/security/fail2ban { }; From 4443198adfb7a072024bcb5af22012824890f5b1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 12:02:33 +0100 Subject: [PATCH 0774/1749] gpsd: use python2 --- pkgs/servers/gpsd/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index b8d2498b71ea..7670c89f0c6a 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -2,7 +2,7 @@ , ncurses, libX11, libXt, libXpm, libXaw, libXext , libusb1, docbook_xml_dtd_412, docbook_xsl, bc , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout" -, pythonPackages +, python2Packages }: # TODO: put the X11 deps behind a guiSupport parameter for headless support @@ -17,18 +17,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc - pythonPackages.python - pythonPackages.wrapPython + python2Packages.python + python2Packages.wrapPython ]; buildInputs = [ - pythonPackages.python dbus dbus_glib ncurses libX11 libXt libXpm libXaw libXext + python2Packages.python dbus dbus_glib ncurses libX11 libXt libXpm libXaw libXext libxslt libusb1 ]; pythonPath = [ - pythonPackages.pygobject2 - pythonPackages.pygtk + python2Packages.pygobject2 + python2Packages.pygtk ]; patches = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConstruct scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \ systemd=yes udevdir="$out/lib/udev" \ - python_libdir="$out/lib/${pythonPackages.python.libPrefix}/site-packages" + python_libdir="$out/lib/${python2Packages.python.libPrefix}/site-packages" ''; checkPhase = '' From 7dd7b9e2188d2ff906a2346ed8abdb869057bdb7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 12:05:02 +0100 Subject: [PATCH 0775/1749] arandr: use python2 --- pkgs/tools/X11/arandr/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index f86e9b60e04a..8bbe1b6a52b6 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, python, xrandr, pythonPackages }: +{ stdenv, fetchurl, xrandr, python2Packages }: -pythonPackages.buildPythonApplication rec { +let + inherit (python2Packages) buildPythonApplication docutils pygtk; +in buildPythonApplication rec { name = "arandr-0.1.9"; src = fetchurl { @@ -15,8 +17,8 @@ pythonPackages.buildPythonApplication rec { # no tests doCheck = false; - buildInputs = [ pythonPackages.docutils ]; - propagatedBuildInputs = [ xrandr pythonPackages.pygtk ]; + buildInputs = [ docutils ]; + propagatedBuildInputs = [ xrandr pygtk ]; meta = { homepage = http://christian.amsuess.com/tools/arandr/; From db8068e92529d6b495488be340ddcf16752d83d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 12:07:13 +0100 Subject: [PATCH 0776/1749] arangodb: use python2 --- pkgs/servers/nosql/arangodb/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 8b8d1ba0ae16..c40b765d3453 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchFromGitHub, openssl, zlib, python, gyp, bash, go, readline }: +{ stdenv, fetchFromGitHub, openssl, zlib, python2Packages, bash, go, readline }: -stdenv.mkDerivation rec { +let + inherit (python2Packages) python gyp; +in stdenv.mkDerivation rec { version = "2.5.3"; name = "arangodb-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 475d8e2b6168..cb9c315c855a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -429,9 +429,7 @@ in arandr = callPackage ../tools/X11/arandr { }; - arangodb = callPackage ../servers/nosql/arangodb { - inherit (pythonPackages) gyp; - }; + arangodb = callPackage ../servers/nosql/arangodb { }; arcanist = callPackage ../development/tools/misc/arcanist {}; From 4fb7a8bf1a7aa5533ca68bfe932bcfd4742f2eb3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 12:08:39 +0100 Subject: [PATCH 0777/1749] libappindicator: use python2 --- pkgs/development/libraries/libappindicator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 2717a326f4ad..ff256fb73c84 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -5,14 +5,14 @@ , glib, dbus_glib, gtkVersion , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null -, pythonPackages, gobjectIntrospection, vala_0_23 +, python2Packages, gobjectIntrospection, vala_0_23 , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: with lib; let - inherit (pythonPackages) python pygobject2 pygtk; + inherit (python2Packages) python pygobject2 pygtk; in stdenv.mkDerivation rec { name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; in "libappindicator-${postfix}-${version}"; From e77a14b24b12703937304f106fc529fa60094488 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 12:09:49 +0100 Subject: [PATCH 0778/1749] aws_shell: use python2 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb9c315c855a..4d463ac85509 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -473,9 +473,9 @@ in avfs = callPackage ../tools/filesystems/avfs { }; - awscli = pythonPackages.awscli; + awscli = pythonPackages.awscli; # Should be moved out of python-packages.nix - aws_shell = pythonPackages.aws_shell; + aws_shell = python2Packages.aws_shell; # Should be moved out of python-packages.nix azure-cli = nodePackages.azure-cli; From 599312739e3a338f923e6c22ab183178ca49c7b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 12:11:07 +0100 Subject: [PATCH 0779/1749] beets: use python2 --- pkgs/tools/audio/beets/default.nix | 54 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index c7b1d6950412..73ff17139a33 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, writeScript, glibcLocales -, pythonPackages, imagemagick +, python2Packages, imagemagick , enableAcousticbrainz ? true , enableAcoustid ? true @@ -22,17 +22,17 @@ , bashInteractive, bash-completion }: -assert enableAcoustid -> pythonPackages.pyacoustid != null; +assert enableAcoustid -> python2Packages.pyacoustid != null; assert enableBadfiles -> flac != null && mp3val != null; assert enableConvert -> ffmpeg != null; -assert enableDiscogs -> pythonPackages.discogs_client != null; -assert enableFetchart -> pythonPackages.responses != null; +assert enableDiscogs -> python2Packages.discogs_client != null; +assert enableFetchart -> python2Packages.responses != null; assert enableKeyfinder -> keyfinder-cli != null; -assert enableLastfm -> pythonPackages.pylast != null; -assert enableMpd -> pythonPackages.mpd != null; +assert enableLastfm -> python2Packages.pylast != null; +assert enableMpd -> python2Packages.mpd != null; assert enableReplaygain -> bs1770gain != null; -assert enableThumbnails -> pythonPackages.pyxdg != null; -assert enableWeb -> pythonPackages.flask != null; +assert enableThumbnails -> python2Packages.pyxdg != null; +assert enableWeb -> python2Packages.flask != null; with stdenv.lib; @@ -72,7 +72,7 @@ let testShell = "${bashInteractive}/bin/bash --norc"; completion = "${bash-completion}/share/bash-completion/bash_completion"; -in pythonPackages.buildPythonApplication rec { +in python2Packages.buildPythonApplication rec { name = "beets-${version}"; version = "1.3.19"; @@ -84,34 +84,34 @@ in pythonPackages.buildPythonApplication rec { }; propagatedBuildInputs = [ - pythonPackages.enum34 - pythonPackages.jellyfish - pythonPackages.munkres - pythonPackages.musicbrainzngs - pythonPackages.mutagen - pythonPackages.pathlib - pythonPackages.pyyaml - pythonPackages.unidecode - ] ++ optional enableAcoustid pythonPackages.pyacoustid + python2Packages.enum34 + python2Packages.jellyfish + python2Packages.munkres + python2Packages.musicbrainzngs + python2Packages.mutagen + python2Packages.pathlib + python2Packages.pyyaml + python2Packages.unidecode + ] ++ optional enableAcoustid python2Packages.pyacoustid ++ optional (enableFetchart || enableEmbyupdate || enableAcousticbrainz) - pythonPackages.requests2 + python2Packages.requests2 ++ optional enableConvert ffmpeg - ++ optional enableDiscogs pythonPackages.discogs_client + ++ optional enableDiscogs python2Packages.discogs_client ++ optional enableKeyfinder keyfinder-cli - ++ optional enableLastfm pythonPackages.pylast - ++ optional enableMpd pythonPackages.mpd - ++ optional enableThumbnails pythonPackages.pyxdg - ++ optional enableWeb pythonPackages.flask + ++ optional enableLastfm python2Packages.pylast + ++ optional enableMpd python2Packages.mpd + ++ optional enableThumbnails python2Packages.pyxdg + ++ optional enableWeb python2Packages.flask ++ optional enableAlternatives (import ./alternatives-plugin.nix { - inherit stdenv pythonPackages fetchFromGitHub; + inherit stdenv python2Packages fetchFromGitHub; }) ++ optional enableCopyArtifacts (import ./copyartifacts-plugin.nix { - inherit stdenv pythonPackages fetchFromGitHub; + inherit stdenv python2Packages fetchFromGitHub; }); - buildInputs = with pythonPackages; [ + buildInputs = with python2Packages; [ beautifulsoup4 imagemagick mock From fb231dd4f6286ae0d573231bdf28bab46a6de745 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 12:14:52 +0100 Subject: [PATCH 0780/1749] pythonPackages.bitbucket-cli: 0.4.1 -> 0.5.1 --- pkgs/top-level/python-packages.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 452ca3205410..58c63c0228df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2668,13 +2668,18 @@ in { }; bitbucket-cli = buildPythonPackage rec { - name = "bitbucket-cli-0.4.1"; + name = "bitbucket-cli-0.5.1"; src = pkgs.fetchurl { url = "mirror://pypi/b/bitbucket-cli/${name}.tar.gz"; - sha256 = "d8909627ae7a46519379c6343698d49f9ffd5de839ff44796974828d843a9419"; + sha256 = "d881e21ec7ebfa006cfca6d10a5b7229aa59990568f8c6b8e3364769fa38b6f6"; }; - pythonPath = [ self.requests ]; + propagatedBuildInputs = [ self.requests2 ]; + + # No tests + doCheck = false; + + disabled = isPy3k; meta = { description = "Bitbucket command line interface"; From 5114fa8e89bf30873b6e674a12a943e306a48f5c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 12:15:48 +0100 Subject: [PATCH 0781/1749] bitbucket-cli: use python2 --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d463ac85509..ccd9c30b385f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -628,7 +628,7 @@ in bins = callPackage ../tools/graphics/bins { }; - bitbucket-cli = pythonPackages.bitbucket-cli; + bitbucket-cli = python2Packages.bitbucket-cli; blink = callPackage ../applications/networking/instant-messengers/blink { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58c63c0228df..f7b21a6a7d83 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2667,6 +2667,7 @@ in { }; }; + # Should be moved out of python-packages.nix bitbucket-cli = buildPythonPackage rec { name = "bitbucket-cli-0.5.1"; src = pkgs.fetchurl { From 869cf8a56b66e69411ece3e9d4f4776bcdf37eb4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 12:21:08 +0100 Subject: [PATCH 0782/1749] python35Packages.netaddr: disable tests instead of building --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7b21a6a7d83..c998001b5871 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15227,7 +15227,7 @@ in { netaddr = buildPythonPackage rec { name = "netaddr-0.7.18"; - disabled = isPy35; # https://github.com/drkjam/netaddr/issues/117 + doCheck = !isPy35; # https://github.com/drkjam/netaddr/issues/117 src = pkgs.fetchurl { url = "mirror://pypi/n/netaddr/${name}.tar.gz"; From 3ebca4f4cf57f5ac3119469cb245955e8e2120e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 13:11:11 +0100 Subject: [PATCH 0783/1749] vde2: use python2 --- pkgs/tools/networking/vde2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 3a3709a9df00..ff54e1ab2d21 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libpcap, python }: +{ stdenv, fetchurl, openssl, libpcap, python2 }: stdenv.mkDerivation rec { name = "vde2-2.3.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2"; }; - buildInputs = [ openssl libpcap python ]; + buildInputs = [ openssl libpcap python2 ]; hardeningDisable = [ "format" ]; From 09a5864d286138907e63f5af9b40836b87abdefb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 13:49:06 +0100 Subject: [PATCH 0784/1749] tor-arm: use python2 --- pkgs/tools/security/tor/tor-arm.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix index 432b1cbfceee..170d5c4ff7a4 100644 --- a/pkgs/tools/security/tor/tor-arm.nix +++ b/pkgs/tools/security/tor/tor-arm.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper -, pythonPackages, ncurses, lsof, nettools +, python2Packages, ncurses, lsof, nettools }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1yi87gdglkvi1a23hv5c3k7mc18g0rw7b05lfcw81qyxhlapf3pw"; }; - nativeBuildInputs = [ makeWrapper pythonPackages.python ]; + nativeBuildInputs = [ makeWrapper python2Packages.python ]; outputs = [ "out" "man" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace "lsof -wnPi" "${lsof}/bin/lsof" substituteInPlace ./arm --replace '"$0" = /usr/bin/arm' 'true' - substituteInPlace ./arm --replace "python" "${pythonPackages.python}/bin/python" + substituteInPlace ./arm --replace "python" "${python2Packages.python}/bin/python" for i in ./install ./arm ./src/gui/controller.py ./src/cli/wizard.py ./src/resources/torrcOverride/override.h ./src/resources/torrcOverride/override.py ./src/resources/arm.1 ./setup.py; do substituteInPlace $i --replace "/usr/share" "$out/share" From 12d9fe12f09e88ae90227cafa39fc3802f940d1b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 13:50:26 +0100 Subject: [PATCH 0785/1749] urbit: use python2 --- pkgs/misc/urbit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index c1dcda54a62d..cbe9416ee8ae 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel, - cmake, re2c, libtool, ncurses, perl, zlib, python }: + cmake, re2c, libtool, ncurses, perl, zlib, python2 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ gcc gmp libsigsegv openssl automake autoconf ragel cmake re2c libtool - ncurses perl zlib python + ncurses perl zlib python2 ]; # uses 'readdir_r' deprecated by glibc 2.24 From 99402f6a06646159cf02b4f344903786a40afba2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 13:52:11 +0100 Subject: [PATCH 0786/1749] twister: use python2 --- pkgs/applications/networking/p2p/twister/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 43ec9a5b022a..b6f4d8b5b19c 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python2 , boost, db, openssl, geoip, libiconv, miniupnpc , srcOnly, fetchgit }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - autoconf automake libtool pkgconfig python + autoconf automake libtool pkgconfig python2 boost db openssl geoip miniupnpc libiconv ]; From 6be672a7cd4202a726fbff804bf75550fc8aea77 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 13:57:12 +0100 Subject: [PATCH 0787/1749] tailor: use python2 --- pkgs/applications/version-management/tailor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index dde09dfe22d1..424a402780af 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "tailor-${version}"; version = "0.9.35"; From 7ea28bfc46b39c4306f5bcaa194ca25620c35fae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 13:59:28 +0100 Subject: [PATCH 0788/1749] ycmd: use python2 --- pkgs/development/tools/misc/ycmd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 75d371b4ec8d..57b4fe99b2f8 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages +{ stdenv, fetchgit, cmake, llvmPackages, boost, python2Packages }: let - inherit (pythonPackages) python; -in pythonPackages.mkPythonDerivation rec { + inherit (python2Packages) python mkPythonDerivation waitress frozendict bottle; +in mkPythonDerivation rec { name = "ycmd-2016-01-12"; namePrefix = ""; @@ -15,7 +15,7 @@ in pythonPackages.mkPythonDerivation rec { buildInputs = [ cmake boost ]; - propagatedBuildInputs = with pythonPackages; [ waitress frozendict bottle ]; + propagatedBuildInputs = [ waitress frozendict bottle ]; buildPhase = '' export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} @@ -24,7 +24,7 @@ in pythonPackages.mkPythonDerivation rec { configurePhase = ":"; - installPhase = with pythonPackages; '' + installPhase = '' mkdir -p $out/lib/ycmd/third_party $out/bin cp -r ycmd/ CORE_VERSION libclang.so.* ycm_client_support.so ycm_core.so $out/lib/ycmd/ ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd From 6449435b04cb608389e3d1df653fed857633b724 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 15:01:28 +0100 Subject: [PATCH 0789/1749] libplist: use python2, multiple outputs, fix bindings --- pkgs/development/libraries/libplist/default.nix | 16 ++++++++++++---- pkgs/top-level/python-packages.nix | 3 +++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 0b9b7bd2f54e..4de5a23569e8 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, swig2, python, glib }: +{ stdenv, fetchurl, pkgconfig, libxml2, swig2, python2Packages, glib }: -stdenv.mkDerivation rec { +let + inherit (python2Packages) python cython; +in stdenv.mkDerivation rec { name = "libplist-1.12"; - nativeBuildInputs = [ pkgconfig swig2 ]; + nativeBuildInputs = [ pkgconfig swig2 python cython ]; #patches = [ ./swig.patch ]; - propagatedBuildInputs = [ libxml2 glib python ]; + propagatedBuildInputs = [ libxml2 glib ]; passthru.swig = swig2; + outputs = ["out" "dev" "bin" "py"]; + + postFixup = '' + moveToOutput "lib/${python.libPrefix}" "$py" + ''; + src = fetchurl { url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; sha256 = "1gj4nv0bvdm5y2sqm2vj2rn44k67ahw3mh6q614qq4nyngfdxzqf"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c998001b5871..86077665670d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13530,6 +13530,9 @@ in { clblas = pkgs.clblas-cuda; }; + libplist = if isPy3k then throw "libplist not supported for interpreter ${python.executable}" else + (pkgs.libplist.override{python2Packages=self; }).py; + libxml2 = if isPy3k then throw "libxml2 not supported for interpreter ${python.executable}" else (pkgs.libxml2.override{pythonSupport=true; python2=python;}).py; From 080daf40c8ad9769f506388ec59f490399be972b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 15:02:44 +0100 Subject: [PATCH 0790/1749] rubber: use python2 --- pkgs/tools/typesetting/rubber/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 2b8505ac5df0..a9403020e41b 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, pythonPackages, texinfo }: +{ fetchurl, stdenv, python2Packages, texinfo }: stdenv.mkDerivation rec { name = "rubber-1.3"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "09715apfd6a0haz1mqsxgm8sj4rwzi38gcz2kz020zxk5rh0dksh"; }; - buildInputs = [ python texinfo ]; - nativeBuildInputs = [ pythonPackages.wrapPython ]; + buildInputs = [ python2Packages.python texinfo ]; + nativeBuildInputs = [ python2Packages.wrapPython ]; patchPhase = '' substituteInPlace configure --replace which "type -P" From f8c93fd939fe8a7417ac4e9344e4fbf9528c6e0e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 15:06:46 +0100 Subject: [PATCH 0791/1749] kargo: use python2 --- pkgs/tools/misc/kargo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index ddc030bcf8da..734d8fb78e23 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { version = "0.4.6"; name = "kargo-${version}"; @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ ansible2 boto cffi From d56209dc3b3ec8b66e85c9fa44193e6aa2ac6bde Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 15:11:21 +0100 Subject: [PATCH 0792/1749] libsearpc: use python2 --- pkgs/development/libraries/libsearpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 0391786c3fd4..49751629430e 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, autoconf, pkgconfig, libtool, python, pythonPackages, glib, jansson}: +{stdenv, fetchurl, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec patches = [ ./libsearpc.pc.patch ]; - buildInputs = [ automake autoconf pkgconfig libtool python pythonPackages.simplejson ]; + buildInputs = [ automake autoconf pkgconfig libtool python2Packages.python python2Packages.simplejson ]; propagatedBuildInputs = [ glib jansson ]; preConfigure = "./autogen.sh"; From 3cd2ca2751087a5f614baa0692ed595aae64498f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 15:39:43 +0100 Subject: [PATCH 0793/1749] tortoisehg: use python2 --- .../version-management/tortoisehg/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index e5c704f71c71..fd61e4904025 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,6 +1,6 @@ -{lib, fetchurl, mercurial, pythonPackages}: +{lib, fetchurl, mercurial, python2Packages}: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; version = "3.9.2"; @@ -9,15 +9,15 @@ pythonPackages.buildPythonApplication rec { sha256 = "17wcsf91z7dnb7c8vyagasj5vvmas6ms5lx1ny4pnm94qzslkfh2"; }; - pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ]; + pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; - propagatedBuildInputs = with pythonPackages; [ qscintilla iniparse ]; + propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ]; doCheck = false; dontStrip = true; buildPhase = ""; installPhase = '' - ${pythonPackages.python.executable} setup.py install --prefix=$out + ${python2Packages.python.executable} setup.py install --prefix=$out ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias ''; From fad1e442ad9230928712aaa7f1facd89f8236689 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 15:47:35 +0100 Subject: [PATCH 0794/1749] calibre: use python2 --- pkgs/applications/misc/calibre/default.nix | 17 ++++++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 7b47b9fb3cb0..4fcb3a085bd0 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, python, pyqt5, sip, poppler_utils, pkgconfig, libpng +{ stdenv, fetchurl, fetchpatch, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite -, makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp +, makeWrapper, unrarSupport ? false, chmlib, python2Packages, xz, libusb1, libmtp , xdg_utils, makeDesktopItem }: @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "18iv1c2nx93gkfqa3k2m42dk4p59b9zp08fggb6imc1xqh2icfch"; }; - inherit python; - patches = [ # Patches from Debian that: # - disable plugin installation (very insecure) @@ -39,7 +37,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; prePatch = '' - sed -i "/pyqt_sip_dir/ s:=.*:= '${pyqt5}/share/sip/PyQt5':" \ + sed -i "/pyqt_sip_dir/ s:=.*:= '${python2Packages.pyqt5}/share/sip/PyQt5':" \ setup/build_environment.py # Remove unneeded files and libs @@ -56,10 +54,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ]; buildInputs = [ - python pyqt5 sip poppler_utils libpng imagemagick libjpeg + poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils - ] ++ (with pythonPackages; [ + ] ++ (with python2Packages; [ apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow + python pyqt5 sip # the following are distributed with calibre, but we use upstream instead chardet cherrypy html5lib odfpy routes ]); @@ -74,8 +73,8 @@ stdenv.mkDerivation rec { export FC_LIB_DIR=${fontconfig.lib}/lib export PODOFO_INC_DIR=${podofo}/include/podofo export PODOFO_LIB_DIR=${podofo}/lib - export SIP_BIN=${sip}/bin/sip - python setup.py install --prefix=$out + export SIP_BIN=${python2Packages.sip}/bin/sip + ${python2Packages.python.interpreter} setup.py install --prefix=$out PYFILES="$out/bin/* $out/lib/calibre/calibre/web/feeds/*.py $out/lib/calibre/calibre/ebooks/metadata/*.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccd9c30b385f..ebbeebaf1166 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12303,9 +12303,7 @@ in calcurse = callPackage ../applications/misc/calcurse { }; - calibre = qt5.callPackage ../applications/misc/calibre { - inherit (pythonPackages) pyqt5 sip; - }; + calibre = qt5.callPackage ../applications/misc/calibre { }; camlistore = callPackage ../applications/misc/camlistore { }; From a0fe37f43f2c6ba641ac5c0346527587c83f4986 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 15:48:49 +0100 Subject: [PATCH 0795/1749] electrum-dash: use python2 --- pkgs/applications/misc/electrum-dash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix index 7abeaf57b64c..917d32e74afd 100644 --- a/pkgs/applications/misc/electrum-dash/default.nix +++ b/pkgs/applications/misc/electrum-dash/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "electrum-dash-${version}"; version = "2.4.1"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "02k7m7fyn0cvlgmwxr2gag7rf2knllkch1ma58shysp7zx9jb000"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ dns ecdsa pbkdf2 From d8b00967049c82185146dc61b19d33410ba51564 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 15:54:07 +0100 Subject: [PATCH 0796/1749] dstat: use python2 --- pkgs/os-specific/linux/dstat/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 8f7772de1fdc..c8e40a4c7ac8 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pythonPackages }: +{ stdenv, fetchurl, python2Packages }: stdenv.mkDerivation rec { name = "dstat-${version}"; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "16286z3y2lc9nsq8njzjkv6k2vyxrj9xiixj1k3gnsbvhlhkirj6"; }; - buildInputs = with pythonPackages; [ python-wifi wrapPython ]; + buildInputs = with python2Packages; [ python-wifi wrapPython ]; - pythonPath = with pythonPackages; [ python-wifi ]; + pythonPath = with python2Packages; [ python-wifi ]; patchPhase = '' - sed -i -e 's|/usr/bin/env python|${python}/bin/python|' \ + sed -i -e 's|/usr/bin/env python|${python2Packages.python.interpreter}|' \ -e "s|/usr/share/dstat|$out/share/dstat|" dstat ''; From f3c869223275676ed57d7cc9f020bff72095516f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 15:59:47 +0100 Subject: [PATCH 0797/1749] rdiff-backup: use python2 and buildPythonApplication --- pkgs/tools/backup/rdiff-backup/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 1c313beae9fd..f3910893b7b2 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, python, librsync, gnused }: +{stdenv, fetchurl, python2Packages, librsync, gnused }: -stdenv.mkDerivation { +python2Packages.buildPythonApplication { name = "rdiff-backup-1.3.3"; src = fetchurl { @@ -10,15 +10,9 @@ stdenv.mkDerivation { patches = [ ./fix-librsync-rs_default_strong_len.patch ]; - installPhase = '' - python ./setup.py install --prefix=$out - sed -i $out/bin/rdiff-backup -e \ - "/import sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]" - sed -i $out/bin/rdiff-backup-statistics -e \ - "/import .*sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]" - ''; + buildInputs = [ librsync gnused ]; - buildInputs = [ python librsync gnused ]; + doCheck = false; meta = { description = "Backup system trying to combine best a mirror and an incremental backup system"; From b1f60ba8cff4c3b4df3fb49411019ddcf0f0eb02 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 16:03:28 +0100 Subject: [PATCH 0798/1749] libcpuid: use python2 --- pkgs/tools/misc/libcpuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 8f258a38f7fc..e26533d46429 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -3,7 +3,7 @@ , libtool , automake , autoconf -, python +, python2 # Needed for tests }: stdenv.mkDerivation rec { name = "libcpuid-${version}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { postInstall = '' pushd Install - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/lib ${python.interpreter} ../tests/run_tests.py ./bin/cpuid_tool ../tests/ + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/lib ${python2.interpreter} ../tests/run_tests.py ./bin/cpuid_tool ../tests/ popd function fixRunPath { From 7ab6edd171ad8b00d868e6475c70415915d486d0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 16:05:53 +0100 Subject: [PATCH 0799/1749] llvm_34: use python2 --- pkgs/development/compilers/llvm/3.4/lld.nix | 4 ++-- pkgs/development/compilers/llvm/3.4/lldb.nix | 4 ++-- pkgs/development/compilers/llvm/3.4/llvm.nix | 4 ++-- pkgs/development/compilers/llvm/3.4/polly.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.4/lld.nix b/pkgs/development/compilers/llvm/3.4/lld.nix index c502b0e215e5..c1841610f314 100644 --- a/pkgs/development/compilers/llvm/3.4/lld.nix +++ b/pkgs/development/compilers/llvm/3.4/lld.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, llvm, ncurses, zlib, python, version }: +{ stdenv, fetch, cmake, llvm, ncurses, zlib, python2, version }: stdenv.mkDerivation { name = "lld-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { export cmakeFlags="$cmakeFlags -DLLD_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*` ''; - buildInputs = [ cmake ncurses zlib python ]; + buildInputs = [ cmake ncurses zlib python2 ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix index cd498b5cf519..5d2e9c479abe 100644 --- a/pkgs/development/compilers/llvm/3.4/lldb.nix +++ b/pkgs/development/compilers/llvm/3.4/lldb.nix @@ -8,7 +8,7 @@ , libedit , llvm , clang -, python +, python2 , version }: @@ -23,7 +23,7 @@ stdenv.mkDerivation { scripts/Python/build-swig-Python.sh ''; - buildInputs = [ cmake python which swig ncurses zlib libedit ]; + buildInputs = [ cmake python2 which swig ncurses zlib libedit ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 7471974d00a1..54346baba0d4 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -3,7 +3,7 @@ , perl , groff , cmake -, python +, python2 , libffi , binutils , libxml2 @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { buildInputs = [ perl groff cmake libxml2 libffi ] - ++ stdenv.lib.optional (!stdenv.isDarwin) python /* + ++ stdenv.lib.optional (!stdenv.isDarwin) python2 /* ++ stdenv.lib.optional stdenv.isLinux valgrind */; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/llvm/3.4/polly.nix b/pkgs/development/compilers/llvm/3.4/polly.nix index 2fed0fc8abed..3d3483afafaa 100644 --- a/pkgs/development/compilers/llvm/3.4/polly.nix +++ b/pkgs/development/compilers/llvm/3.4/polly.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, isl, python, gmp, llvm, version }: +{ stdenv, fetch, cmake, isl, python2, gmp, llvm, version }: stdenv.mkDerivation { name = "polly-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { patches = [ ./polly-separate-build.patch ]; - buildInputs = [ cmake isl python gmp ]; + buildInputs = [ cmake isl python2 gmp ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" From e0a51107792916f72602aacd109f0203d65dec82 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 16:08:35 +0100 Subject: [PATCH 0800/1749] rethinkdb: use python2 --- pkgs/servers/nosql/rethinkdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 31ffcd14bbed..5e22cb118820 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, which, m4, python , protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool -, pythonPackages, makeWrapper +, python2Packages, makeWrapper }: stdenv.mkDerivation rec { @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (!stdenv.isDarwin) jemalloc ++ stdenv.lib.optional stdenv.isDarwin libtool; - nativeBuildInputs = [ which m4 python ]; + nativeBuildInputs = [ which m4 python2Packages.python ]; enableParallelBuilding = true; postInstall = '' wrapProgram $out/bin/rethinkdb \ - --prefix PATH ":" "${pythonPackages.rethinkdb}/bin" + --prefix PATH ":" "${python2Packages.rethinkdb}/bin" ''; meta = { From 27180b67ce59e4584eb896fafe790a7bb418235b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 16:14:48 +0100 Subject: [PATCH 0801/1749] pixie: use python2 --- pkgs/development/interpreters/pixie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index c3da770a6e1f..7cb2a356f951 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, python, makeWrapper, pkgconfig, gcc, +{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkgconfig, gcc, pypy, libffi, libedit, libuv, boost, zlib, variant ? "jit", buildWithPypy ? false }: @@ -36,7 +36,7 @@ let buildInputs = [ pkgconfig makeWrapper ]; PYTHON = if buildWithPypy then "${pypy}/pypy-c/.pypy-c-wrapped" - else "${python}/bin/python"; + else "${python2.interpreter}"; unpackPhase = '' cp -R ${pixie-src} pixie-src mkdir pypy-src From 25a9889f0e05f45d4cc9f0ae37c873efa5837f6d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 16:38:54 +0100 Subject: [PATCH 0802/1749] blivet test: use python2 --- nixos/tests/blivet.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/blivet.nix b/nixos/tests/blivet.nix index a7b836ce99a6..2adc2ee1eeea 100644 --- a/nixos/tests/blivet.nix +++ b/nixos/tests/blivet.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec { +import ./make-test.nix ({ pkgs, ... }: with pkgs.python2Packages; rec { name = "blivet"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ aszlig ]; From 3829e93942ec87009fd6f5918ac8a8f99a2cbd32 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 16:39:54 +0100 Subject: [PATCH 0803/1749] pmenu: use python2 --- pkgs/applications/misc/pmenu/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix index 9b3766842845..da59f7f18867 100644 --- a/pkgs/applications/misc/pmenu/default.nix +++ b/pkgs/applications/misc/pmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pythonPackages, gnome2 }: +{ stdenv, fetchFromGitLab, python2Packages, gnome2 }: stdenv.mkDerivation rec { name = "pmenu-${version}"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "15bkvadr7ab44mc8gkdqs3w14cm498mwf72w5rjm2rdh55357jjh"; }; - nativeBuildInputs = [ pythonPackages.wrapPython ]; + nativeBuildInputs = [ python2Packages.wrapPython ]; - buildInputs = [ pythonPackages.pygtk gnome2.gnome_menus ]; + buildInputs = [ python2Packages.pygtk gnome2.gnome_menus ]; - pythonPath = [ pythonPackages.pygtk ]; + pythonPath = [ python2Packages.pygtk ]; patchPhase = '' substituteInPlace install.sh --replace "/usr/local" "$out" From 659c5c4c625bff2e05db9c44d768dd83e263f962 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 16:40:46 +0100 Subject: [PATCH 0804/1749] keepnote: use python2 --- pkgs/applications/office/keepnote/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index b8d04baf356d..bb2c6adbf3b4 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication { +python2Packages.buildPythonApplication { name = "keepnote-0.7.8"; namePrefix = ""; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh"; }; - propagatedBuildInputs = with pythonPackages; [ pyGtkGlade ]; + propagatedBuildInputs = with python2Packages; [ pyGtkGlade ]; # Testing fails. doCheck = false; From 97259c811ea24745e1a9af3214b1ac6a617d2e56 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 16:35:11 +0100 Subject: [PATCH 0805/1749] qemu: use python2 --- 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..759f0a6ad332 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib +{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib , ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex , bison, lzo, snappy, libaio, gnutls, nettle , makeWrapper @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ python zlib pkgconfig glib ncurses perl pixman + [ python2 zlib pkgconfig glib ncurses perl pixman vde2 texinfo libuuid flex bison makeWrapper lzo snappy gnutls nettle ] From 53af34f226a28c6108186aff0d300b6b7b84bb56 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 16:38:05 +0100 Subject: [PATCH 0806/1749] deluge: use python2 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebbeebaf1166..9559849d9057 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1390,7 +1390,7 @@ in ddrescue = callPackage ../tools/system/ddrescue { }; - deluge = pythonPackages.deluge; + deluge = python2Packages.deluge; # Package should be moved out of python-packages.nix desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { }; From 76a11c1fbbd1995a7a3ead0570c13bf4dd4810ea Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 18:49:45 +0100 Subject: [PATCH 0807/1749] libvirt: use python2 --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index fd9fd168db73..891c861c9fe5 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch , pkgconfig, makeWrapper -, libxml2, gnutls, devicemapper, perl, python +, libxml2, gnutls, devicemapper, perl, python2 , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ - libxml2 gnutls perl python readline + libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap ] ++ stdenv.lib.optionals stdenv.isLinux [ From 4383e20bb111ed1d10fd1020d90a7e176d558f7d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 21:08:08 +0100 Subject: [PATCH 0808/1749] a2jmidid: use python2 --- pkgs/applications/audio/a2jmidid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 35954471877a..ddd34f1bfeb9 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, alsaLib, dbus, libjack2 -, pythonPackages}: +, python2Packages}: let - inherit (pythonPackages) python dbus-python; + inherit (python2Packages) python dbus-python; in stdenv.mkDerivation rec { name = "a2jmidid-${version}"; version = "8"; From 6a8c708d6de716f9d2e5febb247dd817dbff3100 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 09:45:41 +0100 Subject: [PATCH 0809/1749] cryptsetup: use python2 --- pkgs/os-specific/linux/cryptsetup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 8e92aaf63463..5e028ffc74ad 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, devicemapper, openssl, libuuid, pkgconfig, popt -, enablePython ? false, python ? null +, enablePython ? false, python2 ? null }: -assert enablePython -> python != null; +assert enablePython -> python2 != null; stdenv.mkDerivation rec { name = "cryptsetup-1.7.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enablePython "--enable-python"; buildInputs = [ devicemapper openssl libuuid pkgconfig popt ] - ++ stdenv.lib.optional enablePython python; + ++ stdenv.lib.optional enablePython python2; meta = { homepage = https://gitlab.com/cryptsetup/cryptsetup/; From ef981df4452889416d848a6d8afd14f19b16690d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 10:10:49 +0100 Subject: [PATCH 0810/1749] telepathy_glib: use python2 while this package supports Python 3, certain dependencies don't. An example is telepathy mission control. Python 3 sneaked in via telepathy_glib, breaking the build of that package. TODO: put python bindings in separate output! --- pkgs/development/libraries/telepathy/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 69f6f6d89712..b27b0c26f82d 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt +{ stdenv, fetchurl, dbus_glib, glib, python2, pkgconfig, libxslt , gobjectIntrospection, valaSupport ? true, vala_0_23, glibcLocales }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings"; LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [dbus_glib glib python gobjectIntrospection]; + propagatedBuildInputs = [dbus_glib glib python2 gobjectIntrospection]; buildInputs = [pkgconfig libxslt glibcLocales ] ++ stdenv.lib.optional valaSupport vala_0_23; From 2de932188080586ec02e2eac4fee1581c38d247b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 13:02:01 +0100 Subject: [PATCH 0811/1749] nodejs: add python to passthru so nodeEnv uses the exact same version. See also https://github.com/svanderburg/node2nix/issues/25 --- pkgs/development/node-packages/composition-v4.nix | 4 ++-- pkgs/development/node-packages/composition-v6.nix | 4 ++-- pkgs/development/node-packages/node-env.nix | 4 +++- pkgs/development/web/nodejs/nodejs.nix | 2 ++ pkgs/servers/web-apps/pump.io/composition.nix | 4 ++-- pkgs/tools/package-management/nixui/nixui.nix | 4 ++-- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix index 1c0f5f0626ed..ad8c76b4e6ed 100644 --- a/pkgs/development/node-packages/composition-v4.nix +++ b/pkgs/development/node-packages/composition-v4.nix @@ -6,11 +6,11 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit (pkgs) stdenv utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages-v4.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 289a8ab1201e..57bd88bd2a19 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -6,11 +6,11 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit (pkgs) stdenv utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages-v6.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 5819fd1c2e78..389ccae2fe52 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -1,8 +1,10 @@ # This file originates from node2nix -{stdenv, python, nodejs, utillinux, runCommand, writeTextFile}: +{stdenv, nodejs, utillinux, runCommand, writeTextFile}: let + inherit (nodejs) python; + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise tarWrapper = runCommand "tarWrapper" {} '' mkdir -p $out/bin diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index b71f39ca420f..eccdffab4c6e 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -67,4 +67,6 @@ in maintainers = with maintainers; [ goibhniu havvy gilligan cko ]; platforms = platforms.linux ++ platforms.darwin; }; + + passthru.python = python2; # to ensure nodeEnv uses the same version } diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix index 36815198d67b..644d9e6e9e55 100644 --- a/pkgs/servers/web-apps/pump.io/composition.nix +++ b/pkgs/servers/web-apps/pump.io/composition.nix @@ -6,11 +6,11 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit (pkgs) stdenv utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index b6d7606f6cce..fea6de2ea7c5 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -6,11 +6,11 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit (pkgs) stdenv utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} From 862f981317ebd66c5430736d51b2cb8ba155c897 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 13:13:40 +0100 Subject: [PATCH 0812/1749] spice_gtk: use python2 --- pkgs/development/libraries/spice-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 7fc39cfd52b2..325d665aaf65 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, spice_protocol, intltool, celt_0_5_1 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib -, cyrus_sasl, pythonPackages, autoreconfHook, usbredir, libsoup +, cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup , gtk3, epoxy }: with stdenv.lib; let - inherit (pythonPackages) python pygtk; + inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { name = "spice-gtk-0.32"; From eb926468e9743b40d6154511ee0f2e313f51afe5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 13:16:36 +0100 Subject: [PATCH 0813/1749] mailpile: use python2 --- .../networking/mailreaders/mailpile/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 031e835d3f73..05fea05fd14e 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, pythonPackages, gnupg1orig, makeWrapper, openssl }: +{ stdenv, fetchgit, python2Packages, gnupg1orig, makeWrapper, openssl }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "mailpile-${version}"; version = "0.4.1"; @@ -11,11 +11,11 @@ pythonPackages.buildPythonApplication rec { }; patchPhase = '' - substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${pythonPackages.python.libPrefix}/site-packages/' + dir" + substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${python2Packages.python.libPrefix}/site-packages/' + dir" ''; - propagatedBuildInputs = with pythonPackages; [ - makeWrapper pillow jinja2 spambayes pythonPackages.lxml + propagatedBuildInputs = with python2Packages; [ + makeWrapper pillow jinja2 spambayes python2Packages.lxml pgpdump gnupg1orig ]; @@ -24,6 +24,9 @@ pythonPackages.buildPythonApplication rec { --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}" ''; + # No tests were found + doCheck = false; + meta = with stdenv.lib; { description = "A modern, fast web-mail client with user-friendly encryption and privacy features"; homepage = https://www.mailpile.is/; From bde10a9b79d876745a418229459d1afb63c98242 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 13:22:02 +0100 Subject: [PATCH 0814/1749] pythonPackages.pyside: fix name --- pkgs/development/python-modules/pyside/apiextractor.nix | 2 +- pkgs/development/python-modules/pyside/default.nix | 2 +- pkgs/development/python-modules/pyside/generatorrunner.nix | 2 +- pkgs/development/python-modules/pyside/shiboken.nix | 2 +- pkgs/development/python-modules/pyside/tools.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index c7e0cc09f14b..a27a365bb2cd 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, libxml2, libxslt, python, sphinx, qt4 }: stdenv.mkDerivation { - name = "${python.libPrefix}-pyside-apiextractor-0.10.10"; + name = "pyside-apiextractor-0.10.10"; src = fetchurl { url = "https://github.com/PySide/Apiextractor/archive/0.10.10.tar.gz"; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 8f6213beaf1f..6473ebf22b13 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, cmake, python, mkPythonDerivation, pysideGeneratorrunner, pysideShiboken, qt4 }: mkPythonDerivation rec { - name = "${python.libPrefix}-pyside-${version}"; + name = "pyside-${version}"; version = "1.2.4"; src = fetchurl { diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index b576b29dae7b..28ea88ad1fa4 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pysideApiextractor, python, sphinx, qt4 }: stdenv.mkDerivation { - name = "${python.libPrefix}-pyside-generatorrunner-0.6.16"; + name = "pyside-generatorrunner-0.6.16"; src = fetchurl { url = "https://github.com/PySide/Generatorrunner/archive/0.6.16.tar.gz"; diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index 80b2325cbf43..8c91b63d0e11 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -2,7 +2,7 @@ # Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77 stdenv.mkDerivation rec { - name = "${python.libPrefix}-pyside-shiboken-${version}"; + name = "pyside-shiboken-${version}"; version = "1.2.4"; src = fetchurl { diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index facbccdce355..11f2bd97175c 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pyside, python, qt4, pysideShiboken }: stdenv.mkDerivation { - name = "${python.libPrefix}-pyside-tools-0.2.15"; + name = "pyside-tools-0.2.15"; src = fetchurl { url = "https://github.com/PySide/Tools/archive/0.2.15.tar.gz"; From d1b6976edae5cdfb0a671456b33be20c9d0b4d67 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 13:29:32 +0100 Subject: [PATCH 0815/1749] quodlibet: use python2 --- pkgs/applications/audio/quodlibet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 00856721f95d..dd3a0b4a1c6d 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, intltool +{ stdenv, fetchurl, python2Packages, intltool , gst_python, withGstPlugins ? false, gst_plugins_base ? null , gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }: @@ -9,7 +9,7 @@ assert withGstPlugins -> gst_plugins_base != null let version = "2.6.3"; - inherit (pythonPackages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python; + inherit (python2Packages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python; in buildPythonApplication { # call the package quodlibet and just quodlibet name = "quodlibet${stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"}-${version}"; From 2887a633f7dfa18af57ea05f96b0eee4deb5c0f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 13:30:42 +0100 Subject: [PATCH 0816/1749] mypaint: use python2 --- pkgs/applications/graphics/mypaint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 27d6c207e68a..db5e6e1a7e37 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gettext, glib, gtk2, hicolor_icon_theme, json_c -, lcms2, libpng , makeWrapper, pkgconfig, pythonPackages +, lcms2, libpng , makeWrapper, pkgconfig, python2Packages , scons, swig }: let - inherit (pythonPackages) python pygtk numpy; + inherit (python2Packages) python pygtk numpy; in stdenv.mkDerivation rec { name = "mypaint-${version}"; version = "1.1.0"; From 8fb430ca86926d80caef0339a034c817c1e10854 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 14:16:28 +0100 Subject: [PATCH 0817/1749] thunderbird: use python2 and remove pysqlite since its part of the standard library. --- .../networking/mailreaders/thunderbird/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 8e2e5a1be448..9e2baf94527f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python, zip, libIDL +{ stdenv, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python2, zip, libIDL , libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite +, yasm, mesa, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx , cairo, gstreamer, gst_plugins_base, icu , debugBuild ? false @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx [ pkgconfig which libpng gtk2 perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xorg.libXi + python2 dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file alsaLib nspr nss libnotify xorg.pixman yasm mesa - xorg.libXScrnSaver xorg.scrnsaverproto pysqlite + xorg.libXScrnSaver xorg.scrnsaverproto xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification cairo icu ] ++ [ m4 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9559849d9057..805d5d5d5a01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14825,7 +14825,6 @@ in thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome2) libIDL; - inherit (pythonPackages) pysqlite; libpng = libpng_apng; }; From 0031e01e07a9c2aee4cb3ae1f6693417200ffe61 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 14:43:26 +0100 Subject: [PATCH 0818/1749] webkitgtk214x: use python2 --- pkgs/development/libraries/webkitgtk/2.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix index ca74f384ec98..3c92527ea705 100644 --- a/pkgs/development/libraries/webkitgtk/2.14.nix +++ b/pkgs/development/libraries/webkitgtk/2.14.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake +{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls , gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"; nativeBuildInputs = [ - cmake perl python ruby bison gperf sqlite + cmake perl python2 ruby bison gperf sqlite pkgconfig gettext gobjectIntrospection ]; From b21f1d70c6c3fc6fb8952e1ac561fef67ea09971 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 15:06:40 +0100 Subject: [PATCH 0819/1749] qt56.qtwebengine: use python2 --- pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix index e5d7d0d4372c..29a5349ecea8 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix @@ -9,7 +9,7 @@ , bison, flex, git, which, gperf , coreutils -, pkgconfig, python +, pkgconfig, python2 }: @@ -17,7 +17,7 @@ qtSubmodule { name = "qtwebengine"; qtInputs = [ qtquickcontrols qtlocation qtwebchannel ]; buildInputs = [ bison flex git which gperf ]; - nativeBuildInputs = [ pkgconfig python coreutils ]; + nativeBuildInputs = [ pkgconfig python2 coreutils ]; doCheck = true; enableParallelBuilding = true; From 2f25d962e8af6bbbcebc591c023e0bbd7ed8fed7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 15:36:29 +0100 Subject: [PATCH 0820/1749] qt57.qtwebengine: use python2 --- pkgs/development/libraries/qt-5/5.7/qtwebengine.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine.nix index 2a437e62ecae..ab40dcd4c6e0 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtwebengine.nix @@ -9,7 +9,7 @@ , bison, flex, git, which, gperf , coreutils -, pkgconfig, python +, pkgconfig, python2 }: @@ -17,7 +17,7 @@ qtSubmodule { name = "qtwebengine"; qtInputs = [ qtquickcontrols qtlocation qtwebchannel ]; buildInputs = [ bison flex git which gperf ]; - nativeBuildInputs = [ pkgconfig python coreutils ]; + nativeBuildInputs = [ pkgconfig python2 coreutils ]; doCheck = true; enableParallelBuilding = true; From 2bac076931c304741534acf4665f298a2943963a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 16:38:35 +0100 Subject: [PATCH 0821/1749] telepathy_glib: shouldn't propagate python --- pkgs/development/libraries/telepathy/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index b27b0c26f82d..bea07396b0cc 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings"; LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [dbus_glib glib python2 gobjectIntrospection]; + propagatedBuildInputs = [dbus_glib glib gobjectIntrospection]; - buildInputs = [pkgconfig libxslt glibcLocales ] ++ stdenv.lib.optional valaSupport vala_0_23; + buildInputs = [pkgconfig libxslt glibcLocales python2 ] ++ stdenv.lib.optional valaSupport vala_0_23; preConfigure = '' substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires From cd7e72a597fed9e4516d3f1e6426c0a8390ac107 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 16:39:22 +0100 Subject: [PATCH 0822/1749] zeitgeist: python bindings at pythonPackages.zeitgeist --- pkgs/development/libraries/zeitgeist/default.nix | 15 ++++++++++++--- pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index bb6af73356de..252bcd02faff 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala_0_23 -, intltool, libtool, python, dbus_libs, telepathy_glib -, gtk3, json_glib, librdf_raptor2, python2Packages, dbus_glib }: +, intltool, libtool, dbus_libs, telepathy_glib +, gtk3, json_glib, librdf_raptor2, dbus_glib +, pythonSupport ? true, python2Packages +}: stdenv.mkDerivation rec { version = "0.9.15"; @@ -18,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ]; buildInputs = [ pkgconfig glib sqlite gnome3.gnome_common intltool - libtool python dbus_libs telepathy_glib vala_0_23 dbus_glib + libtool dbus_libs telepathy_glib vala_0_23 dbus_glib gtk3 json_glib librdf_raptor2 python2Packages.rdflib ]; prePatch = "patchShebangs ."; @@ -29,6 +31,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postFixup = '' + '' + stdenv.lib.optionalString pythonSupport '' + moveToOutput lib/${python2Packages.python.libPrefix} "$py" + ''; + + outputs = [ "out" ] ++ stdenv.lib.optional pythonSupport "py"; + meta = with stdenv.lib; { description = "A service which logs the users's activities and events"; homepage = https://launchpad.net/zeitgeist; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86077665670d..8af6fa2aaa59 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31273,4 +31273,8 @@ in { license = licenses.mit; }; }; + + zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else + (pkgs.zeitgeist.override{python2Packages=self;}).py; + } From aa9353d158412deae0b90a28917f13e430309e76 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 16:48:03 +0100 Subject: [PATCH 0823/1749] gnome3_20.anjuta: use python2 --- pkgs/desktops/gnome-3/3.20/default.nix | 2 +- pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix index 4facdbfd3e3c..e935552b9f5f 100644 --- a/pkgs/desktops/gnome-3/3.20/default.nix +++ b/pkgs/desktops/gnome-3/3.20/default.nix @@ -307,7 +307,7 @@ let #### Dev http://ftp.gnome.org/pub/GNOME/devtools/ - anjuta = callPackage ./devtools/anjuta { python=pkgs.python2; }; + anjuta = callPackage ./devtools/anjuta { }; devhelp = callPackage ./devtools/devhelp { }; diff --git a/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix index 3cb62fef6c2f..6a50834f105e 100644 --- a/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, - itstool, python, makeWrapper }: + itstool, python2, makeWrapper }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper + gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper gnome3.gsettings_desktop_schemas ]; From 78cf06e316afc23f187c59eb42b22b6b4fca1ea5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 16:48:17 +0100 Subject: [PATCH 0824/1749] gnome3_22.anjuta: use python2 --- pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix index 3cb62fef6c2f..6a50834f105e 100644 --- a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, - itstool, python, makeWrapper }: + itstool, python2, makeWrapper }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper + gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper gnome3.gsettings_desktop_schemas ]; From fda03ec4bd0849cc5364a62c05ff55826b17f1a8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 18:29:43 +0100 Subject: [PATCH 0825/1749] telepathy.glib: add python to passthru and let the telepathy plugins use it. --- .../instant-messengers/telepathy/gabble/default.nix | 4 ++-- .../instant-messengers/telepathy/haze/default.nix | 2 +- .../instant-messengers/telepathy/idle/default.nix | 2 +- .../instant-messengers/telepathy/logger/default.nix | 2 +- .../telepathy/mission-control/default.nix | 2 +- .../instant-messengers/telepathy/rakia/default.nix | 6 +++--- .../instant-messengers/telepathy/salut/default.nix | 2 +- pkgs/development/libraries/telepathy/glib/default.nix | 2 ++ 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 971a834f4096..32266d7b42d5 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon -, sqlite, libsoup, libnice, gnutls }: +, sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { name = "telepathy-gabble-0.18.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig libxslt ]; - buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ] + buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls telepathy_glib.python ] ++ stdenv.lib.optional doCheck dbus_daemon; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index b1880be6562b..4e4a2a9b6a96 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; - buildInputs = [ glib telepathy_glib dbus_glib pidgin ]; + buildInputs = [ glib telepathy_glib dbus_glib pidgin telepathy_glib.python ]; nativeBuildInputs = [ pkgconfig libxslt ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 16a31f6f3ba1..c29c6def2f60 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; }; - buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt ]; + buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python ]; meta = { description = "IRC connection manager for the Telepathy framework"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index aaff39ccb44d..2ade2fd3edd0 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool - gobjectIntrospection dbus_libs ]; + gobjectIntrospection dbus_libs telepathy_glib.python ]; nativeBuildInputs = [ libxslt ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index aab7f84f467a..a8fc9477707d 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0zcbx69k0d3p2pjh3g7sa3q2zkd5xchxkqsmlfn3fwxaz0pmsmvi"; }; - buildInputs = [ telepathy_glib makeWrapper /*upower*/ ]; # ToDo: optional stuff missing + buildInputs = [ telepathy_glib telepathy_glib.python makeWrapper /*upower*/ ]; # ToDo: optional stuff missing # 5.16.3 won't build with upower-0.99. Arch and Debian choose to disable it nativeBuildInputs = [ pkgconfig libxslt ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix index 538a8d7f6d2b..7d06d57ca9ac 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfigUpstream, libxslt, telepathy_glib, libxml2, dbus_glib -, python, sofia_sip }: +, sofia_sip }: stdenv.mkDerivation rec { pname = "telepathy-rakia"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv"; }; - nativeBuildInputs = [pkgconfigUpstream libxslt python]; - buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip]; + nativeBuildInputs = [pkgconfigUpstream libxslt ]; + buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip telepathy_glib.python ]; meta = { homepage = http://telepathy.freedesktop.org; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 918be4e9b83e..cbae6af97b85 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046 buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl - sqlite pcre ]; + sqlite pcre telepathy_glib.python ]; nativeBuildInputs = [ libxslt pkgconfigUpstream ]; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index bea07396b0cc..bc9e861df9c6 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires ''; + passthru.python = python2; + meta = { homepage = http://telepathy.freedesktop.org; platforms = stdenv.lib.platforms.unix; From 9b88697bbd2b5ed950023cf5d429ba4e799259c1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 19 Nov 2016 10:12:25 +0100 Subject: [PATCH 0826/1749] gn: use python2 --- pkgs/development/tools/build-managers/gn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index a579b45cf626..6fdd250913c9 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, python, ninja, libevent, xdg-user-dirs }: +{ stdenv, fetchgit, fetchurl, python2, ninja, libevent, xdg-user-dirs }: let date = "20161008"; @@ -61,11 +61,11 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = "-levent"; - nativeBuildInputs = [ python ninja ]; + nativeBuildInputs = [ python2 ninja ]; buildInputs = [ libevent ]; buildPhase = '' - python tools/gn/bootstrap/bootstrap.py -v -s --no-clean + python2 tools/gn/bootstrap/bootstrap.py -v -s --no-clean ''; installPhase = '' From b91c43d8d319f540c7bf971752bd6c49d2838ee1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 19 Nov 2016 10:16:16 +0100 Subject: [PATCH 0827/1749] afl-qemu: use python2 --- pkgs/tools/security/afl/qemu.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index 3dd47f50cf76..0e91e2871237 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl +{ stdenv, fetchurl, python2, zlib, pkgconfig, glib, ncurses, perl , attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy , libaio, libcap_ng, gnutls, pixman, autoconf , writeText @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ python zlib pkgconfig glib pixman ncurses perl attr libcap + [ python2 zlib pkgconfig glib pixman ncurses perl attr libcap vde2 texinfo libuuid flex bison lzo snappy autoconf libcap_ng gnutls ] From b28689f453d506827b9449e070040320ea179be6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 19 Nov 2016 10:29:45 +0100 Subject: [PATCH 0828/1749] chromium: use python2 --- pkgs/applications/networking/browsers/chromium/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 07ad1bef25f0..ea66703f166d 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -7,7 +7,7 @@ , xdg_utils, yasm, minizip, libwebp , libusb1, pciutils, nss, re2, zlib, libvpx -, python, pythonPackages, perl, pkgconfig +, python2Packages, perl, pkgconfig , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf @@ -86,7 +86,7 @@ let src = upstream-info.main; - nativeBuildInputs = [ gn which python perl pkgconfig ]; + nativeBuildInputs = [ gn which python2Packages.python perl pkgconfig ]; buildInputs = defaultDependencies ++ [ nspr nss systemd @@ -95,7 +95,7 @@ let glib gtk2 dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage - pythonPackages.ply pythonPackages.jinja2 + python2Packages.ply python2Packages.jinja2 ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux From 163e1ee7bd4e0a5ea165285f28035e5e11b8b425 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 24 Nov 2016 19:48:32 -0200 Subject: [PATCH 0829/1749] 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 0830/1749] 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 0831/1749] 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 0832/1749] 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 0833/1749] 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 0834/1749] 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 0835/1749] 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 d395439a10d5e96f3ec395081c0db65291f4614d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 22 Nov 2016 23:47:43 -0200 Subject: [PATCH 0836/1749] pari/gp: 2.7.6 -> 2.9.0 Adding gp2c compiler, too. --- .../science/math/pari/default.nix | 44 +++++++++++++++---- pkgs/applications/science/math/pari/gp2c.nix | 28 ++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 65 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/science/math/pari/gp2c.nix diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 0cda65b32c30..27153ea9b083 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,30 +1,56 @@ -{ stdenv, fetchurl, gmp, readline }: +{ stdenv, fetchurl +, gmp, readline, libX11, libpthreadstubs, tex, perl }: stdenv.mkDerivation rec { - version = "2.7.6"; + name = "pari-${version}"; + version = "2.9.0"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "04dqi697czd8mmw8aiwzrkgbvkjassqagg6lfy3lkf1k5qi9g9rr"; + sha256 = "0rljznrvjgy71n4hlpgx1l1yy1qx52mly68k3c05ds21mlvzg92a"; }; - buildInputs = [gmp readline]; + buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ]; configureScript = "./Configure"; configureFlags = + "--mt=pthread" + "--with-gmp=${gmp.dev} " + "--with-readline=${readline.dev}"; + makeFlags = "all"; + meta = with stdenv.lib; { description = "Computer algebra system for high-performance number theory computations"; - homepage = "http://pari.math.u-bordeaux.fr/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ertes raskin ]; - platforms = platforms.linux; + longDescription = '' + PARI/GP is a widely used computer algebra system designed for fast + computations in number theory (factorizations, algebraic number theory, + elliptic curves...), but also contains a large number of other useful + functions to compute with mathematical entities such as matrices, + polynomials, power series, algebraic numbers etc., and a lot of + transcendental functions. PARI is also available as a C library to allow + for faster computations. - inherit version; + Originally developed by Henri Cohen and his co-workers (Université + Bordeaux I, France), PARI is now under the GPL and maintained by Karim + Belabas with the help of many volunteer contributors. + + - PARI is a C library, allowing fast computations. + - gp is an easy-to-use interactive shell giving access to the + PARI functions. + - GP is the name of gp's scripting language. + - gp2c, the GP-to-C compiler, combines the best of both worlds + by compiling GP scripts to the C language and transparently loading + the resulting functions into gp. (gp2c-compiled scripts will typically + run 3 or 4 times faster.) gp2c currently only understands a subset + of the GP language. + ''; + homepage = "http://pari.math.u-bordeaux.fr/"; downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ertes raskin AndersonTorres ]; + platforms = platforms.linux; updateWalker = true; }; } diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix new file mode 100644 index 000000000000..007514e65528 --- /dev/null +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl +, pari, perl }: + +stdenv.mkDerivation rec { + + name = "gp2c-${version}"; + version = "0.0.10"; + + src = fetchurl { + url = "http://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz"; + sha256 = "1xhpz5p81iw261ay1kip283ggr0ir8ydz8qx3v24z8jfms1r3y70"; + }; + + buildInputs = [ pari perl ]; + + configureFlags = [ + "--with-paricfg=${pari}/lib/pari/pari.cfg" + "--with-perl=${perl}/bin/perl" ]; + + meta = with stdenv.lib; { + description = "A compiler to translate GP scripts to PARI programs"; + homepage = "http://pari.math.u-bordeaux.fr/"; + downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} +# TODO: add it as "source file" for default package diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8600419a707..b2460474d6f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16833,7 +16833,8 @@ in wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; }; - pari = callPackage ../applications/science/math/pari {}; + pari = callPackage ../applications/science/math/pari { tex = texlive.combined.scheme-basic; }; + gp2c = callPackage ../applications/science/math/pari/gp2c.nix { }; pari-unstable = callPackage ../applications/science/math/pari/unstable.nix {}; ratpoints = callPackage ../applications/science/math/ratpoints {}; From 0f9f74f1d5c33172b5d46659f3bba0a711ff665d Mon Sep 17 00:00:00 2001 From: Sebastian Hagen Date: Thu, 24 Nov 2016 23:48:58 +0000 Subject: [PATCH 0837/1749] 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 0838/1749] 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 25cfafdf5bf7fe2fdae3771d3d817df114987384 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 25 Nov 2016 00:00:49 -0600 Subject: [PATCH 0839/1749] emacs-macport: fix "Carbon.h" present but cannot be compiled Previously, emacs-macport was giving the error: - AppKit/AppKit.h: present but cannot be compiled - Carbon/Carbon.h: present but cannot be compiled This add "MAC_OS_X_VERSION_MIN_REQUIRED=1090" to CFLAGS to allow them to compile with the new 10.10 headers. Fixes #20682. --- pkgs/applications/editors/emacs/macport-24.5.nix | 2 +- pkgs/applications/editors/emacs/macport-25.1.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/macport-24.5.nix b/pkgs/applications/editors/emacs/macport-24.5.nix index 885538dc8837..8a33155d62bb 100644 --- a/pkgs/applications/editors/emacs/macport-24.5.nix +++ b/pkgs/applications/editors/emacs/macport-24.5.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "--enable-mac-app=$$out/Applications" ]; - CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090"; + CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"; LDFLAGS = "-O3 -L${ncurses.out}/lib"; postInstall = '' diff --git a/pkgs/applications/editors/emacs/macport-25.1.nix b/pkgs/applications/editors/emacs/macport-25.1.nix index 81e77c725d9c..0f947a1f46a4 100644 --- a/pkgs/applications/editors/emacs/macport-25.1.nix +++ b/pkgs/applications/editors/emacs/macport-25.1.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "--enable-mac-app=$$out/Applications" ]; - CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090"; + CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"; LDFLAGS = "-O3 -L${ncurses.out}/lib"; postInstall = '' From 558551399df9760d3183c919d0295d177a533a78 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 25 Nov 2016 00:29:55 -0600 Subject: [PATCH 0840/1749] emacs-macport: 6.0 -> 6.1 --- pkgs/applications/editors/emacs/macport-25.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/macport-25.1.nix b/pkgs/applications/editors/emacs/macport-25.1.nix index 0f947a1f46a4..84d1950b8659 100644 --- a/pkgs/applications/editors/emacs/macport-25.1.nix +++ b/pkgs/applications/editors/emacs/macport-25.1.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { emacsName = "emacs-25.1"; - name = "${emacsName}-mac-6.0"; + name = "${emacsName}-mac-6.1"; builder = ./builder.sh; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "2f7a3fd826e6dea541ada04f4a1ff2903a87a1f736b89c5b90bf7bb820568e34"; + sha256 = "1zwxh7zsvwcg221mpjh0dhpdas3j9mc5q92pprf8yljl7clqvg62"; }; enableParallelBuilding = true; 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 0841/1749] 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 0842/1749] 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 0843/1749] 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 0844/1749] 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 0845/1749] 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 0846/1749] 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 0847/1749] 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 0848/1749] [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 0849/1749] 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 0850/1749] 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 0851/1749] 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 0852/1749] 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 0853/1749] 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 b191034d8ad7ba5f490d1a8751d298b7b5a528b0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 25 Nov 2016 14:45:03 +0100 Subject: [PATCH 0854/1749] remarkjs: fix evaluation --- pkgs/development/web/remarkjs/nodepkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index e7a3f74d2b84..4d6c2d6662c4 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../node-packages/node-env.nix { - inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit (pkgs) stdenv utillinux runCommand writeTextFile; inherit nodejs; }; in From 8a424e3fbd30b54d73b91fa8841ac82d2af75a9a Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 19 Nov 2016 15:12:42 +0100 Subject: [PATCH 0855/1749] 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 0856/1749] 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 0857/1749] 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 0858/1749] 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 0859/1749] 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 0860/1749] 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 0861/1749] 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 0862/1749] 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 0863/1749] 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 0864/1749] 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 0865/1749] 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 0866/1749] 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] From 7a88f314cb1ebea9cb05ba8bdb3866c8d4d6a6b8 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:35:23 +0100 Subject: [PATCH 0867/1749] guile: doCheck = false on i686-linux It fails on Hydra now; I can't reproduce it locally and don't feel like debugging it. It might be due to the warning below. That appears on x86_64-linux as well, but we've got no problems in there so far... warning: call to primitive-fork while multiple threads are running; further behavior unspecified. See "Processes" in the manual, for more information. --- pkgs/development/interpreters/guile/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 97f8f61a98e6..05ef07961210 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -55,7 +55,8 @@ ''; # make check doesn't work on darwin - doCheck = !stdenv.isDarwin; + # On i686-linux we got some error that doesn't always appear. + doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux"); setupHook = ./setup-hook-2.0.sh; From 97853c07d73be7f2717bebe3d2ff038b72aeb1e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 26 Nov 2016 10:25:20 +0100 Subject: [PATCH 0868/1749] stdenv moveToOutput: move even broken symlinks I believe this reduces surprises and is actually simpler semantically. This is important e.g. for relative symlinks when moving both source and target - now the order of moving won't matter. Fixes #20723 (a particular instance of the surprise). --- pkgs/build-support/setup-hooks/multiple-outputs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index ae491e8a7ef1..eafc770a8e17 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -98,7 +98,8 @@ moveToOutput() { if [ "${!output}" = "$dstOut" ]; then continue; fi local srcPath for srcPath in "${!output}"/$patt; do - if [ ! -e "$srcPath" ]; then continue; fi + # apply to existing files/dirs, *including* broken symlinks + if [ ! -e "$srcPath" ] && [ ! -L "$srcPath" ]; then continue; fi if [ "$dstOut" = REMOVE ]; then echo "Removing $srcPath" From c04f1139607ac50f705a13f71aa1b68638b7a480 Mon Sep 17 00:00:00 2001 From: montag451 Date: Sat, 26 Nov 2016 12:50:15 +0100 Subject: [PATCH 0869/1749] epiphany: enable the playing of HTML5 videos --- pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix | 6 ++++-- pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix index cc31c7e7b975..e472014e38f6 100644 --- a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix @@ -2,7 +2,7 @@ , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool , webkitgtk214x, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, gdk_pixbuf, librsvg, gnome_common }: +, gdk_pixbuf, librsvg, gnome_common, gst_all_1 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf - gnome3.glib_networking ]; + gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav]; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix index 9d36648d5cdc..015f8213b443 100644 --- a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix @@ -2,7 +2,7 @@ , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool , webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, gdk_pixbuf, librsvg, gnome_common }: +, gdk_pixbuf, librsvg, gnome_common, gst_all_1 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf - gnome3.glib_networking ]; + gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav]; NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; From 757638acae621c07d457a3e6a77176675a207dd0 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 26 Nov 2016 12:06:56 +0000 Subject: [PATCH 0870/1749] ghcWithPackages: fix env NIX_GHC_LIBDIR value Ideally the duplication between the environment shellHook and the ghc wrapper would be removed. Fixes #20730 --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 168558424641..6c75c1f35507 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -304,7 +304,7 @@ stdenv.mkDerivation ({ export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}" export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg" export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html" - export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}" + export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}" ${shellHook} ''; }; From 2bf9413280e5098768e10b3e5340556710358234 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 26 Nov 2016 14:22:41 +0100 Subject: [PATCH 0871/1749] gitlab-runner: 1.7.1 -> 1.8.0 (#20719) --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 0a0f732ccda7..2a546c8c9073 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "1.7.1"; + version = "1.8.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "1gcd8rhyxg5sa9g27gih28hi9y6cpjgw1j21jmjm06wzyjdlrsi8"; + sha256 = "0fa8hfdxg903n1dqrqbm4069sr8rq6zx7zzybfyj7qz4mmayp24m"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0i0kd5xm2ii7rzis9h4h99vpi1anjvhcjw732l0rxg4anyxzywjj"; + sha256 = "1rvvz34rsjxrgg59rda6v4k8zw16slwprnh4h5b16yhyp7lcx93q"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "14lx00w502scpb5crxscsm8kvdld1wrxn60a9c45fcccjwl2kkcl"; + sha256 = "0svmy2dc4h6jll80y8j2ml7k0a9krknsp9d0zpsfkw3wcz1wfipl"; }; buildInputs = [ go-bindata ]; From 94fe387fcb3b77839490010ca05dd5d274a3a567 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Nov 2016 01:18:27 +0100 Subject: [PATCH 0872/1749] nghttp2: 1.14.1 -> 1.16.1 --- pkgs/development/libraries/nghttp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index a761106d9b16..080a3e35138e 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.14.1"; + version = "1.16.1"; # Don't use fetchFromGitHub since this needs a bootstrap curl src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "0d7sk3pfkajhkmcqa7zx4rjg1pkwqraxxs7bxbwbm67r8wwqw87j"; + sha256 = "069pw84f8gg21npapn7y1sizwn6w35692zaq5g45gy8hdbmcl8yc"; }; # Configure script searches for a symbol which does not exist in jemalloc on Darwin From 9007303001dc885e8424540ee28f89abac5c5bab Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Nov 2016 16:27:56 +0100 Subject: [PATCH 0873/1749] curl: add upstream patch to fix HTTP2 performance issues See #20639. Patch has to be in nixpkgs because fetchurl depends on curl. --- pkgs/tools/networking/curl/default.nix | 2 + .../networking/curl/disable-ca-install.patch | 14 --- .../curl/fix-http2-window-size.patch | 88 +++++++++++++++++++ 3 files changed, 90 insertions(+), 14 deletions(-) delete mode 100644 pkgs/tools/networking/curl/disable-ca-install.patch create mode 100644 pkgs/tools/networking/curl/fix-http2-window-size.patch diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 56c0d26a999a..5dd523d6fa6b 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { optional sslSupport openssl ++ optional scpSupport libssh2; + patches = stdenv.lib.optional http2Support ./fix-http2-window-size.patch; + # for the second line see http://curl.haxx.se/mail/tracker-2014-03/0087.html preConfigure = '' sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure diff --git a/pkgs/tools/networking/curl/disable-ca-install.patch b/pkgs/tools/networking/curl/disable-ca-install.patch deleted file mode 100644 index aedf8ef5c3e2..000000000000 --- a/pkgs/tools/networking/curl/disable-ca-install.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/lib/Makefile.in -+++ b/lib/Makefile.in -@@ -106,10 +106,7 @@ else - endif - - install-data-hook: -- @if test -n "@CURL_CA_BUNDLE@"; then \ -- $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \ -- @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(DESTDIR)@CURL_CA_BUNDLE@; \ -- fi -+ echo "install-data-hook disabled" - - # this hook is mainly for non-unix systems to build even if configure - # isn't run diff --git a/pkgs/tools/networking/curl/fix-http2-window-size.patch b/pkgs/tools/networking/curl/fix-http2-window-size.patch new file mode 100644 index 000000000000..6fac3e1b42ac --- /dev/null +++ b/pkgs/tools/networking/curl/fix-http2-window-size.patch @@ -0,0 +1,88 @@ +From a4d888857ede39a8e2aa5f961048c6362d3a5377 Mon Sep 17 00:00:00 2001 +From: Jay Satiro +Date: Wed, 16 Nov 2016 02:55:30 -0500 +Subject: [PATCH] http2: Use huge HTTP/2 windows + +- Improve performance by using a huge HTTP/2 window size. + +Bug: https://github.com/curl/curl/issues/1102 +Reported-by: afrind@users.noreply.github.com +Assisted-by: Tatsuhiro Tsujikawa +--- + docs/TODO | 8 -------- + lib/http2.c | 15 +++++++++++++-- + 2 files changed, 13 insertions(+), 10 deletions(-) + +diff --git a/docs/TODO b/docs/TODO +index c3bc4eb..99c610f 100644 +--- a/docs/TODO ++++ b/docs/TODO +@@ -63,7 +63,6 @@ + 5.1 Better persistency for HTTP 1.0 + 5.2 support FF3 sqlite cookie files + 5.3 Rearrange request header order +- 5.4 Use huge HTTP/2 windows + 5.5 auth= in URLs + 5.6 Refuse "downgrade" redirects + 5.7 Brotli compression +@@ -528,13 +527,6 @@ This is not detailed in any FTP specification. + headers use a default value so only headers that need to be moved have to be + specified. + +-5.4 Use huge HTTP/2 windows +- +- We're currently using nghttp2's default window size which is terribly small +- (64K). This becomes a bottle neck over high bandwidth networks. We should +- instead make the window size to be very big (512MB?) as we really don't do +- much flow control anyway. +- + 5.5 auth= in URLs + + Add the ability to specify the preferred authentication mechanism to use by +diff --git a/lib/http2.c b/lib/http2.c +index 6720984..202ab1b 100644 +--- a/lib/http2.c ++++ b/lib/http2.c +@@ -59,6 +59,8 @@ + #define nghttp2_session_callbacks_set_error_callback(x,y) + #endif + ++#define HTTP2_HUGE_WINDOW_SIZE (1 << 30) ++ + /* + * Curl_http2_init_state() is called when the easy handle is created and + * allows for HTTP/2 specific init of state. +@@ -965,7 +967,7 @@ static ssize_t data_source_read_callback(nghttp2_session *session, + */ + static nghttp2_settings_entry settings[] = { + { NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100 }, +- { NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, NGHTTP2_INITIAL_WINDOW_SIZE }, ++ { NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, HTTP2_HUGE_WINDOW_SIZE }, + }; + + #define H2_BUFSIZE 32768 +@@ -2031,7 +2033,8 @@ CURLcode Curl_http2_switched(struct connectdata *conn, + else { + /* stream ID is unknown at this point */ + stream->stream_id = -1; +- rv = nghttp2_submit_settings(httpc->h2, NGHTTP2_FLAG_NONE, NULL, 0); ++ rv = nghttp2_submit_settings(httpc->h2, NGHTTP2_FLAG_NONE, settings, ++ sizeof(settings) / sizeof(settings[0])); + if(rv != 0) { + failf(data, "nghttp2_submit_settings() failed: %s(%d)", + nghttp2_strerror(rv), rv); +@@ -2039,6 +2042,14 @@ CURLcode Curl_http2_switched(struct connectdata *conn, + } + } + ++ rv = nghttp2_session_set_local_window_size(httpc->h2, NGHTTP2_FLAG_NONE, 0, ++ HTTP2_HUGE_WINDOW_SIZE); ++ if(rv != 0) { ++ failf(data, "nghttp2_session_set_local_window_size() failed: %s(%d)", ++ nghttp2_strerror(rv), rv); ++ return CURLE_HTTP2; ++ } ++ + /* we are going to copy mem to httpc->inbuf. This is required since + mem is part of buffer pointed by stream->mem, and callbacks + called by nghttp2_session_mem_recv() will write stream specific From 8ee4a1fd65e78ea82fde096ea8fd510224cecf8b Mon Sep 17 00:00:00 2001 From: Matthias Herrmann Date: Sat, 26 Nov 2016 16:20:02 +0100 Subject: [PATCH 0874/1749] pyload: add send2trash as dep With this pyload is able to move compressed files into trash after unpacking them --- pkgs/applications/networking/pyload/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix index 9be45e126a12..f8cd1ab1d00b 100644 --- a/pkgs/applications/networking/pyload/default.nix +++ b/pkgs/applications/networking/pyload/default.nix @@ -6,8 +6,8 @@ pythonPackages.buildPythonApplication rec { src = fetchFromGitHub { owner = "pyload"; repo = "pyload"; - rev = "03f3ad9e39da2b9a378987693c4a69720e4084c7"; - sha256 = "0fgsz6yzxrlq3qvsyxsyzgmy4za35v1xh3i4drhispk9zb5jm1xx"; + rev = "721ea9f089217b9cb0f2799c051116421faac081"; + sha256 = "1ad4r9slx1wgvd2fs4plfbpzi4i2l2bk0lybzsb2ncgh59m87h54"; }; patches = @@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ pycurl jinja2 beaker thrift simplejson pycrypto feedparser tkinter - beautifulsoup + beautifulsoup send2trash ]; #remove this once the PR patches above are merged. Needed because githubs diff endpoint From 57d3827d49a6b6c2531e16af2c7f5a25983e6da2 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 26 Nov 2016 16:39:03 +0100 Subject: [PATCH 0875/1749] perl-IO-Socket-SSL: 2.037 -> 2.039 --- 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 6688483914b2..efc4faa4786a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6664,10 +6664,10 @@ let self = _self // overrides; _self = with self; { }; IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-2.037"; + name = "IO-Socket-SSL-2.039"; src = fetchurl { url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz"; - sha256 = "6747226937d652a30a2c9c21d171412737f41f27ea7d82cd74845b3052909469"; + sha256 = "c6379a76860c724a22b79ebe9e91d26bd8a04e3ce035bacfd15de3d9beaf83ac"; }; propagatedBuildInputs = [ NetSSLeay URI ]; # Fix path to default certificate store. From 7f4e514a31602b32583eb5d37a095fe670ecc93d Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 26 Nov 2016 16:27:56 +0000 Subject: [PATCH 0876/1749] su-exec: init at 0.2 --- pkgs/tools/security/su-exec/default.nix | 26 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/security/su-exec/default.nix diff --git a/pkgs/tools/security/su-exec/default.nix b/pkgs/tools/security/su-exec/default.nix new file mode 100644 index 000000000000..56e40d514bb1 --- /dev/null +++ b/pkgs/tools/security/su-exec/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "su-exec-${version}"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "ncopa"; + repo = "su-exec"; + rev = "v${version}"; + sha256 = "12vqlnpv48cjfh25sn98k1myc7h2wiv5qw2y2awgp6sipzv88abv"; + }; + + installPhase = '' + mkdir -p $out/bin + cp -a su-exec $out/bin/su-exec + ''; + + meta = with stdenv.lib; { + description = "switch user and group id and exec"; + homepage = "https://github.com/ncopa/su-exec"; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51a7dea2e684..112462ecc09f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3756,6 +3756,8 @@ in sstp = callPackage ../tools/networking/sstp {}; + su-exec = callPackage ../tools/security/su-exec {}; + subsurface = qt55.callPackage ../applications/misc/subsurface { libgit2 = pkgs.libgit2_0_23; From 956e3dec29b1fe9eb23270c80f586fdc059055ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 26 Nov 2016 14:49:22 -0200 Subject: [PATCH 0877/1749] efl: 1.18.2 -> 1.18.3 (#20728) --- pkgs/desktops/enlightenment/efl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 8df9b48a8bfb..c4b8ba8cd058 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.18.2"; + version = "1.18.3"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "1vbvsrrpkvvrmvjavwnp5q77kw5i7vmbaj2vq5mnmrbzamvaybr9"; + sha256 = "1h347sfxajyb5s931m9qga14wwiqci7aicww2imxjhzm8w4fqj07"; }; nativeBuildInputs = [ pkgconfig ]; From 3ae052b2a2a454861130d315bebb4f52b2703559 Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Sat, 26 Nov 2016 08:50:01 -0800 Subject: [PATCH 0878/1749] librecad: 2.0.10 -> 2.1.3 (#20720) --- pkgs/applications/misc/librecad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 3161af33ead1..bfb658098b73 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, qt4, qmake4Hook, muparser, which, boost, pkgconfig }: stdenv.mkDerivation rec { - version = "2.0.10"; + version = "2.1.3"; name = "librecad-${version}"; src = fetchurl { url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}"; name = name + ".tar.gz"; - sha256 = "13jr0zkirnnpkbx8ysh7j6sh2psxi1dg7ncfjqzyxrcr2b270rcj"; + sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx"; }; patchPhase = '' From 6b42bf43d6d4982479ed4678f08b830ad0f967b6 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sat, 26 Nov 2016 17:57:49 +0100 Subject: [PATCH 0879/1749] wallabag: 2.1.3 -> 2.1.4 --- pkgs/servers/web-apps/wallabag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 9db45d6a8e14..4eed952f8042 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.1.3"; + version = "2.1.4"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://framabag.org/wallabag-release-${version}.tar.gz"; - sha256 = "0pl1sqigrp08r657jmfpf8m3wnw65g2k3mg50zsc8xbrzn6nwbgp"; + sha256 = "0s4p9jls7jqq9jbcac21ibz9k5yxx0ifv2yhxlkia5kw9md20r7b"; }; outputs = [ "out" "doc" ]; From e24df8ea69667ba5965406860f9520ad7535fed3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 26 Nov 2016 12:18:00 -0500 Subject: [PATCH 0880/1749] rkt: 1.19.0 -> 1.20.0 (#20697) --- pkgs/applications/virtualization/rkt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index a1c6927043ed..d4a10080aee8 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -4,7 +4,7 @@ let # Always get the information from # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk - coreosImageRelease = "1192.0.0"; + coreosImageRelease = "1235.0.0"; coreosImageSystemdVersion = "231"; # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.19.0"; + version = "1.20.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,12 +20,12 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "0s3x27m16jl7nw63zg8g522km1zkwwgafrs8l8sc7pfryhnpmvag"; + sha256 = "0cypksr13k0qp6qvbd6y8my1dg82s44k6qkiqkpn1vs2ynjg3i52"; }; stage1BaseImage = fetchurl { url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; - sha256 = "1j75ad1g217aqar84m9ycl2m71g821hq9yahl4bgjaipx9xnj23g"; + sha256 = "05gk28a7zzp3j0d1y96cr1xwy9gdl4s0lpnbakzqppa4w3c4m3lq"; }; buildInputs = [ From 2d679dbe745e05e62a0f14c0fad12f83f3d4e2b3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 26 Nov 2016 20:38:17 +0200 Subject: [PATCH 0881/1749] ntp: Don't use seccomp on non-x86 It only has the allowed system call numbers defined for i386 and x86_64 so it fails to build otherwise. --- pkgs/tools/networking/ntp/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index a37b1bdbd98a..64f4b9008b1e 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -1,8 +1,12 @@ -{ stdenv, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }: +{ stdenv, lib, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }: assert stdenv.isLinux -> libcap != null; assert stdenv.isLinux -> libseccomp != null; +let + withSeccomp = stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64); +in + stdenv.mkDerivation rec { name = "ntp-4.2.8p9"; @@ -17,12 +21,10 @@ stdenv.mkDerivation rec { "--with-openssl-libdir=${openssl.out}/lib" "--with-openssl-incdir=${openssl.dev}/include" "--enable-ignore-dns-errors" - ] ++ stdenv.lib.optionals stdenv.isLinux [ - "--enable-linuxcaps" - "--enable-libseccomp" - ]; + ] ++ stdenv.lib.optional stdenv.isLinux "--enable-linuxcaps" + ++ stdenv.lib.optional withSeccomp "--enable-libseccomp"; - buildInputs = [ libcap openssl libseccomp perl ]; + buildInputs = [ libcap openssl perl ] ++ lib.optional withSeccomp libseccomp; hardeningEnable = [ "pie" ]; From aad48be62bbea40d29e2a6507af38687990ec7de Mon Sep 17 00:00:00 2001 From: Sebastian Hagen Date: Sat, 26 Nov 2016 19:23:37 +0000 Subject: [PATCH 0882/1749] rogue: Add alternative source archive URLs. As of right now, rogue.rogueforge.net has been down for at least several hours (likely more). We add two mirrors here which are likely to be more reliable. We keep the original download location as a fallback, in case that estimate turns out to be incorrect. --- pkgs/games/rogue/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index 6be9b06e9074..b246a94715e4 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -4,7 +4,11 @@ stdenv.mkDerivation { name = "rogue-5.4.4"; src = fetchurl { - url = http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz; + urls = [ + "http://pkgs.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz" + "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue5.4.4-src.tar.gz" + "http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz" + ]; sha256 = "18g81274d0f7sr04p7h7irz0d53j6kd9j1y3zbka1gcqq0gscdvx"; }; From 99522fb742eef35264c0ecb05fd3019bfcc30901 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sat, 26 Nov 2016 17:18:35 -0200 Subject: [PATCH 0883/1749] allegro5: 5.0.11 -> 5.2.11 --- pkgs/development/libraries/allegro/5.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 6f05afa4f480..7efccfad2432 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,15 +1,19 @@ { stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto -, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac }: +, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac +, inputproto, libXi, fixesproto, libXfixes, freetype, libopus, libtheora +, physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs +, libXdmcp +}: stdenv.mkDerivation rec { name = "allegro-${version}"; - version = "5.0.11"; + version = "5.2.1.1"; src = fetchurl { url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz"; - sha256 = "0cd51qrh97jrr0xdmnivqgwljpmizg8pixsgvc4blqqlaz4i9zj9"; + sha256 = "0waalic7lyaf6i33nikmkc29bndci5c5090c4ra2vmy67cqdzndm"; }; buildInputs = [ @@ -17,8 +21,15 @@ stdenv.mkDerivation rec { alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa kbproto libjpeg flac + inputproto libXi fixesproto libXfixes + enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp + libpulseaudio libpthreadstubs ]; + patchPhase = '' + sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c + ''; + cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; meta = with stdenv.lib; { From ec74f36ccc25526f551bdbb66b20a8046865c156 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sat, 26 Nov 2016 17:19:07 -0200 Subject: [PATCH 0884/1749] allegro5unstable: removed --- .../libraries/allegro/5-unstable.nix | 36 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 pkgs/development/libraries/allegro/5-unstable.nix diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix deleted file mode 100644 index e5a2c38ddab7..000000000000 --- a/pkgs/development/libraries/allegro/5-unstable.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto -, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis -, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto -, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac -, inputproto, libXi, fixesproto, libXfixes }: - -stdenv.mkDerivation rec { - name = "allegro-${version}"; - version = "5.1.11"; - - src = fetchurl { - url = "http://download.gna.org/allegro/allegro-unstable/${version}/${name}.tar.gz"; - sha256 = "0zz07gdyc6xflpvkknwgzsyyyh9qiwd69j42rm9cw1ciwcsic1vs"; - }; - - buildInputs = [ - texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor - alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc - xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa - kbproto libjpeg flac inputproto libXi fixesproto libXfixes - ]; - - patchPhase = '' - sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c - ''; - - cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; - - meta = with stdenv.lib; { - description = "A game programming library"; - homepage = http://liballeg.org/; - license = licenses.zlib; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abd483d47773..c3c66181140f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6477,8 +6477,6 @@ in allegro = callPackage ../development/libraries/allegro {}; allegro5 = callPackage ../development/libraries/allegro/5.nix {}; - allegro5unstable = callPackage - ../development/libraries/allegro/5-unstable.nix {}; amrnb = callPackage ../development/libraries/amrnb { }; From be34ee415baaecc5756d630b4e4619a7d43e1753 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 26 Nov 2016 20:56:30 +0100 Subject: [PATCH 0885/1749] cpulimit: 2.3 -> 2.4 --- pkgs/tools/misc/cpulimit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index d5b84e6dd46c..98b91964e640 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cpulimit-${version}"; - version = "2.3"; + version = "2.4"; src = fetchurl { url = "mirror://sourceforge/limitcpu/${name}.tar.gz"; - sha256 = "192r2ghxyn8dm1la65f685nzsbj3dhdrxx3cv3i6cafygs3dyfa0"; + sha256 = "1fr4rgi5vdbjxsn04j99g1qyr7n5169hrv6lp3lli030alvkfbm2"; }; buildFlags = with stdenv; From c272c662765399706d344ffda3f4fe8e366b8d8e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 26 Nov 2016 21:24:08 +0100 Subject: [PATCH 0886/1749] ghc: add release candidate 1 for 8.0.2 --- pkgs/development/compilers/ghc/8.0.2.nix | 84 ++++++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 +++ 2 files changed, 92 insertions(+) create mode 100644 pkgs/development/compilers/ghc/8.0.2.nix diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix new file mode 100644 index 000000000000..9ff94f204eb2 --- /dev/null +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -0,0 +1,84 @@ +{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils +, hscolour, patchutils +}: + +let + inherit (bootPkgs) ghc; + + fetchFilteredPatch = args: fetchurl (args // { + downloadToTemp = true; + postFetch = '' + ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out" + ''; + }); +in +stdenv.mkDerivation rec { + version = "8.0.1.20161117"; + name = "ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/8.0.2-rc1/${name}-src.tar.xz"; + sha256 = "08hpzvg059ha0knmlngd0winfkplkkb7dk88zfz3s177z38kd874"; + }; + + patches = [ + ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 + + # Already applied? + # ./relocation.patch + # Fix https://ghc.haskell.org/trac/ghc/ticket/12130 + # (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; }) + (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; }) + ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; + + buildInputs = [ ghc perl hscolour ]; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + preConfigure = '' + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + ''; + + configureFlags = [ + "--with-gcc=${stdenv.cc}/bin/cc" + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + "--datadir=$doc/share/doc/ghc" + ] ++ stdenv.lib.optional stdenv.isDarwin [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a3cb0a8ca1c6..4cdc70fed4fa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -46,6 +46,10 @@ rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) hscolour; }; + ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec { + bootPkgs = packages.ghc7103; + inherit (bootPkgs) hscolour; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) alex happy; @@ -119,6 +123,10 @@ rec { ghc = compiler.ghc801; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; }; + ghc802 = callPackage ../development/haskell-modules { + ghc = compiler.ghc802; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; From dcc2bfddfe3dbac5eeebf38b6202c5182700bcff Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Sat, 26 Nov 2016 21:27:44 +0100 Subject: [PATCH 0887/1749] autorandr: 59f6aec0b -> 53d29f9 --- pkgs/tools/misc/autorandr/default.nix | 57 ++++++++++++--------------- 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 1fab8a493bb4..da9a599714cb 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -1,48 +1,41 @@ { fetchgit , stdenv -, enableXRandr ? true, xrandr ? null -, enableDisper ? true, disper ? null -, python -, xdpyinfo }: - -assert enableXRandr -> xrandr != null; -assert enableDisper -> disper != null; +, python3Packages +, fetchFromGitHub }: let - # Revision and date taken from the legacy tree, which still - # supports disper: - # https://github.com/phillipberndt/autorandr/tree/legacy - rev = "59f6aec0bb72e26751ce285d079e085b7178e45d"; - date = "20150127"; + python = python3Packages.python; + wrapPython = python3Packages.wrapPython; + date = "2016-11-23"; in stdenv.mkDerivation { - name = "autorandr-${date}"; + name = "autorandr-unstable-${date}"; - src = fetchgit { - inherit rev; - url = "https://github.com/phillipberndt/autorandr.git"; - sha256 = "0mnggsp42477kbzwwn65gi8y0rydk10my9iahikvs6n43lphfa1f"; - }; + buildInputs = [ python wrapPython ]; - patchPhase = '' - substituteInPlace "autorandr" \ - --replace "/usr/bin/xrandr" "${if enableXRandr then xrandr else "/nowhere"}/bin/xrandr" \ - --replace "/usr/bin/disper" "${if enableDisper then disper else "/nowhere"}/bin/disper" \ - --replace "/usr/bin/xdpyinfo" "${xdpyinfo}/bin/xdpyinfo" \ - --replace "which xxd" "false" \ - --replace "python" "${python}/bin/python" - ''; + phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - mkdir -p "$out/etc/bash_completion.d" - cp -v bash_completion/autorandr "$out/etc/bash_completion.d" - mkdir -p "$out/bin" - cp -v autorandr auto-disper $out/bin + # install bash completions + mkdir -p $out/bin $out/libexec $out/etc/bash_completion.d + cp -v contrib/bash_completion/autorandr $out/etc/bash_completion.d + + # install autorandr bin + cp autorandr.py $out/bin/autorandr + wrapPythonProgramsIn $out/bin/autorandr $out ''; + src = fetchFromGitHub { + owner = "phillipberndt"; + repo = "autorandr"; + rev = "53d29f99275aebf14240ea95f2d7022b305738d5"; + sha256 = "0pza4wfkzv7mmg2m4pf3n8wk0p7cy6bfqknn8ywz51r8ja16cqfj"; + }; + meta = { - description = "Automatic display configuration selector based on connected devices"; - homepage = https://github.com/wertarbyte/autorandr; + homepage = "http://github.com/phillipberndt/autorandr/"; + description = "Auto-detect the connect display hardware and load the appropiate X11 setup using xrandr"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.coroa ]; platforms = stdenv.lib.platforms.unix; }; From e934ffb28c114890ea4896ba419495a634b7d8b1 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 26 Nov 2016 14:19:41 +0100 Subject: [PATCH 0888/1749] utf8proc: 1.3 -> 2.0.2 --- pkgs/development/libraries/utf8proc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 4b7d06fe8c77..6cef26d3aada 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "utf8proc-${version}"; - version = "1.3"; + version = "2.0.2"; src = fetchurl { url = "https://github.com/JuliaLang/utf8proc/archive/v${version}.tar.gz"; - sha256 = "07r7djkmd399wl9cn0s2iqjhmm7l5iifp5h1yf2in9s366mlhkkg"; + sha256 = "140vib1m6n5kwzkw1n9fbsi5gl6xymbd7yndwqx1sj15aakak776"; }; makeFlags = [ "prefix=$(out)" ]; From b7eb9241dc2430b6b21529859b14885ad44efc17 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 26 Nov 2016 14:56:30 +0100 Subject: [PATCH 0889/1749] julia-git: 0.5.0-dev-2016-06-10 -> 0.6.0-dev-2016-11-25 --- pkgs/development/compilers/julia/git.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index ed23bcb73ccd..f3fe5ff156ce 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -34,10 +34,10 @@ let sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; }; - libuvVersion = "a1d9166a440e4a0664c0e6de6ebe25350de56a42"; + libuvVersion = "8d5131b6c1595920dd30644cd1435b4f344b46c8"; libuv = fetchurl { url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; - sha256 = "1sjvly4ylfyj8kxnx0gsjj2f70cg17h302h1i08gfndrqam68za5"; + sha256 = "1886r04igcs0k24sbb61wn10f8ki35c39jsnc5djv3rg4hvn9l49"; }; rmathVersion = "0.1"; @@ -55,13 +55,13 @@ in stdenv.mkDerivation rec { pname = "julia"; - version = "0.5.0-dev-2016-06-10"; + version = "0.6.0-dev-2016-11-25"; name = "${pname}-${version}"; src = fetchgit { url = "https://github.com/JuliaLang/${pname}"; - rev = "56d7d6672c7db717dacb5e34f485180c2eba83b2"; - sha256 = "1wbrzdrxp94i7yxdgf3qgrjshmqxi0c4bqz7wy0c0c0kjlg6flmx"; + rev = "03c24644815ba5320d038bb60c08565375fea1d9"; + sha256 = "103mg9dz8yda2zxbd85jv8zhdzs29jj0dxrm2ppxpfhbbf6fxqav"; }; prePatch = '' @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { postInstall = '' for prog in "$out/bin/julia" "$out/bin/julia-debug"; do wrapProgram "$prog" \ - --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ + --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \ --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" done ''; From e3d0fd8bc797d4a0043f4208bfdf33445fdfc553 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 26 Nov 2016 22:33:52 +0100 Subject: [PATCH 0890/1749] julia-git: pin LLVM 3.9, seems to work fine --- pkgs/development/compilers/julia/git.nix | 14 ++++---------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index f3fe5ff156ce..41f33501eb99 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -3,6 +3,7 @@ , gfortran, m4, makeWrapper, patchelf, perl, which, python2 # libjulia dependencies , libunwind, readline, utf8proc, zlib +, llvm # standard library dependencies , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra @@ -22,12 +23,6 @@ let in let - llvmVersion = "3.7.1"; - llvm = fetchurl { - url = "http://llvm.org/releases/${llvmVersion}/llvm-${llvmVersion}.src.tar.xz"; - sha256 = "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy"; - }; - dsfmtVersion = "2.2.3"; dsfmt = fetchurl { url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz"; @@ -66,7 +61,6 @@ stdenv.mkDerivation rec { prePatch = '' mkdir deps/srccache - cp "${llvm}" "./deps/srccache/llvm-${llvmVersion}.src.tar.xz" cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz" cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz" cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz" @@ -85,7 +79,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc - zlib + zlib llvm ]; nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; @@ -125,7 +119,7 @@ stdenv.mkDerivation rec { "USE_SYSTEM_LIBGIT2=1" "USE_SYSTEM_LIBUNWIND=1" # 'replutil' test failure with LLVM 3.8.0, invalid libraries with 3.7.1 - "USE_SYSTEM_LLVM=0" + "USE_SYSTEM_LLVM=1" "USE_SYSTEM_MPFR=1" "USE_SYSTEM_OPENLIBM=1" "USE_SYSTEM_OPENSPECFUN=1" @@ -142,7 +136,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH = makeLibraryPath [ arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm - openspecfun pcre2 suitesparse + openspecfun pcre2 suitesparse llvm ]; dontStrip = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51a7dea2e684..92b5dc42dea6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5052,6 +5052,7 @@ in julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix { gmp = gmp6; openblas = openblasCompat; + llvm = llvm_39; }); kotlin = callPackage ../development/compilers/kotlin { }; From cc77360bed83777b48bb6c055a2e168fc3ce1493 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 26 Nov 2016 16:28:58 -0500 Subject: [PATCH 0891/1749] linux: 4.4.34 -> 4.4.35 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 0fad9a578eff..8e92afca6e44 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.34"; + version = "4.4.35"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1xrk7adgapr4wpid6l6s05cypy3r28skynajy2h73xciradaqs9b"; + sha256 = "1spqkh0bsd2s4qjlaa5q0cr2qdlw0bflxinr451dbhwrzdwfnaz9"; }; kernelPatches = args.kernelPatches; From b47307bd74f14e1de0389a41ccb6423f945e9ff6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 26 Nov 2016 16:29:23 -0500 Subject: [PATCH 0892/1749] linux: 4.8.10 -> 4.8.11 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index e0e8fbaf95e8..4937c2271c7a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.10"; + version = "4.8.11"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1i3hydxjl3zz4i3v2spnv5y5pidmwgiyc10q6rlwvf0bs8aynh53"; + sha256 = "03w90vfjfcya38mcp1njasa5c67za203sgp9n3w52gms13s443yc"; }; kernelPatches = args.kernelPatches; From db7e616b4546aca996d84c6c870d9c4f4f4b3ce6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 26 Nov 2016 22:41:32 +0100 Subject: [PATCH 0893/1749] julia-git: add macOS frameworks, hopefully that's useful --- pkgs/development/compilers/julia/git.nix | 6 +++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index 41f33501eb99..73f0e67baa56 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -8,6 +8,8 @@ , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra , openblas, arpack, suitesparse +# Darwin frameworks +, CoreServices, ApplicationServices }: with stdenv.lib; @@ -80,7 +82,9 @@ stdenv.mkDerivation rec { arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc zlib llvm - ]; + ] + ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] + ; nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92b5dc42dea6..31fc4c5c6096 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5052,6 +5052,7 @@ in julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix { gmp = gmp6; openblas = openblasCompat; + inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; llvm = llvm_39; }); From a9aa372186fd05bc96fcda938d5621bed15167d2 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sun, 27 Nov 2016 11:29:03 +0900 Subject: [PATCH 0894/1749] pamix: 1.4.1 -> 1.5 --- pkgs/applications/audio/pamix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index 8f71c848f184..dbf3cd92b5d0 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "pamix-${version}"; - version = "1.4.1"; + version = "1.5"; src = fetchFromGitHub { owner = "patroclos"; repo = "pamix"; - rev = "v${version}"; - sha256 = "06pxpalzynb8z7qwhkfs7sj823k9chdmpyj40rp27f2znf2qga19"; + rev = version; + sha256 = "1d6b0iv8p73bwq88kdaanm4igvmp9rkq082vyaxpc67mz398yjbp"; }; nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconfig ]; From d0e8117ccb3a1d4665b6b327f509373e4b6be265 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sun, 27 Nov 2016 11:37:20 +0900 Subject: [PATCH 0895/1749] rainbowstream: 1.3.5 -> 1.3.6 --- .../python-modules/rainbowstream/setup.patch | 24 ------------------- pkgs/top-level/python-packages.nix | 7 ++---- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/rainbowstream/setup.patch diff --git a/pkgs/development/python-modules/rainbowstream/setup.patch b/pkgs/development/python-modules/rainbowstream/setup.patch deleted file mode 100644 index 55afa49a96e8..000000000000 --- a/pkgs/development/python-modules/rainbowstream/setup.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/setup.py b/setup.py -index 07b5913..2b7b15e 100644 ---- a/setup.py -+++ b/setup.py -@@ -24,15 +24,16 @@ install_requires = [ - ] - - # Default user (considers non virtualenv method) --user = os.environ.get('SUDO_USER', os.environ['USER']) -+user = os.environ.get('SUDO_USER', os.environ.get('USER', None)) - - # Copy default config if not exists - default = os.path.expanduser("~") + os.sep + '.rainbow_config.json' - if not os.path.isfile(default): - cmd = 'cp rainbowstream/colorset/config ' + default - os.system(cmd) -- cmd = 'chown ' + quote(user) + ' ' + default -- os.system(cmd) -+ if user: -+ cmd = 'chown ' + quote(user) + ' ' + default -+ os.system(cmd) - cmd = 'chmod 777 ' + default - os.system(cmd) - diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d19e2d77800..d80324a9fb1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14248,18 +14248,15 @@ in { rainbowstream = buildPythonPackage rec { name = "rainbowstream-${version}"; - version = "1.3.5"; + version = "1.3.6"; src = pkgs.fetchurl { url = "mirror://pypi/r/rainbowstream/${name}.tar.gz"; - sha256 = "0a8bs9g81ns47d4vaj5pfgw9zwbcp0nivlm5rps4dlb6qwvzni1w"; + sha256 = "04ki61mc2f5rw60zssr1rr6dmjmvhlws5rpnwd3zih6pi5b7cy4a"; }; - doCheck = false; - patches = [ ../development/python-modules/rainbowstream/image.patch - ../development/python-modules/rainbowstream/setup.patch ]; postPatch = '' From f7ad0223ce934e59c41ebdcfb8f09bf599d5321c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 27 Nov 2016 09:36:51 +0100 Subject: [PATCH 0896/1749] pythonPackages.ipywidgets: fix tests --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d80324a9fb1c..ffb2bf35faf1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12831,7 +12831,7 @@ in { sha256 = "baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2"; }; - buildInputs = with self; [ nose ]; + buildInputs = with self; [ nose pytest ]; propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook widgetsnbextension ]; meta = { From 868bd67aa9d4bf9e69b455a781c3a4eaadb422e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 27 Nov 2016 09:37:18 +0100 Subject: [PATCH 0897/1749] pythonPackages.jupyter_console: disable tests --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ffb2bf35faf1..cd206511f833 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7911,6 +7911,9 @@ in { ipykernel ]; + # ValueError: underlying buffer has been detached + doCheck = false; + meta = { description = "Jupyter terminal console"; homepage = "http://jupyter.org/"; From fcf9f5d4d54a1771243dbcea111b1566294f0acc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 27 Nov 2016 10:13:24 +0100 Subject: [PATCH 0898/1749] julia: 0.4.6 -> 0.4.7 --- pkgs/development/compilers/julia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 335de9b50cde..214b31534818 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -48,12 +48,12 @@ in stdenv.mkDerivation rec { pname = "julia"; - version = "0.4.6"; + version = "0.4.7"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "17wsppmsf782icyzri34zha61wfx4brfq4h68qg17w6zimd2plg5"; + sha256 = "09f531jhs8pyd1xng5c26x994w7q0sxxr28mr3qfw9wpkbmsc2pf"; }; prePatch = '' From 5d5346d824fdf19d5ac879bb4c98e6381d41c76d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 27 Nov 2016 10:14:10 +0100 Subject: [PATCH 0899/1749] julia_05: init at 0.5.0; right now backtrace-related tests are disabled because they fail in this configuration, but the rest works --- pkgs/development/compilers/julia/0.5.nix | 185 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 + 2 files changed, 192 insertions(+) create mode 100644 pkgs/development/compilers/julia/0.5.nix diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix new file mode 100644 index 000000000000..04ef7b86c483 --- /dev/null +++ b/pkgs/development/compilers/julia/0.5.nix @@ -0,0 +1,185 @@ +{ stdenv, fetchgit, fetchurl +# build tools +, gfortran, m4, makeWrapper, patchelf, perl, which, python2 +, runCommand +# libjulia dependencies +, libunwind, readline, utf8proc, zlib +, llvm, libffi, ncurses +# standard library dependencies +, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 +# linear algebra +, openblas, arpack, suitesparse +# Darwin frameworks +, CoreServices, ApplicationServices +}: + +with stdenv.lib; + +# All dependencies must use the same OpenBLAS. +let + arpack_ = arpack; + suitesparse_ = suitesparse; +in +let + arpack = arpack_.override { inherit openblas; }; + suitesparse = suitesparse_.override { inherit openblas; }; +in + +let + dsfmtVersion = "2.2.3"; + dsfmt = fetchurl { + url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz"; + sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; + }; + + libuvVersion = "8d5131b6c1595920dd30644cd1435b4f344b46c8"; + libuv = fetchurl { + url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; + sha256 = "1886r04igcs0k24sbb61wn10f8ki35c39jsnc5djv3rg4hvn9l49"; + }; + + rmathVersion = "0.1"; + rmath-julia = fetchurl { + url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; + sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4"; + }; + + virtualenvVersion = "15.0.0"; + virtualenv = fetchurl { + url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz"; + sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh"; + }; +in + +stdenv.mkDerivation rec { + pname = "julia"; + version = "0.5.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; + sha256 = "0bhickil88lalp9jdj1kmf4is70zinhx8ha9rng0g3z50r4a2qmv"; + }; + prePatch = '' + mkdir deps/srccache + cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz" + cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz" + cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz" + cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz" + ''; + + patches = [ + ./0001.1-use-system-utf8proc.patch + ./0002-use-system-suitesparse.patch + ]; + + postPatch = '' + patchShebangs . contrib + for i in backtrace replutil cmdlineargs compile; do + mv test/$i.jl{,.off} + touch test/$i.jl + done + ''; + + buildInputs = [ + arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr + pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc + zlib llvm + ] + ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] + ; + + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; + + makeFlags = + let + arch = head (splitString "-" stdenv.system); + march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" + or (throw "unsupported architecture: ${arch}"); + # Julia requires Pentium 4 (SSE2) or better + cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" + or (throw "unsupported architecture: ${arch}"); + in [ + "ARCH=${arch}" + "MARCH=${march}" + "JULIA_CPU_TARGET=${cpuTarget}" + "PREFIX=$(out)" + "prefix=$(out)" + "SHELL=${stdenv.shell}" + + "USE_SYSTEM_BLAS=1" + "USE_BLAS64=${if openblas.blas64 then "1" else "0"}" + "LIBBLAS=-lopenblas" + "LIBBLASNAME=libopenblas" + + "USE_SYSTEM_LAPACK=1" + "LIBLAPACK=-lopenblas" + "LIBLAPACKNAME=libopenblas" + + "USE_SYSTEM_SUITESPARSE=1" + "SUITESPARSE_LIB=-lsuitesparse" + "SUITESPARSE_INC=-I${suitesparse}/include" + + "USE_SYSTEM_ARPACK=1" + "USE_SYSTEM_FFTW=1" + "USE_SYSTEM_GMP=1" + "USE_SYSTEM_LIBGIT2=1" + "USE_SYSTEM_LIBUNWIND=1" + + "USE_SYSTEM_LLVM=1" + "LLVM_VER=3.8.1" + + "USE_SYSTEM_MPFR=1" + "USE_SYSTEM_OPENLIBM=1" + "USE_SYSTEM_OPENSPECFUN=1" + "USE_SYSTEM_PATCHELF=1" + "USE_SYSTEM_PCRE=1" + "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" + "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" + "USE_SYSTEM_READLINE=1" + "USE_SYSTEM_UTF8PROC=1" + "USE_SYSTEM_ZLIB=1" + ]; + + NIX_CFLAGS_COMPILE = [ "-fPIC" ]; + + LD_LIBRARY_PATH = makeLibraryPath [ + arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm + openspecfun pcre2 suitesparse llvm + ]; + + dontStrip = true; + dontPatchELF = true; + + enableParallelBuilding = true; + + doCheck = true; + checkTarget = "testall"; + # Julia's tests require read/write access to $HOME + preCheck = '' + export HOME="$NIX_BUILD_TOP" + set + ''; + + preBuild = '' + sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile + sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile + ''; + + postInstall = '' + for prog in "$out/bin/julia" "$out/bin/julia-debug"; do + wrapProgram "$prog" \ + --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" + done + ''; + + meta = { + description = "High-level performance-oriented dynamical language for technical computing"; + homepage = "http://julialang.org/"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ raskin ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + broken = stdenv.isi686; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06ec3496941c..7bec1275dbda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5051,6 +5051,13 @@ in llvm = llvm_37; }; + julia_05 = callPackage ../development/compilers/julia/0.5.nix { + gmp = gmp6; + openblas = openblasCompat; + inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + llvm = llvm_38; + }; + julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix { gmp = gmp6; openblas = openblasCompat; From 244f0456f06066a87ba37e610f638b60489e14ef Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sun, 27 Nov 2016 12:21:25 +0300 Subject: [PATCH 0900/1749] genymotion: add menu item --- pkgs/development/mobile/genymotion/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index f21c25a60f7c..d5f1b09a9468 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -1,4 +1,5 @@ { stdenv, requireFile, makeWrapper, which, zlib, mesa_noglu, glib, xorg, libxkbcommon +, xdg_utils # For glewinfo , libXmu, libXi, libXext }: @@ -17,17 +18,24 @@ stdenv.mkDerivation rec { sha256 = "0j1dzry6wf6cw3yr318z81rmj79r6w5l6vpilm7m9h786jrgywa1"; }; - buildInputs = [ makeWrapper which ]; + buildInputs = [ makeWrapper which xdg_utils ]; unpackPhase = '' + mkdir -p phony-home $out/share/applications + export HOME=$TMP/phony-home + mkdir ${name} echo "y" | sh $src -d ${name} sourceRoot=${name} + + substitute phony-home/.local/share/applications/genymobile-genymotion.desktop \ + $out/share/applications/genymobile-genymotion.desktop --replace "$TMP/${name}" "$out/libexec" ''; installPhase = '' mkdir -p $out/bin $out/libexec mv genymotion $out/libexec/ + ln -s $out/libexec/genymotion/{genymotion,player} $out/bin ''; fixupPhase = '' @@ -38,7 +46,7 @@ stdenv.mkDerivation rec { patchExecutable() { patchInterpreter "$1" - makeWrapper "$out/libexec/genymotion/$1" "$out/bin/$1" \ + wrapProgram "$out/libexec/genymotion/$1" \ --set "LD_LIBRARY_PATH" "${libPath}" } From af1dacc2c33ce97fbd36a4856afcc3297c8645e1 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sun, 27 Nov 2016 13:18:24 +0300 Subject: [PATCH 0901/1749] genymotion: 2.7.2 -> 2.8.0 --- pkgs/development/mobile/genymotion/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index d5f1b09a9468..745111171bb6 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "genymotion-${version}"; - version = "2.7.2"; + version = "2.8.0"; src = requireFile { - url = https://www.genymotion.com/account/login/; + url = https://www.genymotion.com/download/; name = "genymotion-${version}-linux_x64.bin"; - sha256 = "0j1dzry6wf6cw3yr318z81rmj79r6w5l6vpilm7m9h786jrgywa1"; + sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk"; }; buildInputs = [ makeWrapper which xdg_utils ]; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.genymotion.com/; license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + platforms = ["x86_64-linux"]; maintainers = [ stdenv.lib.maintainers.puffnfresh ]; }; } From c4650769f53cd61ad2c0127e1de4d3278d85f562 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Fri, 25 Nov 2016 19:28:20 -0800 Subject: [PATCH 0902/1749] f3: newer git rev, build extra binaries --- pkgs/tools/filesystems/f3/default.nix | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index e7f20b1e6b3d..0ea8b1b89867 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -1,21 +1,35 @@ -{ stdenv, fetchFromGitHub }: - +{ stdenv, fetchFromGitHub +, parted, udev +}: +let + version = "unstable-2016-11-26"; +in stdenv.mkDerivation rec { name = "f3-${version}"; - version = "6.0"; enableParallelBuilding = true; src = fetchFromGitHub { owner = "AltraMayor"; repo = "f3"; - rev = "v${version}"; - sha256 = "1azi10ba0h9z7m0gmfnyymmfqb8380k9za8hn1rrw1s442hzgnz2"; + rev = "eabf001f69a788e64912bc9e812c118a324077d5"; + sha256 = "0ypqyqwqiy3ynssdd9gamk1jxywg6avb45ndlzhv3wxh2qcframm"; }; - makeFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ parted udev ]; + patchPhase = "sed -i 's/-oroot -groot//' Makefile"; + buildFlags = [ "CFLAGS=-fgnu89-inline" # HACK for weird gcc incompatibility with -O2 + "all" # f3read, f3write + "extra" # f3brew, f3fix, f3probe + ]; + + installFlags = [ "PREFIX=$(out)" + "install" + "install-extra" + ]; + meta = { description = "Fight Flash Fraud"; homepage = http://oss.digirati.com.br/f3/; From 22e9476e5947cce18a974ce5470317fb61638431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20G=C3=B6tz?= Date: Sun, 27 Nov 2016 15:06:34 +0100 Subject: [PATCH 0903/1749] youtube-dl: 2016-11-22 -> 2016-11-27 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 70719bdfdf1f..c1d4d3c15567 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.11.22"; + version = "2016.11.27"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "e8d599c512ce56a6ea46955e2bb8f4471ae8a6f757183212cc49b6dd48d9a282"; + sha256 = "6ecc3996e28b6274d159643641a964098549b4cb8b33a3a3481148b88166e2cc"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From f4d163aab740aac77287fde4378da9c6c579351b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 27 Nov 2016 15:48:40 +0100 Subject: [PATCH 0904/1749] zsh-navigation-tools: 2.1.16 -> 2.2.7 --- pkgs/tools/misc/zsh-navigation-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index b0939a4698b0..108071edb64c 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-navigation-tools-${version}"; - version = "2.1.16"; + version = "2.2.7"; src = fetchFromGitHub { owner = "psprint"; repo = "zsh-navigation-tools"; rev = "v${version}"; - sha256 = "1ccb4f5md8wn60mymk91y2p4fq9f666bc5zc9xwx1q2wra8j4yf5"; + sha256 = "0c4kb19aprb868xnlyq8h1nd2d32r0zkrqblsrzvg7m9gx8vqps8"; }; dontBuild = true; From 0a77fc86b27412671215bcc7450fbd45f9fbfa04 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Sun, 27 Nov 2016 06:52:38 -0800 Subject: [PATCH 0905/1749] f3: corrected version number --- pkgs/tools/filesystems/f3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index 0ea8b1b89867..4af076e8f2cd 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -2,7 +2,7 @@ , parted, udev }: let - version = "unstable-2016-11-26"; + version = "6.0-2016.11.16-unstable"; in stdenv.mkDerivation rec { name = "f3-${version}"; From e8f7c31dfbf9ce3b268d91d10d9ab7760c9ae0e0 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 27 Nov 2016 15:57:56 +0100 Subject: [PATCH 0906/1749] opkg: 0.3.1 -> 0.3.3 --- pkgs/tools/package-management/opkg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 059f63495d1c..9d99af2e59a5 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -2,15 +2,15 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.3.1"; + version = "0.3.3"; name = "opkg-${version}"; src = fetchurl { url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "1pw7igmb4miyxl11sj9g8p8pgxg9nmn1h2hzi8b23v44hcmc1inj"; + sha256 = "03nhz0ralc3cqsrwyc310n8kbk2m9im0m2r2za8lqphs29rrxnqr"; }; - buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl libxml2 - autoreconfHook ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ curl gpgme libarchive bzip2 lzma attr acl libxml2 ]; meta = with stdenv.lib; { description = "A lightweight package management system based upon ipkg"; From b74d732f67b4297176d014fd0157bc9546fe2bff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 23 Nov 2016 17:34:49 +0100 Subject: [PATCH 0907/1749] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-8-gcc531ff. --- .../haskell-modules/hackage-packages.nix | 1325 ++++++++++++++--- 1 file changed, 1078 insertions(+), 247 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 65904d0d249c..bd046c77d50b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -726,6 +726,53 @@ self: { maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {inherit (pkgs) emacs;}; + "Agda_2_5_1_2" = callPackage + ({ mkDerivation, alex, array, base, binary, boxes, bytestring + , containers, cpphs, data-hash, deepseq, directory, EdisonAPI + , EdisonCore, edit-distance, emacs, equivalence, filemanip + , filepath, geniplate-mirror, happy, hashable, hashtables + , haskeline, haskell-src-exts, monadplus, mtl, parallel, pretty + , process, QuickCheck, strict, template-haskell, text, time + , transformers, transformers-compat, unordered-containers, xhtml + , zlib + }: + mkDerivation { + pname = "Agda"; + version = "2.5.1.2"; + sha256 = "fb272bd6f7d532320c669b96faa85088b37bae02d906e9a9f764bc8e8639fb5e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary boxes bytestring containers data-hash deepseq + directory EdisonAPI EdisonCore edit-distance equivalence filepath + geniplate-mirror hashable hashtables haskeline haskell-src-exts + monadplus mtl parallel pretty process QuickCheck strict + template-haskell text time transformers transformers-compat + unordered-containers xhtml zlib + ]; + libraryToolDepends = [ alex cpphs happy ]; + executableHaskellDepends = [ + base binary containers directory filemanip filepath + haskell-src-exts mtl process + ]; + executableToolDepends = [ emacs ]; + postInstall = '' + files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) + for f in "''${files[@]}" ; do + $out/bin/agda $f + done + for f in "''${files[@]}" ; do + $out/bin/agda -c --no-main $f + done + $out/bin/agda-mode compile + ''; + homepage = "http://wiki.portal.chalmers.se/agda/"; + description = "A dependently typed functional programming language and proof assistant"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ abbradar ]; + }) {inherit (pkgs) emacs;}; + "Agda-executable" = callPackage ({ mkDerivation, Agda, base }: mkDerivation { @@ -6117,6 +6164,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Glob_0_7_13" = callPackage + ({ mkDerivation, base, containers, directory, dlist, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + }: + mkDerivation { + pname = "Glob"; + version = "0.7.13"; + sha256 = "fe99d9434a2dbbac5385cb6690cbb6e2f2eb25df6ab5ce99c8121fc3fdddbd4c"; + libraryHaskellDepends = [ + base containers directory dlist filepath transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers directory dlist filepath HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers transformers-compat + ]; + homepage = "http://iki.fi/matti.niemenmaa/glob/"; + description = "Globbing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GlomeTrace" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -6749,8 +6820,8 @@ self: { }: mkDerivation { pname = "HDBC-odbc"; - version = "2.5.0.0"; - sha256 = "729982fb31e2d7816e8600212236f32d9d9a59191d73ce57fce097be2234953b"; + version = "2.5.0.1"; + sha256 = "96000a9573e873d231ca09f974c4ff0c4d7ec86d7ec6ceaaeb0cc02fc5e6de99"; libraryHaskellDepends = [ base bytestring concurrent-extra HDBC mtl time utf8-string ]; @@ -7515,6 +7586,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HMarkov" = callPackage + ({ mkDerivation, base, lens, mtl, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "HMarkov"; + version = "1.0.0.3"; + sha256 = "0f43a9e0dd4da3258f89668e240081f4d0144003b8b45283ea3a0b446715a8a7"; + libraryHaskellDepends = [ base lens mtl random vector ]; + testHaskellDepends = [ + base QuickCheck random tasty tasty-hunit tasty-quickcheck vector + ]; + homepage = "https://github.com/swizzard/HMarkov#readme"; + description = "Markov-generated sequences"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "HNM" = callPackage ({ mkDerivation, base, containers, directory, glib, gtk, haskell98 , mtl, process, regex-posix, unix @@ -20724,8 +20812,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, random, vector }: mkDerivation { pname = "aivika"; - version = "4.5"; - sha256 = "4a86928ea9d289f82a5e81227dd2f5b29870fa3be608f135e4469e5a8f08c865"; + version = "4.6"; + sha256 = "1e84a2957a7f974e4e11cdaa2a7c4ec3da5b03fe15a0fed07427e9ee74712bba"; libraryHaskellDepends = [ array base containers mtl random vector ]; @@ -20757,8 +20845,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "0.2"; - sha256 = "19dac37eb6436ce9dbcda7b8a30ee914ec28b6704321512571c27c483ac8b8cc"; + version = "0.3"; + sha256 = "400b00cde06525918c0ece01f1a5c411b27c4d5f45d9316ccb03380255e1a911"; libraryHaskellDepends = [ aivika aivika-transformers base binary containers distributed-process exceptions mtl random stm time @@ -20854,14 +20942,15 @@ self: { "aivika-realtime" = callPackage ({ mkDerivation, aivika, aivika-transformers, async, base - , containers, mtl, stm, time + , containers, mtl, random, stm, time }: mkDerivation { pname = "aivika-realtime"; - version = "0.1"; - sha256 = "843febd0367be16058268bb2d3e5cb65b42018c69aa21dd1351089b72a4a81bf"; + version = "0.1.2"; + sha256 = "fb60a9126563c09f44e915991f655cb062807deb3c8a51892d6bfba97d30de7a"; libraryHaskellDepends = [ - aivika aivika-transformers async base containers mtl stm time + aivika aivika-transformers async base containers mtl random stm + time ]; homepage = "http://www.aivikasoft.com/en/products/aivika.html"; description = "Soft real-time simulation module for the Aivika library"; @@ -20874,8 +20963,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "4.5.1"; - sha256 = "76bfd156d6e9d037adf65b22ea1b66c75ed15ec00fd6b773c34e1c60ac12444a"; + version = "4.6"; + sha256 = "7b4c8179260f865fb6e00005c679ee9894403f098ae462082891bd0f6bed59ef"; libraryHaskellDepends = [ aivika array base containers mtl random vector ]; @@ -24407,20 +24496,22 @@ self: { }) {}; "amby" = callPackage - ({ mkDerivation, base, Chart, Chart-cairo, Chart-diagrams, colour - , 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, base, bytestring, cassava, Chart, Chart-cairo + , Chart-diagrams, colour, containers, data-default + , data-default-class, datasets, doctest, either, exceptions, extra + , foldl, lens, mtl, mwc-random, pretty-display, process, safe + , scientific, statistics, tasty, tasty-hunit, text, vector + , vector-algorithms }: mkDerivation { pname = "amby"; - version = "0.3.1"; - sha256 = "c13b92e077e577df6e34da03bd267f9e9c29a0f3345e6935915aabf8a3b3fda5"; + version = "0.3.2"; + sha256 = "fa7b70c21377bb19396a69a5782abb0400ce19d99082d6a9f191c790a5049369"; libraryHaskellDepends = [ - base Chart Chart-cairo Chart-diagrams colour data-default - data-default-class either exceptions lens mtl mwc-random - pretty-display process safe scientific statistics vector - vector-algorithms + base bytestring cassava Chart Chart-cairo Chart-diagrams colour + containers data-default data-default-class datasets either + exceptions extra foldl lens mtl mwc-random pretty-display process + safe scientific statistics text vector vector-algorithms ]; testHaskellDepends = [ base doctest tasty tasty-hunit vector ]; homepage = "https://github.com/jsermeno/amby#readme"; @@ -24694,6 +24785,8 @@ self: { pname = "angel"; version = "0.6.2"; sha256 = "caff0b06481dc3858b059e2faa12afdad66152c0341020dc53cceacf28e2e358"; + revision = "1"; + editedCabalFile = "b8dc3c8526dde130a1acd260a062b184f0c614cb459116455d8637a83702a23f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -28772,6 +28865,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aws-simple" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, amazonka-sqs + , base, blaze-builder, bytestring, conduit, lens, mtl, resourcet + , text + }: + mkDerivation { + pname = "aws-simple"; + version = "0.1.0.0"; + sha256 = "70091063d883e2320a622a2909abc093e11a47d0a18c64b6557679e401ba918f"; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 amazonka-sqs base blaze-builder + bytestring conduit lens mtl resourcet text + ]; + homepage = "https://github.com/agrafix/aws-simple#readme"; + description = "Dead simple bindings to commonly used AWS Services"; + license = stdenv.lib.licenses.mit; + }) {}; + "aws-sns" = callPackage ({ mkDerivation, aeson, aws, aws-general, base, blaze-builder , bytestring, conduit, containers, errors, http-conduit, http-types @@ -33491,18 +33602,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bloodhound_0_11_1_0" = callPackage + "bloodhound_0_12_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers - , data-default-class, derive, directory, doctest, doctest-prop - , errors, exceptions, filepath, hashable, hspec, http-client - , http-types, mtl, mtl-compat, network-uri, QuickCheck - , quickcheck-properties, scientific, semigroups, text, time - , transformers, unordered-containers, vector + , data-default-class, directory, doctest, errors, exceptions + , filepath, generics-sop, hashable, hspec, http-client, http-types + , mtl, mtl-compat, network-uri, QuickCheck, quickcheck-properties + , scientific, semigroups, temporary, text, time, transformers, unix + , unordered-containers, vector }: mkDerivation { pname = "bloodhound"; - version = "0.11.1.0"; - sha256 = "ecaf8e6d1bcb197387f8f7862420a362f33f03cb86fd068b8b9a1e462813d557"; + version = "0.12.0.0"; + sha256 = "b3673675c75ee393281502ce45d0d9768c6a9165df9cebc23beb25539d7acbdc"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers data-default-class exceptions hashable http-client http-types mtl mtl-compat @@ -33510,10 +33621,10 @@ self: { unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring containers derive directory doctest - doctest-prop errors filepath hspec http-client http-types mtl - QuickCheck quickcheck-properties semigroups text time - unordered-containers vector + aeson base bytestring containers directory doctest errors + exceptions filepath generics-sop hspec http-client http-types mtl + network-uri QuickCheck quickcheck-properties semigroups temporary + text time unix unordered-containers vector ]; homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; @@ -33799,6 +33910,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bolt" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, cereal, containers + , hashable, network, network-uri, text, unordered-containers + , vector + }: + mkDerivation { + pname = "bolt"; + version = "0.1.0.3"; + sha256 = "7779436fc5da3ea036547273a82dd10909caebf76a294b3741aa5097b75aaa22"; + libraryHaskellDepends = [ + base bifunctors bytestring cereal containers hashable network + network-uri text unordered-containers vector + ]; + homepage = "https://github.com/bflyblue/bolt#readme"; + description = "Bolt driver for Neo4j"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bond" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring , cmdargs, derive, Diff, directory, filepath, HUnit, monad-loops @@ -33838,8 +33967,8 @@ self: { }: mkDerivation { pname = "bond-haskell"; - version = "0.1.4.1"; - sha256 = "914e2dd778f817536ad36708983a57517356b4d8c44368544c9ae5e73ef8e900"; + version = "0.1.5.0"; + sha256 = "db62f0b0913e92c1892cdbeeb67a0397e911eae67aa3de8255bc61d19fb18606"; libraryHaskellDepends = [ aeson array base binary bond-haskell-compiler bytestring containers deepseq extra hashable mtl scientific text unordered-containers @@ -33862,8 +33991,8 @@ self: { }: mkDerivation { pname = "bond-haskell-compiler"; - version = "0.1.4.1"; - sha256 = "f48b794e2b9096a0f7335bc8ab6264a841fd35d369929105011d16e574684aac"; + version = "0.1.5.0"; + sha256 = "08fcc16b2990bb16ad43fa9cccb460f8299243ddc4a277395bc230021a5ebc13"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35785,8 +35914,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.33"; - sha256 = "ae69fd45365f670b3d36274884b1a7d1b1ec0429f7775ee79d5d813d82e93193"; + version = "4.35.3"; + sha256 = "09d5531215a3c963adc80bd40402d16c7a59698537ee4d21c7d3f9b7c486d56f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35799,6 +35928,10 @@ self: { executableHaskellDepends = [ base Cabal debian lens mtl pretty Unixutils ]; + testHaskellDepends = [ + base Cabal containers debian Diff directory filepath hsemail HUnit + lens pretty process text + ]; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; @@ -40429,8 +40562,8 @@ self: { ({ mkDerivation, base, template-haskell, type-list }: mkDerivation { pname = "classyplate"; - version = "0.1.0.0"; - sha256 = "b10d14b679f41e41755013b18b11158310bf80ff415cb369444a8f82388f6fbc"; + version = "0.2.0.0"; + sha256 = "962081fdb262da338d9e1076cb6ac21a75a6230f641301f06580de88cf796188"; libraryHaskellDepends = [ base template-haskell type-list ]; description = "Fuseable type-class based generics"; license = stdenv.lib.licenses.bsd3; @@ -42102,15 +42235,16 @@ self: { }) {}; "colour-space" = callPackage - ({ mkDerivation, base, colour, JuicyPixels, manifolds, semigroups - , vector-space + ({ mkDerivation, base, colour, constrained-categories, JuicyPixels + , linear, linearmap-category, manifolds, semigroups, vector-space }: mkDerivation { pname = "colour-space"; - version = "0.1.0.0"; - sha256 = "4b26cee762f9e673f3e461c25622942e80b7676950f768ce607f90ebc6ae6b48"; + version = "0.1.1.0"; + sha256 = "1dcb84098dfbe7389e4794fef80e629a95cc3607f5277092965f8a4604152339"; libraryHaskellDepends = [ - base colour JuicyPixels manifolds semigroups vector-space + base colour constrained-categories JuicyPixels linear + linearmap-category manifolds semigroups vector-space ]; homepage = "https://github.com/leftaroundabout/colour-space"; description = "Instances of the manifold-classes for colour types"; @@ -43019,15 +43153,15 @@ self: { }) {}; "concrete-haskell" = callPackage - ({ mkDerivation, base, bytestring, hashable, QuickCheck, text - , thrift, unordered-containers, vector + ({ mkDerivation, base, bytestring, containers, hashable, QuickCheck + , text, thrift, unordered-containers, vector }: mkDerivation { pname = "concrete-haskell"; - version = "0.1.0.0"; - sha256 = "68312cbefd0aa617b253c5e4d89dbdd71a394c74dfee9eb20426222fff017e40"; + version = "0.1.0.4"; + sha256 = "6fbe447023cb0b5f7b3753e354af34c8a35f1497b5829a907728e336de64eb2b"; libraryHaskellDepends = [ - base bytestring hashable QuickCheck text thrift + base bytestring containers hashable QuickCheck text thrift unordered-containers vector ]; homepage = "https://github.com/hltcoe"; @@ -47589,22 +47723,19 @@ self: { }) {}; "cudd" = callPackage - ({ mkDerivation, array, base, c2hs, cudd, dddmp, epd, mtl, mtr, st - , transformers, util - }: + ({ mkDerivation, array, base, c2hs, cudd, mtl, transformers }: mkDerivation { pname = "cudd"; - version = "0.1.0.2"; - sha256 = "59008e024553375eeeabfd9dd7c2e8a186b0edd75edb52640e38cc9d31911a7e"; + version = "0.1.0.3"; + sha256 = "8e0684c4e01f4d48140d3cedbe15548c747a389e4e32bbe388a1341350dd675d"; libraryHaskellDepends = [ array base mtl transformers ]; - librarySystemDepends = [ cudd dddmp epd mtr st util ]; + librarySystemDepends = [ cudd ]; libraryToolDepends = [ c2hs ]; homepage = "https://github.com/adamwalker/haskell_cudd"; description = "Bindings to the CUDD binary decision diagrams library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {cudd = null; dddmp = null; epd = null; inherit (pkgs) mtr; - inherit (pkgs) st; util = null;}; + }) {cudd = null;}; "cufft" = callPackage ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath @@ -49242,8 +49373,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-has"; - version = "0.1.0.0"; - sha256 = "8b5b4a68965b8c31ef10cc2ae37e7c4d09ae44ee0790002adb8ccf1ad6a48ab2"; + version = "0.2.1.0"; + sha256 = "c13dd9875174926b41911a826bbf6d616ceabc56d27017a76a39d097e170f890"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/winterland1989/data-has"; description = "Simple extensible product"; @@ -50117,6 +50248,24 @@ self: { license = "GPL"; }) {}; + "datasets" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, directory + , file-embed, filepath, hashable, HTTP, stringsearch, text, time + , vector + }: + mkDerivation { + pname = "datasets"; + version = "0.2.0.2"; + sha256 = "e79f13a2001031230b968d582bc5c3567568b673d4ea9cc3571451c2deaddae2"; + libraryHaskellDepends = [ + aeson base bytestring cassava directory file-embed filepath + hashable HTTP stringsearch text time vector + ]; + homepage = "https://github.com/glutamate/datasets"; + description = "Classical data sets for statistics and machine learning"; + license = stdenv.lib.licenses.mit; + }) {}; + "dataurl" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , HTF, text @@ -54796,8 +54945,8 @@ self: { }: mkDerivation { pname = "dmenu"; - version = "0.3.0.0"; - sha256 = "dee250a81b5ba065cec749cb260c0945b5f57cf13ef99b7b5b9d1dda189077fb"; + version = "0.3.1.0"; + sha256 = "0c5e0cc0e78ceffcb762e507e083b22ce509e21e87088052597ab1e6dc5bd899"; libraryHaskellDepends = [ base containers directory lens mtl process transformers ]; @@ -54806,6 +54955,60 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dmenu-pkill" = callPackage + ({ mkDerivation, base, containers, directory, dmenu, lens, mtl + , process, transformers + }: + mkDerivation { + pname = "dmenu-pkill"; + version = "0.1.0.0"; + sha256 = "5dc7055896945f60231a9eeda11242c1c739d7e9eed316866597305df941fa75"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory dmenu lens mtl process transformers + ]; + homepage = "https://github.com/m0rphism/haskell-dmenu-pkill"; + description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage."; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "dmenu-pmount" = callPackage + ({ mkDerivation, base, containers, directory, dmenu, lens, mtl + , process, transformers + }: + mkDerivation { + pname = "dmenu-pmount"; + version = "0.1.0.0"; + sha256 = "2a7bc00b47554944c5ac3a88897325d47dcf64bdc9f229214ea64474cfb5009c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory dmenu lens mtl process transformers + ]; + homepage = "https://github.com/m0rphism/haskell-dmenu-pmount"; + description = "Mounting and unmounting linux devices as user with dmenu and pmount"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "dmenu-search" = callPackage + ({ mkDerivation, base, containers, directory, dmenu, lens, mtl + , process, transformers + }: + mkDerivation { + pname = "dmenu-search"; + version = "0.1.0.0"; + sha256 = "c3aa52379389c120b2858796baa0b1dc21212573ed2ca4cf2b5b9141196094c6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory dmenu lens mtl process transformers + ]; + homepage = "https://github.com/m0rphism/haskell-dmenu-search"; + description = "dmenu script for searching the web with customizable search engines"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dns" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-builder, conduit, conduit-extra, containers, doctest @@ -54829,6 +55032,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dns_2_0_10" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , bytestring-builder, conduit, conduit-extra, containers, doctest + , hspec, iproute, mtl, network, random, resourcet, safe, word8 + }: + mkDerivation { + pname = "dns"; + version = "2.0.10"; + sha256 = "ba03bc8fe25b58fd066588569eb5707a245cb098181e2d5cca72c239849aa6a3"; + libraryHaskellDepends = [ + attoparsec base binary bytestring bytestring-builder conduit + conduit-extra containers iproute mtl network random resourcet safe + ]; + testHaskellDepends = [ + attoparsec base binary bytestring bytestring-builder conduit + conduit-extra containers doctest hspec iproute mtl network random + resourcet safe word8 + ]; + testTarget = "spec"; + description = "DNS library in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dnscache" = callPackage ({ mkDerivation, base, bytestring, containers, contstuff, dns , iproute, time @@ -56538,6 +56765,8 @@ self: { pname = "dynamic-plot"; version = "0.2.0.0"; sha256 = "4a5e2d6105139bd8756d3b1d1d2fbffcf36cb435e02973efa9066123cbd3e528"; + revision = "1"; + editedCabalFile = "a527e3da82b5b147ba9cfed25526a2a34eb07cd42710dbea9aee590a15d88fed"; libraryHaskellDepends = [ base colour colour-space constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk @@ -57806,6 +58035,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elm-bridge_0_4_0" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, QuickCheck + , template-haskell, text + }: + mkDerivation { + pname = "elm-bridge"; + version = "0.4.0"; + sha256 = "45721d5ee406b21c9b9cab180a7a0ee618d8492aecd131080345d772e6b51fd9"; + libraryHaskellDepends = [ aeson base template-haskell ]; + testHaskellDepends = [ + aeson base containers hspec QuickCheck text + ]; + homepage = "https://github.com/agrafix/elm-bridge"; + description = "Derive Elm types from Haskell types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elm-build-lib" = callPackage ({ mkDerivation, base, bytestring, containers, elm-compiler , elm-core-sources, file-embed, template-haskell @@ -61736,6 +61983,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fclabels_2_0_3_2" = callPackage + ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers + }: + mkDerivation { + pname = "fclabels"; + version = "2.0.3.2"; + sha256 = "4d5d83ffc3c8bc610e9c42e19c2e07a1ca68666310261de15703c605047182b0"; + libraryHaskellDepends = [ base mtl template-haskell transformers ]; + testHaskellDepends = [ + base HUnit mtl template-haskell transformers + ]; + homepage = "https://github.com/sebastiaanvisser/fclabels"; + description = "First class accessor labels implemented as lenses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fclabels-monadlib" = callPackage ({ mkDerivation, base, fclabels, monadLib }: mkDerivation { @@ -64078,6 +64342,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fold-debounce_0_2_0_4" = callPackage + ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay + , time + }: + mkDerivation { + pname = "fold-debounce"; + version = "0.2.0.4"; + sha256 = "429702d10061c9c518a119ece8d3bc890feb124a524a3b6a5cdd31a17bcca67a"; + libraryHaskellDepends = [ + base data-default-class stm stm-delay time + ]; + testHaskellDepends = [ base hspec stm time ]; + homepage = "https://github.com/debug-ito/fold-debounce"; + description = "Fold multiple events that happen in a given period of time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fold-debounce-conduit" = callPackage ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet , stm, transformers, transformers-base @@ -64568,6 +64850,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "formatting_6_2_4" = callPackage + ({ mkDerivation, base, clock, old-locale, scientific, text + , text-format, time + }: + mkDerivation { + pname = "formatting"; + version = "6.2.4"; + sha256 = "432db74037d3bc326ab70e6e033502f818d9694535dbfc4c949cb50f72f33367"; + libraryHaskellDepends = [ + base clock old-locale scientific text text-format time + ]; + description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "forml" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger @@ -64698,8 +64996,8 @@ self: { }: mkDerivation { pname = "foscam-directory"; - version = "0.0.7"; - sha256 = "ae30ec2b2a5f737436d4438ed1071a549a0d37bbf8871014aabe702046382312"; + version = "0.0.8"; + sha256 = "0b5ba1bd30d081d5ce32beb92047e10978eb2050489317516d26b3a87061bb66"; libraryHaskellDepends = [ base directory foscam-filename lens pretty trifecta utf8-string ]; @@ -64740,8 +65038,8 @@ self: { }: mkDerivation { pname = "foscam-sort"; - version = "0.0.2"; - sha256 = "a1f76b3c3772098a7d843e955e84e4e6d41d23c197522eed23baa402de724145"; + version = "0.0.3"; + sha256 = "dd248dd26bb9ab9da3c8ce88c53a268e869b0118817f1a3ee27a5d7ad7790a52"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65354,6 +65652,29 @@ self: { pname = "freer"; version = "0.2.3.0"; sha256 = "e0ef288ad5c8fc5b1ab7a50413e435648251575bb6803d41374d702fc5ad44b8"; + revision = "2"; + editedCabalFile = "39d3fcc74267e006eae237770ac8d6b7c651a927913544fb74a260ac8307beca"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://gitlab.com/queertypes/freer"; + description = "Implementation of the Freer Monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "freer_0_2_4_1" = callPackage + ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "freer"; + version = "0.2.4.1"; + sha256 = "cb01c6609c789d363fbd72df110010cfda57c6b16a8f9d5f1ae02780f764c1d9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -68780,8 +69101,8 @@ self: { ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.6.0.0"; - sha256 = "35b859e5a09dd12ada9cea7c343dae75500f50cd7d5ff247d5a5868d419049d6"; + version = "0.7.0.0"; + sha256 = "433c06b7c445fd9edfc081720ab51f9ced41994f481d66d4ce181df583efda38"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; @@ -68810,8 +69131,8 @@ self: { ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.6.0.0"; - sha256 = "92dea9556a700d8473b0657f80228868194984dd9edb3405cd11f58939d81e5a"; + version = "0.7.0.0"; + sha256 = "5359536c791cfaf24fb8a5884d30cc117ad869ab773b977293d6424b52520a2d"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; @@ -68823,8 +69144,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.6.0.0"; - sha256 = "cf65462c0b94e3d2b21efc78dd60e90e147767a0b9719a7542f4a040dc00e60d"; + version = "0.7.0.0"; + sha256 = "da1532bf854bc9d0ae311dd1b1f14900f1258e6e29884b8c35c9326c55811ed9"; isLibrary = false; isExecutable = false; description = "DOM library using JSFFI and GHCJS"; @@ -69818,7 +70139,7 @@ self: { "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , text, transformers, webkit2gtk-web-extension + , text, transformers, webkit2gtk-web-extension, webkitgtk }: mkDerivation { pname = "gi-webkit2webextension"; @@ -69829,13 +70150,14 @@ self: { base bytestring containers gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ webkit2gtk-web-extension ]; + libraryPkgconfigDepends = [ webkit2gtk-web-extension webkitgtk ]; doHaddock = false; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit2-WebExtension bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit2gtk-web-extension = null;}; + }) {webkit2gtk-web-extension = null; inherit (pkgs) webkitgtk;}; "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers @@ -71736,8 +72058,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.1.19"; - sha256 = "4cf869138bb7a748ccfb0d084ed53ddb19930793da39c0a45065d14e5251013b"; + version = "0.1.20"; + sha256 = "217adfa4568c7099c722e519399a56c930ae23c48cc49bed1947368e8d48c043"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79311,6 +79633,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hamilton" = callPackage + ({ mkDerivation, ad, ansi-wl-pprint, base, comonad, containers + , free, hmatrix, hmatrix-gsl, optparse-applicative + , typelits-witnesses, vector, vector-sized, vty + }: + mkDerivation { + pname = "hamilton"; + version = "0.1.0.0"; + sha256 = "2c8653d3272e7fa59bfef888771ebafb8e265ba10ee03cdb8b73b5bc3bcf98d7"; + revision = "2"; + editedCabalFile = "f0a9099cd8474b2fff95c7f027c10b6a3cc43cce1be1a7bebf6914b4a2c2a49d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ad base comonad free hmatrix hmatrix-gsl typelits-witnesses + vector-sized + ]; + executableHaskellDepends = [ + ansi-wl-pprint base containers hmatrix optparse-applicative vector + vector-sized vty + ]; + homepage = "https://github.com/mstksg/hamilton"; + description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hamlet" = callPackage ({ mkDerivation, base, shakespeare }: mkDerivation { @@ -84252,8 +84600,8 @@ self: { }: mkDerivation { pname = "haxl"; - version = "0.4.0.1"; - sha256 = "15bc6c2ed641b3c1f1e8f8cfc377fe5ae8ec3e1f4a8eb03be8e154f981cfd6a3"; + version = "0.4.0.2"; + sha256 = "272b50d432da234803d7a590530ae87266de1f3f75b6d98bdbc53262183fd634"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84589,27 +84937,27 @@ self: { "hbro" = callPackage ({ 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 + , filepath, glib, gtk3, lifted-async, lifted-base + , microlens-platform, monad-control, monad-logger, monadIO + , mono-traversable, mtl, network-uri, optparse-applicative, pango + , parsec, process, random, resourcet, safe, safe-exceptions + , semigroups, stm-chans, template-haskell, text, time, transformers + , transformers-base, unix, uuid, webkitgtk3, zeromq4-haskell }: mkDerivation { pname = "hbro"; - version = "1.6.0.0"; - sha256 = "0572d35613f0b6e199f563375fb71991fe46ebfa7881bcee591a2054629febce"; + version = "1.7.0.0"; + sha256 = "f00f064cfe00d662b32d93ab3ae4fca204ae0cab44f115b6ef0be0f44e02a36f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ 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 + directory dyre errors fast-logger filepath glib gtk3 lifted-async + lifted-base microlens-platform 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 + template-haskell text time transformers transformers-base unix uuid + webkitgtk3 zeromq4-haskell ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/k0ral/hbro"; @@ -84621,17 +84969,25 @@ self: { "hbro-contrib" = callPackage ({ mkDerivation, 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 + , microlens, 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.6.0.0"; - sha256 = "7ca63236aa588f4ac538ffb17840fca1039c36eefb2f56317b1614170c9b1603"; + version = "1.7.0.0"; + sha256 = "55398cdfcc3b0437d57798765fd5b04253d7d20e05b4c4f56a7d670832659508"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring chunked-data containers - directory filepath glib gtk3 hbro lens monad-control + directory filepath glib gtk3 hbro microlens monad-control + mono-traversable mtl network-uri pango parsec process resourcet + safe safe-exceptions text time transformers-base unix webkitgtk3 + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring chunked-data containers + directory filepath glib gtk3 hbro microlens monad-control mono-traversable mtl network-uri pango parsec process resourcet safe safe-exceptions text time transformers-base unix webkitgtk3 ]; @@ -86286,8 +86642,8 @@ self: { }: mkDerivation { pname = "heterocephalus"; - version = "1.0.0.1"; - sha256 = "f25a727b6df685596b78d1a82c60da8433b3afb8a3c0766ece241700578fa5b7"; + version = "1.0.1.0"; + sha256 = "9b13428f919b3df7fd7f6f4012826223370951065f0fb020ae57a80810368103"; libraryHaskellDepends = [ base blaze-html blaze-markup containers parsec shakespeare template-haskell text @@ -87537,32 +87893,6 @@ self: { }) {}; "hindent" = callPackage - ({ mkDerivation, base, containers, descriptive, directory, ghc-prim - , haskell-src-exts, hspec, monad-loops, mtl, text, transformers - }: - mkDerivation { - pname = "hindent"; - version = "4.6.4"; - sha256 = "26fc1498705b8a64b03eb5b699ba6229955273d91a49a01c3c2b58436c8e4dcf"; - revision = "3"; - editedCabalFile = "86ebc305942be9a659bdd7a9f66771d74e72825816c6ba1f0dd29a65ce8eef35"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers haskell-src-exts monad-loops mtl text transformers - ]; - executableHaskellDepends = [ - base descriptive directory ghc-prim haskell-src-exts text - ]; - testHaskellDepends = [ - base directory haskell-src-exts hspec monad-loops mtl text - ]; - homepage = "http://www.github.com/chrisdone/hindent"; - description = "Extensible Haskell pretty printer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hindent_5_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, descriptive , Diff, directory, exceptions, ghc-prim, haskell-src-exts, hspec , monad-loops, mtl, path, path-io, text, transformers, unix-compat @@ -87590,7 +87920,6 @@ self: { homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hindley-milner" = callPackage @@ -88791,15 +89120,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hlint_1_9_37" = callPackage + "hlint_1_9_38" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs , directory, extra, filepath, haskell-src-exts, hscolour, process , refact, transformers, uniplate }: mkDerivation { pname = "hlint"; - version = "1.9.37"; - sha256 = "a208466a837b58159d6a4bbd4c360ae918da306fb38630eae52ba5ef0c88c415"; + version = "1.9.38"; + sha256 = "43131e26bfcca9fa9dab0f4fd3a260d895586d57b871ee886f124ad1d41f989d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90282,8 +90611,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.4"; - sha256 = "7ae3b649d435afa178241ade97f3eef3d8519ddd86f4a97d23b7aa5a88c9a665"; + version = "5.0.5"; + sha256 = "d5b6f897ddd63f037ae9ce09c4f671e95a7f4331add3c09bd2bbd29114a89bb1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93955,8 +94284,8 @@ self: { }: mkDerivation { pname = "hsparql"; - version = "0.2.9"; - sha256 = "283e50db41018e115147f533024d874cb878f42b466f59e1f97ce3735bfd13f0"; + version = "0.3.0"; + sha256 = "a9b1e3ce4e7ad04634a4eec62249f877d8a2203bdd38192dee9a57714c779fe1"; libraryHaskellDepends = [ base bytestring HTTP MissingH mtl network network-uri rdf4h text xml @@ -95748,8 +96077,8 @@ self: { ({ mkDerivation, attoparsec, base, deepseq, text }: mkDerivation { pname = "html-parse"; - version = "0.1.0.0"; - sha256 = "077760e09e7ea180b786d6379b725419f9e892579a53d7469d1c09e48d7af000"; + version = "0.2.0.0"; + sha256 = "9c9f8401dc86ea3a9612bfc0d430a03b7e9130183f0b8dc1fa100cd0bbb84a92"; libraryHaskellDepends = [ attoparsec base deepseq text ]; homepage = "http://github.com/bgamari/html-parse"; description = "A high-performance HTML tokenizer"; @@ -95835,6 +96164,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "htn" = callPackage + ({ mkDerivation, base, containers, hspec }: + mkDerivation { + pname = "htn"; + version = "0.1.0.0"; + sha256 = "13f49c161f754d3bac7a08227b949c7a34c7658f22476fcc99f26c0d8e673ce5"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec ]; + homepage = "https://github.com/y-kamiya/htn-haskell#readme"; + description = "resolver using htn algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "htodo" = callPackage ({ mkDerivation, base, HDBC, HDBC-sqlite3 }: mkDerivation { @@ -104357,17 +104699,19 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, filepath - , http-types, lens, primitive, process, ref-tf, stm - , template-haskell, text, time, transformers + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , deepseq, filepath, ghc-prim, http-types, lens, primitive, process + , ref-tf, scientific, stm, template-haskell, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "jsaddle"; - version = "0.6.0.1"; - sha256 = "16bca9ea2c962ecaeb42961b9795de61504f1c214a20d189c3e3483cdbc557e1"; + version = "0.7.0.0"; + sha256 = "bfbf63663129551b95efc44333e944dd56357ea4e0778b592701480836511554"; libraryHaskellDepends = [ - aeson base bytestring containers filepath http-types lens primitive - process ref-tf stm template-haskell text time transformers + aeson attoparsec base bytestring containers deepseq filepath + ghc-prim http-types lens primitive process ref-tf scientific stm + template-haskell text time transformers unordered-containers vector ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -104380,8 +104724,8 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.6.0.0"; - sha256 = "ef270104ea9a4eef9eca156bd2406f1ad453f1d7543e9dc3054d4549e8a85e37"; + version = "0.7.0.0"; + sha256 = "0315258fbf5a1ce449de3df26d53de1d3e569ad4604bd17697983629fc183f82"; libraryHaskellDepends = [ base base-compat jsaddle lens text transformers ]; @@ -104406,22 +104750,22 @@ self: { }) {}; "jsaddle-warp" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , filepath, http-types, jsaddle, lens, primitive, process - , QuickCheck, ref-tf, stm, text, time, transformers, wai + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , doctest, filepath, ghc-prim, http-types, jsaddle, lens, primitive + , process, QuickCheck, ref-tf, stm, text, time, transformers, wai , wai-websockets, warp, websockets }: mkDerivation { pname = "jsaddle-warp"; - version = "0.6.0.1"; - sha256 = "c91ba8f83df56044247ee8deadec3889346c640b069efed2b8035162e8c4cfc0"; + version = "0.7.0.0"; + sha256 = "5f847b737fc542f9b5f8a0b3aa3a384b18d588fd5433cffbc279c7aac52de818"; libraryHaskellDepends = [ aeson base containers http-types jsaddle stm text time transformers wai wai-websockets warp websockets ]; testHaskellDepends = [ - base bytestring doctest filepath jsaddle lens primitive process - QuickCheck ref-tf + base bytestring deepseq doctest filepath ghc-prim jsaddle lens + primitive process QuickCheck ref-tf ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -104432,8 +104776,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, jsaddle }: mkDerivation { pname = "jsaddle-wkwebview"; - version = "0.6.0.0"; - sha256 = "cedc6b826bc2b07841aed149ecf3ad3c39f5ed75964f3ea49e0ee3c445b5373c"; + version = "0.7.0.0"; + sha256 = "fa9a722cab4659f00acdad3c50d70b6ecbaf8d457fcc50c44191a60802f8c26d"; libraryHaskellDepends = [ aeson base bytestring jsaddle ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -104706,10 +105050,8 @@ self: { }: mkDerivation { pname = "json-extra"; - version = "0.1.0.1"; - sha256 = "7a3a70ea9e1f4c9538a91563446ec0bcdfe6c10967b116fbe9b1ca99173216f3"; - revision = "1"; - editedCabalFile = "76113c3d47cb5d8087ffe18e1b09eaa22cc8dcd07010537739c7f1e4dc6b0741"; + version = "0.2.0.0"; + sha256 = "f8d8c1721f148ff2c3ed02a55944804cf050fcec3587935a0e076fc61c608a93"; libraryHaskellDepends = [ aeson base bytestring data-default template-haskell unordered-containers yaml @@ -106877,6 +107219,8 @@ self: { pname = "kqueue"; version = "0.2"; sha256 = "700c6daf8a3f6ff1dbbc7f8ef10f3acb2ffddb4ccc65a68fa533907802f67369"; + revision = "1"; + editedCabalFile = "cea5494eb8fc333d8f9d35768eea1c813620f39e35f1a37feae1811aa57b9850"; libraryHaskellDepends = [ base directory filepath mtl time unix ]; libraryToolDepends = [ c2hs ]; homepage = "http://github.com/hesselink/kqueue"; @@ -107291,6 +107635,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lambda-sampler" = callPackage + ({ mkDerivation, base, MonadRandom, mtl, QuickCheck, test-framework + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "lambda-sampler"; + version = "1.0"; + sha256 = "caa0d9284dc39ca81a8ff86e4c675d24937dbbe7b6298d9c0aa13524e12d1af2"; + libraryHaskellDepends = [ base MonadRandom mtl transformers ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + homepage = "https://github.com/maciej-bendkowski/lambda-sampler"; + description = "Boltzmann sampler utilities for lambda calculus"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lambda-toolbox" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -109026,6 +109387,8 @@ self: { pname = "latex-function-tables"; version = "0.1.0.0"; sha256 = "7145b64e438624e8c5a3590c67f113df5010f8f28feb33aaa95602ef75939af4"; + revision = "1"; + editedCabalFile = "6bd3bb245f08cc610e07279a310ae99bd37ee797fda60c6fc84b13c9fb38bf83"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109034,7 +109397,7 @@ self: { ]; executableHaskellDepends = [ base HaTeX process template-haskell ]; testHaskellDepends = [ base ]; - homepage = "https://github.com/githubuser/nfm2017#readme"; + homepage = "https://github.com/unitb/latex-function-tables"; description = "Function table specifications in latex"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -110635,6 +110998,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "libmolude" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, binary + , bytestring, concurrent-machines, containers + , containers-unicode-symbols, contravariant, data-textual + , directory, exceptions, filepath, hjsonschema, lens, machines, mtl + , parsers, path, path-io, protolude, QuickCheck, random, semigroups + , stm, stm-containers, temporary, test-framework + , test-framework-quickcheck2, test-framework-th, text, text-icu + , text-icu-normalized, text-printer, time, transformers, yaml + , zippers + }: + mkDerivation { + pname = "libmolude"; + version = "0.12.3"; + sha256 = "4914c6c7dbbf08d5ab03498654d096ee3b21385ecb5be5e2574b05215b2f55b2"; + libraryHaskellDepends = [ + aeson base base-unicode-symbols binary bytestring + concurrent-machines containers containers-unicode-symbols + contravariant data-textual directory exceptions filepath + hjsonschema lens machines mtl parsers path path-io protolude random + semigroups stm stm-containers temporary text text-icu + text-icu-normalized text-printer time transformers yaml zippers + ]; + testHaskellDepends = [ + base binary bytestring exceptions filepath QuickCheck semigroups + temporary test-framework test-framework-quickcheck2 + test-framework-th text time transformers + ]; + description = "Prelude based on protolude for GHC 8 and beyond"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "libmpd" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default-class, filepath, hspec, mtl, network, old-locale @@ -111331,6 +111726,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "line" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , cryptohash-sha256, http-types, lens, text, time, transformers + , wai, wreq + }: + mkDerivation { + pname = "line"; + version = "1.0.0.1"; + sha256 = "f4cdfb7531f722143c20ee7a52655ec0a5c776777a45f9a9b653e2ff9910d9d6"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptohash-sha256 + http-types lens text time transformers wai wreq + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/noraesae/line"; + description = "Haskell SDK for the LINE API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "line-break" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -113180,22 +113594,17 @@ self: { }) {}; "log" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring - , 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 - , transformers-base, unordered-containers, vector + ({ mkDerivation, aeson, base, bloodhound, bytestring, exceptions + , http-client, http-types, log-base, log-elasticsearch + , log-postgres, process, random, tasty, tasty-hunit, text, time + , transformers }: mkDerivation { pname = "log"; - version = "0.6"; - sha256 = "7b059a5130d7a7ec87109bdb118223ba281135ccdbc68551ff4123da4181176a"; + version = "0.7"; + sha256 = "67daea67ce76d9838f2cb853f198e891d853d705405ff3806ce46fdf2376e51b"; libraryHaskellDepends = [ - aeson aeson-pretty base base64-bytestring bloodhound bytestring - 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 + base log-base log-elasticsearch log-postgres ]; testHaskellDepends = [ aeson base bloodhound bytestring exceptions http-client http-types @@ -113207,6 +113616,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "log-base" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq + , exceptions, monad-control, monad-time, mtl, semigroups, stm, text + , time, transformers-base, unordered-containers + }: + mkDerivation { + pname = "log-base"; + version = "0.7"; + sha256 = "ba961838e19cccb5d84a052ba75acbd7320119dda482a4fa230346743c8a8c07"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring deepseq exceptions monad-control + monad-time mtl semigroups stm text time transformers-base + unordered-containers + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (base package)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "log-domain" = callPackage ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq , directory, distributive, doctest, filepath, generic-deriving @@ -113249,6 +113677,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "log-elasticsearch" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bloodhound, bytestring, deepseq, http-client, log-base + , semigroups, text, text-show, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "log-elasticsearch"; + version = "0.7"; + sha256 = "bf2326aa0c54972452543973cec3f03f68c6d0c6f9aed285696425da24122bb7"; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bloodhound bytestring + deepseq http-client log-base semigroups text text-show time + transformers unordered-containers vector + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (Elasticsearch back end)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "log-postgres" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base + , mtl, semigroups, split, text, text-show, time + , unordered-containers, vector + }: + mkDerivation { + pname = "log-postgres"; + version = "0.7"; + sha256 = "33744eff195af018d2cf9fa2ce6617ce3cf5242cf478fea776e4a9db7a74f963"; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring deepseq + hpqtypes http-client lifted-base log-base mtl semigroups split text + text-show time unordered-containers vector + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (PostgreSQL back end)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "log-utils" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, data-default , exceptions, hpqtypes, http-types, invariant, kontra-config @@ -115636,12 +116104,17 @@ self: { }) {}; "manifold-random" = callPackage - ({ mkDerivation, base, manifolds, random-fu, vector-space }: + ({ mkDerivation, base, constrained-categories, linearmap-category + , manifolds, random-fu, semigroups, vector-space + }: mkDerivation { pname = "manifold-random"; - version = "0.1.1.0"; - sha256 = "9979681fcea7a314db619da04ffca77c93d5afe42ce0b819bd974ca70e74050c"; - libraryHaskellDepends = [ base manifolds random-fu vector-space ]; + version = "0.3.0.0"; + sha256 = "1ea6a797e4325a16d4a4c7f59d2f732a5c5796491dad79a2b82db3a84feaf369"; + libraryHaskellDepends = [ + base constrained-categories linearmap-category manifolds random-fu + semigroups vector-space + ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "Sampling random points on general manifolds"; license = stdenv.lib.licenses.gpl3; @@ -116715,8 +117188,8 @@ self: { ({ mkDerivation, base, heap, QuickCheck }: mkDerivation { pname = "median-stream"; - version = "0.6.0.0"; - sha256 = "bae6347b85b0914dee5a8a7c146b8af937bf450ce2aa09c5f62cee0811ff9a1d"; + version = "0.7.0.0"; + sha256 = "e92fc44be8189dafe9190aad225462780f26d0b1fe1823376342329db6c71f3d"; libraryHaskellDepends = [ base heap ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/caneroj1/median-stream#readme"; @@ -118749,6 +119222,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "model" = callPackage + ({ mkDerivation, base, containers, deepseq, ghc-prim, ListLike + , pretty, tasty, tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "model"; + version = "0.2.1"; + sha256 = "0da6c98beffd1767fa5bbee92de5ff444402899a4855b193f83511309afeb96d"; + libraryHaskellDepends = [ + base containers deepseq ListLike pretty transformers + ]; + testHaskellDepends = [ + base containers ghc-prim pretty tasty tasty-hunit tasty-quickcheck + ]; + homepage = "http://github.com/tittoassini/model"; + description = "Derive a model of a data type using Generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "modelicaparser" = callPackage ({ mkDerivation, ansi-terminal, base, containers, filepath, parsec , QuickCheck @@ -121807,9 +122299,10 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "multirec"; - version = "0.7.6"; - sha256 = "5212ab1014ccf58472c831fd203e2218073aea213f9f3cc80acafef0458afc27"; + version = "0.7.7"; + sha256 = "f342653e874db55f673e6d6236a2c21cc815d5e999ce62affe54fc99a49362e7"; libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; description = "Generic programming for families of recursive datatypes"; license = stdenv.lib.licenses.bsd3; @@ -126550,22 +127043,24 @@ self: { "oanda-rest-api" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, Decimal - , hlint, hspec, HUnit, lens, old-locale, scientific, text, time - , vector, wreq + , hlint, hspec, http-conduit, HUnit, lens, old-locale, scientific + , text, thyme, vector }: mkDerivation { pname = "oanda-rest-api"; - version = "0.1.0.0"; - sha256 = "7a22fbe550d0bd7d80d9a07e4e563557ff81f294eef423026542bc2bd8a18b0f"; + version = "0.3.0.0"; + sha256 = "be57364a4da2e2b20d188c8a50efe15b4a07daf641e4294e3b9eba87b75f7603"; + revision = "1"; + editedCabalFile = "44db3924a18face1edc0b9c6ee19c0ed2bc0d0441a123286bb099bfac663d1d5"; libraryHaskellDepends = [ - aeson base bytestring containers Decimal lens old-locale scientific - text time vector wreq + aeson base bytestring containers Decimal http-conduit lens + old-locale scientific text thyme vector ]; testHaskellDepends = [ - aeson base bytestring containers Decimal hlint hspec HUnit lens - old-locale scientific text time vector wreq + aeson base bytestring containers Decimal hlint hspec http-conduit + HUnit lens old-locale scientific text thyme vector ]; - homepage = "http://github.com/jdreaver/oanda-rest-api"; + homepage = "https://github.com/jdreaver/oanda-rest-api#readme"; description = "Client to the OANDA REST API"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -127387,6 +127882,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_5_2_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, case-insensitive, containers, contravariant, multiset + , postgresql-simple, pretty, product-profunctors, profunctors + , QuickCheck, semigroups, text, time, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.5.2.2"; + sha256 = "e09e565314d59a420349f0a5295ee4f9ed7215d579741fcf06d376703dd3d102"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors semigroups text time time-locale-compat transformers + uuid void + ]; + testHaskellDepends = [ + aeson base containers contravariant multiset postgresql-simple + product-profunctors profunctors QuickCheck semigroups text time + ]; + homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -133314,8 +133836,8 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pinboard_0_9_11" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, either, hspec + "pinboard_0_9_12_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec , http-client, http-client-tls, http-types, monad-logger, mtl , network, profunctors, QuickCheck, random, safe-exceptions , semigroups, text, time, transformers, unordered-containers @@ -133323,10 +133845,10 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.9.11"; - sha256 = "2fc06cd5f9afb134802d9777cb53052066eb7ee9b3fa6f24b7eb12907146f774"; + version = "0.9.12.1"; + sha256 = "dd6303ec05b38e9b2af196d4efee5ee174fef62c960c2ad15943faef9d96d237"; libraryHaskellDepends = [ - aeson base bytestring containers either http-client http-client-tls + aeson base bytestring containers http-client http-client-tls http-types monad-logger mtl network profunctors random safe-exceptions text time transformers unordered-containers vector ]; @@ -136913,20 +137435,22 @@ self: { }) {}; "pregame" = callPackage - ({ mkDerivation, base, bytestring, cmdargs, containers - , data-default, lens, mtl, parallel, safe, stm, text, transformers - , tuple, vector + ({ mkDerivation, aeson, array, base, bytestring, containers + , data-default, deepseq, either, ghc-prim, integer-gmp, lens, mtl + , safe, stm, text, text-conversions, time, tuple + , unordered-containers, vector }: mkDerivation { pname = "pregame"; - version = "0.1.4.3"; - sha256 = "c46be43886c12e04954a7674ea4fbc8be0f79a75d19effb9b420d41e5e754253"; + version = "1.0.1.0"; + sha256 = "218237f29e51e0635845008541629efc4fcc66403b90c4401087e5279871a9f4"; libraryHaskellDepends = [ - base bytestring cmdargs containers data-default lens mtl parallel - safe stm text transformers tuple vector + aeson array base bytestring containers data-default deepseq either + ghc-prim integer-gmp lens mtl safe stm text text-conversions time + tuple unordered-containers vector ]; homepage = "https://github.com/jxv/pregame"; - description = "Prelude counterpart"; + description = "Prelude for applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -137214,8 +137738,8 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, pretty-show, text }: mkDerivation { pname = "pretty-display"; - version = "0.1.9"; - sha256 = "3913780e6e3aace5cd63d9b8dd8454ab8c08f6bf10d44ac19c70dc059341909c"; + version = "0.1.10"; + sha256 = "7dd446519a316ebd9b33f3d6fc61603d73ffba1f6dd3ed6ada79bd9c8a043406"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base pretty-show text ]; @@ -139370,19 +139894,19 @@ self: { }) {}; "pure-zlib" = callPackage - ({ mkDerivation, base, base-compat, bytestring, bytestring-builder - , containers, filepath, fingertree, HUnit, monadLib, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, array, base, base-compat, bytestring + , bytestring-builder, containers, filepath, fingertree, HUnit + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "pure-zlib"; - version = "0.5"; - sha256 = "b7cf6e9d02c9ab7d246651b4a49696448dd35cbd2146ace84ff4a9ea5afc30ab"; + version = "0.6"; + sha256 = "ab7814fbef5bfa299d3c9e3f7c614a20d3a2600b85807ee7284e235ada78ebc5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base-compat bytestring bytestring-builder containers - fingertree monadLib + array base base-compat bytestring bytestring-builder containers + fingertree ]; executableHaskellDepends = [ base base-compat bytestring ]; testHaskellDepends = [ @@ -140648,6 +141172,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "quickcheck-string-random" = callPackage + ({ mkDerivation, base, QuickCheck, string-random, tasty + , tasty-quickcheck, text + }: + mkDerivation { + pname = "quickcheck-string-random"; + version = "0.1.0.0"; + sha256 = "dec015a4dabc4f6b63926502b11c0882272b1282d341a9d39e69033974d9eb12"; + libraryHaskellDepends = [ base QuickCheck string-random text ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck text + ]; + homepage = "https://github.com/hiratara/hs-string-random#readme"; + description = "Helper to build generators with Text.StringRandom"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quickcheck-text" = callPackage ({ mkDerivation, base, binary, bytestring, QuickCheck, text }: mkDerivation { @@ -140836,8 +141377,8 @@ self: { }: mkDerivation { pname = "quiver-binary"; - version = "0.1.1.0"; - sha256 = "44e9190ce2a87135e85b98d6843ce74b15710537e7dd56524ecb731181fb162a"; + version = "0.1.1.1"; + sha256 = "d9a1b83fc011daa5ecc5f29615aa338f44df78d375d6a9d7d2548b8289115832"; libraryHaskellDepends = [ base binary bytestring quiver quiver-bytestring ]; @@ -140934,8 +141475,8 @@ self: { }: mkDerivation { pname = "quiver-instances"; - version = "0.2.0.0"; - sha256 = "00acef0be95c1aad3a0cc56fa6281a794e9375ba25def925370b9bc77eecd90d"; + version = "0.2.0.1"; + sha256 = "4365f1cd79585fbecfd9e3f20be97c6cbe41b70dc543a513eed8e97bc53f2ca3"; libraryHaskellDepends = [ base exceptions quiver resourcet transformers transformers-base ]; @@ -140948,8 +141489,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, quiver }: mkDerivation { pname = "quiver-interleave"; - version = "0.2.0.1"; - sha256 = "0dbe071064fdffb6995475048afe2531096e4009243fe58fc9bfe6ed31f2dad8"; + version = "0.2.0.2"; + sha256 = "4648939ed31c08f22b8c0c9be84e826ba4ce964525ee9cdd25c76d618612beaf"; libraryHaskellDepends = [ base quiver ]; testHaskellDepends = [ base hspec QuickCheck quiver ]; description = "Interleave values from multiple Quivers"; @@ -140965,8 +141506,8 @@ self: { }: mkDerivation { pname = "quiver-sort"; - version = "0.2.0.0"; - sha256 = "78dba51aa22ecc34e7d871d066bd936febcb684dd20679d46ba2cd377399ee0c"; + version = "0.2.0.1"; + sha256 = "0d181443faa5b577b6f2483af3a51bb1572ea4f5d81000d78ceddd480c51a961"; libraryHaskellDepends = [ base containers directory exceptions quiver quiver-binary quiver-bytestring quiver-groups quiver-instances quiver-interleave @@ -142254,8 +142795,8 @@ self: { ({ mkDerivation, aeson, base, react-flux, servant, text }: mkDerivation { pname = "react-flux-servant"; - version = "0.1.0"; - sha256 = "9dac8c127094cb3ddfded25f5b79f2da46f3f8cd5e6aa58c552b55d341ced901"; + version = "0.1.1"; + sha256 = "04931915c2a2afa50effe3e40d4c61dc6e9e6c7c0f7eb834670b9de6054c389c"; libraryHaskellDepends = [ aeson base react-flux servant text ]; homepage = "https://bitbucket.org/wuzzeb/react-flux-servant"; description = "Allow react-flux stores to send requests to a servant server"; @@ -142794,6 +143335,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rebase_1_0_6" = callPackage + ({ mkDerivation, base, base-prelude, bifunctors, bytestring + , containers, contravariant, contravariant-extras, deepseq, dlist + , either, fail, hashable, mtl, profunctors, scientific + , semigroupoids, semigroups, stm, text, time, transformers + , unordered-containers, uuid, vector, void + }: + mkDerivation { + pname = "rebase"; + version = "1.0.6"; + sha256 = "dcf4217ab3f089a8934808af88d95e6d8e57bd57fac3cce54d8b048232abfa01"; + libraryHaskellDepends = [ + base base-prelude bifunctors bytestring containers contravariant + contravariant-extras deepseq dlist either fail hashable mtl + profunctors scientific semigroupoids semigroups stm text time + transformers unordered-containers uuid vector void + ]; + homepage = "https://github.com/nikita-volkov/rebase"; + description = "A more progressive alternative to the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -145435,6 +145999,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rerebase" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.0.1"; + sha256 = "8cc418b668b575382ef5a977b06de3475c5ab92c3ed47174c94ef98bdbf13205"; + libraryHaskellDepends = [ rebase ]; + homepage = "https://github.com/nikita-volkov/rerebase"; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = stdenv.lib.licenses.mit; + }) {}; + "reroute" = callPackage ({ mkDerivation, base, deepseq, hashable, hspec, hvect, mtl , path-pieces, text, unordered-containers, vector @@ -145780,8 +146356,8 @@ self: { pname = "rest-gen"; version = "0.20.0.0"; sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542"; - revision = "2"; - editedCabalFile = "9eb0c067b4a15b128d75c240694fc31504664107c88b9b80f925ef669eac632a"; + revision = "3"; + editedCabalFile = "b1de24d30b40005298357ecadb54055f9842d8c1e3673feeb453a067a9f9a812"; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt @@ -146071,6 +146647,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "retry_0_7_4_2" = callPackage + ({ mkDerivation, base, data-default-class, exceptions, ghc-prim + , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers + }: + mkDerivation { + pname = "retry"; + version = "0.7.4.2"; + sha256 = "521b392570b37b17ac8aaea2586a0a16a578f56b9cd0bbf69813b35f7ed2b47c"; + libraryHaskellDepends = [ + base data-default-class exceptions ghc-prim random transformers + ]; + testHaskellDepends = [ + base data-default-class exceptions ghc-prim hspec HUnit mtl + QuickCheck random stm time transformers + ]; + homepage = "http://github.com/Soostone/retry"; + description = "Retry combinators for monadic actions that may fail"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "retryer" = callPackage ({ mkDerivation, base, optparse-applicative, process }: mkDerivation { @@ -151172,10 +151769,8 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.1.1.1"; - sha256 = "8411ea10fcff87ce1d2fbe177cf2b3d6d254dc66cded2f49867daeed8334e427"; - revision = "1"; - editedCabalFile = "34fcc8e8cd473bab43aec11ed13d068aebb6f22298268f038798a6c7fd7f2b85"; + version = "0.1.2.0"; + sha256 = "7dfa3165d4edb739c33e7d737b5655535ae28666f9d3886501ed623f28c6e15e"; libraryHaskellDepends = [ acid-state aeson aeson-extra base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal @@ -153867,8 +154462,8 @@ self: { }: mkDerivation { pname = "shikensu"; - version = "0.1.2"; - sha256 = "ad596f07202898eff28471720a7784f4b70bce4eeea0b8b7a4c47390a4f4f817"; + version = "0.1.3"; + sha256 = "73d50978e7b6a0c1d1784ab607572411da44aafce58defe45938f2b427b85713"; libraryHaskellDepends = [ aeson base bytestring directory filepath flow Glob unordered-containers @@ -155836,6 +156431,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "slope-field" = callPackage + ({ mkDerivation, base, Chart, Chart-cairo, colour + , data-default-class, lens, mathexpr + }: + mkDerivation { + pname = "slope-field"; + version = "0.1.0.1"; + sha256 = "51c49a88ceb3fd3ec77670e32950a18fe1e185a79820228bb231b4f0d13a29af"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base data-default-class mathexpr ]; + executableHaskellDepends = [ + base Chart Chart-cairo colour data-default-class lens + ]; + homepage = "https://github.com/mdibaiee/slope-field"; + description = "Visualize mathematical function's slope fields"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "slot-lambda" = callPackage ({ mkDerivation, base, containers, haskell-src-exts , haskell-src-meta, syb, template-haskell, vector @@ -157180,6 +157794,8 @@ self: { pname = "snaplet-postgresql-simple"; version = "1.0.1.0"; sha256 = "c747f9a0145c22f36441bab504a45ab20fc68ad46a8383c5f4db6686cd0dee7d"; + revision = "1"; + editedCabalFile = "94e77c56c9493373c7d57f50b6dc62e178cf37d294aa046bd66f71f6102b3372"; libraryHaskellDepends = [ base bytestring clientsession configurator lens lifted-base monad-control mtl postgresql-simple resource-pool snap text @@ -157828,6 +158444,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "soap_0_2_3_2" = callPackage + ({ mkDerivation, base, bytestring, conduit, configurator + , data-default, exceptions, hspec, http-client, http-types, HUnit + , iconv, mtl, resourcet, text, unordered-containers, xml-conduit + , xml-conduit-writer, xml-types + }: + mkDerivation { + pname = "soap"; + version = "0.2.3.2"; + sha256 = "e7e5d21f70d67f14806a44f7328350d0f06b39ad4cbbc5a514437c5ddfb95395"; + libraryHaskellDepends = [ + base bytestring conduit configurator data-default exceptions + http-client http-types iconv mtl resourcet text + unordered-containers xml-conduit xml-conduit-writer xml-types + ]; + testHaskellDepends = [ + base bytestring hspec HUnit text unordered-containers xml-conduit + xml-conduit-writer + ]; + homepage = "https://bitbucket.org/dpwiz/haskell-soap"; + description = "SOAP client tools"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "soap-openssl" = callPackage ({ mkDerivation, base, configurator, data-default, HsOpenSSL , http-client, http-client-openssl, soap, text @@ -157958,8 +158599,8 @@ self: { ({ mkDerivation, base, bytestring, lksctp-tools, socket }: mkDerivation { pname = "socket-sctp"; - version = "0.2.0.1"; - sha256 = "65944b69c49d176a9c542bb03a1762dae3428b97aab76825381e22dc37ada036"; + version = "0.3.0.0"; + sha256 = "3320909a90d21f51743a114dd3f69604c7490ce1e86242f280cae8bc7c45092c"; libraryHaskellDepends = [ base bytestring socket ]; librarySystemDepends = [ lksctp-tools ]; testHaskellDepends = [ base bytestring socket ]; @@ -159274,8 +159915,8 @@ self: { }: mkDerivation { pname = "sproxy2"; - version = "1.90.1"; - sha256 = "5feb5f23458155f317808992af1de5cb1e86ee6d89a0ce0371efe3dfd130926b"; + version = "1.91.0"; + sha256 = "cfa966eddf2336a000d26cf6d4234529dddabeb8d87cadd51e7a5d2e5e794738"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161674,22 +162315,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_2_0" = callPackage + "stratosphere_0_2_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , hlint, lens, tasty, tasty-hspec, template-haskell, text + , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.2.0"; - sha256 = "7a5b78bbcf125e5fec7e377ddb6917111341bab23a7bf5567e1393a910f9085e"; + version = "0.2.2"; + sha256 = "e7f212a1dad585810e72adbf572b4324a5bfbc4fe7ace581c613fa668bc24ed1"; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring lens template-haskell text - unordered-containers + aeson aeson-pretty base bytestring hashable lens template-haskell + text unordered-containers ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring directory hlint lens tasty - tasty-hspec template-haskell text unordered-containers + aeson aeson-pretty base bytestring directory hashable hlint lens + tasty tasty-hspec template-haskell text unordered-containers ]; homepage = "https://github.com/frontrowed/stratosphere#readme"; description = "EDSL for AWS CloudFormation"; @@ -162261,6 +162902,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "string-random" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , pcre-heavy, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "string-random"; + version = "0.1.0.0"; + sha256 = "501904563b2dc7466568822e6b95e152d2e6e61818717b3963fd78b0888d1424"; + libraryHaskellDepends = [ + attoparsec base containers random text transformers + ]; + testHaskellDepends = [ + base bytestring pcre-heavy QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + homepage = "https://github.com/hiratara/hs-string-random#readme"; + description = "A library for generating random string from a regular experession"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "string-similarity" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, suffixtree }: mkDerivation { @@ -166281,8 +166943,8 @@ self: { }: mkDerivation { pname = "telegram-api"; - version = "0.5.1.1"; - sha256 = "2d253937a83605fd947a0d68d86208f0801bef97bf45679c81528d6c4d4e5d1d"; + version = "0.5.1.2"; + sha256 = "f13c9ce45a3d3a7bf52f4fadd8e1410ba64e3015ace00a6f82b2d4adf7e2410c"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client http-media http-types mime-types mtl servant servant-client string-conversions @@ -170196,6 +170858,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timezone-unix" = callPackage + ({ mkDerivation, base, directory, filepath, leapseconds, tasty + , tasty-golden, tasty-hunit, time, timezone-olson, timezone-series + , unix + }: + mkDerivation { + pname = "timezone-unix"; + version = "1.0"; + sha256 = "d23f524eb3738a0ee21a168bb56e8dfe85e602edc80268027358deddae63c0ba"; + libraryHaskellDepends = [ + base directory filepath leapseconds time timezone-olson + timezone-series unix + ]; + testHaskellDepends = [ + base directory leapseconds tasty tasty-golden tasty-hunit time + timezone-series + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "timing-convenience" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -171404,6 +172086,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "transient-universe_0_3_5_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , directory, filepath, hashable, HTTP, iproute, mtl, network + , network-info, network-uri, process, random, stm, TCache, text + , time, transformers, transient, vector, websockets + }: + mkDerivation { + pname = "transient-universe"; + version = "0.3.5.1"; + sha256 = "7613bf9a99b111423649793f687b7a2b81241b89840a8046a316793ecc7df985"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers directory filepath + hashable HTTP iproute mtl network network-info network-uri process + random stm TCache text time transformers transient vector + websockets + ]; + executableHaskellDepends = [ base transformers transient ]; + testHaskellDepends = [ + base bytestring case-insensitive containers directory filepath + hashable HTTP mtl network network-info network-uri process random + stm TCache text time transformers transient vector websockets + ]; + homepage = "http://www.fpcomplete.com/user/agocorona"; + description = "Remote execution and map-reduce: distributed computing for Transient"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "translatable-intset" = callPackage ({ mkDerivation, base, fingertree }: mkDerivation { @@ -171746,6 +172458,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "trifecta_1_6_1" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base + , blaze-builder, blaze-html, blaze-markup, bytestring, charset + , comonad, containers, deepseq, directory, doctest, filepath + , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors + , QuickCheck, reducers, semigroups, transformers + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "trifecta"; + version = "1.6.1"; + sha256 = "854c2892ffddfa5315206a1ff94b4814517933c496acf5b7ae09fdde72a28cf7"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html + blaze-markup bytestring charset comonad containers deepseq + fingertree ghc-prim hashable lens mtl parsers profunctors reducers + semigroups transformers unordered-containers utf8-string + ]; + testHaskellDepends = [ + base directory doctest filepath parsers QuickCheck + ]; + homepage = "http://github.com/ekmett/trifecta/"; + description = "A modern parser combinator library with convenient diagnostics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "trimpolya" = callPackage ({ mkDerivation, base, bio, bytestring, simpleargs }: mkDerivation { @@ -175707,6 +176446,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uri-bytestring_0_2_2_1" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , containers, generics-sop, HUnit, lens-simple, QuickCheck + , quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "uri-bytestring"; + version = "0.2.2.1"; + sha256 = "9185e8f05d5c5154348c0d57d0df2b92ba6d09153fbdebded995b2f54e71c67e"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring containers + ]; + testHaskellDepends = [ + attoparsec base blaze-builder bytestring containers generics-sop + HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty + tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/Soostone/uri-bytestring"; + description = "Haskell URI parsing as ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uri-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, containers, deepseq , failure, monad-control, network, system-fileio, system-filepath @@ -176787,6 +177550,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "validation_0_5_4" = callPackage + ({ mkDerivation, base, bifunctors, directory, doctest, filepath + , lens, mtl, QuickCheck, semigroupoids, semigroups + , template-haskell, transformers + }: + mkDerivation { + pname = "validation"; + version = "0.5.4"; + sha256 = "8b785f5d9e35285b2fbc35039799410bf3a9c7179735c232e573485cb98f74a3"; + libraryHaskellDepends = [ + base bifunctors lens mtl semigroupoids semigroups transformers + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/NICTA/validation"; + description = "A data-type like Either but with an accumulating Applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validations" = callPackage ({ mkDerivation, base, containers, digestive-functors, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -177544,8 +178328,8 @@ self: { ({ mkDerivation, base, deepseq, vector }: mkDerivation { pname = "vector-sized"; - version = "0.4.0.1"; - sha256 = "88880ec1fafecf2ef3ab545c43ff3256a32dc7dd854eec4aaa0d6bd4afd7b008"; + version = "0.4.1.0"; + sha256 = "19205fe36c63edfc52ea0f057bdf13ac22c71f5e40afc666bc9c6ff20846ca39"; libraryHaskellDepends = [ base deepseq vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -181360,6 +182144,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wikicfp-scraper_0_1_0_6" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec + , scalpel, text, time + }: + mkDerivation { + pname = "wikicfp-scraper"; + version = "0.1.0.6"; + sha256 = "8da3d67ee089342a9057e08b350896f278d404466e771757412ddcf1117270eb"; + libraryHaskellDepends = [ + attoparsec base bytestring scalpel text time + ]; + testHaskellDepends = [ base bytestring filepath hspec time ]; + homepage = "https://github.com/debug-ito/wikicfp-scraper"; + description = "Scrape WikiCFP web site"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wikipedia4epub" = callPackage ({ mkDerivation, base, bytestring, directory, epub, filepath , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url @@ -181437,8 +182239,8 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.1.0.2"; - sha256 = "dd31ca0fff07e5976076ed092ffb261ca438240fa33b25ba5ec3de66dcfd6d2d"; + version = "0.1.0.3"; + sha256 = "1eed4881d43da9a4169f338d5b503269df8c4c5f92e6da08a12282f2c17f9a36"; libraryHaskellDepends = [ base containers fold-debounce stm text transformers wild-bind X11 ]; @@ -182333,6 +183135,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "writer-cps-mtl_0_1_1_0" = callPackage + ({ mkDerivation, base, mtl, transformers, writer-cps-transformers + }: + mkDerivation { + pname = "writer-cps-mtl"; + version = "0.1.1.0"; + sha256 = "c8c17d4112fc851d3b48fd52ee1c5dc44c29b0e85dec73ddc8fa9a2415e99dd3"; + libraryHaskellDepends = [ + base mtl transformers writer-cps-transformers + ]; + homepage = "https://github.com/minad/writer-cps-mtl#readme"; + description = "MonadWriter orphan instances for writer-cps-transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "writer-cps-transformers" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -182347,6 +183165,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "writer-cps-transformers_0_1_1_0" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "writer-cps-transformers"; + version = "0.1.1.0"; + sha256 = "0a8663fe10576b659955fc3f9f816c776cc3a2cd9620e907d0e9ca1a8e88c62e"; + libraryHaskellDepends = [ base transformers ]; + homepage = "https://github.com/minad/writer-cps-transformers#readme"; + description = "WriteT and RWST monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wsdl" = callPackage ({ mkDerivation, base, bytestring, conduit, exceptions, file-embed , hspec, mtl, network-uri, resourcet, text, xml-conduit, xml-types From 1e62dc2929f2722d9d31810edd8fc887315f79d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 26 Nov 2016 20:28:05 +0100 Subject: [PATCH 0908/1749] configuration-hackage2nix.yaml: use latest hindent --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 832451138ee8..ab42bbd08368 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -844,7 +844,6 @@ default-package-overrides: - hidapi ==0.1.4 - hierarchical-clustering ==0.4.6 - highlighting-kate ==0.6.3 - - hindent ==4.6.4 - hinotify ==0.3.8.1 - hint ==0.6.0 - histogram-fill ==0.8.4.1 From 725e44cc046aaa8723f78ab420012db360eff11c Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 24 Nov 2016 19:17:46 -0500 Subject: [PATCH 0909/1749] hindent: fix 5.2.1 build --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f521f3100500..85970c88851f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -807,7 +807,7 @@ self: super: { }; # # Make elisp files available at a location where people expect it. - hindent = overrideCabal super.hindent (drv: { + hindent = (overrideCabal super.hindent (drv: { # We cannot easily byte-compile these files, unfortunately, because they # depend on a new version of haskell-mode that we don't have yet. postInstall = '' @@ -816,7 +816,9 @@ self: super: { ln -s $lispdir $out/share/emacs/site-lisp ''; doCheck = false; # https://github.com/chrisdone/hindent/issues/299 - }); + })).override { + haskell-src-exts = self.haskell-src-exts_1_19_0; + }; # https://github.com/yesodweb/Shelly.hs/issues/106 # https://github.com/yesodweb/Shelly.hs/issues/108 From d24a886419ce40e79daaf1f910a5bc861db4db0b Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 25 Nov 2016 13:48:21 -0500 Subject: [PATCH 0910/1749] hoogle: build with newest haskell-src-exts --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 85970c88851f..8a8d0e84e761 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -988,7 +988,7 @@ self: super: { }); # The latest Hoogle needs versions not yet in LTS Haskell 7.x. - hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_18_2; }; + hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_0; }; # To be in sync with Hoogle. lambdabot-haskell-plugins = (overrideCabal super.lambdabot-haskell-plugins (drv: { From bbd39a8057a4cfd32ac6db41ac922804dcf6dd5e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 27 Nov 2016 17:07:01 +0100 Subject: [PATCH 0911/1749] fbida: 2.11 -> 2.12 --- pkgs/applications/graphics/fbida/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 65209cbd6ffe..75033cf0f9d6 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,20 +1,18 @@ { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm -, pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends -}: +, pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm +, epoxy, poppler }: stdenv.mkDerivation rec { - name = "fbida-2.11"; + name = "fbida-2.12"; src = fetchurl { url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; - sha256 = "00x1lppb66b0gvp6sqs7zjgnlfh80lnkwvsm15ifzvlss3b67akw"; + sha256 = "0bw224vb7jh0lrqaf4jgxk48xglvxs674qcpj5y0axyfbh896cfk"; }; nativeBuildInputs = [ pkgconfig which ]; - buildInputs = - [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp - imagemagick curl sane-backends libdrm - ]; + buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff + libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler ]; makeFlags = [ "prefix=$(out)" "verbose=yes" ]; @@ -34,6 +32,6 @@ stdenv.mkDerivation rec { homepage = https://www.kraxel.org/blog/linux/fbida/; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; } From bcc9a6ac75d87738bae8dac55d074e1c5b9f9201 Mon Sep 17 00:00:00 2001 From: pngwjpgh Date: Sun, 27 Nov 2016 17:23:21 +0100 Subject: [PATCH 0912/1749] infinoted service: init Service module for the dedicated gobby server included in libinfinity --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/editors/infinoted.nix | 158 +++++++++++++++++++ 3 files changed, 161 insertions(+) create mode 100644 nixos/modules/services/editors/infinoted.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index b61c1f4799ec..41ee63a96035 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -281,6 +281,7 @@ ipfs = 261; stanchion = 262; riak-cs = 263; + infinoted = 264; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -532,6 +533,7 @@ ipfs = 261; stanchion = 262; riak-cs = 263; + infinoted = 264; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4589f47e7c19..12ff1cac4f4f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -180,6 +180,7 @@ ./services/desktops/telepathy.nix ./services/development/hoogle.nix ./services/editors/emacs.nix + ./services/editors/infinoted.nix ./services/games/factorio.nix ./services/games/ghost-one.nix ./services/games/minecraft-server.nix diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix new file mode 100644 index 000000000000..963147b18a04 --- /dev/null +++ b/nixos/modules/services/editors/infinoted.nix @@ -0,0 +1,158 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.infinoted; +in { + options.services.infinoted = { + enable = mkEnableOption "infinoted"; + + package = mkOption { + type = types.package; + default = pkgs.libinfinity.override { daemon = true; }; + defaultText = "pkgs.libinfinity.override { daemon = true; }"; + description = '' + Package providing infinoted + ''; + }; + + keyFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Private key to use for TLS + ''; + }; + + certificateFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Server certificate to use for TLS + ''; + }; + + certificateChain = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Chain of CA-certificates to which our `certificateFile` is relative. + Optional for TLS. + ''; + }; + + securityPolicy = mkOption { + type = types.enum ["no-tls" "allow-tls" "require-tls"]; + default = "require-tls"; + description = '' + How strictly to enforce clients connection with TLS. + ''; + }; + + port = mkOption { + type = types.int; + default = 6523; + description = '' + Port to listen on + ''; + }; + + rootDirectory = mkOption { + type = types.path; + default = "/var/lib/infinoted/documents/"; + description = '' + Root of the directory structure to serve + ''; + }; + + plugins = mkOption { + type = types.listOf types.str; + default = [ "note-text" "note-chat" "logging" "autosave" ]; + description = '' + Plugins to enable + ''; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + File to read server-wide password from + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = '' + [autosave] + interval=10 + ''; + description = '' + Additional configuration to append to infinoted.conf + ''; + }; + + user = mkOption { + type = types.str; + default = "infinoted"; + description = '' + What to call the dedicated user under which infinoted is run + ''; + }; + + group = mkOption { + type = types.str; + default = "infinoted"; + description = '' + What to call the primary group of the dedicated user under which infinoted is run + ''; + }; + }; + + config = mkIf (cfg.enable) { + users.extraUsers = optional (cfg.user == "infinoted") + { name = "infinoted"; + description = "Infinoted user"; + group = cfg.group; + }; + users.extraGroups = optional (cfg.group == "infinoted") + { name = "infinoted"; + }; + + systemd.services.infinoted = + { description = "Gobby Dedicated Server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + Type = "simple"; + Restart = "always"; + ExecStart = "${cfg.package}/bin/infinoted-0.6 --config-file=/var/lib/infinoted/infinoted.conf"; + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = true; + }; + preStart = '' + mkdir -p /var/lib/infinoted + install -o ${cfg.user} -g ${cfg.group} -m 0600 /dev/null /var/lib/infinoted/infinoted.conf + cat >>/var/lib/infinoted/infinoted.conf < Date: Mon, 28 Nov 2016 00:23:12 +0200 Subject: [PATCH 0913/1749] U-Boot: 2016.05 -> 2016.11 --- pkgs/misc/uboot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index a87971d4d9c9..e6577839718f 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -10,11 +10,11 @@ let stdenv.mkDerivation (rec { name = "uboot-${defconfig}-${version}"; - version = "2016.05"; + version = "2016.11"; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "0wdivib8kbm17qr6r7n7wyzg5vnwpagvwk5m0z80rbssc5sj5l47"; + sha256 = "1j6dkd9fqiibsdv0smq6q4x5zgyd4i1n4lk7prm47h6wcmjkx0a5"; }; nativeBuildInputs = [ bc dtc ]; From 25d6bfa2585b39beaeeb54a090d8e29a8787f783 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 28 Nov 2016 00:23:40 +0200 Subject: [PATCH 0914/1749] raspberrypifw: 1.20160620 -> 1.20161020 --- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 2ee232e877df..1c1b11f1ef4b 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "raspberrypi-firmware-${version}"; - version = "1.20160620"; + version = "1.20161020"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "06g691px0abndp5zvz2ba1g675rcqb64n055h5ahgnlck5cdpawg"; + sha256 = "073cry7xqrbkn8p1qzl4f3z6jvcbks4i61fz7i2pbwa60vddcp34"; }; dontStrip = true; # Stripping breaks some of the binaries From 86ea3126bc4543cc7880aab73dc1edaffe80537e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 28 Nov 2016 00:24:00 +0200 Subject: [PATCH 0915/1749] linux_rpi: 1.20160620 -> 1.20161020 --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index a069e7606ccc..3d046ee8f59a 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args: let - modDirVersion = "4.4.13"; - tag = "1.20160620-1"; + modDirVersion = "4.4.26"; + tag = "1.20161020-1"; in stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { version = "${modDirVersion}-${tag}"; @@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}"; - sha256 = "0bydlzmd9mar07j6dihhzn1xm6vpn92y33vf1qsdkl3hjil6brfc"; + sha256 = "0y76xrapq7710zzf6sif94xzly72gg505y65lslfirng500ncnv5"; }; features.iwlwifi = true; From eecf76eaa23f12109fc2be64a892fcabcf8ae642 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 27 Nov 2016 19:47:34 -0500 Subject: [PATCH 0916/1749] linux: 4.9-rc6 -> 4.9-rc7 --- pkgs/os-specific/linux/kernel/common-config.nix | 4 +++- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ab5af38d8b67..2ae714ea089f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -367,7 +367,9 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.15" && versionOlder version "4.8") '' MLX4_EN_VXLAN y ''} - MODVERSIONS y + ${optionalString (versionOlder version "4.9") '' + MODVERSIONS y + ''} MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension MTRR_SANITIZER y NET_FC y # Fibre Channel driver support diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 9979b854693b..95e89005b0fb 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9-rc6"; - modDirVersion = "4.9.0-rc6"; + version = "4.9-rc7"; + modDirVersion = "4.9.0-rc7"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0pxf4gzg8qxlf0i83vybf8g22aj0jjbk6n63bh9nciqhbshilr1w"; + sha256 = "0da5bf5cizvbn68d8pb5kyli3zkgsc8g61kn1b4d8gwvfxrb75hx"; }; features.iwlwifi = true; From 6d47cb41314a7acd220fdc83b6d173e130fb9155 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 23 Nov 2016 23:47:02 +0100 Subject: [PATCH 0917/1749] skopeo: init at 0.1.16 Signed-off-by: Vincent Demeester --- pkgs/development/tools/skopeo/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/skopeo/default.nix diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix new file mode 100644 index 000000000000..547f21a6f5dc --- /dev/null +++ b/pkgs/development/tools/skopeo/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme }: + +buildGoPackage rec { + name = "skopeo-${version}"; + version = "0.1.16"; + rev = "v${version}"; + + goPackagePath = "github.com/projectatomic/skopeo"; + excludedPackages = "integration"; + + buildInputs = [ gpgme ]; + + src = fetchFromGitHub { + inherit rev; + owner = "projectatomic"; + repo = "skopeo"; + sha256 = "11na7imx6yc1zijb010hx6fjh6v0m3wm5r4sa2nkclm5lkjq259b"; + }; + + meta = { + description = "A command line utility for various operations on container images and image repositories"; + homepage = "https://github.com/projectatomic/skopeo"; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.asl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b3c7348979c..0075b345898f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11457,6 +11457,8 @@ in rcshutdown = "/etc/rc.d/rc.shutdown"; }; + skopeo = callPackage ../development/tools/skopeo { }; + smem = callPackage ../os-specific/linux/smem { }; statifier = callPackage ../os-specific/linux/statifier { }; From dfb354ea7d76bf7bf60e39a07e4a7acdbfd0d3be Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sun, 27 Nov 2016 18:24:51 -0800 Subject: [PATCH 0918/1749] multi-ghc-travis: git-2015-11-04 -> git-2016-10-23 (#20754) adds support for ghc8 --- .../tools/haskell/multi-ghc-travis/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index a8fa950c98d8..71b363b27406 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "multi-ghc-travis-${version}"; - version = "git-2015-11-04"; + version = "git-2016-10-23"; buildInputs = [ ghc ]; src = fetchFromGitHub { owner = "hvr"; repo = "multi-ghc-travis"; - rev = "4c288937ff8b80f6f1532609f9920912856dc3ee"; - sha256 = "0978k81by403in7iq7ia4hsfwlvaalnjqyh3ihwyw8822a5gm8y9"; + rev = "03dd35f3801d6af4224906d45e982a748de9960e"; + sha256 = "1s08n8diis22cafych66zihdnd5q3dkv8m6i3a2s5g5f1phsk3mi"; }; patchPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - ghc -O --make make_travis_yml.hs -o $out/bin/multi-ghc-travis + ghc -O --make make_travis_yml_2.hs -o $out/bin/multi-ghc-travis ''; meta = with stdenv.lib; { From 9538176042c8f3cabdbb4aa5ffcc86b7dad3d425 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 28 Nov 2016 03:28:40 +0100 Subject: [PATCH 0919/1749] sks: init at 1.1.6 (#20717) --- pkgs/servers/sks/default.nix | 45 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/servers/sks/default.nix diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix new file mode 100644 index 000000000000..9149f050655c --- /dev/null +++ b/pkgs/servers/sks/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromBitbucket, ocaml, zlib, db48, perl }: + +stdenv.mkDerivation rec { + name = "sks-${version}"; + version = "1.1.6"; + + src = fetchFromBitbucket { + owner = "skskeyserver"; + repo = "sks-keyserver"; + rev = "${version}"; + sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm"; + }; + + buildInputs = [ ocaml zlib db48 perl ]; + + makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ]; + preConfigure = '' + cp Makefile.local.unused Makefile.local + sed -i \ + -e "s:^LIBDB=.*$:LIBDB=-ldb-4.8:g" \ + Makefile.local + ''; + + preBuild = "make dep"; + + doCheck = true; + checkPhase = "./sks unit_test"; + + meta = with stdenv.lib; { + description = "An OpenPGP keyserver whose goal is to provide easy to + deploy, decentralized, and highly reliable synchronization"; + longDescription = '' + SKS is an OpenPGP keyserver whose goal is to provide easy to deploy, + decentralized, and highly reliable synchronization. That means that a key + submitted to one SKS server will quickly be distributed to all key + servers, and even wildly out-of-date servers, or servers that experience + spotty connectivity, can fully synchronize with rest of the system. + ''; + inherit (src.meta) homepage; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0075b345898f..c6eab716b288 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3684,6 +3684,8 @@ in skippy-xd = callPackage ../tools/X11/skippy-xd {}; + sks = callPackage ../servers/sks { }; + skydns = callPackage ../servers/skydns { }; sipcalc = callPackage ../tools/networking/sipcalc { }; From 9c9a21d525926574ee6b3f24a549d943673cabd1 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Mon, 28 Nov 2016 13:03:48 +1030 Subject: [PATCH 0920/1749] matrix-synapse service: Make url_preview_enabled optional (#20609) --- .../modules/services/misc/matrix-synapse.nix | 48 ++++++++++++++++++- pkgs/servers/matrix-synapse/default.nix | 2 +- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 277fc9a39022..4a1bea50c14e 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -59,7 +59,12 @@ uploads_path: "/var/lib/matrix-synapse/uploads" max_upload_size: "${cfg.max_upload_size}" max_image_pixels: "${cfg.max_image_pixels}" dynamic_thumbnails: ${fromBool cfg.dynamic_thumbnails} -url_preview_enabled: False +url_preview_enabled: ${fromBool cfg.url_preview_enabled} +${optionalString (cfg.url_preview_enabled == true) '' +url_preview_ip_range_blacklist: ${builtins.toJSON cfg.url_preview_ip_range_blacklist} +url_preview_ip_range_whitelist: ${builtins.toJSON cfg.url_preview_ip_range_whitelist} +url_preview_url_blacklist: ${builtins.toJSON cfg.url_preview_url_blacklist} +''} recaptcha_private_key: "${cfg.recaptcha_private_key}" recaptcha_public_key: "${cfg.recaptcha_public_key}" enable_registration_captcha: ${fromBool cfg.enable_registration_captcha} @@ -355,6 +360,47 @@ in { default = "10K"; description = "Number of events to cache in memory."; }; + url_preview_enabled = mkOption { + type = types.bool; + default = false; + description = '' + Is the preview URL API enabled? If enabled, you *must* specify an + explicit url_preview_ip_range_blacklist of IPs that the spider is + denied from accessing. + ''; + }; + url_preview_ip_range_blacklist = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of IP address CIDR ranges that the URL preview spider is denied + from accessing. + ''; + }; + url_preview_ip_range_whitelist = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of IP address CIDR ranges that the URL preview spider is allowed + to access even if they are specified in + url_preview_ip_range_blacklist. + ''; + }; + url_preview_url_blacklist = mkOption { + type = types.listOf types.str; + default = [ + "127.0.0.0/8" + "10.0.0.0/8" + "172.16.0.0/12" + "192.168.0.0/16" + "100.64.0.0/10" + "169.254.0.0/16" + ]; + description = '' + Optional list of URL matches that the URL preview spider is + denied from accessing. + ''; + }; recaptcha_private_key = mkOption { type = types.str; default = ""; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index d290c124244f..d1301fad7abc 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -27,7 +27,7 @@ in pythonPackages.buildPythonApplication rec { pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2 service-identity signedjson systemd twisted ujson unpaddedbase64 pyyaml matrix-angular-sdk bleach netaddr jinja2 psycopg2 - ldap3 psutil msgpack + ldap3 psutil msgpack lxml ]; # Checks fail because of Tox. From 2891256daa2dea79868de926a2640aa06748dc57 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 27 Nov 2016 21:38:41 -0500 Subject: [PATCH 0921/1749] skopeo: fix evaluation, change license from asl2 to asl20 --- pkgs/development/tools/skopeo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 547f21a6f5dc..e724d00e4d39 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -21,6 +21,6 @@ buildGoPackage rec { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/projectatomic/skopeo"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.asl2; + license = stdenv.lib.licenses.asl20; }; } From 880d616ec007df10454b87593062711c39da9f7d Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 28 Nov 2016 03:35:05 +0100 Subject: [PATCH 0922/1749] neovim: 0.1.6 -> 0.1.7 --- pkgs/applications/editors/neovim/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 57a684d5572a..e76683aa1807 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -23,8 +23,8 @@ let src = fetchFromGitHub { owner = "neovim"; repo = "libvterm"; - rev = "e0a3d4dbd44a9534bf7437ee98ceb26dabebf3ad"; - sha256 = "131mcnbdq4wvsf280v4az8vnakr78yrwlaihzgr5s1wmfjvf6knf"; + rev = "11682793d84668057c5aedc3d7f8071bb54eaf2c"; + sha256 = "0pd90yx6xsagrqjipi26sxri1l4wdnx23ziad1zbxnqx9njxa7g3"; }; buildInputs = [ perl ]; @@ -60,13 +60,13 @@ let neovim = stdenv.mkDerivation rec { name = "neovim-${version}"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "0s8vqf4aym1d1h8yi0znpqw5rv9v3z64y5aha9dmynbwxa58q7pp"; + sha256 = "0bk0raxlb1xsqyw9pmqmxvcq5szqhimidrasnvzrci84gld8cwz4"; }; enableParallelBuilding = true; From 016fa06c71c86c1e43ad8df91dae76d8ac9d7ab3 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Sat, 5 Nov 2016 18:10:09 +1000 Subject: [PATCH 0923/1749] cjdns: Improving systemd unit description --- nixos/modules/services/networking/cjdns.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index f50dae2ab7be..0dd028997f46 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -198,8 +198,9 @@ in systemd.services.cjdns = { description = "cjdns: routing engine designed for security, scalability, speed and ease of use"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + wantedBy = [ "multi-user.target" "sleep.target"]; + after = [ "network-online.target" ]; + bindsTo = [ "network-online.target" ]; preStart = if cfg.confFile != null then "" else '' [ -e /etc/cjdns.keys ] && source /etc/cjdns.keys @@ -235,7 +236,9 @@ in serviceConfig = { Type = "forking"; - Restart = "on-failure"; + Restart = "always"; + StartLimitInterval = 0; + RestartSec = 1; CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW"; ProtectSystem = "full"; From bff2b98290b7167db60af97b0d6ac8fa280699d2 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 25 Nov 2016 11:24:07 +0100 Subject: [PATCH 0924/1749] ruby: 3.2.1 -> 2.3.3 --- pkgs/development/interpreters/ruby/default.nix | 8 ++++---- pkgs/development/interpreters/ruby/patchsets.nix | 5 +++++ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 336c861bbdc4..9486d030a8b4 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -211,11 +211,11 @@ in { }; }; - ruby_2_3_1 = generic { - version = rubyVersion "2" "3" "1" ""; + ruby_2_3_3 = generic { + version = rubyVersion "2" "3" "3" ""; sha256 = { - src = "1kbxg72las93w0y553cxv3lymy2wvij3i3pg1y9g8aq3na676z5q"; - git = "0dv1rf5f9lj3icqs51bq7ljdcf17sdclmxm9hilwxps5l69v5q9r"; + src = "1dqmh42p6siv9aqzdjldsnhljj3f2h30m0v8cf25icjmqp40h514"; + git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 4c1321b5b873..d21e7d669dcc 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -60,4 +60,9 @@ rec { "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; + "2.3.3" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" + "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" + ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a69dcf75bb2..93d967372619 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5713,7 +5713,7 @@ in ruby_2_0_0 ruby_2_1_10 ruby_2_2_5 - ruby_2_3_1; + ruby_2_3_3; # Ruby aliases ruby = ruby_2_3; @@ -5721,7 +5721,7 @@ in ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; ruby_2_2 = ruby_2_2_5; - ruby_2_3 = ruby_2_3_1; + ruby_2_3 = ruby_2_3_3; scsh = callPackage ../development/interpreters/scsh { }; From d1055c0ed763286ec991a0caf286769f0bb3466e Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 27 Nov 2016 22:12:06 -0500 Subject: [PATCH 0925/1749] all-packages.nix: whitespace cleanup --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93d967372619..69abb1d39b28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10270,7 +10270,7 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { - erlang = erlang_basho_R16B03; + erlang = erlang_basho_R16B03; }; stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { From bd57e3231206cb967b9f03e0b5baf8f4fc4d4031 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 24 Nov 2016 00:43:37 -0600 Subject: [PATCH 0926/1749] file_cmds: init at 264.1.1 --- .../darwin/apple-source-releases/default.nix | 2 ++ .../file_cmds/default.nix | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index c63d7465a13d..69dc22836453 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -39,6 +39,7 @@ let network_cmds = "481.20.1"; basic_cmds = "55"; adv_cmds = "163"; + file_cmds = "264.1.1"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ @@ -231,6 +232,7 @@ let basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; developer_cmds = applePackage "developer_cmds" "osx-10.11.6" "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {}; network_cmds = applePackage "network_cmds" "osx-10.11.6" "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {}; + file_cmds = applePackage "file_cmds" "osx-10.11.6" "1zfxbmasps529pnfdjvc13p7ws2cfx8pidkplypkswyff0nff4wp" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix new file mode 100644 index 000000000000..2618b4974f9f --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -0,0 +1,33 @@ +{ stdenv, appleDerivation, xcbuild, zlib, bzip2, lzma }: + +appleDerivation rec { + buildInputs = [ xcbuild zlib bzip2 lzma ]; + + # some commands not working: + # mtree: _simple.h not found + # ipcs: sys/ipcs.h not found + # so remove their targets from the project + patchPhase = '' + substituteInPlace file_cmds.xcodeproj/project.pbxproj \ + --replace "FC8A8CAA14B655FD001B97AD /* PBXTargetDependency */," "" \ + --replace "FC8A8C9C14B655FD001B97AD /* PBXTargetDependency */," "" \ + --replace "productName = file_cmds;" "" + sed -i -re "s/name = ([a-zA-Z]+);/name = \1; productName = \1;/" file_cmds.xcodeproj/project.pbxproj + ''; + + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + install file_cmds-*/Build/Products/Release/* $out/bin/ + + for n in 1; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n + done + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} From de925e952e477153f555a3abcc911e4c843e33a1 Mon Sep 17 00:00:00 2001 From: Okasu Date: Sat, 26 Nov 2016 23:09:49 +0300 Subject: [PATCH 0927/1749] terminus-font-ttf: init at 4.40.1 --- lib/maintainers.nix | 1 + pkgs/data/fonts/terminus-font-ttf/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/data/fonts/terminus-font-ttf/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7e4a7168effb..11a4b14e08e9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -323,6 +323,7 @@ ocharles = "Oliver Charles "; odi = "Oliver Dunkl "; offline = "Jaka Hudoklin "; + okasu = "Okasu "; olcai = "Erik Timan "; olejorgenb = "Ole Jørgen Brønner "; orbekk = "KJ Ørbekk "; diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix new file mode 100644 index 000000000000..e9adc4c0422b --- /dev/null +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "terminus-font-ttf-${version}"; + version = "4.40.1"; + + src = fetchurl { + url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; + sha256 = "c3cb690c2935123035a0b1f3bfdd9511c282dab489cd423e161a47c592edf188"; + }; + + buildInputs = [unzip]; + + installPhase = '' + for i in *.ttf; do + local destname="$(echo "$i" | sed -E 's|-[[:digit:].]+\.ttf$|.ttf|')" + install -Dm 644 "$i" "$out/share/fonts/truetype/$destname" + done + + install -Dm 644 COPYING "$out/share/doc/COPYING" + ''; + + meta = with stdenv.lib; { + description = "A clean fixed width TTF font"; + longDescription = '' + Monospaced bitmap font designed for long work with computers + (TTF version, mainly for Java applications) + ''; + homepage = http://files.ax86.net/terminus-ttf; + license = licenses.ofl; + maintainers = with maintainers; [ okasu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaeb78207174..c2af8edacc1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17602,4 +17602,6 @@ in fpm2 = callPackage ../tools/security/fpm2 { }; simplenote = callPackage ../applications/misc/simplenote { }; + + terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; } From 83410d9954ff9ce27023b66c86c05ace38a0c6e5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 28 Nov 2016 08:52:26 +0100 Subject: [PATCH 0928/1749] beets: 1.3.19 -> 1.4.1 Full upstream release announcement: https://github.com/beetbox/beets/releases/tag/v1.4.1 I had to rebase the keyfinder-default-bin.patch in order to apply with the new release. Other than that I didn't test whether beets works on my machine, as I have a more or less temporary setup at the moment. However, since the bump of mutagen to version 1.34 in commit 555928c228634b4c372f38e6ea5c320c1662711b, the mediafile tests fail and thus this commit unbreaks beets. Signed-off-by: aszlig --- pkgs/tools/audio/beets/default.nix | 6 +++--- .../audio/beets/keyfinder-default-bin.patch | 21 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index c7b1d6950412..0c6dc9219c47 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -74,13 +74,13 @@ let in pythonPackages.buildPythonApplication rec { name = "beets-${version}"; - version = "1.3.19"; + version = "1.4.1"; src = fetchFromGitHub { - owner = "sampsyo"; + owner = "beetbox"; repo = "beets"; rev = "v${version}"; - sha256 = "0f2v1924ryx5xijpv1jycanl4471vcd7c5lld58lm0viyvh5k28x"; + sha256 = "1yj2m7l157lldhxanwifp3yv1c6k649iwhn061mcf26q4n8qmspk"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/audio/beets/keyfinder-default-bin.patch b/pkgs/tools/audio/beets/keyfinder-default-bin.patch index b0b573bbf313..1ea195a678e8 100644 --- a/pkgs/tools/audio/beets/keyfinder-default-bin.patch +++ b/pkgs/tools/audio/beets/keyfinder-default-bin.patch @@ -1,5 +1,5 @@ diff --git a/beetsplug/keyfinder.py b/beetsplug/keyfinder.py -index b6131a4..b493792 100644 +index 34a4abc..59e8539 100644 --- a/beetsplug/keyfinder.py +++ b/beetsplug/keyfinder.py @@ -30,7 +30,7 @@ class KeyFinderPlugin(BeetsPlugin): @@ -11,25 +11,26 @@ index b6131a4..b493792 100644 u'auto': True, u'overwrite': False, }) -@@ -59,7 +59,7 @@ class KeyFinderPlugin(BeetsPlugin): +@@ -59,8 +59,7 @@ class KeyFinderPlugin(BeetsPlugin): continue try: -- output = util.command_output([bin, b'-f', -+ output = util.command_output([bin, - util.syspath(item.path)]) +- output = util.command_output([bin, '-f', +- util.syspath(item.path)]) ++ output = util.command_output([bin, util.syspath(item.path)]) except (subprocess.CalledProcessError, OSError) as exc: self._log.error(u'execution failed: {0}', exc) + continue diff --git a/test/test_keyfinder.py b/test/test_keyfinder.py -index 00952fe..01ff8d4 100644 +index 57e2bcd..c1ee916 100644 --- a/test/test_keyfinder.py +++ b/test/test_keyfinder.py -@@ -46,7 +46,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper): +@@ -44,7 +44,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper): item.load() self.assertEqual(item['initial_key'], 'C#m') - self.command_output.assert_called_with( + command_output.assert_called_with( - ['KeyFinder', '-f', util.syspath(item.path)]) + ['keyfinder-cli', util.syspath(item.path)]) - def test_add_key_on_import(self): - self.command_output.return_value = 'dbm' + def test_add_key_on_import(self, command_output): + command_output.return_value = 'dbm' From 33d49bbfb733de7d4a69fc187af2da3c03667470 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 27 Nov 2016 17:54:44 +0100 Subject: [PATCH 0929/1749] ocamlPackages.ocp-index: 1.1.4 -> 1.1.5 --- .../tools/ocaml/ocp-index/default.nix | 37 +++++++------------ 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 721111f676fb..6b865e9709a6 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,39 +1,30 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: let inherit (stdenv.lib) getVersion versionAtLeast optional; in assert versionAtLeast (getVersion ocaml) "4"; -assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; +assert versionAtLeast (getVersion ocpBuild) "1.99.13-beta"; assert versionAtLeast (getVersion ocpIndent) "1.4.2"; let - version = "1.1.4"; - srcs = { - "4.03.0" = { - rev = "${version}-4.03"; - sha256 = "0c6s5radwyvxf9hrq2y9lirk72z686k9yzd0vgzy98yrrp1w56mv"; - }; - "4.02.3" = { - rev = "${version}-4.02"; - sha256 = "057ss3lz754b2pznkb3zda5h65kjgqnvabvfqwqcz4qqxxki2yc8"; - }; - "4.01.0" = { - rev = "${version}"; - sha256 = "106bnc8jhmjnychcl8k3gl9n6b50bc66qc5hqf1wkbkk9kz4vc9d"; - }; - }; - - src = fetchFromGitHub ({ - owner = "OCamlPro"; - repo = "ocp-index"; - } // srcs."${ocaml.version}"); + version = "1.1.5"; in stdenv.mkDerivation { name = "ocp-index-${version}"; - inherit src; + src = fetchFromGitHub { + owner = "OCamlPro"; + repo = "ocp-index"; + rev = version; + sha256 = "0gir0fm8mq609371kmwpsqfvpfx2b26ax3f9rg5fjf5r0bjk9pqd"; + }; + + patches = [ (fetchpatch { + url = https://github.com/OCamlPro/ocp-index/commit/618872a0980d077857a63d502eadbbf0d1b05c0f.diff; + sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z"; + }) ]; buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ] ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm; From 5b6d52b4fb7378740d3c2e7017326a5d0f68711e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 28 Nov 2016 09:55:17 +0100 Subject: [PATCH 0930/1749] nagios: 4.0.8 -> 4.2.3 This update includes many security related fixes. Version 4.2.0 fixes: - CVE-2008-4796 - CVE-2013-4214 Version 4.2.2 fixes: - CVE-2016-9565 Version 4.2.3 fixes: - CVE-2016-8641 See https://www.nagios.org/projects/nagios-core/history/4x/ for full detail changes. --- pkgs/servers/monitoring/nagios/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index bf43a93a81b2..c4d60cabaa39 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, perl, php, gd, libpng, zlib }: +{ stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip }: stdenv.mkDerivation rec { name = "nagios-${version}"; - version = "4.0.8"; + version = "4.2.3"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; - sha256 = "0jyad39wa318613awlnpczrrakvjcipz8qp1mdsig1cp1hjqs9lb"; + sha256 = "0p16sm5pkbzf4py30hwzm38194cl23wfzsvkhk4jkf3p1fq7xvl3"; }; patches = [ ./nagios.patch ]; - buildInputs = [ php perl gd libpng zlib ]; + buildInputs = [ php perl gd libpng zlib unzip ]; configureFlags = [ "--localstatedir=/var/lib/nagios" ]; buildFlags = "all"; From c77011c6decc989d11eef7dcbd37625c980f0790 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 28 Nov 2016 09:58:29 +0100 Subject: [PATCH 0931/1749] nagiosPluginsOfficial: 2.0.3 -> 2.1.4 See https://github.com/nagios-plugins/nagios-plugins/blob/master/NEWS for release history --- pkgs/servers/monitoring/nagios/plugins/official-2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix index 79180f172417..306dee0ec627 100644 --- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix +++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nagios-plugins-${version}"; - version = "2.0.3"; + version = "2.1.4"; src = fetchurl { url = "http://nagios-plugins.org/download/${name}.tar.gz"; - sha256 = "0jm0mn55hqwl8ffx8ww9mql2wrkhp1h2k8jw53q3h0ff5m22204g"; + sha256 = "146hrpcwciz0niqsv4k5yvkhaggs9mr5v02xnnxp5yp0xpdbama3"; }; # !!! Awful hack. Grrr... this of course only works on NixOS. From e36d243258889fa98efba3cb1ee3997d0af2c40e Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 28 Nov 2016 11:16:13 +0100 Subject: [PATCH 0932/1749] rustc: Don't fail if deleting of breaking tests fails. --- pkgs/development/compilers/rust/rustc.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 57480974a3f1..18f5a41e51df 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -88,14 +88,14 @@ stdenv.mkDerivation { #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ # Disable fragile linker-output-non-utf8 test - rm -vr src/test/run-make/linker-output-non-utf8/ + rm -vr src/test/run-make/linker-output-non-utf8 || true # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 - rm -vr src/test/run-pass/issue-36023.rs + rm -vr src/test/run-pass/issue-36023.rs || true # Disable test getting stuck on hydra - possible fix: # https://reviews.llvm.org/rL281650 - rm -vr src/test/run-pass/issue-36474.rs + rm -vr src/test/run-pass/issue-36474.rs || true # Useful debugging parameter # export VERBOSE=1 From bfc187f23a80a02135b2d76fb1e92adc7d5759ce Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 28 Nov 2016 11:21:12 +0100 Subject: [PATCH 0933/1749] rustc: Loosen bootstrapping restrictions. Newer nightlies check a new environment variable that if set will loosen restrictions on which compiler version can be used for bootstrapping. Upstream issue is at https://github.com/rust-lang/rust/pull/37265 --- pkgs/development/compilers/rust/rustc.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 18f5a41e51df..04543f17ec98 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -46,6 +46,12 @@ stdenv.mkDerivation { NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; + # Enable nightly features in stable compiles (used for + # bootstrapping, see https://github.com/rust-lang/rust/pull/37265). + # This loosens the hard restrictions on bootstrapping-compiler + # versions. + RUSTC_BOOTSTRAP = "1"; + src = fetchgit { url = https://github.com/rust-lang/rust; rev = srcRev; From 4c7323545b21e103f6e864abb0dcec314eed6ae9 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 27 Nov 2016 21:36:17 +0100 Subject: [PATCH 0934/1749] Revert "grsecurity: work around for #20490" This reverts commit e38b74ba89d3d03e01ee751131d2a6dc316ac33a. I failed to notice f19c961b4e461da045f2e72e73701059e5117be0; better use that fix instead. --- .../linux/kernel/grsecurity-modinst.patch | 12 ------------ pkgs/os-specific/linux/kernel/patches.nix | 8 -------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/grsecurity-modinst.patch diff --git a/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch b/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch deleted file mode 100644 index 275d96fbb29b..000000000000 --- a/pkgs/os-specific/linux/kernel/grsecurity-modinst.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN a/scripts/Makefile.modinst b/scripts/Makefile.modinst ---- a/scripts/Makefile.modinst 2016-11-15 07:49:06.000000000 +0100 -+++ b/scripts/Makefile.modinst 2016-11-18 13:45:07.977270500 +0100 -@@ -9,7 +9,7 @@ - - # - --__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod))) -+__modules := $(shell find $(MODVERDIR) -name '*.mod' -exec grep -h '\.ko$$' '{}' \; | sort) - modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o))) - - PHONY += $(modules) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 999b9dc260a0..fc9ef4ac53e5 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -99,14 +99,6 @@ rec { patch = ./grsecurity-nixos-kmod.patch; }; - # A temporary work-around for execvp: arglist too long error during - # module_install. Without this, no modules are installed into the - # resulting output. - grsecurity_modinst = - { name = "grsecurity-modinst"; - patch = ./grsecurity-modinst.patch; - }; - crc_regression = { name = "crc-backport-regression"; patch = ./crc-regression.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69abb1d39b28..6f7808b9b2aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11207,7 +11207,7 @@ in ]; }; grsecPatch = self.kernelPatches.grsecurity_testing; - kernelPatches = with self.kernelPatches; [ grsecurity_nixos_kmod grsecurity_modinst ]; + kernelPatches = [ self.kernelPatches.grsecurity_nixos_kmod ]; extraConfig = callPackage ../os-specific/linux/kernel/grsecurity-nixos-config.nix { }; }; From 1915f6908ab17bf37b8aa1cf33eef55f9fac69ce Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 27 Nov 2016 21:40:03 +0100 Subject: [PATCH 0935/1749] linux_grsec_nixos: use the "modinst arg list too long" patch An alternative to e38b74ba89d3d03e01ee751131d2a6dc316ac33a; see f19c961b4e461da045f2e72e73701059e5117be0 for details --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f7808b9b2aa..bd390e1d245b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11199,8 +11199,10 @@ in linux_grsec_nixos = callPackage ../build-support/grsecurity { inherit (lib) overrideDerivation; kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix { - kernelPatches = with self.kernelPatches; [ bridge_stp_helper ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = with self.kernelPatches; [ + bridge_stp_helper + modinst_arg_list_too_long + ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 From b90ed0cc80293e16a219193f4b2495be14fd563b Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 28 Nov 2016 11:38:10 +0100 Subject: [PATCH 0936/1749] grsecurity: 4.8.10-201611232213 -> 4.8.11-201611271225 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index e0e8fbaf95e8..4937c2271c7a 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.10"; + version = "4.8.11"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1i3hydxjl3zz4i3v2spnv5y5pidmwgiyc10q6rlwvf0bs8aynh53"; + sha256 = "03w90vfjfcya38mcp1njasa5c67za203sgp9n3w52gms13s443yc"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index fc9ef4ac53e5..fa5984ebf8bc 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.10"; - grrev = "201611232213"; - sha256 = "13v3h6cjd5qz57rf242kpxhz5rk094lg5kyf86a852fk58apk6b6"; + { kver = "4.8.11"; + grrev = "201611271225"; + sha256 = "12vcy030vxi7h2dxyikfj8cirrifk9j186dbc2vk45dv4flcxpac"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 5da1394a587a9123f07a55d2bf8d9966df907c10 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 28 Nov 2016 11:38:23 +0100 Subject: [PATCH 0937/1749] Revert "gradm: fix using gradm while the RBAC system is active" This reverts commit fdbf7dc8b38cd523804d342d2c153dfeb10cc83d. Unfortunately, while gradm now works when the RBAC system is enabled, gradm still fails when full system learning is enabled, so I probably need to try again later. --- pkgs/os-specific/linux/gradm/default.nix | 2 -- .../linux/gradm/gradm_nix_store.patch | 31 ------------------- 2 files changed, 33 deletions(-) delete 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 2beb07094697..7f64ed227719 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -12,8 +12,6 @@ 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 deleted file mode 100644 index c1b7047324b1..000000000000 --- a/pkgs/os-specific/linux/gradm/gradm_nix_store.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 e99228db3014131255e19b88ba78e47b46a4bff8 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 28 Nov 2016 12:04:51 +0100 Subject: [PATCH 0938/1749] grsecurity module: force a known good kernel package set Previously, we would only set a default value, on the theory that `boot.kernelPackages` could be used to sanely configure a custom grsec kernel. Regrettably, this is not the case and users who expect e.g., `boot.kernelPackages = pkgs.linuxPackages_latest` to work will end up with a non-grsec kernel (this problem has come up twice on the bug tracker recently). With this patch, `security.grsecurity.enable = true` implies `boot.kernelPackages = linuxPackages_grsec_nixos` and any customization must be done via package override or by eschewing the module. --- nixos/modules/security/grsecurity.nix | 2 +- nixos/modules/security/grsecurity.xml | 44 +++++++++++++++++++-------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index ea245ecc5b6a..92afb74956eb 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -57,7 +57,7 @@ in config = mkIf cfg.enable { - boot.kernelPackages = mkDefault pkgs.linuxPackages_grsec_nixos; + boot.kernelPackages = mkForce pkgs.linuxPackages_grsec_nixos; boot.kernelParams = optional cfg.disableEfiRuntimeServices "noefi"; diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index 6f9884336b1e..e41748358fbb 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -51,6 +51,13 @@ # nixos-rebuild boot # reboot + + Enabling the grsecurity module overrides + , to reduce the risk of + misconfiguration. + describes how to use a custom kernel package set. + + For most users, further configuration should be unnecessary. All users are encouraged to look over before using the system, however. If you experience problems, please refer to @@ -205,21 +212,22 @@ - To use a custom kernel with upstream's recommended settings for server - deployments: + To build a custom kernel using upstream's recommended settings for server + deployments, while still using the NixOS module: - boot.kernelPackages = - let - kernel = pkgs.linux_grsec_nixos.override { - extraConfig = '' - GRKERNSEC_CONFIG_AUTO y - GRKERNSEC_CONFIG_SERVER y - GRKERNSEC_CONFIG_SECURITY y - ''; + nixpkgs.config.packageOverrides = super: { + linux_grsec_nixos = super.linux_grsec_nixos.override { + extraConfig = '' + GRKERNSEC_CONFIG_AUTO y + GRKERNSEC_CONFIG_SERVER y + GRKERNSEC_CONFIG_SECURITY y + ''; }; - self = pkgs.linuxPackagesFor kernel self; - in self; + } + + + The wikibook provides an exhaustive listing of kernel configuration options. @@ -228,6 +236,18 @@ The NixOS module makes several assumptions about the kernel and so may be incompatible with your customised kernel. Currently, the only way to work around incompatibilities is to eschew the NixOS module. + + If not using the NixOS module, a custom grsecurity package set can + be specified inline instead, as in + + boot.kernelPackages = + let + kernel = pkgs.linux_grsec_nixos.override { + extraConfig = /* as above */; + }; + self = pkgs.linuxPackagesFor kernel self; + in self; + From 41ed3a8dd10b1e4babb045d06c2074042e13c7e0 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 24 Nov 2016 11:48:43 +0100 Subject: [PATCH 0939/1749] lnav: fix compilation nix-env -i lnav currently result of a failure: command_executor.cc:34:21: fatal error: pcrecpp.h: No such file or directory This fixes by using pcre-cpp instead of pcre. Signed-off-by: Vincent Demeester --- pkgs/tools/misc/lnav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index a4a081aeadee..a3b40edb46ca 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pcre, sqlite, ncurses, +{ stdenv, fetchFromGitHub, pcre-cpp, sqlite, ncurses, readline, zlib, bzip2, autoconf, automake }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { zlib bzip2 ncurses - pcre + pcre-cpp readline sqlite ]; From c93ec7b6b75ce6c7aebe11a18f25f1831d0620a6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 28 Nov 2016 13:54:57 +0100 Subject: [PATCH 0940/1749] bftpd: init at 4.4 --- pkgs/servers/ftp/bftpd/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/servers/ftp/bftpd/default.nix diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix new file mode 100644 index 000000000000..ceabce82c712 --- /dev/null +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "bftpd"; + version = "4.4"; + # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + src = fetchurl { + url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; + sha256 = "0hgpqwv7mj1yln8ps9bbcjhl5hvs02nxjfkk9nhkr6fysfyyn1dq"; + }; + buildInputs = []; + preConfigure = '' + sed -re 's/-[og] 0//g' -i Makefile* + ''; + meta = { + inherit version; + description = ''A minimal ftp server''; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://bftpd.sf.net/"; + downloadPage = "http://bftpd.sf.net/download.html"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd390e1d245b..816fa30d4c32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10016,6 +10016,8 @@ in sabnzbd = callPackage ../servers/sabnzbd { }; + bftpd = callPackage ../servers/ftp/bftpd {}; + bind = callPackage ../servers/dns/bind { }; dnsutils = bind.dnsutils; From 448d605f89fb0b66640c1a660b8f1e2b8d4a9893 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Mon, 28 Nov 2016 14:16:37 +0100 Subject: [PATCH 0941/1749] opencv3: adding myself as co-maintainer --- 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 2ad15ca8c152..d86a2671cded 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = http://opencv.org/; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [viric flosse]; + maintainers = with stdenv.lib.maintainers; [viric flosse mdaiter]; platforms = with stdenv.lib.platforms; linux; }; } From 70c18b55d71e8bd49c7ac0a1d149cdc1c963f2dd Mon Sep 17 00:00:00 2001 From: Tim Nieradzik Date: Fri, 11 Nov 2016 18:29:46 +0100 Subject: [PATCH 0942/1749] rxvt_unicode: create .desktop file --- .../misc/rxvt_unicode/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 69eda23b1433..f3939d3b6eba 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -1,10 +1,21 @@ -{ stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl, - fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf, - unicode3Support }: +{ stdenv, fetchurl, makeDesktopItem, perlSupport, libX11, libXt, libXft, + ncurses, perl, fontconfig, freetype, pkgconfig, libXrender, + gdkPixbufSupport, gdk_pixbuf, unicode3Support }: let pname = "rxvt-unicode"; version = "9.22"; + description = "A clone of the well-known terminal emulator rxvt"; + + desktopItem = makeDesktopItem { + name = "${pname}"; + exec = "urxvt"; + icon = "utilities-terminal"; + comment = description; + desktopName = "URxvt"; + genericName = "${pname}"; + categories = "System;TerminalEmulator;"; + }; in stdenv.mkDerivation (rec { @@ -47,13 +58,14 @@ stdenv.mkDerivation (rec { postInstall = '' mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + cp -r ${desktopItem}/share/applications/ $out/share/ ''; - meta = { - description = "A clone of the well-known terminal emulator rxvt"; + meta = with stdenv.lib; { + inherit description; homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; - maintainers = [ stdenv.lib.maintainers.mornfall ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.mornfall ]; + platforms = platforms.unix; }; }) From 121da5e93882073963836dcc2bbacc9e40f33d6c Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 28 Nov 2016 14:47:46 +0200 Subject: [PATCH 0943/1749] lxc: fix sandbox builds Package attempt to write /etc/bash_completion.d, I directed it to "${out}/etc/bash_completion.d" as it was suggested. --- pkgs/os-specific/linux/lxc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index aad73844a665..430836adb1a7 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" "sysconfdir=\${out}/etc" "sysconfigdir=\${out}/etc/default" + "bashcompdir=\${out}/share/bash-completion/completions" "READMEdir=\${TMPDIR}/var/lib/lxc/rootfs" "LXCPATH=\${TMPDIR}/var/lib/lxc" ]; From a8eeef62e62bec7b09da028a7340b7bf7f2dc011 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 28 Nov 2016 13:44:20 +0200 Subject: [PATCH 0944/1749] lxc: 2.0.4 -> 2.0.6 (security) https://security-tracker.debian.org/tracker/CVE-2016-8649 --- pkgs/os-specific/linux/lxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 430836adb1a7..3c413ca2426f 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -12,11 +12,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "10lm7vfw4j7arcynmgyjqd8v2fqn7spbablj42j26kmzljcydj8l"; + sha256 = "0ynddnfirh9pmy7ijg300jrgzdhjzm07fsmvdw71mb2x0p82qabw"; }; nativeBuildInputs = [ From 37715d1f46653f331d9b5e52e5436fc6afc6d6c2 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Mon, 28 Nov 2016 15:53:44 +0200 Subject: [PATCH 0945/1749] hydra-module: add cfg.package to hydra-evaluator path --- nixos/modules/services/continuous-integration/hydra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index b1b3404add09..fa550f68b338 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -343,7 +343,7 @@ in { wantedBy = [ "multi-user.target" ]; requires = [ "hydra-init.service" ]; after = [ "hydra-init.service" "network.target" ]; - path = [ pkgs.nettools ]; + path = [ cfg.package pkgs.nettools ]; environment = env; serviceConfig = { ExecStart = "@${cfg.package}/bin/hydra-evaluator hydra-evaluator"; From 5c750e49404bbc70cc56f3f47b5aa8101e581eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 30 Oct 2016 10:48:48 +0100 Subject: [PATCH 0946/1749] Build all derivations at least for 64bit Linux --- pkgs/top-level/release-lib.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 34788736edd4..5f6dd49d6ecc 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -85,7 +85,7 @@ rec { packagePlatforms = mapAttrs (name: value: let res = builtins.tryEval ( if isDerivation value then - value.meta.hydraPlatforms or (value.meta.platforms or []) + value.meta.hydraPlatforms or (value.meta.platforms or [ "x86_64-linux" ]) else if value.recurseForDerivations or false || value.recurseForRelease or false then packagePlatforms value else From 0526a5c90a251cf88f247af0dc436e9b08da733c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Mon, 28 Nov 2016 15:24:09 +0100 Subject: [PATCH 0947/1749] services: add gatewayAddress and apiAddress to ipfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- .../modules/services/network-filesystems/ipfs.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index c26a70737033..104b5b92620e 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -47,6 +47,18 @@ in ''; }; + gatewayAddress = mkOption { + type = types.str; + default = "/ip4/127.0.0.1/tcp/8080"; + description = "Where the IPFS Gateway can be reached"; + }; + + apiAddress = mkOption { + type = types.str; + default = "/ip4/127.0.0.1/tcp/5001"; + description = "Where IPFS exposes its API to"; + }; + enableGC = mkOption { type = types.bool; default = false; @@ -98,6 +110,8 @@ in cd ${cfg.dataDir} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs init" fi + ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs config Addresses.API ${cfg.apiAddress}" + ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs config Addresses.Gateway ${cfg.gatewayAddress}" ''; serviceConfig = { From f7c099bd8c9c2ad89408f3b689c06daa7ae654ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Sat, 26 Nov 2016 20:07:01 +0100 Subject: [PATCH 0948/1749] tests: added basic ipfs test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit $getter can be used once ipfs supports private/local networks and or internet gets routed to the VMs Signed-off-by: Maximilian Güntner --- nixos/tests/ipfs.nix | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 nixos/tests/ipfs.nix diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix new file mode 100644 index 000000000000..92d742e4f37f --- /dev/null +++ b/nixos/tests/ipfs.nix @@ -0,0 +1,37 @@ + +import ./make-test.nix ({ pkgs, ...} : { + name = "ipfs"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mguentner ]; + }; + + nodes = { + adder = + { config, pkgs, ... }: + { + services.ipfs = { + enable = true; + gatewayAddress = "/ip4/127.0.0.1/tcp/2323"; + apiAddress = "/ip4/127.0.0.1/tcp/2324"; + }; + }; + getter = + { config, pkgs, ... }: + { + services.ipfs.enable = true; + }; + }; + + testScript = '' + startAll; + $adder->waitForUnit("ipfs"); + # * => needs ipfs dht (internet) + # $getter->waitForUnit("ipfs"); + $adder->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id"); + $adder->mustSucceed("([[ -n '$(ipfs --api /ip4/127.0.0.1/tcp/2324 config Addresses.gatewayAddress | grep /ip4/127.0.0.1/tcp/2323)' ]])"); + # * $getter->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/5001 id"); + # * my $ipfsHash = $adder->mustSucceed("echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | cut -d' ' -f2"); + $adder->mustSucceed("([[ -n '$(echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | grep added)' ]])"); + # * $getter->mustSucceed("ipfs --api /ip4/127.0.0.1/tcp/5001 cat $ipfsHash"); + ''; +}) From b60873ed99ccdcd4c0fadc452ba025a75176dc16 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Nov 2016 16:14:35 +0100 Subject: [PATCH 0949/1749] aws-sdk-cpp: 0.10.6 -> 1.0.34 --- .../libraries/aws-sdk-cpp/default.nix | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 948cbacf8766..3f5ebd9a8c13 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl +{ lib, stdenv, fetchFromGitHub, cmake, curl, libuuid, openssl, zlib , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] , # Whether to enable AWS' custom memory management. @@ -7,25 +7,21 @@ stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "0.10.6"; + version = "1.0.34"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "1x3xam7vprlld6iqhqgdhgmqyclfy8dvzgy3375cijy9akhvv67i"; + sha256 = "09vag1ybfqvw37djmd9g740iqjvg8nwr4p0xb21rfj06vazrdg4b"; }; - buildInputs = [ cmake curl ]; + buildInputs = [ cmake curl libuuid ]; cmakeFlags = lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" ++ lib.optional (apis != ["*"]) - "-DBUILD_ONLY=${lib.concatMapStringsSep ";" (api: "aws-cpp-sdk-" + api) apis}"; - - # curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and - # therefore requires the followin flag until this package gets updated - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; enableParallelBuilding = true; @@ -37,12 +33,9 @@ stdenv.mkDerivation rec { done ''; - postInstall = - '' - # Move the .so files to a more reasonable location. - mv $out/lib/linux/*/Release/*.so $out/lib - rm -rf $out/lib/linux - ''; + NIX_LDFLAGS = lib.concatStringsSep " " ( + (map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib")) + [ libuuid curl openssl zlib stdenv.cc.cc ]); meta = { description = "A C++ interface for Amazon Web Services"; From f390d68b7532eecea4856a9e0814697489a0ca2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Mon, 28 Nov 2016 17:03:19 +0100 Subject: [PATCH 0950/1749] yarp: 2.3.66.1 -> 2.3.68 --- pkgs/applications/science/robotics/yarp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index 5e4bda1aaa06..76b05c8a3a71 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "yarp-${version}"; - version = "2.3.66"; + version = "2.3.68"; src = fetchFromGitHub { owner = "robotology"; repo = "yarp"; - rev = "v${version}.1"; - sha256 = "0hznysxhk6pd92fymcrnbbl8ah7rcwhcvb6n92v09zjv6yl5xpiq"; + rev = "v${version}"; + sha256 = "1ksz2kv4v14fqgz3fsvvmdk2sikhnxr11jhhf7c2547x6jbzhda6"; }; buildInputs = [ cmake ace ]; From 44177794d253ea189e9aa9cde102085e76034f81 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Mon, 28 Nov 2016 15:41:28 +0100 Subject: [PATCH 0951/1749] =?UTF-8?q?matplotlib:=20Fix=20"attribute=20?= =?UTF-8?q?=E2=80=98tkinter=E2=80=99=20missing"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `tkinter` is not part of `python`, but of `pythonPackages`. --- pkgs/development/python-modules/matplotlib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index a9dced9b6c4a..5ba813deba60 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ] ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ] - ++ stdenv.lib.optionals enableTk [ python.tkinter tcl tk tkinter libX11 ]; + ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]; patches = [ ./basedirlist.patch ] ++ From b67ae8b33c38b442a7d0f4bed0e68a8cd85e22bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 28 Nov 2016 18:55:04 +0100 Subject: [PATCH 0952/1749] llvmPackages*.lldb: fixup input by disabling libedit Fixes #20773. https://llvm.org/bugs/show_bug.cgi?id=28898 Of course, feel free to find a better solution. I love this copy&paste :-/ --- pkgs/development/compilers/llvm/3.4/lldb.nix | 1 + pkgs/development/compilers/llvm/3.5/lldb.nix | 1 + pkgs/development/compilers/llvm/3.6/lldb.nix | 1 + pkgs/development/compilers/llvm/3.7/lldb.nix | 1 + pkgs/development/compilers/llvm/3.8/lldb.nix | 1 + pkgs/development/compilers/llvm/3.9/lldb.nix | 1 + 6 files changed, 6 insertions(+) diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix index cd498b5cf519..9d42d81923a2 100644 --- a/pkgs/development/compilers/llvm/3.4/lldb.nix +++ b/pkgs/development/compilers/llvm/3.4/lldb.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang}" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix index 8e7c8151df13..bbffa1a9a938 100644 --- a/pkgs/development/compilers/llvm/3.5/lldb.nix +++ b/pkgs/development/compilers/llvm/3.5/lldb.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang}" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix index 207971b81727..17f7f5793b98 100644 --- a/pkgs/development/compilers/llvm/3.6/lldb.nix +++ b/pkgs/development/compilers/llvm/3.6/lldb.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix index 434fdc7650ff..36f9cb1f1398 100644 --- a/pkgs/development/compilers/llvm/3.7/lldb.nix +++ b/pkgs/development/compilers/llvm/3.7/lldb.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation { "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" "-DPYTHON_VERSION_MAJOR=2" "-DPYTHON_VERSION_MINOR=7" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix index 568476e44ac2..fe0dcfc83060 100644 --- a/pkgs/development/compilers/llvm/3.8/lldb.nix +++ b/pkgs/development/compilers/llvm/3.8/lldb.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation { "-DCLANG_MAIN_INCLUDE_DIR=${clang-unwrapped}/include" "-DPYTHON_VERSION_MAJOR=2" "-DPYTHON_VERSION_MINOR=7" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix index 0acef48f57b4..55c00eb07fcb 100644 --- a/pkgs/development/compilers/llvm/3.9/lldb.nix +++ b/pkgs/development/compilers/llvm/3.9/lldb.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; From 5d804566dfecaa3928893244399b86453edcacb3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 28 Nov 2016 06:28:38 +0100 Subject: [PATCH 0953/1749] lxc: 2.0.4 -> 2.0.6 Fixes CVE-2016-8649. See https://lists.linuxcontainers.org/pipermail/lxc-users/2016-November/012597.html. --- pkgs/os-specific/linux/lxc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 3c413ca2426f..79f6b4d5043f 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { "bashcompdir=\${out}/share/bash-completion/completions" "READMEdir=\${TMPDIR}/var/lib/lxc/rootfs" "LXCPATH=\${TMPDIR}/var/lib/lxc" + "bashcompdir=\${out}/etc/bash_completion.d" ]; postInstall = '' From 2d341ca7fcb5a835a6e59d1f823c26159acaba90 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 29 Nov 2016 03:12:10 +0900 Subject: [PATCH 0954/1749] firefox-bin: 50.0 -> 50.0.1 --- .../browsers/firefox-bin/sources.nix | 366 +++++++++--------- 1 file changed, 183 insertions(+), 183 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index ac4bc88e1280..cee9f16390b7 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,189 +4,189 @@ # ruby generate_sources.rb 46.0.1 > sources.nix { - version = "50.0"; + version = "50.0.1"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ach/firefox-50.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "d1fc1b384b44067920b63385d486d41e6fcd47ed14ab31dce708ae25029bb5b437ba5824725c90573d9ccd010c3d4c83131afaf2a2494fdee56a8b7f2ad3c24b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ach/firefox-50.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "cb4a8a03e4a2fd495c8fd6e9b42d6a9556ef7033b8aa6d587b45ed64f2d7b96e1cdaf3dd4413f1a55aaf4300c473ca6abda8cd823efc3a33f15b6f2c693cfc31"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/af/firefox-50.0.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "f2d22dda5b35a4a093fdde9fd6d99b7ba6540c5da218ab8ec87fdf1094b740c71a73e3bd62997fd4a3726a99c39a4c441e1cf3adfb5d56f07752dd508001c802"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/af/firefox-50.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "4dee2a39797423ae4f525b14a007019ac0f4ec2ca781c3ba2b2e6d62dc7fa538c1fa8d2f4b8d7eebdfbece391bcf56bf96a2ef74fb290ebfd217e7ce8f43717b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/an/firefox-50.0.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "56778bd3626177faaeed0a0da8d5db2913fe9fd0f2341b9f438a9862066a8e5818f2ae746f79e03c6c576c5735945c5df378c72269f80054bfb93228b881403b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/an/firefox-50.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "b509fddc94fca6960be4bf358391e2dcd256c70d7a0c730759ba2832b56b654c5d4aff74773499f7be4bf2238c6b575a97a4df28c5943439d0025dda9dab7c18"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ar/firefox-50.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "5480712a3a2a40872ca7ac9625d76761b81a64319b3bb8e675d86022973784621a104dd28c651d7ab633ec11f50823d1a849def5cb06016b54d44c86f586d383"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ar/firefox-50.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "2fc3d317f1afca7784f949bf56dec725228db5f41c8e3be855d5d2bedf416803ba7e32a1fb89628ab844967212cc3a7d0b6320f4a820563e71a70edf0637d3f9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/as/firefox-50.0.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "d6634c1ca6d82e2ed2e7e283431ed95dd65b1db558f50c73130b6d3804517a199d22819c74d6caf66cbbbb3185241990c7bc90fb4932249e5d19c6c48eee6caa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/as/firefox-50.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "1688ec07557c477fdb6ea2df524e28a3acc125016d6d2ea5042d8bc0cc8ba3a8e77f65f44ff41298502459f10749f615484aac9dd3ac6ffcfa8db04f6355d8b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ast/firefox-50.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "96ec194358754aa1c71c1d929fe0641544fb25bbc73e31a865b7f31b5def4320c56d56ffe81388348bc24ac9cb62c4d5055aa2e6b31124cbea9637c1e529f13b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ast/firefox-50.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "46497eb1eb6c432bddd6ae1e9a39f4d86c9f14d3f956302ab2bc5d57625a6f966f687d978e1e93bc351be2c0d32150a5b2873fbb62309698fa7c37794adefb00"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/az/firefox-50.0.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "208d81168e9cdabee3b590813d64bce6211ab9e3cc2bcd11ebeff90a2705f037d2c489a6a50c6e786ade80eaa17faf388b6540610e51f308da03e14e453cc7b1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/az/firefox-50.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "844f3be9b6f52d34f2fb87d8a881a50e49a4820fa97f522d9e462127b88ea4ffdd36a514f353fbbf80e702452a26e2dc30bcd750a0cbd43b26452937955c9c68"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/be/firefox-50.0.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "e0e2f3d6eef948867888f4564dd3322d5e44cde5573675c6d58fbbaddee65e787a31284172f688854e3646bb57e71961ca04ee4623ea3192be1483e5d677dcff"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/be/firefox-50.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "459f5192ca7a1f8dc6f3f22c106db1dd216a41cb11122050e02f86cec06e578fa033b00c1d8355a5a2a759fd8702a14dbaa3a706ec28c50911c2250d4561b228"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bg/firefox-50.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "3ce16e6e974c41d671a58c16b44f660f420dabb7eba7eba9213ba6d86fb029ff495f507a09a1669c6c3641a6dfa9b377a511141b0c3d55839a7ca1e2790a188d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bg/firefox-50.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "53e965cdf50e12a876a9301370029254953eea1bf4e6ff45ef62835a48d25630a59de0ef655b8bd1664e1746b656c556d0955f39ca2e0c9fbf95b795a93197e2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bn-BD/firefox-50.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "789eb6dc6f3f42051ba5f91999fb675955b568198dbe7cce3b2bfe3f3763859a1610009480edd348c857f42704da3338eea28617f97d8272b24a2ff95c7b2450"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bn-BD/firefox-50.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "9cd693b98776e426c0c6d66934c0f7beb7c692b0df5967d09c91889dd12a8a2652cd4641acaaf1c6d7aff9b740504ca54c4fe518496d855316eeb82f82c6f31b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bn-IN/firefox-50.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "b36d55da04a98b29291b65c6f6ced5ccc67bdce7d3265665258e2ad212c5c0f7928943f55b98678924ed1d05121e2d2beaf7fafea9044d7ea4e0263ae2aad3a8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bn-IN/firefox-50.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "f9049cd7d5d67fb52587710d5b7a273819439064a621af6de051a196c5ea597d0d27aaecf638eca1670ac08570df91be906d30935e1f79c2d53c080a5d715ccf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/br/firefox-50.0.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "c8c61f8ab7476c073776e27a9c8110ed5c2968782c9580b5d9afe3670472f984fb4e586a2ce50cc6b0f65dc3628f9fa632c12c9219cb9a5375c5d845f1d39f18"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/br/firefox-50.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "601f5785b61f6900c496cd73430d679d459ef8e4fe37463e752b483ddb16c4c879451fca67c97a4e74bf75473116c171f5ae4ce8da4fb17742785ef7d0baa365"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bs/firefox-50.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "c45716c519a29b5b94383b7c23c592b4d7922c0778abdd0c87519576ba1af459180dbdd87aee112cb9b7f607d3100cf38bb47c59ec1b2dabb6f96169f09c97c9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bs/firefox-50.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "a3a4873487737ca3ad80f4b683ee3342a340dee4543af007b21e7bec008c3187755857cfbd3aa63a16478e93d80b4f40ab1fda44cbf9bb7ed7abfc760073b535"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ca/firefox-50.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "5470ebe85f960627e9b9f08ae37fda4eaf0203542d8e4c2aca85ba54fa8fd8d1694b8722a67e647c9b71ceb75d7eeedb338f9b75f630694fe084160c241d6a1d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ca/firefox-50.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "98ac4372d48b0b7f714ea81da512ca46ccb2fc5d35c17a8e4e17f48942a34008de55935ed65295034376a6d6c6d0b9c984cf7eb82f9450a90adc7d714c8514c5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cak/firefox-50.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "499fc78ab65e872218282cecfdb72ea8ffc54cada9e9f533d5b678c235512489a3f75c78893058a05853372c23cce11e581cc95b9dc249c9932e9d0e4d9ede30"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cak/firefox-50.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "e92f0713a43a1ef4884de071ac598df37499bef2f636031f3e685308dcbc62bdd11ad5b633c4e35f07eb85279bf1114a0210a890f4813d68b114ca52a9122636"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cs/firefox-50.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "0f068b5756a5c6bea869207282cd916703ddabdefe815bdc08a27c70e9992a1041db9ce6dcbb3cc063788ee438cab624cf89ddea480765ef3f09d6b4467c3eb7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cs/firefox-50.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "12f0eae081ddaadbc89283f17b0f69ba677c4f368b29f6cc3bbe308be5beb5be7938019fdcd924abf274c49464ce23e03277e010fe40bbc78f7aba2b6ad8995b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cy/firefox-50.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "ab8a1f8afdece2b69a510a3946dd6fc5763c25bd03456ffe4181aa2b6c3f17471578a64ea1b0a65085ca8682bb7f6cd8c4939394c4686e9ffc3478aa2a7b3a7f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cy/firefox-50.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "2aec664a8884547a81b2cb0bb8a0cf2aa7f5f1ad6c02ead41e6e752cfd0d6739aa408b6d0461a88eacdadf4f2c8323f4de9f8d50669ce756c904510a243d964d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/da/firefox-50.0.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "77d28752fb60f2347393cd952329ab9ab128cbe3442117d2f4d53e84ea69ff10862d930a1884788db61bf6a910909d9ded46e56f2b3ea791a2e4f89b8dc1fab1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/da/firefox-50.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "e864623ef2af94a161f1a22d233480f7bf94adf0a9f75cb23caae207b47a5d34ba9d1d1cc00fe8a51121d3d465f5af087ac5020fc6ba246fc850c5ae4ff3edda"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/de/firefox-50.0.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "148e4c1990f0e68e0550f00d517355f0d2e81f744ec592b297ad3c6a1be12baadedc0d7485ac1585e09891a162fc3fcab1d96645a2b4ab04dbe3b2853fe837f4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/de/firefox-50.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "a13463559ebdd0409d9e2c5de410b748be28de1455fc5b38d8531fd3afaac17e5e5520435908788f5370d4d8329c9dd692d3c2c1e6e0cd00e7f0ec76b2797b1e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/dsb/firefox-50.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "699f12418a92ea82b3bf96b2b2217f20260dbea294c2e7a37f03f9a6f15820fc15cbfb73c0ef3f2e0ff10353b5e6f61a39a4c57d61d6e51da5ba48cce9b6a0a1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/dsb/firefox-50.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "7a8de523144d4f87062f2984788f77e2a36a12087d62e5bb3f054ae7251821aeb9b8d11b5f1c45304dfb9bdd2380f4b5a131c1d5c5a9918d23e0c419f0f27fc0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/el/firefox-50.0.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "9058fa8f99d96eb073581ba96ed37fb6d17ac87040730219962b0afa7348ae39582167b051d3c5e8f11ed6467b36fd73433c3262217f4990b917ad14470a4255"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/el/firefox-50.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "7b4230b827e08863c427ad1b059a8509d9e4bd8de953f588cf750b0dfef5e40bf310022301a2005152fea31c9fe14510c9503ee4fea2362c37e98e52f90abc16"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-GB/firefox-50.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "352ef41a90a9bb237a223d33235d98b0b1d319d30ff091e4b7c3bcf62c7f2511c8fb42d78bc8cbc41f52be4e0111975ad7e7e67e71611170409f41d126e648e4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-GB/firefox-50.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "d452f6bf0bf4a361ca42e9545dc98cae9dbaffe1815efc92e3ee59a91d59554a248b95737d6cfb0e1e40b6cff3fdbbb66a13ded7366572a2b7bb5acb15bcb62e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-US/firefox-50.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "ed9153779e91537aab0f44f86262663da2c0fd32850cb18c86a31952926d0df0ad07108989d698bfbe9f6fd4db8d4e000d5eccb10a9080f1ff0e7fc055e8319a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-US/firefox-50.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "f9c077f4f196cb664383824ef8899db8916890addafaf850aaa99629ede100cfd438af674f37dabe2bd5f8f1e56b870cc308476e5d13e5a24bd3f1694b9719fd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-ZA/firefox-50.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "baa0c4a63a9849dddabfc99f63f42ef007eaec21bfbd9929629c7b3201005256f4862046896a4099c143653bc29967d26c3db35dcf8b39bedc920b8c06625103"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-ZA/firefox-50.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "28c11301d9937a1a7489d2d26d86b44b942d84396a8c0ec4af2cda078ba7c2159452ed44a0132ff3c0d6b93487bead5de373aa0463eede5ea4a9cec3eb95c698"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/eo/firefox-50.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "400763f0273a3be94cde7c38bb410e654e99d190ace2a81d1b588f2bfb143fa7e4a425a9549b5edcdb02a324825d70faa65020752f236043d9e3448313062748"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/eo/firefox-50.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "8bcea2944595a7900dc3a55c4e1d8b0fd70bede700bb244bc75ae981f33e32b67e89878715114e073e64d17b5ab351019628224b47bfe33ddc9a195a0ef08ed4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-AR/firefox-50.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "57a5daa81df3381f32246813e352d453424264cf724b3666d796a0181f08ff0e1a57df53fd089facd5fa32ed072e7821412383de997141cf50fb8a8d73c0ade9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-AR/firefox-50.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "caad9fe9203dbcb03dde31c3a3826d9ab3fc6a8df9a55e79036848d055d7594988c479e6021762a94d5a47fd931aa8f6650947e34d3bbbaccb702002f967e5f3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-CL/firefox-50.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "61ea4becca8ccd9ee635567bb87e881b57ddda08ec00a0cdf4a50c80532789f9730a3a5e7a1c1368d6a80354369471603e89f3e7f2539c6dbce2a40b7821524f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-CL/firefox-50.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "748fec2bf32a63ee7eeb59835e17dc0c60ae78ff3fb3f05b59d4082e29475d8b3758c978a8fbf260ff616c32487e36f2efd0b51b69c8647e9997e8a6c7d0e5f1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-ES/firefox-50.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "2fa4107225c498691148f444eb6497e71111613097d50e4610ac0bec893acd7893e0f3bd4024e2351509f4778af281df3baea97a523d4be4540c6ff28f29aafb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-ES/firefox-50.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "1d9b298fc979b7baab7dfbfca12c172544cec8828afca494a75d0e0517b6cdc89693e94e3cd1c2887d7156a0fd54da9c59adbbc055947f1e9f4c4880f6a125fd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-MX/firefox-50.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "903146601206d5e196684fd908de24ea34d287aee2d03ce68fe2ae8092799a38054ec5a9be2d94b2d3680088eb4a58d2a8a8834652519dd3db2340667041e032"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-MX/firefox-50.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "e84dac8ca10564581f6a13b436a86010da60e88c38ae6f06c67129f2d3c33b4c1bf202810c19bd781aea7a55a809f4bb46cc8fed4b26e892dcd798731d19ea92"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/et/firefox-50.0.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "689674c1ce12fe8f04d0a2824d78ccc0e0685320dbfc83ce5ad00b07ef62dd34bac5ec9719d97241d790daaf20dedfaf63f05b062aff63ca87eaf9b43f796b9b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/et/firefox-50.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "37b8a6b008402ec8ae0dca89a062e9f6b0c84de04a3ebef98de45453252e3f373bc5c58c918c5e7caf05afd8c97fb4b691ec67b22330e3386ff8810d8b46dab9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/eu/firefox-50.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "54d5963fbed7204c0311430f620479ce5eeb0ee3f8d5dc2611c8bf7fc76ca6e44c26d5bc8156afc2406d17b7e6c72a966469333ee1426e2de053666a246a9008"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/eu/firefox-50.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "8296591b01349424dcdea4683795b5063b89d15aed67c299298abc2842e313b18c426e42e687fb7fabe7d6a54cb39af7ebbb1374ad0fbdba42d9c012a82ec8f0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fa/firefox-50.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "3da3bd8e914e155662c9d8377e198e3363b931d4c2483ed880b1d7f7199380165e44183d9e9bb8189a7d461f080c3a0b5cc5b2041c939a2fb8625e4728f4c8ed"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fa/firefox-50.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "1fbaceba15cd7e11b93c0e6977f5711e9aeae64d42e2b8a21aa42c814ee432c7cb0a64a84f0b5d1268275a69dfe2677859f37fb5f62e3d8c729473f4483fe794"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ff/firefox-50.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "21825fd0502866603d3878702d505e3db60e21fde005a4e3ce1d6ddb2c695859c56c1ee352f9a4dcfa6ab4f3bab7a8f7bb4f75d0868920af0186f16d88850d20"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ff/firefox-50.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "52ee181257cac9b916be9c804a1ff7e33f363a1ad2b6aafbbe00d461c4f9d1949345cd7b55d10df0eecf7f0e410ac07a9d7d5ae6dfe142cd594b5b72348726e1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fi/firefox-50.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "612013364ce9f9d984d00c815e8e76f1b45c2de7bc013bdf49aa83c46d522c940e694c530c8a1d9971c1c5a2234b1bdd438f41903fd777b29ea5d51df6c314b4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fi/firefox-50.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "aa93258af4ffa49068887638a33ff41ad29895ecc86ed329094a2b925b655755048b08f862cfb1a5c1d86365dcc1adef2227054c8b5eeac9f46268e1558d10ef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fr/firefox-50.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "be02f1bcc28af5d4b3cd6e1eca126846cd1443a2f0caa3d1e59be0f3046c5373a22b3fd5c3a853601249ee3e34100cf308bfc1ba54c514bc4cce3b647ce0c691"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fr/firefox-50.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "008d3b64553faaff26ff79a2123d81c0df3d5aa2dc9a6c678cbf472bee47c11d235c59711c5915e5ac991401d076dc7f3edc1da8207481d1c1f871a79a4362b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fy-NL/firefox-50.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "74dbea8c626496a356a0b29fc302f03565dfcdd60e9ea4d68b8b3d3a45f43d66230b2c76919ec4cfd2e4b8d5d4d07d901912a471aeb582c3d35c5799c4d3dda4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fy-NL/firefox-50.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "982ed9e4b817e90b19b2c104b3eae8117b59bded0b066dc773b9515aa8daadc322dc80105a5bc961ce7b0a3c5630838a26492f014be41d92ebde140030dad5c1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ga-IE/firefox-50.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "4be2dfcaf244ec9a3ac64291dc1a77a6359fa4922bfda8a57d847418104adc7f591ae3ff51a5b2d0b2b04e916649889d852e9527b0b59f965fa90b3c091be431"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ga-IE/firefox-50.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "151ca36fa5fd165a1992a682934f0219fb2b85a7a9aab8f503f4cc6685bce5253c7c9317c71007e8fcb2064c3c63c4107c696b5c2651bb1aa3b25897a2d3b17e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gd/firefox-50.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "37dd8b1d6162c05bffe114ea632485316e99cade321f4bda64ee61718f85d61e39c85f543b221833ba3bfbffec29926c907c9ea9349fb54600172c64d1d751a8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gd/firefox-50.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "ae2b24bbbbac0eac95e559cb21561e15221d4d40acb4b6bc069c353e1c0af123cc396a960918683f88f2ab8d6b0207e585a83289704c18ff4735fea3c7e8f51a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gl/firefox-50.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "7105f05777629d12e7c90ec1574cc96a762938841e19185b3b077bdd52d6c28827e285eca95d2d6b0be899541981370f09944bad7773edd646b5199100f50b7f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gl/firefox-50.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "a7dec692e8500d9e884a46cb1f2e340522d770c35b5f0c2743448747ce4322cea63149679f7409162772bd9a13c8275d099ea22ad711ce124d426300e0bb9473"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gn/firefox-50.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "74a46b05abfe713b3f9df1fd651dccd97b281d7d5c5ff93856c6d88c50b0a49428610dc7d8fe6ad5748290d15c2194750e890ddb79b7f7b2eeee77cf9d277bed"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gn/firefox-50.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "486d32491f9f54d374fe24622477677ee90d09209c0eb74bcb52b93d33c2d0a8a540e195cdcc3fb117bf82ed0b777bee6465da51291f1d2998b0fcc1dcec1557"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gu-IN/firefox-50.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "e471f9cf94e85bcf3a0404c9ea0cec7adfb38b64f93a931b86a164814d7b8cdb95d9e78d3790b21235a4da816710ca7f2b9fc547ceb5c11f9d4ed949a7a68ab2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gu-IN/firefox-50.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "70399ee841ca80a3add669509249a57d5be11a7fd69aec4bfdf6eb0d5df5d40941fd59ebd79a0598699fc3adb5e162837691261e31922af8d8074caae6ea0977"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/he/firefox-50.0.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "dacacdfcc223c9709d0082be2a1f51568b8d8adece09640cfd4df74e29ee41c0cf28fc926899310d15a3ee81975f860ae00e896a825f3660ada72fc9318aa23e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/he/firefox-50.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "fbf321e64deba8b83d5e128179671b4c9fc6582ec5447b1a85044f1b142cbbf7f1a38abaab1b6d85f6ce9fff00575f3cc1dc08906f469a8f51b9a51f2d1c86ad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hi-IN/firefox-50.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "3434e4e259373981127422de30f8d659789651ba5220135a05286ac76e5a468d6d80c9a09f379ea0f4f03f1542ba5fbec064c54718c73bfa85cdd3144ccf5991"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hi-IN/firefox-50.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "d400e6afb62dbcf65e1697bca8aca8d2aabd5391bce50b83201e28fd140c00cef11dcaa7d68ad69a9e82f31e93b3ae350bb0aa2ddf4370cc672a77510bdab89c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hr/firefox-50.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "2210439603d946eca55701bdb95449fffb898442efe85d31059d0314e033c39a8b460b6e7f95c08bb9da145acd27744dc7d59600111bddfee05302c9743aaf4f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hr/firefox-50.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "154d4124cd2fab2f7c01e8e8c4b55ceac6a6582d2c425517a04ab0ba7211f9a834840baf56042a106d59e33e2e6f616597e1f29a21b183567f410627a1bf658b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hsb/firefox-50.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "d33f95c47d6d56599b67e19185b629b05e35ef085d0b8fe08ae461aba3cf9d21b186667f55a5dceba1019fdee6fdc4c105b7e5d7f625252cca5f939c8b7a0cd7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hsb/firefox-50.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "a10434af0fd28a6c38a3bc57acd257dced2f2ec476ce18c7da07927295a98e8ec86f5dcc9012e2c6eb155b70d0ac7c143f74ead9f18bba932c192e5efff87087"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hu/firefox-50.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "f82ba0dea755c93cac27cdfa58b40a79cba3cf09efa126bd978aaead0d64716ec4f9aefbdc3a8e1af0d06fcf2279f1c545efb6177b641fbbcdc24052c7655860"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hu/firefox-50.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "65ae4501c718705163fdccf39e53ef9c753f8b841221832ad6967921e0e7b385a23c0dacf9a1d5f5b309cd1dbfa813879f5a2fd3f0ca93c3dec6865ff36ef5ca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hy-AM/firefox-50.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "dded53d77f186a64336517d5d0cc7777bea256de43cb31f96d35cffc64a55c703b9b986038e82949369348ac83a7a42d4356b72e329e635ec827ddad8d6b5cf9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hy-AM/firefox-50.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "95c883bed5f89a826241b0e8c0f8ca5db10a534a1045ac2b0bc4ac9c93b9dd788644bb3404a95883641c6ed18696096f198dfb74f243a6a6a2d9b59f5e075c4e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/id/firefox-50.0.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "1dbd123dc5a8c15eaf311964fa46175cbefd6a72c84f0e046bdcf0904d942f8e375ad0205e2b708403482ace902b8457377c988eb57aec5a64f366273f818177"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/id/firefox-50.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "d1ccf36aaf7f85cfbdf34f5ec80b73757fb5fa7d1a0f7929bb97e5ebe5ad0cd189d0d288a4ca9466467968234b5b3939b1ffd2650266e26c506c95d0ab36ef61"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/is/firefox-50.0.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "7092e252bb6ed7290d0e0acb6d6fa0be6a4b89e48610909b74a954246eac6066fc2931132afdd15aee617000f59ad042141fe8a83e1a37a1ec9f0bb96197330e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/is/firefox-50.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "1f4b21c65356dc4fb959072020123850654cd0eaecc6057f138608ecdcdca215a64089441d0a2cb2f0b892c430d41f5b24cfc202f3f2fc994ec2cfb5d520cfc3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/it/firefox-50.0.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "41a1e8b539b0eeefbae4c031a997fd8196a05ff4e7883288936b8a4caf6d30f0b6104aad3b955843bd982f8a6785e038bc15913a6423c4a8bc43c5815f890343"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/it/firefox-50.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "cdd26321281d3049b9e34ccbc153af22f8f6a8b43f989df7ad74c448f21b5bc318ec3f6d26d6b9e35e60efe856b831a26e2785bb08b005791ad5b5a7d68feb15"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ja/firefox-50.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "87a8b95bfb8171dd49999ae47f788b1818df0916fc66da9a4bacab5ffafd9791055e49ac5497d19aeb9404a62c6cb9874596f7d5a29c4c7355f119b5105e80bd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ja/firefox-50.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "04c6e5be875955cb4333ccf5bf8134c8485cd65bec9f86f3b06e8e9593bc45ca0d85ffccb7a0477287ed9a5700621d0555627c1261bcc2322d4c446086b6cdf1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/kk/firefox-50.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "e3e597bac7ec1aa163a1e758d23c633d9d453613f8b52bac4b566b6499b1fe1658fcaff1b466f37a752f862a48985a811606ac9c92ea65b8f75a9ff8c2172d7c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/kk/firefox-50.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "1f686ebf1cf1ca38e7e67a9ebfc73af6e9e72e648c34f7e3d2a0e4092c14697dd7608ab4ead11ce38edf3eaead09f96e01d81ad6b8491b54523f37268d1527e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/km/firefox-50.0.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "b21bba0745523be576c2f99002e01463bbcf5a3dd122578bf78b5614c303e336d3e5c1a27a2b7ad88d53b7df4b063352c867fe66bfd25c167c17c7fc2e81622b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/km/firefox-50.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "9f6b1506ed8fa820f1619d30dc045781a1bcb92f6755c0aad38fc5143c522341ff62afc39d6158aab863996d400a89546d4d2b4fec4f207c01d5c1ad1df8163c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/kn/firefox-50.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "1822443cf61962f06ba82bfb5bf344aeedd12ee77e44acec0fb292ed6ec9fd843f2dab3e43caa0cb633107b8b79f30db88d0fbdfbbceaa5b6441141796a82699"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/kn/firefox-50.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "54542ebefdeecc74344396862dd443bc09c910ff02cc49980e40dc8ec202cc187ee925d560e3d5c409f88b92158aaea2fe2be3ac24a56d370e50f6a9d0caaff1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ko/firefox-50.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "0ca6dca9be0e957d35adfb7f95a38677836620be986fe2b99a5437d5dc64258d081b91c31502103ad61f8f7828d1d6f18049fdd3248721a44ea31a0648512366"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ko/firefox-50.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "9503bd88caf715738f8fcfb2b249fac0cb69873c4c5ed36eda4b06fd1e7f3032c7c8488613a042fc8236cbdaa93c1ef5d7a1d81d374559070006bbd714597313"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lij/firefox-50.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "666615b5905236e42c96c40d911a26b5d9c6c888d825d5bfeb6eccf9881668df41258920093c477e06470ba97046896390fc9fdae4e29e00ef5aad12064fd66a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lij/firefox-50.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "88d7accbd48856477137efde6b2b3d37b017c2b7126e4d37e0b328094e6d110e278ac75b61ac3a09cb5de63aa76b21adfb093327a099013d107fc772b1a7686a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lt/firefox-50.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "eb2300f63ac5983be2138afe6d588385b80595b736ec4d2f878bec3adebb27c5f1fa789103fd500e7297ae5034541287512602d6edf35035bff2c4d2b8f4c087"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lt/firefox-50.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "b45dbcde74268f95b2279ab735140a14ebb2c2a375e8dd296be95136d24f60c2ddf687f61a09218f9bc17575b0014827415b02dad4b3958540cb1fb2b78fff40"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lv/firefox-50.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "6252465e24583b2ee5599a47ff008287a3321955cdfccfb0a8d9b174e02b644e463c2aedf77d9ae9678cf2c682fbec07796a13fea060c735ccc6b11390c3792e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lv/firefox-50.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "068ecd5325471dffe741bcd02adcb3308497eb3c1e2a1679675e27fc8ac58e233457589a56d4eae658540a0876b2e3c1f39407b404a322ea079d95195ae736b9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mai/firefox-50.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "4690b802d91833bd96f7beaabd302ffd9bd40795893cd196a0f09ea47e333e7d645f0462b12fa0ca8909cdee07f2efab5094a0925d3fc11e48138098468ab43e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mai/firefox-50.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "88b4c27346fd74cea35eb635b02840ea771f015fd9f2700751ca26978f502ebce23cecf425e70cf558e38ad4ccb6cc86558190aeb559194005474b6777399591"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mk/firefox-50.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "171fe438b11434ef3ed68507d6bd1465b0d8f9af9a77fefcd2fc7730f0bc8a46a319d9e3d94227b2051e18b990cd8167103e0cf50293bfc0fa57a3b539b4fe5b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mk/firefox-50.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "1f59cd9237149dc22c540461abc640367f02d65103cd60e1d7afb8f43b973cf03122130fb6c665b418896932cae1d4deb7241b45f7d4dcdfe8ea69f0bd4b8143"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ml/firefox-50.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "0cfc6ff07e0fa2b194ca8851d52e3f819f96626d21b827fac14319c849f0fdde21d269637cd5c833d6f0adadd49656b9dbf603d1c0f761aea912c4b8f89917dd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ml/firefox-50.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "de1c49aff4dc4cc4fe2c57a658d1c7dd2ef7b7b7067247c1c261a89109548ba3d22ec7ae488b9c7d338fdef50317ed095ac4cb7390673c6e10e5eb28ffaa3d08"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mr/firefox-50.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "f4a470619058a8d509d4fb25f017f859628c0f502de4af7504ec189e70dd07460aedf7ad0dd36224c57eb6b6acad763d6781893369e1db7ed1e12050a0bbd6e2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mr/firefox-50.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "13e5c2fd2f0aab0ebf186d4042e3aaba4b5a7d01a6de1515e9ae34c2d1d81825fd6db52ae7994f0c6f711830dd95e32fbe61e1e09a020cae08a85f575ae2d22d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ms/firefox-50.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "3ee62d50bf8dbf1d013e61b19856efebe5a5624f4111286c81ccb4449a6d8124702106a49405570cfa810c0a32f0737e9cc105bd75229d466864e8471a5e5c44"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ms/firefox-50.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "39531760eb1cfe7ef58d7c2eb8eee3fa8c467e9880d3a1ddb0f957364949df0af06c0d03b91e50efe420f16c26df32ce5214979fa7088a79cd1de70691fa8a9c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nb-NO/firefox-50.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "e566041725660698d2c51941859301036801aef3596ff250ad9faa96d1333951ba388df09aaedf04204becfa9e177448fff5229845f6a8b5507784e4df0665c9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nb-NO/firefox-50.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "b11ca7ad3089bdcd2921a882395384cc2e35512488224e0d3b7b227c05436064a8fa6d174221adbcf405bf274a63e61d365a3a3b4b5a6d9f053714448cb267c7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nl/firefox-50.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "7f6f5a34bd1f2a6c9b637768af109f7612847258f45dd59d713004dc2b7c9cb46387310b000416d96e6ce1266e709f30df9fc48bdc97312f082ffa9c5ed3fc28"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nl/firefox-50.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "db633339a4ab8c788b267aa2435a13607a5d1fda365c06f1d90f19e5604b60a809dae31e8d135204fb14d8af8a67334dcf62a88e29102c30a19c1ecb9ef415ce"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nn-NO/firefox-50.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "841de10098e98a2148dd035983d7d1e2429e1b10789d5bdc8fad5d3276427eafc6ad9d9cf2db0038eab313484835a8ebd77098c7018f81fb0b9fb523c4841bdd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nn-NO/firefox-50.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "ae58d4a6a5d0b5ea1d5d080598fbcd6235c06657b4a3ee3b294bcd4f7360094a47a26bbdc6d5de8d2b782b3f243dda31bfb663bd3c7f81b0b980b9b75a089205"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/or/firefox-50.0.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "20d1a99edb738fde9791404ab0b55385386d33c74b1d2f944c1f8cd3b3175fc8a8ddf7351ab8f551a6d6299379e7551366a6cc02461c8ce3a28e59da4094e636"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/or/firefox-50.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "b3e77c5d5730c616170361d785ce138bba1ebff030b33d88eb3340eee53114e07e9129072e77e2cc10513b036bd05ccf7e1e1e46ab3a7c760b8eab7963a69152"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pa-IN/firefox-50.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "7e2a99511fb20a8f34a9fa18f66a45643cae32313818dde229239a48eed7ab8ddc71c501f8b14233e67daaf0f4dc914fb9ffbb0ef807a89209a5a46fe4ae62cb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pa-IN/firefox-50.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "8d3b86add09c64c76bbf0ce7530d43785704fd38c98859dc9c2c42364f58633de61de8dbe00dfae9f89f8c9960acc42eef317c1d87b8e7944daf54e18b295073"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pl/firefox-50.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "9aa2853624394395ac0f17ca3a0fbf90b8519e852e16b12ea8221a9ba146cb87d7e3b881e26db4be69aa9499e8f6c2f83be2ce7aca9a4c1ed8eaf562d98b80d5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pl/firefox-50.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "7dd5dfa772b8869eef4b47ba01380b84989135690fae5417ff029ce2b1226c7335239e4832fae760a311c184d21a6cf3f92f30531620614c16829084b41cb48d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pt-BR/firefox-50.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "d9a431bd40fdefe3c84e820c6d6df478dd26a8eefe7ec42537891fb8043ac0101363e256d953f85cf48f812aca09e8800aad4263f6999da1e079d75d09386031"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pt-BR/firefox-50.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "f1c2a10e5ecb74570c5e985ba09763d362105242b53fc9e9cd51098f3bc8f4f9280c7290b9ba4335e455ce9e3dd175f67554fb25aa86544d37fc609b8b98adca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pt-PT/firefox-50.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "0958cb1f5ef1260da0931cc4e16c81ab8995711acf846a2658c5f184968c13fd8d40af27613ce2b5c6e5ad462ee14f39f2a614294bea9cfb2dc875d0f0e8779c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pt-PT/firefox-50.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "5ae4cf72ebc9af54a7b24ae0a37947cb4e8045f674538d26ee642d4fb7547e6ee2fe5525c4e04b8aa41a34ec26276832663088ba379f6abbcc9ccde533388f7b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/rm/firefox-50.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "48c20ddc5d312f3720bdb8b40cde75830475fcc00ef579c100aa45d668416ae9dd048fe5711448eab59d50b019326aea7885110ef15112e7c4e58185dade84cb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/rm/firefox-50.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "4e2a66781f0d7e7349debaab08a6c532a82a603562a65437230c7301f2abc6674a6acbd4254c616e3bff8eab53978c780f870141cab42872a0361f853e3be6ee"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ro/firefox-50.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "d2cbb5bd4e7dea0596c3fe16ce2dc383e4c8408f5a4f0a9035094a8b714961d3d541b473c586ec8a3140984e8ac902d940e5e86be5215321090c14fb67688a33"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ro/firefox-50.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "81ec70d793ece3f33ca7dbf7667764a9ed9d0234b084dbd2ea1e92bcce281ed71133f342618c30be4195da49247ac09b44eb27c9a2996cf07d5f5a17455ea939"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ru/firefox-50.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "07e460bf0545e35399c937f06a6a848e4967eed45e86562a6a9a673baeaf1beade10ff7bad1d3892f9304e6018bc87260e212c067a81ca7bc25f2a8e9fbc5f2c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ru/firefox-50.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "23a097dd2e8047f9623a35f4190c7acc70123f9f0347e2ca204bc7cd71da4b2c20a3c26192773eae70bc5fbaa7ec194b9137a8f30c28bae672c608c58bdb3f23"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/si/firefox-50.0.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "1bfac64a39a787f02311a0486badc56f0a3058362b6c4947b92688cc654e21c6502703464f0e3a90ec7eac35fb2596e3ddff7b23b3970316320d38e013d5db88"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/si/firefox-50.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "dddf6b5248c71ec8fd152d5d9ee24809add324d529fddfca6166c48e300e92a9bcc96084b2b3b99968044174cefa757e8af8f5d13198a0ff0fac59c321b3f00c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sk/firefox-50.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "1ca56172371a3470cec3ec174b6cc14fd5721bc29e3f7683d8f5009c5ace2a5aeb005d28cc9096398e79c03dbeb6a3f14677b9792ce95fb36c8c69d0070a0b78"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sk/firefox-50.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "2fa6ec9328ab40f46eae66e18ae167d9bccd4d5be43fe3ab5fce73059941178af8813bfe7fe26106ad569e6d1c03338e440ee32722f041e73ec63338828e4d23"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sl/firefox-50.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "b3aa500e2b55b502d60f322c63f08f5add6063b8b5f0f2d4cbecabd56b08ab8a20792f47c34daac6d9c56e9d74d10fc15ef3901f27442e5de2db0933932b3dfe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sl/firefox-50.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "c1deecac7551c39b3b47b0b97896ae8264519251e58f5f34272bf15f53f4d6b28a82bd8a55ff584d501aeed00b6c2d6c56a7d6594d2ea4129fa2f16951cec4d7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/son/firefox-50.0.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "4655634990c822e94bc9cea432a0c90de92dbdc3b6d033a546c8d30a23c078b5725e20151f61c60c92ade138aca083032c7182fb7030d53accf2586d03d435f4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/son/firefox-50.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "8c5a0d0e3a042750a72b40908a862e4e98d0350efe9f10ee7a1c0c27913ebdc94ebbf4cc216f12b7ba459b2b12c889df2715e2664a6eb3ad52107c3c791f26c3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sq/firefox-50.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "7a9616abba37469aa5c8686a726723f32059a682ab35c0d3ca179ae8c817490c01947b69d329e224526a972e9116d4755303fc99f601b1a4d2581e75b77924b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sq/firefox-50.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "39b28857af6b2ca281eda2525731987a9eb3474f538fcdc402d3bc067ed28d43c445f88355ed84a30c5f99f1b9f7281435501fb4dc89ba217ff9a0b2d7121026"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sr/firefox-50.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "318dd8b07c62f2c98c35695d36b4273d4e3189d0003b5047be5f5c1bf49ae9b82a33ea3244f37e354b4c6b0db75c068042c22a6949b2dc90045ae2f87a8b45c0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sr/firefox-50.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "690ff481c3c79ed3bb8b0ee3157a5f1708f53a985cefa245776a47ccb93ad769228fe76db665d8488884a93f397d219dd8474fd1a63744be54d7b9cfa58ef37e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sv-SE/firefox-50.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "d55e6447238a8bcd1521eae2167064eb4951bc11dcd7a16227ec4690d4ca7d56a567a70d2737a084bbe3aa4e5276970586b4bf21d16c85e2435ed60824d32a38"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sv-SE/firefox-50.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "f48485a6ce34e2915d91a4673af7bc050776bdbffb8e9dd3656691e9cd389c9534666969de7bef065c4825012594ee1e4e633b1fcf4f4947bdcf644c08962304"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ta/firefox-50.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "b7b006f1ff11895bca5b33cb138385055b902730892dccd5620d1537c3dba6c4a5a8c6a11d4a61ed0baa75feadccf04aad29ca251f7bf19c17c7d8db13c401b7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ta/firefox-50.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "1f7c5dd068f4829569b398691ebb719c851ff165844eb4ca1d26026a4d40926ebc3c71c4ddcaa5e8d9b9b159ed5d08d24e2b50d3a93d111cad3d3d02d5a26f43"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/te/firefox-50.0.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "ee698d3366f202ae4ff8ed2f1d8bbe1e592fa6200e9734469292d76595e3629d3818744ae05d1d37e7372c622f79b4e8c075011dd7b835a61aba86b272c6ac94"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/te/firefox-50.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "7037a57a9e456bed79b7527b35bd680c32a94204c94b1b9d0247c0e521867ea0c606875e11a3bce6f5c2271a5e322f3481cc5451fc413cec5a5f6f199a676a2b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/th/firefox-50.0.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "62870d113beadebcfafba9c6d133cdc88769f20088b788a8577a99afa85562df901f14ce1f2c8bf6e344ac31b8a8dcb96172a5724add11936f78aba7d26d5444"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/th/firefox-50.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "5c9cca0455a4da647b8f2b178bbe73037b1d5c7ffe95dd12ee3042ab982da0cea21ff9afd4b954805966d25b035d0ad83fe138dc80a7d345a81a01df722a9dba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/tr/firefox-50.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "0f7e16b46d0c931e147f1f6efa7ba4d12d629bb909f220bfccd9646e968e52e1d7641ab174880313781f1c149ef7b4f6311acb042b704fd18337a31531fc8863"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/tr/firefox-50.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "864a500456f1728c2043e6841256a21613864501d7428248606495c8c34ceefe0db23b3dca6a3fca9f92a22af663109d41ffe46daf19d64aad379774848a448f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/uk/firefox-50.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "94cbfc40c5c9cbf13592a7134cc4ec2ee2fea4b733738acb45ca454e029228cf741111c5478961494a9e7965f771fca06aef0e58eca076721e8bfb11ee237202"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/uk/firefox-50.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "a4d7ca792c89f37fc1457e36beba54e75a5901bbad1832272a03b0bcaa3536ed237559aca38775e16940c035b117efd1caa1929e96c889843d2732d5cbbe38a4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/uz/firefox-50.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "e3b740953b1a9456321e684cb0dd606967d46d9ebc120d43a10244b88586c1ac4fa7cd6c7ede0fdb52690fb102e8a8a456c1c226ac7eecaa50776b52062e5285"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/uz/firefox-50.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "6a45689d06f4d52c5352d69049e55346c8791720f1d38257a49ad8ddeb9d94c0b0adafdb10a3432b4e4a75dd83eff618d7731a3bbf8752c979c0efc09b67a363"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/vi/firefox-50.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "f1691996ead43b59409f590a46bd97359183a05ca5f5bf49966d128b2de6b8bcc2fff2c3f73e3966a8f6182aff9c1dabb88e659ce128ca6ae4cf11aa877c8df1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/vi/firefox-50.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "9fd0fe5312763143d83677b11efd0dab2e84fd93cf4a884261d33dfc23d76facd7be7d6e3701e3dc9134bfe7ac7cf8d3138f63dc490964d1b6dd696451ae18cd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/xh/firefox-50.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "f15b3c3e4b57447023a6086b948b5f68bb5c6301c3e7f138d7e61b2cf34d87357b7e5894bcc6262552449a5d67c2548f52fa3942b01603c15cdc9803fa45660e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/xh/firefox-50.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "b28e30d95f608733099acfc6c39e0062bc3470d8ba386ea563d9b376f95e5a4bb9374d0fc360d0a387b9edd1ba252b437cf32c555c68667323648830efd96e45"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/zh-CN/firefox-50.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "b351d0c9f5bce2da39dd4dc500377e7a07812c6ee2c3359a15b095be562b90b43da6bd7c61435c04791278b9e47eb2ed9dbcb589fc86abdf84a16dea86c88dca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/zh-CN/firefox-50.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "3912d4ef5bd3e9cb5bd7e6f559c66e06568a1441394c41a9a47433c28a551f3c012717adb66f02441106e20cbf866a4a201af079f4f59b9c34ed1250fb64b22e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/zh-TW/firefox-50.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "1438e36a719409637e246b2d2b18b7493b00446daaa18579d2c1c45866e0aa597a8934e9d3c15893d987dccf1c1df5d4a03d34f37cbb3b3f2d2fcd52392621ca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/zh-TW/firefox-50.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "cd5f4baef991942ac555dcc8ed37857d4a9faa29befb8b8dcce82f000a87b0bf62f0ce208df7f7238b8d7e684294f33d63194bedb21e988085bc64241fcf633f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ach/firefox-50.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "79fca7e28b71bcf665021ebd54bf8acb80d6d598a2abd6235d455dd64085ebb4b26ec14341a3139a70ddd96f8e5861b7f2685cd1f5cb909af0f12d21d1bffc11"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ach/firefox-50.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "07af694903d677e11d6266d251bb7aad31e0c21e0bc7af67cb4888af20c38aa02c001799b93836553a9699d038ae896337d75ba4dacd47aba02b979097a4863c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/af/firefox-50.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "ed0afc72579b59cd59be409dd35d18becd8eb7a8bbaf4fb1de451cc29cf8464a528f4bd78fd914f1951ac9b9f45ec8f12291f1487ed9c5f0dbcf4a2fdb821c82"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/af/firefox-50.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "18d387115da72dc1312864cb67f0ba40e94546bfe1cd4530ae97c5f58443508fd0bd94e91a9f2e6bcc528b115449ae2abc53f6c318cbfc0d1db5415f80ef8ada"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/an/firefox-50.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "deb7a2e2cebb721e90d19820b4489ad64f90603dc7d88596083c7bea9cca7910e2d17d502329fa1a427d08d5ba6dacbd34a1e7855ff7a48933fde61d2650ff0d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/an/firefox-50.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "c9cfc8237a0415ee375a2a8dd08f83ac039fad866da05a55cb2adc2a3bfcfc2293f9059139588e93ee25568c5099d80a9dc56321e7dae92bcd0b076d7d1a8062"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ar/firefox-50.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "ce2418f967e8ea03acfc2c8b47dd4460127865917134f555e44c834ec4eb5cc1bcce6fbfedaffdfcc372fd40d757693fea5dad570730b3fe1e69e8ebea732d8c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ar/firefox-50.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "cfc8ab9c94df5c60881b48ec32807128597c528fb22ccd08afaa643a232f6e793ea04263e445ba468099e58a7f81bf5721b839ea6adf75f201521bbd59ae0fa1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/as/firefox-50.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "41057a92d38896a11eecabab4d85cc08765764f0f33581d604fa4e76ddd1600030033309cefe62c1e8d43b45ca1a25a079c522d54329b6aaf59b7a17c76b6991"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/as/firefox-50.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "1feb97f7553d4aa4ab914806bbdaa16bfbcf192b002f4875f8796389a7f9b892c4dbf4f04fb52f17d062d9e555831d6eb31ed32714f0bd45d3e629aa65f0abaf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ast/firefox-50.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "2d5ba2c2682276eb58c92c7a45e4c6e8341dcbda1eb01214b4e912ba7aba084357e35e35a03e51e51d246f72d25293482ad60dfc6bcbef1710b1df10b1f63893"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ast/firefox-50.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "0ffef374f47f8525d02e578e5cceee5821ed1319368e3cb9c78e8037f4089e3113db156bd77437c7c41af8dc57538d27484fc405791f39f0a431b72cb199b7c6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/az/firefox-50.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "c95091418cceeca6f5d84e65200566bef4b1b316f78177cacd2191ce9c6637cea5bc53a2f44f318edb04bd1e08a2976afd8d8e523ff65e471f71576a62c10207"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/az/firefox-50.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "ee8557e2a39f6f04d6269ff6dc09fb17ffe383b9441c499b626f8c0ede6e0984b9c338e30d356d13b1a7d226c72b949a0a868d6baf542726a972e1655b3de868"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/be/firefox-50.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "0617722ffb61b7a732a1d2b448ff5f513effcab4ec2eaf1d97ebbeb69ed8cd693f20137d4e1d83e128bb7cfeeacb98b4c149a0a51935010f00b3e554d00d740f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/be/firefox-50.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "2fe7086dbbc7886a0bbb2b75f493c3c4d45497f1de9625e2a64c4cc506d8f73e42000d3ba3d81e39861817e7545f9b29ea3a41f27440d1587c0a4f04a99e5f84"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bg/firefox-50.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "ecf746ac12b5508d143e98252a121d246f00776daac2d1c972978a37701ddd2132d562ab328bbc2cc4cdc74e02232ff70efaa8ba5ad50769994d1b393eabb8db"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bg/firefox-50.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "7e04449f5e3934e73357622c9d1819cb84111a963ddb59b06e1b266d6f56afa78cbb88da7a41fedb7ab695149900fac70e5b379171accabd6c903dc211d2eff2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bn-BD/firefox-50.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "75198737ab142988f034ea78a3e289992107da83b115ad671487320a0fb6af4f3aab1589676542725d25e9b0f43ec30da41bc95c63597228337d25ff73baa8cf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bn-BD/firefox-50.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "c1096bae08cad67205dab2b81d25b8cfe835eb3a2657701d6f89fa978f92d5c45b5a3e9dfe90f3cf78158f5fc68922da4c235d57dd837d4b00933207265ddc23"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bn-IN/firefox-50.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "a0fe8351efd9ebf9c3441a831a50aa1d5eb413b5d9f1a7f57e068a25c00c2efc062c71bfe47501ca5016138fb22762a3a37dd90e50113bb038fd1566adc36fc6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bn-IN/firefox-50.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "2cfcfa36468f16c7f3b32d98ecb51c432a8ccb19a91cfa8e99974b21a60851c1b73aa4e9261b10cc9ea0bdc4c862c9db6dc9cacd46d2070abaf991812e680d45"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/br/firefox-50.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "9c6acb0013921bd51ba7caf4016a75ee6f02e7388cca676fad6ef7e330f984ef28667da14a777740f9d7d03659fd74c0621a2ecb2b447106998362815dd74fbb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/br/firefox-50.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "828599a94a461ebed9fce77e0968741cfc0e79375cc9bc0584d1fabfa11fd7a5300406298ddd0b9650548c18db5873376cef155807b62a110ede500d62e2effe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bs/firefox-50.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "6581af0e61dc1286af63f7ff18270a7a8326679f8090f3dda07917cd3bce0febbce45b30e8d819231fd91e1d15eed394525d24afe79fbc8841148e85f332940a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bs/firefox-50.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "89d0c07943c2c7ec8052289afdedb9483ed5752a5967795938d12fb87b8ab80248058f2162e84a9bf526d1165b4f7d651f39e7dd9eda9b4455565f8f48f1a4e1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ca/firefox-50.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "b879086f33d86da437d4839c6c3443b8b4bb524ea1645b460a8f7a90c2d3e3aeab540daad501b7ba2c9960eb625e74ece8cbbffc39e6931e0421beafba0969eb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ca/firefox-50.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "5b2a622224c0b0fd9f6e003a051bcbc25c9282e464f21c16495779f22c5f64275ee3e5c10afe31802b8badd99b7346533b7999e7e525f24f7e3a78450ffc0ac5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/cak/firefox-50.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "961eac523fd0402c9f1b4532c00661df5391a08f3af6180007f5f59e754fa795063c188491614f2e7ff1d253fcb04b34216a95718edac035df3c62f6714c8906"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/cak/firefox-50.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "9768209346ccb052e92e44833a5672dd032f5915106b7884f6b4c363a257010d284120ff20931f0c6f68c0f4c72b4818408bd8f723d24879932fc598aea4f06b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/cs/firefox-50.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "b1d788775f15216273338c9f12a61712b546acd6b353681adf44d19c5349ae35d201737c69c19c0e7ef3abb8d3df36e07093523eb8af7cb81d56cadf5906d52e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/cs/firefox-50.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "b54c884cea39defa105556302e483f4f39d96f413df8eb94e8232d0b5832ab760d2affa2ff248851fc8a060dcbeed84b9ec58b4fe2dbed963b19a497bdaf7ebb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/cy/firefox-50.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "98c249ee8a67bd48e6368033c5b7b06ea0940ee66568d6105b13ae7a3d58fac6e1135376962958a4a290bdabc43fa0a0ee8fb32429e3c2c7e5dd0296ba0f55ad"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/cy/firefox-50.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "1fe74bfa41d59ef31384ee5f819ec284d1dde33f62da767699f0decff49a1f00a4fe44860546aa20a404a743420c5bcc20b7a67ae9bb7c01b072f113edc90ac0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/da/firefox-50.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "444287facf993cf321dd477d366498beb4a834ef6977b71a6e328566a16c6a17aa3d5f67b5bae26cd4476b85e1271f72b9223939db528b2998d21bf5237a9d05"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/da/firefox-50.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "c087db44747af90822881d7e466f8246df0d5bce957aa93ff9c27da16cab195f29121cc67d1de9099c3e018c6ff2a6f22435b2c1ea3a5e99bb8592dc0a8bb0d5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/de/firefox-50.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "9d8ee1ae3b1a8072b9ffc7162707ab8b5881d96970c72ff5d27dd78f37527f163ee30feb64121e9b7eba6ba0002ac7a6ba511364770f2c9759781cd6435d8d06"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/de/firefox-50.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "83f05cf00a86f26c414b11227c3a893608a218cfbfde29b67ec7d10fbadaad95dd59402557d1a58dc15a4cd50e27f8c15ad067b9cd3387f5e1080c280377c6d9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/dsb/firefox-50.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "1dbabac6ef0365dcced762805a25dfcc867185430dbf87a0affbe0eda4e37fb0100844b9ef7418fcea54f1950779a57afefd9fc2b8c3b9777df08134dd8b172d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/dsb/firefox-50.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "86c145eb3e031f677bd3e66e3e52442d85e02d2350b3c281094e8f72279b0edb19ec4bfae15819d4c7b483f0bdd00c324cafaed4cf924af606be1f29da19ff87"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/el/firefox-50.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f217dd91412f709055f085e747593a1c06f71f23cf87afd04685ff4f9dc7511d2aa0ca60f6ed9e7751ce9d18dd801788a0981deb9233b6457eb294b9d3a6803d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/el/firefox-50.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "b15189ccbc478ac7eb57c1a3027fc4865a87490cd0ce6023110793bfa2451d64d98e6ef70d9c33e42b2fe50a042b140961b6cda1e9e44d787045bcd880fac7a6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/en-GB/firefox-50.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "289efe9e1046a3367ae7f379c86405808acbcd7478a10af0a785f8cbba2a0645888bf5dc180b6a3ebe300a69a0ebfc12b211b1b6901ff4343da88a0ce17b9161"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/en-GB/firefox-50.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "df65892afd9e6e13e5ef6b6e94a453a6402286171f87bdbda21d51abb2d8a2900aa1cecf01cba9216ebdb8ccc60d7d40c9e6ba2710de2e170b223c18b7030708"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/en-US/firefox-50.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "e768d47528799f22c291abef82ff372f9f7a60a844f26c61e94ed39c0998f0fda4abaa3e27f520079b741c0cdcfd973e9745a5c39cba02d9de3bfe74ee06e9a6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/en-US/firefox-50.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "56bc42624be4e27a086f4a38cdc1613a291a5ab22859bca25e39651b23854d596c68f7ab930026bf7a7df590bfb429538ff8bc59f6a6cf6f5249768fc1dc414f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/en-ZA/firefox-50.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "f89f6a75878b89c0c1252c17d3baad19a4f44ed9e64880c345521be8ca643f5edc83097261f849b2b46eab3923bacc17c9f9e143a7ca98b702c53a5151e0d4e0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/en-ZA/firefox-50.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "7a518aebce8a27b9561c576054dff8e58759f56bc986a3a0626e2de7053ec69677f57b22e56ee54e6eb2ee1ed06d9ce650300731602b19f85cfb17d3c6ebc891"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/eo/firefox-50.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "76e24f56a9072c88207221ed4f607d4f03144581301ccb8eaca66ac9d0fafc4c2ef67c446b6bf4001586de943336d854e0d950b3e5aebbc167c43422d484cbef"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/eo/firefox-50.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "76f65744d90c79393f1ab4ce35ce86f8e970c35675761bc74aad07c66e69e0a403261c502d697497c0034c4bfa1043decb9f3fc83a7aa8c386d2ebc7b6b422b1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-AR/firefox-50.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "c577bddd6b71d93772abe83c2a4b7ecc26bab5e3f53d7a8ebdf820f4694173603d969e8baded32eb5e0a750c5f8da2afa829341685c78e4f83396739dd340e8a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-AR/firefox-50.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "38e55ee251bbae1d96008742c5c6a3b4eb5150c442d6b0728849dfaf444d77fdac9c11865388fa224633668de578c66d0ae16192dc1fec7930d4cc7684369f1b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-CL/firefox-50.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "382e026173aa82f00bc817704f2acc030ab2f939bce4f6e6ed039b1d4f917c57e35be5812ab57616097ec9e27a81c36517bd7977b777dd6bbec5f347bd985645"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-CL/firefox-50.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "dfbce27fb2bece1f32b5c10d93c48c927d2c60673240e4ae65f33c5658aabb682f3dbae0fb2c44c8465e54711ba879afdd4ec09feb04b9b4b7b9f73675eeb878"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-ES/firefox-50.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "bf49fd10f7e70e419d2a4eac4277066121a54ed588533523412d5286613459b74086cd49b44e77266217444c851a9d78497e0ab3bf821db86038f948bec40011"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-ES/firefox-50.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "6fd53b36740c0bc2ed524b3cfdc1cf6baad630304a67543695ddd8dcf3d5e254cf5b754d188dfd93a4d27848ab99c89e1a473435dc32513bec0c7464c5f523f7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-MX/firefox-50.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "15d08e8ab252be103741f40ec36f2a782372c29ad8ccb6af7b79557d1aba7381d4ab7186247702772777fd68c31dd0de6a78c7117f33c90f8ab58ceab8b7445a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-MX/firefox-50.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "f5f4e74d181bfee27d402b5d2123934480eff95c0240d762f7f648e4220fe3c9c154df8b849d9ea27bd4d0b53997d3175f7f3b7bc8ee70be7086d0bf676a729b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/et/firefox-50.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "7eb67ca81cfd0ee4a19b98cc00db084a2d29f1b335bb51ecf75a833f1133ff31345726292bb03c777a6654070685c78774c53a263fede51c4c101f6bd22249d7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/et/firefox-50.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "a91f4ae5ec30fd2447521984432ea1997796f6569e99c2763364ff6857e579f1c0631addd4fc8f0faed5f489efef6bd29d817de58dc1b432abb0698a5b0291ad"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/eu/firefox-50.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "7f9318bc697e5654f0585f18fe9525c1eaf24de3e9e33c87a7d0471ec8d41552798d9149cc58f3849a0cfa5850639ec95332df861f9215061bb3eb9af78fedf0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/eu/firefox-50.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "6a1fdf302c54afdc25e1b2e3c055044b8c37eeba5e51fab0ff3df9517f3137482f9daf28da4cd62072845e368260986e9d03593074e4b448f3aa23de5c7a3dd2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fa/firefox-50.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "c07bf9368b8c49936dbd4f36aa01f40d10c23edddc14526177e2ea98bdf7f36e482eece3e2f3ff16f04f0078f7c993833c52014514cdad4d1c476f326fcd8482"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fa/firefox-50.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "0fd3b4e08cf0ce0f3d68880564f1c14bdef198f0140404ecdf4cf9c8d48cc7dff0dcda9be0b3af274878efc9ca3b764cead6430d0e348c550cd5abc23dda16ea"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ff/firefox-50.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "0395d9d46363a2f598615551aba6ed3b0419f83038c7744dc29253469a52c318c474bc564fd1560d9f5bf9375bde1a9f4013dcefcc781ebc82bfbfec6c910ec2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ff/firefox-50.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "3c804f341dbe6d69e2cdfdd2dc1bc294dc04c4ea3bfd4a62e4de6edbca0be00f76a3112a56c9e5b3ae0929cf01168cadf7242246fbdbe25ff74bb088714c05a8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fi/firefox-50.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "056cb941c6ad6b9445a896d3cf948c942aa5c2f9506b80b72f1a3926e33c2f0798c6ef437152637a3a137f6b6e8d8f0eaef869788e7925282705a00d3d5ab01c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fi/firefox-50.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "325baae030a6b23bb4dbc8bf51a87dbc27c6349b3d56366730d2aee975aabf9f1d9af505b7fb1ea6aeab4f5891ac74166c5acbf72b503accf5614480d57c7402"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fr/firefox-50.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "f5c475b7c0c8d7ff4426c840189fa6b6e2a39ad64b1ba24477ed5cf164e55c4ea7065ca3785d9c56d5d35503c26bf52a00d491b3557b307f437a0744d7cd100d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fr/firefox-50.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "603b0bd1087e63f2d0e0ac26266cdc7e038e8faa014d80f9f0e194b2878886b466a541c8c4b79a1026ccc60cec6d0f555d6e65a7a53dacdb7cb595a7f877f6f5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fy-NL/firefox-50.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "4abf78014ad6eaa93c9ddfca43f24c9f4e160b8f9619ddffd57a31a30721ad8d11e7f3b4697de76b30ea6a3a07973b460febca607000a48da7e6d422548e1ef0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fy-NL/firefox-50.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "1614556b3b9ac0ed6be7ca4455882fe57a9644dfed95b0b3818498d4b47cde9c95fcca66d820802154721ab90ecff8e662f3670ffc6f4f5224dc35139fbc6fed"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ga-IE/firefox-50.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "d38810c0bb088c999079575253492df0fa57d1995c2e88c5a49ec57e858e3c550bf86a4e834037f6ab11b1d956b941557cf44d562c8214ece0175c61b6de34d1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ga-IE/firefox-50.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "d498f468ed487c5dfb70cd8e831d7694665e9cdc2a9eb0fd7526e4f7c3f97873af87fd919990b03e921dabdcf35859840f263fd071ec4151f5812461c97c8179"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gd/firefox-50.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "1f2f939987840e0e845238a4123d81c698b528474b81facb7a296d80be023aee8b3036db095709167ea3da310a9040d7bbee5d16f7c7aad6444f3c1e078b2ce2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gd/firefox-50.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "29954be29ffcf9dce21f53fb674d5d14f17ba04315dcb114756478e0cb4c6b58e61ec1c1fbdc7a25808a1ca347b512691481090504b1ac85e6998950edd043bc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gl/firefox-50.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "92fcdffc99f3d7b6bd70889b3ad6bb661ea7071be6ce65461dfb1a93b4a566ab5b5f24c7cfefe6c2d6515e8f42b3d04ec01a13c2919e47daeffdb5034ebd5e36"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gl/firefox-50.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "66adebeb4bcdac0060b8cf562607deb8956588d86a04fee35f23b753614aba9588e74e2d389055c5186099bc200fde27529a26392ba08c0aa69ccd9be12a5eb0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gn/firefox-50.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "4ddfe0518a1487479c0c68b53cf24f9eebdcd91cde738053cb3e796f9373a0147f980a3dd7356ab92083f2b8975379c42691e7dd9cf5d78075a86cfe5a83d8e5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gn/firefox-50.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "3fc217727c139a11ab77218428269851df78ae42fc34e4deb34ba48733bee2af878aadc5a90578c467072ac4f328ba5db3f1588069573521e951aecae25552ab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gu-IN/firefox-50.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "6bd026db0390d79a142954b2c8feae4f884cacfd5f8418e31b7c6b88ec171160054424c87af81ca8701a32065e9de3d469699471a99aed498683296765d22033"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gu-IN/firefox-50.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "751fc9580027ae5dbd05202578dfe059b1c849dac79975da4245c94e5fa7089a7f189fe1510341072b41fbe8e1fa5e22217a9876cd033e062fb6c567523e3326"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/he/firefox-50.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "1c229bf7dfec02cf035a2b6d2b17b55d24fc7ad6b36f1c2be7f08898a94c02e31e1812e1232e348907e177038d935b0f90f800165314eea3a7605616f828d493"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/he/firefox-50.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "563f92a47fb7f4d86d39e88458f38aabfd5f64cd3fd54e51a5572eeedc57a5b0b3bb86bc26837b2438623edf3d06ab37a94064ae9ac5a2431c3038dd75a71913"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hi-IN/firefox-50.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "568d0da98615df8489a04dfc277235d39ffca0a6cf78e15eb04f7784be3b2a3a7480dc0f3e04a2d22bc35e6b77c0f23a9d90bc8c8786812c89454086d5723445"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hi-IN/firefox-50.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "2079fe3f54992ea7a7d2ce90c9615e748896c595115958e5dd018d33f743ab79b3325242171bdcdc49818692088698aab1e351d35c535cc854904d42e4ef78c5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hr/firefox-50.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "10fa4e95d71a5a12f2c4cbc2b97c2bbc1301902d76b6dec99f16f55e73a4a8dfa560e4d8f2dffc347918405749c1b32c3c55b70e6b3b5d9e45566785ecb8d009"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hr/firefox-50.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "eb00d3f069d8eaad95a4534cfc422722977856af50d7477a427372ebbb1dc0f1606dae97f05457e6a5da3b7e1bd7689ece4ebbf7592bf7439a495170be6c52e0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hsb/firefox-50.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "11ddfff8f81de369d721a24c61696fbf80d636396b9b7464c2ec163f8009961599b06c97df6dd1a4494478f7741728c6220292b762d0f7273dc68be65ab05a6c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hsb/firefox-50.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "f8b13383b7f67512312fa8d82cffe4fa21ce1aa64e04d75171faff12c0aa3311ba57e0875ab4dec47e2c1db057a041b921dfd0919587494e571c57a14461ae5a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hu/firefox-50.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "76631fb790cf3ea88f35dd5aff6243f7577e200ad16699c206206e02a30b472004712e78b563f115124d3c7bcaf8fdd07f98e731a78629f93accae55a4baacb9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hu/firefox-50.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "8bd8ad5efcc8e8cef7d59f9be575e5314b2a02dd16e8244bae80864ea684649af8a8eaa2ee40cfff426ef6472802fefaa98d9a7389d2a5be870cae9b4581eebb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hy-AM/firefox-50.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "863f9b6f99a2f025351b7dc3f4796d8b04f2506424ca39fb5bbffe46d123b5f2d74a773af0e2d28b646164e52c1e9efdb097c91ddbf2bf1ab912c787e575f89a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hy-AM/firefox-50.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "934c47c03281e90ca801e87594e0710208bb5f308a10fac386343492581d918e6342bbbabf57c2be959b9c894454d2dcce38923307f036a759e80b1d31d89cd4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/id/firefox-50.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "4d56f033f9b397bcce792017166db2ec5e589d5bc7a3b20e8eb4ca534db11f570df7fbaaebe60d64370325b8ba07c98874aa1d74b58a979090696a0e0bf77f71"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/id/firefox-50.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "e9eb7539cfd92cac77c44c9ec99cf9bf2c9b3d6a1e014d3a8e0b084cef05fd32bb215ff66323618ee9a7c4312732e8a471df5e63710b172eda304ffbac7e8075"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/is/firefox-50.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "9dec3fb45cbb51c101e8b2c22ad68ad508d865f6f903be9dfd8d818ef907e6d4d377a7b075ada729fb66e98187dffde59e5e669349ec0e02e632d47921586f8c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/is/firefox-50.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "ed8d2995ee07a66e5be3b72c2dac6d0fba53613983ba8a76ce01c169033d6b9014de514bfbd9592f0eb6835884f56ff1ff7ef9e2ebd5f0dbb347f6f95db47f7c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/it/firefox-50.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "d180080acd094e6bb7d5e5f2a3e8f13b0e4d672f4f4640786b14a481e52bdec7b865e9f9c970eb8f8987764cdb4155a2964fd8ad8f5c4c3a8d3929b3002f48ef"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/it/firefox-50.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "f158b113ca2c05539c032b8c416c8f5ed022c81bc56f20a95e38e5ea641255b8f780d85c641e5bee2ad347f7b8e3cacf26e18a5c4095c7bc588f4e54784d3028"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ja/firefox-50.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "b964b35ec30fc17965483085fea1cd09450dae10602e04495bd50855fae48b44893f825decd0bbad81fed42d211d85fdcada39b24d07d48236ba208275be6215"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ja/firefox-50.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "3c92f3e9bb5203a2c316e95e2dbb0f94607eaf96c125b7bb96f2962b9bdb5cc2f5d1df44f02fc2154c6da8b5b359177c1cd7cf5379139f43d3f0f0531fd8a03d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/kk/firefox-50.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "e27c1b36220d344746fafeaed2a92639f938abbc268f30efe3665c3da1f01a5990e961686cddc4143e4b33126606728cc4b70ae1031d8e628d156f1b2895c624"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/kk/firefox-50.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "f021cc29f230113577026052c5350d0196e144675dea80248c3449974b7bcbe7e19310c9324cc3b779d50c50a1445793001049c11dedb8841b9f57c26abe5dbf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/km/firefox-50.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "760cbfd406fd8771897b7e5f8646efb30f8ef769e48045b1f26f38fd70efd0def8e03804b649bc838815063c75c1e8309858b80a54301411e91271811d86560b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/km/firefox-50.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "813b0510a7bd3a1f6d6a2da8d408d038d577d051f600a195068edf7679868a259bdc25b6d3225aa52a3d83278625764deb4918a7649c2cfbb565e88b9a0c587a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/kn/firefox-50.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "e20012964a11e4d3d05fcd3107bbb9449d023b2749e4fb41a7f84d1d7c9ddd686be46dea9eb589e2e99ba60832cae7e673f8dcf9ea96b8219ffb7b6be3f82430"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/kn/firefox-50.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "7b1b2c23baad1ddf53e1ac3e10ae7dbe8d963f2d7bd4f1b0dd1f06c1c3162cb415c3b11a2c08e4bc689c296cc1304b970d376a77b253ddafd92e54ec35d2bb3b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ko/firefox-50.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "5304b7bb4e3cf2e97c8eb8a5704dd10c8abf8416b12003b85368154f17d777bcf50fc5b725acf3a2570c17db1327564e854e934a7364b67a4276d77d28c486e1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ko/firefox-50.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "9c2d778bb1b8db25ec8aad1566f2c1c05484a604cfc388ca2bc9c6fa1128ebc4a298e5c5ba4be416e7ef22e1c995b529903855154e4e732d5f3df33bbddcb555"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/lij/firefox-50.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "6d04c7a7f2019fcb5a726f3d1f1c4e26530b6c19a4f7fa353f40c5ce5d79792270bbfdf2b3c03d0c092bbd908b0525fc4cef24ac7550a06c9b052bad6770e618"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/lij/firefox-50.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "5ce1c0588b6e1e4e9336d937c5b8669698eaf88c3fc3a72a528cc1e18e5ad2141056efe96daeb892d86553211679a4c34e15839e6057ff9c891de3cfa4d89cbd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/lt/firefox-50.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "5eca438952f9158863f72e69d9a76a63d02e1ff7bfb63bfdaa52a21c6ac1d7b693ef996b4dca6e869a688d2b829b563550a7623f38b15a6f900de24d696e9bb5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/lt/firefox-50.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "e5f65271adf2744ad36b4c453e3691cc14c067550c0f720797c3b7f92e74abb47d48db3b0d1c24df9285d1b88692aa18b1fa35902ea1bb08367a89cf238bf75d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/lv/firefox-50.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "e9e8e1c989af0374af8d33cfc2ad35bb07351214316065162eafe395d54c6b8b0560b0447b41814967cb70639ac95f34f80251d48bda0c2b55647850aac77728"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/lv/firefox-50.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "44687873e3fc48153c2685855fc1dd3f81ceb2ac4e363f7dae3e5a09700baae3c073de6cc35ac40bc8f1634daa446a8747d28aa6d0c8d50819e9691ba5be14eb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/mai/firefox-50.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "97184b1d0b7e959f6b29be6fd040e9e2dbb9a6c95a94b314103ab4e45fd369c3cbf6a755d229f4c5d862fbe31aa911d8c2fa2e191f929fb9fc456f1da46b324a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/mai/firefox-50.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "073a4b720bff6e703b77ee7b66ec636868acbb9fdb508146e87ee6d5762caf9c03b835ad6f8556fd3485e9830a7194baf3e7cd3119bacd3e7d4ec8084805d7ea"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/mk/firefox-50.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "86548875a1e5ad4fcd514545369affcbeb0a1a1cb4f9ed95be3c811659013ab134466a80ac2f8e085b77c409d8b657d39d9eeef289b7d2c3ae49a04315439c87"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/mk/firefox-50.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "79f42dae37ce34f2ccbc59efdbdf582ab5ad73eb9df8ac655b3e0a986077a5dfffabe7c11fdcce4660217343bcced993076caae14c3fc88e14d5545110252641"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ml/firefox-50.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "227375f9866434b5810c74a9664b913b567291c1efe5f8eb970a092d7eb6fcb8c70b99ace68460a8276af11dce88998aed9f194a7e9abda6383b56d6632fb624"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ml/firefox-50.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "bb5c9a2fde5e9e56d96bc9a0331a2a19e44f93e0f3ddab699e02f281313a9b19bbb3734e936d49d80dad5027443f40603184fac710adda1f5f2338cff138f54f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/mr/firefox-50.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "cd723149ede0b48f3d44977be1ef8033f3b070a037a60bbe6af475a2975f207aafa73a78bd12b272ea85cd841007cdd825f00592c7c563c5275423115442345e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/mr/firefox-50.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "af4216cb3be0967ef5df8cb17b7e720ae4a967dc2b9695d83ceb39c48734472f25063e1e9f2b791b7893dc7a44a99658ee9374a85d33fd77b143eeb2a09e4afb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ms/firefox-50.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "8654d082075f93c31c1ea1feeaa7383c0103475e3e2f129a92c1f27ccdcf8a3cb72b17c380c31b5b62cb37cf3bb5be95383359c6792ed7f5657d6f7c279f2c18"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ms/firefox-50.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "9b23dd532d029322cd686d0cf0362ebb0205dfc56499331fcaa29f038aa2671cfa6d5f395e04e47147a7870852e1d026a9a018a417bc5a5447f82acbfd9f12b9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/nb-NO/firefox-50.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "65358e65b06ef09431fc15f9b6d6cfef343f8bb4ba4c5f6f773f8122f15e2242f2d26a8d6953d6fb25404d68e61c166d79b00483875cefda0f097c0d75bf4cf5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/nb-NO/firefox-50.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "3832d0f87032cbddb0ec42518732f8fb9a253341c33159f152ebad59a7d83234d56f0fe76c48503619bb13a59f2512691d94c3a32d0e85f7874a0886ad189f2c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/nl/firefox-50.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "82972732af96b74b5f69892e7a60d3a03446cb2b048c70f3462fd10d18110c0bffd7e5a9e4b36493d35f701e38dfee7a716cb979bb087bfec7c91d12a4e7702f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/nl/firefox-50.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "9681c8d3e09a69e32d174129b45f49d422bef74c107139e5cfc5448429692d22aeff795b3ec457b2732473f4531c6ab0a3324d235fc9ff827a5b18aaa12829fe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/nn-NO/firefox-50.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "0ca3c8044825907e543255ba66b4679924583cfa82cc15d59afad0d58b493a899025db15d24c69da7b4c4ddb1c83980dbe6132041955475f08816465bc1b2806"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/nn-NO/firefox-50.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "ff470ff06a878fc1237446d8a2411be11513b8431860ab02d4d7b5e617683408bd97ada6dc4a85c2607e1bb7123132bba16d3f94ce9fd989526469420ac322c1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/or/firefox-50.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "2ae92c249786115aba2baaf5aeb0e0b50aae1d089e42e42c332062b245c34518ba0ba26db626ebb252c976cd970fb7fa7bf161f860ff53cb4b20dec73a17d3c4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/or/firefox-50.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "aa9de9557d2c9da388c40fc2bda1c0bcd52e1c7a069cfa3b2936b3c32d3f8af3bf5d385428f9eafc0106f4212def5f11621a52118283f787ee823beee59ae2e4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pa-IN/firefox-50.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "bf2af6ba5d17ddb9112c1abbd7e3c7f5c936e7b88023b24329b1ae24b2283baa9a691a5d8f9a807ad23d679c3e37516fecf8a8fe05331e1531ee0f3edeafafab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pa-IN/firefox-50.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "04406c356da280bafd94e8dfae6c0d667b15d179106a60087a8fc798a2dcb1562e279c6591ef11e4f4783025699e29868054eff96c540cf88803ef13fb658820"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pl/firefox-50.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "03ce9231a3a2e01ff15f5e85a729ec40a38c6424ca51858740f0dd903936e428b611e594486c25d9583987af535133705d83353198f77009862dfb56675b0a1c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pl/firefox-50.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "a62c52e5186084d1c99f54f3f5eea6218b1d6b424e51eed851acba784d16f3845bc8d119fd03737a3404710ff9f3883676642704431d3d7df462452130d50387"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pt-BR/firefox-50.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "c0a627bc9760b3f7a96a5e16fa9b13a356292cbd1abc5be795eb656c1099ef8408be04b090f4f32039485ab43697f811ee5eb1f70324d79304a57cdff14b57ca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pt-BR/firefox-50.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "3e0e840aef1063ac7c553a1bf9ba5a5db63cb2553c0af61b9401a01c84d5e6af74ec1b7b8b260471f2d40101770e9ee6bafd11c842a0eca47b28dd83314d47f9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pt-PT/firefox-50.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "5985b798a7d634d01a427028a847ad4f76000a8f7ed2c1c14b0a68088837bed2e157c66137408e2a0b4567fd2bd4bf63b4717d893c88aab879d8f9c583f73c5b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pt-PT/firefox-50.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "b75b1119708c4bbbcd41b88747a3c2dc22b090d2920831cac56373311e1a996ad558021a85446d5d9ac762ec95cc2ef736692a3c65a20f632693d51a6c1f2ce7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/rm/firefox-50.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "3d375b16a4785fe3af8061ca7759dbccfbeb120b8bdc35a455e411be0a961d9a65345f5aff6b0c01bb7dbcaa4d4a7173117aea52ccb5099bd4ed714f38fcce36"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/rm/firefox-50.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "66a1aaf6d1805be3f6bf4bc71bdb30b7a44e916ccabbb57fb09aec109a3bbab62a8a1a669b6c1806a7959879700a0ac6c97c196d5a75079dcc4042ed789ee922"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ro/firefox-50.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "11f84f8b93db54c88a3d4b0ff155ec69998033ef2cc592dc4d1736129be62249b722a2d7817f3172fe5bad2418980fb57a48d3bec656837c03580ad9e65eedc7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ro/firefox-50.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "c9c3d4d54e5002aec6cb202f7e1269344eea1e9b969fa972000dfc85ccd2f1aed93de52176622f055a9bc5d639b0cce60af69b4507d0f9ebcce77b34f87350c5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ru/firefox-50.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "e8faeee4ed9f69c0f6b3542fa077d50ae3c432709ff1449a91d190e0880d37f849bad199c1dc6d0f6d436203a1e0f8302f6fd082f23bdd8f3338e8cd8c938d4a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ru/firefox-50.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "bfea8fe2273960e84dc3b3dac18d83b36cd0ec9f7d22d25733b36079cb31c76215bdc1862214fe7180229e6163154eef65aeb2b54f94895954d7ff5e4afec813"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/si/firefox-50.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "7995eb7ef1cc5768052bd28c86b547b60c949ce3c0f8089324af4ef0d654bce6c48750ae579f20442f5aaa0c69853290ecabe28f29f2796eacaf2af83e3bed87"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/si/firefox-50.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "9488b18fddb35142a0a88ccc05bac3eb4ab3fc6415736d9a36d58f3bc88016ee8ce1b66e86739c34cabfcc89d2e17a46c282f9495599b8b3fc39be8e6f10b7d8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sk/firefox-50.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "c9694b5aea764255eaa38db4091da6d9fad85d7fa1a67d1529ca66f9dd337818b21c4afda5bcd3fa11c6116bd65ef6c9cb3c7217290982ec10af5ab9b31bbcd4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sk/firefox-50.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "d3186e2c3c3eb3b907fc34aacb9dcb55cbc8433431bb76ac2870bd6823d7261d347819d6d8ea24ac042401d76c155d7efaa00bb81f03ca2991f16aa36bb87b8f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sl/firefox-50.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "b09296856db8af2a61ecb2cf7b27da8ee7fac4598f88be504547f912aaf367a250c66c4dccde77c74588e9319cfd802ca296fbe178b1f7442076f67690f356ab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sl/firefox-50.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "7cdcbf8199fd98e33a509043aee60a40df1ce734067a0a519770466e7eaf20d15d7f4b9942e0b589bedb67f7ba51ac1242bc452c1f79f2449421281d00606433"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/son/firefox-50.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "c8431622708478816c8e0176b8f55c3ae5a32d2a94c24c6ddb059322f0747b55c85a12be869afe41f30c03d769cedbe62c097626d6554de29e47d672d0dae502"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/son/firefox-50.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "79d6c04f251ea26cd78c095f4dab2252162b0c1107e73642836da53504929f775403e4f1872ceb8dccbf45b5c52487c7fd2a58c182b6e006e6307d5b1f854a5f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sq/firefox-50.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "1420ebabc1d5f95db723a1493988d3e3e07354c92256dbed3ef9505d0fd8ce7270c49fa2401de1fe9fe53992c83e81debcdff87b2163eec1ac1ab2f860d8060b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sq/firefox-50.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "9e42c2ed46ec6ec8c0b33a51577e841fe8bcb36fbab369ad7b65d77029f7ca06ad58fdd52343db2e34f64ec2f85224af15a8a3e43f3112beac7c7434dbcacfe9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sr/firefox-50.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "f7726bf8745554d426321add7fd64407d80fbe36c47ba209e837ba8de0392a7db38b386cd5b5b104484b614a497b8792985347260f4c0465878c51f5396e96fa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sr/firefox-50.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "cb0143438cac468d2e70bb53eff678ffb8b831a735c4af0f4aa6ae4b0d7431ff88b33d100d82c3af4d0d4d5bc79dfb8d4c4ad2f8b2ee8c0527cd998f286fe2c8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sv-SE/firefox-50.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "e1321a23d72d292b50fada4d2e468924304787f107f4111a9c51be5a05098ecd8cb3ad6235e26ad5b60a264ad387264b0955cbd8596e8cfc6202acb937029c52"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sv-SE/firefox-50.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "e9dfea71269ce2bb4fd44f613477cf202aab03268c87d0cfef6c05c4c3a36d1a5cf4b5d5a2987265e21722aaf81b1217d81d94f4b79ae447a0df34cda01a2b19"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ta/firefox-50.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "196de192baa7abb85389257adcba33b09a1489971c6c2c92ee9166578a24aaef19fbd42fb039f671ff590ba74ba7fb1a0ffb90f2956369a14e08c04845833943"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ta/firefox-50.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "61f5bad2236cb7a95a9910814fe23cbbfd81e039e9ad4e7218de7f49ba6db604a1376c1a0ec42a866a2fc693778e155a821fcc654443647557899427d1e4c2ad"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/te/firefox-50.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "a823be574db87212d9f822dbaa32cfa885647ec78cf10e465033afd6cac8adeb98c4b1c3ab358d10db76b4a02a73819df28ba4e446b2e4db42c406a434a5c2d7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/te/firefox-50.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "c432aaa53bbbcfe0c38c0cd5748d0b34dfea245302407e3367b05cb35d979b16a7eb669819a62aa0cf3582ba31ce328dd21e812a129101242b1543e8782c4a97"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/th/firefox-50.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "5734973be02d5929354e8dd710b03367cbdc1b7b25f2341057b5e7421d3c8b5ebef7f4674015f385aaf0d8d47efed4db7f1dd17fa53220f62e15c1ecc81a9889"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/th/firefox-50.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "b1f9a0b32b09f2658544cea4995344b8faf0033133a84c996b65d73dca608d8260f257ed2b981a3afa761d02d0669be866c9bce7324956767e154f637b3bbcbc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/tr/firefox-50.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "911497ec90ecdb400c7f43e711ba9e0b6ab1160288d45c3d1d293e9c847fe98167bd3400983915383ccb6f21d057374ade755b0c8e42d229cd178a2fbfd0d397"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/tr/firefox-50.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "b2b5abc20a1fda08c2dbdbb9f0ffac768a2902db330f0646920dcc8b72052893ec59c861d8b26515143290454e20e64bef28617f79e885a9e884088c74f20138"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/uk/firefox-50.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "5816d9f28ea308a3b5910ab718898cd6a36bb27a9f9f273970c8ba86eb7db0be2d39b7e616299c2adf84770da4d98442005d1a87503083da0970a05947cb14ee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/uk/firefox-50.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "1761fd41f5d1c413fa4f35545f5a95df91bd5625be110dc1257b9ee4b3480c2a1ce3e7294dcf4825a412b43fcbdc2da86147fb6d8b004137ae0bcec4cda2ebd2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/uz/firefox-50.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "83f2f053b5a592fe8070d5c01d17a3ca4df988257f19e4dfd17fed6cdee3886cb42701d3aece737817e1cfae7f580c63250b404ad847dc408e2f967b7b70ee32"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/uz/firefox-50.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "ad87b6ae4340041aa7335b69b50f3ddc4731934d25136a0815531708197db9c6b4496ce855d3ce4ec9cf942b594ebd18ccf997e28ea7e625caa7629ca5714fb9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/vi/firefox-50.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "3825405b73375aef6c391cf0e6520f3c9283178b8a2daaf3f5a287a9398c9978d90ac33066fbd114728e7805555cd440a9e2d123c62f099e71a77b13f959dc13"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/vi/firefox-50.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "221029fa0cde5873cd3908c445bdcab03cdf3fc5298203772b6157342f73be7d60e460546f373a50bb2ec308038238da5906374dad326de9f950f838e73b18a9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/xh/firefox-50.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "017bad22c732c2c5d1d1fd44dfc6423eff52f489513e05ae178c61a48376a6353243c2fa095c3acd3a8bfcc032532ef1b046600a625775e6ec5a0b408845aac2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/xh/firefox-50.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "a38742529cfb00c78d3603aba4d1091c4c26b7a4124afe6a976487d3685e92fa3393d2b006ebd34315c9cf8e5b07e8b2e72eaf75669e1195bdcefe86331827fc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/zh-CN/firefox-50.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "0e0e785028fa438957f33f9041be50d0912ba1ba6fd4f5b12b752de9aee8883d6b02af3f62397b656ea802f9c2e0606211bfaa96d7efc47afc44cbe35e18e6ba"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/zh-CN/firefox-50.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "4d9ac8495985147af065da832cccb059b211b0fe66bf171450d207daff175ee04388e499f4f70dd656590689f1fb1d21cd364045b77a96f0304632325ca2d53b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/zh-TW/firefox-50.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "1b46da4872b9b79854dba843f1a340b01969a9c6a9142b0d39a9f9bd7b984f36fac21cf3097d75855e818f34db87792bbf6801746b5a59936b598942c387d44c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/zh-TW/firefox-50.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "3a9966017d4f55fe07cf31f251374281e827bdbdf6f88b65236e14e1a7cb10f09de8a8610d2d21a991896854140907d6a7e8f9caa34e22c614aa403558644e6c"; } ]; } From f0bdca82c0ce446c827f9f4b10381e558f0a9c31 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Mon, 28 Nov 2016 13:56:50 -0500 Subject: [PATCH 0955/1749] linuxPackages.ati_drivers_x11: patch for kernel 4.7+ (#19810) --- .../os-specific/linux/ati-drivers/default.nix | 11 +-- .../patches/4.7-arch-cpu_has_pge-v2.patch | 70 +++++++++++++++++++ 2 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 3bfd59de7ed6..395850384d1e 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, which +{ stdenv, lib, fetchurl, kernel ? null, which , xorg, makeWrapper, glibc, patchelf, unzip , fontconfig, freetype, mesa # for fgl_glxgears , # Whether to build the libraries only (i.e. not the kernel module or @@ -75,9 +75,12 @@ stdenv.mkDerivation rec { ./patches/15.9-preempt.patch ./patches/15.9-sep_printf.patch ] ++ optionals ( kernel != null && - (builtins.compareVersions kernel.version "4.6") >= 0 ) + (lib.versionAtLeast kernel.version "4.6") ) [ ./patches/kernel-4.6-get_user_pages.patch - ./patches/kernel-4.6-page_cache_release-put_page.patch ]; + ./patches/kernel-4.6-page_cache_release-put_page.patch ] + ++ optionals ( kernel != null && + (lib.versionAtLeast kernel.version "4.7") ) + [ ./patches/4.7-arch-cpu_has_pge-v2.patch ]; buildInputs = [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM @@ -124,7 +127,7 @@ stdenv.mkDerivation rec { description = "ATI Catalyst display drivers"; homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; license = licenses.unfree; - maintainers = with maintainers; [ marcweber offline jgeerds ]; + maintainers = with maintainers; [ marcweber offline jgeerds jerith666 ]; platforms = platforms.linux; hydraPlatforms = []; # Copied from the nvidia default.nix to prevent a store collision. diff --git a/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch b/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch new file mode 100644 index 000000000000..cb86f5aff276 --- /dev/null +++ b/pkgs/os-specific/linux/ati-drivers/patches/4.7-arch-cpu_has_pge-v2.patch @@ -0,0 +1,70 @@ +diff -uNr 16.8/common/lib/modules/fglrx/build_mod/firegl_public.c 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.c +--- 16.8/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-12-18 19:47:41.000000000 +0100 ++++ 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.c 2016-08-15 15:09:37.228538907 +0200 +@@ -4518,7 +4518,11 @@ + write_cr0(cr0); + wbinvd(); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) ++ if (boot_cpu_has(X86_FEATURE_PGE)) ++#else + if (cpu_has_pge) ++#endif + { + cr4 = READ_CR4(); + WRITE_CR4(cr4 & ~X86_CR4_PGE); +@@ -4532,7 +4536,11 @@ + wbinvd(); + __flush_tlb(); + write_cr0(cr0 & 0xbfffffff); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) ++ if (boot_cpu_has(X86_FEATURE_PGE)) ++#else + if (cpu_has_pge) ++#endif + { + WRITE_CR4(cr4); + } +@@ -4559,7 +4567,11 @@ + write_cr0(cr0); + wbinvd(); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) ++ if (boot_cpu_has(X86_FEATURE_PGE)) ++#else + if (cpu_has_pge) ++#endif + { + cr4 = READ_CR4(); + WRITE_CR4(cr4 & ~X86_CR4_PGE); +@@ -4572,7 +4584,11 @@ + wbinvd(); + __flush_tlb(); + write_cr0(cr0 & 0xbfffffff); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) ++ if (boot_cpu_has(X86_FEATURE_PGE)) ++#else + if (cpu_has_pge) ++#endif + { + WRITE_CR4(cr4); + } +diff -uNr 16.8/common/lib/modules/fglrx/build_mod/firegl_public.h 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.h +--- 16.8/common/lib/modules/fglrx/build_mod/firegl_public.h 2015-12-18 19:47:41.000000000 +0100 ++++ 16.8b/common/lib/modules/fglrx/build_mod/firegl_public.h 2016-08-15 15:09:05.815141238 +0200 +@@ -650,9 +650,15 @@ + #define cpu_has_pat test_bit(X86_FEATURE_PAT, (void *) &boot_cpu_data.x86_capability) + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) ++#ifndef boot_cpu_has(X86_FEATURE_PGE) ++#define boot_cpu_has(X86_FEATURE_PGE) test_bit(X86_FEATURE_PGE, &boot_cpu_data.x86_capability) ++#endif ++#else + #ifndef cpu_has_pge + #define cpu_has_pge test_bit(X86_FEATURE_PGE, &boot_cpu_data.x86_capability) + #endif ++#endif + + /* 2.6.29 defines pgprot_writecombine as a macro which resolves to a + * GPL-only function with the same name. So we always use our own From 076e3ae32cb40b590a50bffdcf1ee5da85bfabe9 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 28 Nov 2016 14:46:47 -0500 Subject: [PATCH 0956/1749] gitRepo: 1.22 -> 1.23 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index ad3311d967ae..001aa0c5b097 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation { - name = "git-repo-1.22"; + name = "git-repo-1.23"; src = fetchurl { # I could not find a versioned url for the 1.21 version. In case # the sha mismatches, check the homepage for new version and sha. url = "http://commondatastorage.googleapis.com/git-repo-downloads/repo"; - sha1 = "da0514e484f74648a890c0467d61ca415379f791"; + sha256 = "1i8xymxh630a7d5nkqi49nmlwk77dqn36vsygpyhri464qwz0iz1"; }; unpackPhase = "true"; From 2587611ed5916e8fad810a4a2038e12ed85337c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 28 Nov 2016 21:44:15 +0100 Subject: [PATCH 0957/1749] mesa: maintenance 13.0.1 -> 13.0.2 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2b31405980b0..c363cbcd3718 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -26,7 +26,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then else let - version = "13.0.1"; + version = "13.0.2"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -40,7 +40,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "0cd7axwihwsay0i9fvcw14cldbxyvf8b8rd5sh53plvppyr2z5ki"; + sha256 = "a6ed622645f4ed61da418bf65adde5bcc4bb79023c36ba7d6b45b389da4416d5"; }; prePatch = "patchShebangs ."; From 1ac1d934272bda06f93d30ae3481fe39a269c5d5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 28 Nov 2016 17:37:32 -0500 Subject: [PATCH 0958/1749] atom: 1.12.5 -> 1.12.6 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 03b858c896cc..572b7085cbc7 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.12.5"; + version = "1.12.6"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0bxv9j6v77g9sjlg6vjcxjdsgbh10v3c8f0qp5fpzr7dzk7k9w41"; + sha256 = "0b85bjfxdd18i2v8py5jx4284m58zxad38c2vvqhgx7cxm9hn8k6"; name = "${name}.deb"; }; From 80bee8ffe70cba34ea1f0098c45f65b2e761d3e3 Mon Sep 17 00:00:00 2001 From: Tikhon Jelvis Date: Mon, 28 Nov 2016 15:07:41 -0800 Subject: [PATCH 0959/1749] Added a check to not run patchelf on Darwin systems. --- pkgs/applications/networking/cluster/hadoop/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index c5cc7ca74312..55ebb580f52b 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { for n in "bin/"* "sbin/"*; do sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|" done - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor; ''; installPhase = '' From f44023c4852893612b3c332ac6fff0a5ea9bfef5 Mon Sep 17 00:00:00 2001 From: Ruslan Babayev Date: Mon, 28 Nov 2016 17:18:21 -0800 Subject: [PATCH 0960/1749] haskellPackages.barrier: jailbreak --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8a8d0e84e761..0498bcb27772 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1128,4 +1128,6 @@ self: super: { # https://github.com/rampion/ReadArgs/issues/8 ReadArgs = doJailbreak super.ReadArgs; + # https://github.com/philopon/barrier/issues/3 + barrier = doJailbreak super.barrier; } From 66fb5ac222767f8650c3ea3e4de1dc81c44bb3fd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 29 Nov 2016 10:57:52 +0800 Subject: [PATCH 0961/1749] puddletag: 1.1.1 -> 1.2.0 --- pkgs/applications/audio/puddletag/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index b8213f4d9f48..631a5701591d 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -2,19 +2,20 @@ let pypkgs = python2Packages; + pname = "puddletag"; in pypkgs.buildPythonApplication rec { - name = "puddletag-${version}"; - version = "1.1.1"; + name = "${pname}-${version}"; + version = "1.2.0"; src = fetchFromGitHub { owner = "keithgg"; - repo = "puddletag"; - rev = version; - sha256 = "0zmhc01qg64fb825b3kj0mb0r0d9hms30nqvhdks0qnv7ahahqrx"; + repo = pname; + rev = "v${version}"; + sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; }; - sourceRoot = "${name}-src/source"; + sourceRoot = "${pname}-v${version}-src/source"; disabled = pypkgs.isPy3k; # work to support python 3 has not begun From 96dfd01966cc0af2abc1a4c2246a9659dd9fb133 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Tue, 29 Nov 2016 15:33:24 +0900 Subject: [PATCH 0962/1749] groonga: 6.1.0 -> 6.1.1 release notes: http://groonga.org/en/blog/2016/11/29/groonga-6.1.1.html --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index babca9af1685..8dce24948fe3 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "03wz6zjql211dd8kvzcqyzkc8czd8gayr7rw5v274lajcs8f6rkb"; + sha256 = "03h65gycy0j2q4n5h62x3sw76ibdywdvmiciys5a7ppxb2mncabz"; }; buildInputs = with stdenv.lib; [ pkgconfig mecab kytea libedit ] ++ From f67061c1de847f310d1569cfabf98fef8fb09d4e Mon Sep 17 00:00:00 2001 From: joachim schiele Date: Fri, 25 Nov 2016 09:46:40 +0100 Subject: [PATCH 0963/1749] (rustc-nightly) init at 2016-11-26 - precompiled rustc nightly binary --- .../development/compilers/rust/nightlyBin.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/compilers/rust/nightlyBin.nix diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix new file mode 100644 index 000000000000..eff5db9143f1 --- /dev/null +++ b/pkgs/development/compilers/rust/nightlyBin.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, makeWrapper, cacert, zlib }: + +let + inherit (stdenv.lib) optionalString; + + platform = if stdenv.system == "x86_64-linux" + then "x86_64-unknown-linux-gnu" + else abort "missing boostrap url for platform ${stdenv.system}"; + + bootstrapHash = + if stdenv.system == "x86_64-linux" + then "1hsvf1vj18fqxkqw8jhnwahhk2q5xcl5396czr034fphmp5n4haw" + else throw "missing boostrap hash for platform ${stdenv.system}"; + + needsPatchelf = stdenv.isLinux; + + src = fetchurl { + url = "https://static.rust-lang.org/dist/${version}/rustc-nightly-${platform}.tar.gz"; + sha256 = bootstrapHash; + }; + + version = "2016-11-26"; +in + +rec { + rustc = stdenv.mkDerivation rec { + name = "rustc-nightly-${version}"; + + inherit version; + inherit src; + + meta = with stdenv.lib; { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ qknight ]; + license = [ licenses.mit licenses.asl20 ]; + }; + + buildInputs = [ makeWrapper ]; + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + ./install.sh --prefix=$out \ + --components=rustc + + ${optionalString needsPatchelf '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/rustc" + ''} + + # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc + # (or similar) here. It causes strange effects where rustc loads + # the wrong libraries in a bootstrap-build causing failures that + # are very hard to track dow. For details, see + # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 816fa30d4c32..187e8de8e7c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5215,6 +5215,8 @@ in }; rust = rustStable; + rustcNightlyBin = lowPrio(callPackage ../development/compilers/rust/nightlyBin.nix {}); + rustcNightlyBin-2016-11-26 = rustcNightlyBin; rustStable = callPackage ../development/compilers/rust {}; rustBeta = callPackage ../development/compilers/rust/beta.nix {}; rustUnstable = callPackage ../development/compilers/rust/head.nix { From 66c3818e988fe3066d0306c73cf6e6f538e1119a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 29 Nov 2016 07:02:11 -0600 Subject: [PATCH 0964/1749] kde5.frameworks: 5.27 -> 5.28 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../kde-frameworks/plasma-framework.nix | 7 - .../libraries/kde-frameworks/srcs.nix | 584 +++++++++--------- 3 files changed, 297 insertions(+), 296 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 365d44c5e39d..20d63af51264 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/frameworks/5.27/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/frameworks/5.28/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index fe5ba503a406..389b7fc452ba 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -8,13 +8,6 @@ kdeFramework { name = "plasma-framework"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = [ - (fetchurl { - url = "https://cgit.kde.org/plasma-framework.git/patch/?id=62b0865492d863cd000814054681ba6a97972cd5"; - sha256 = "1ipz79apa9lkvcyfm5pap6v67hzncfz60z7s00zi6rnlbz96cy5f"; - name = "plasma-framework-osd-no-dialog.patch"; - }) - ]; nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 4891c1bc07be..eebba2d6a8c7 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,579 +3,587 @@ { attica = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/attica-5.27.0.tar.xz"; - sha256 = "0w6dwq83vj70m8rf52x60a64f6s6h0y7c948j3hddfql7s3ghha7"; - name = "attica-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/attica-5.28.0.tar.xz"; + sha256 = "14v6vi8awk1m58l9svpjd54ckd6milzavgfbkdspsz0km1cpqlks"; + name = "attica-5.28.0.tar.xz"; }; }; baloo = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/baloo-5.27.0.tar.xz"; - sha256 = "0dqa5sxz2z440h6zry7s1x0r1d919qky69i5fv2nir7y844xx2cc"; - name = "baloo-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/baloo-5.28.0.tar.xz"; + sha256 = "071in785y1qplm59fmsmifzbmczvlvkf5gxdb6d0iw93pb36r7h5"; + name = "baloo-5.28.0.tar.xz"; }; }; bluez-qt = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/bluez-qt-5.27.0.tar.xz"; - sha256 = "111gqxw1bvazdhxk5rcfhi438i6bd92r3wvlkxsdqrp7ypcqdpig"; - name = "bluez-qt-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/bluez-qt-5.28.0.tar.xz"; + sha256 = "1rfzwrvvkc5f4l943f4r235gdniqc7njyw4fx36v00daj2r4aqi9"; + name = "bluez-qt-5.28.0.tar.xz"; }; }; breeze-icons = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/breeze-icons-5.27.0.tar.xz"; - sha256 = "12awfvka9sgdgh7dyg7cw7myw7fxrx1w93s1gyhdq2drjsdbghgz"; - name = "breeze-icons-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/breeze-icons-5.28.0.tar.xz"; + sha256 = "06zwg2g0157ac6xsgxs5f8s1sk8rh2j3y057iqmfg2ng2sh9byh2"; + name = "breeze-icons-5.28.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/extra-cmake-modules-5.27.0.tar.xz"; - sha256 = "0n7vw2a4kxdgpsc1wn9f1d0y01p6qfk8ac360rq329bvdpigxmnj"; - name = "extra-cmake-modules-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/extra-cmake-modules-5.28.0.tar.xz"; + sha256 = "0yi60qd08x5093wb8dv9cx370iaabn44hzcang92g9ssfmz0zd2h"; + name = "extra-cmake-modules-5.28.0.tar.xz"; }; }; frameworkintegration = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/frameworkintegration-5.27.0.tar.xz"; - sha256 = "0zpv7wj2006f039wr1gp5bc4md8yq9ig5g3v5mx46sdjip5423p1"; - name = "frameworkintegration-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/frameworkintegration-5.28.0.tar.xz"; + sha256 = "1bcjryngmmyransd5y3zd5ygri13fyy6z7piz3ai9lqmcdbwf7qn"; + name = "frameworkintegration-5.28.0.tar.xz"; }; }; kactivities = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kactivities-5.27.0.tar.xz"; - sha256 = "08x07rlf2gff1j9jahznz2838919vab1ay8jppz3bp5kywx104yk"; - name = "kactivities-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kactivities-5.28.0.tar.xz"; + sha256 = "162ilqcfp8b3lb3gpzbw94ppsdqzn6i6ymiwh12xy5nrxixdpagb"; + name = "kactivities-5.28.0.tar.xz"; }; }; kactivities-stats = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kactivities-stats-5.27.0.tar.xz"; - sha256 = "134a3zgasza9wghp1lkiaar3sakag7vn82pm2kcrmr420a0jigsw"; - name = "kactivities-stats-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kactivities-stats-5.28.0.tar.xz"; + sha256 = "0pjgjl5bwmq0n23nwcqjp3b412fsibnvwsr3s3l67k9scmdpbm4v"; + name = "kactivities-stats-5.28.0.tar.xz"; }; }; kapidox = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kapidox-5.27.0.tar.xz"; - sha256 = "193m0qpcqdkspdcwc8cwabjjcqyd9d0m5kl53mycyiv1m220x11l"; - name = "kapidox-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kapidox-5.28.0.tar.xz"; + sha256 = "1whkl9rzhjnnmpj532d23mlrwhp5wcfxfvq4z4bxyr64g9plbzyq"; + name = "kapidox-5.28.0.tar.xz"; }; }; karchive = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/karchive-5.27.0.tar.xz"; - sha256 = "1c7bifmzyr398p1qx9qfxp893wbr44sjn3sda9q0hdpmw2i7yf3z"; - name = "karchive-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/karchive-5.28.0.tar.xz"; + sha256 = "1s068z0ih6qk3m4lm10wm28y0nq5qwn4gpnx9vckar51xbrl4bb7"; + name = "karchive-5.28.0.tar.xz"; }; }; kauth = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kauth-5.27.0.tar.xz"; - sha256 = "17z6dh1qdpd490z84g6ynl8bcrr9naalvh34ybnpipvx3qs50kwl"; - name = "kauth-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kauth-5.28.0.tar.xz"; + sha256 = "09m7dipkykw75dbka6mhsvrikbniwshl1l0qxcny3ywc0fkzgf40"; + name = "kauth-5.28.0.tar.xz"; }; }; kbookmarks = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kbookmarks-5.27.0.tar.xz"; - sha256 = "1lb20yn8s27h0965yf6w4v4wwlm80bl24mpsksp01z9f0711j8vm"; - name = "kbookmarks-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kbookmarks-5.28.0.tar.xz"; + sha256 = "1lfvps0xzpzn42n7rpsdcmsiryclykz6h1hk8sp6nsbhqwzd0r65"; + name = "kbookmarks-5.28.0.tar.xz"; }; }; kcmutils = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kcmutils-5.27.0.tar.xz"; - sha256 = "04nbd0836azs2i0pq8hq8ljnmfc45mqs022zdn84xd2q3npl3hfx"; - name = "kcmutils-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kcmutils-5.28.0.tar.xz"; + sha256 = "0wj3f5ykzb7q9536y9wk8mnfcb6zay2mmc25dg67mdznzwdy36aa"; + name = "kcmutils-5.28.0.tar.xz"; }; }; kcodecs = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kcodecs-5.27.0.tar.xz"; - sha256 = "0f4k276sm0svh5y8yyq8hfc5vy60cpsrwany7kswyh22m57v5j8a"; - name = "kcodecs-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kcodecs-5.28.0.tar.xz"; + sha256 = "0r01raiva4iddiz5qqshmbmidgkf4q6illanz6zwmc4n66c6s3q3"; + name = "kcodecs-5.28.0.tar.xz"; }; }; kcompletion = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kcompletion-5.27.0.tar.xz"; - sha256 = "1mb64ii4ilhqhy9p6cl3phs17bg3lr4b60jkkm71yn2wnd4wl47s"; - name = "kcompletion-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kcompletion-5.28.0.tar.xz"; + sha256 = "1yrlhf6n7xlkid3xbpirf8n6kybc3sqp5fnb01kr1rcl89qs273f"; + name = "kcompletion-5.28.0.tar.xz"; }; }; kconfig = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kconfig-5.27.0.tar.xz"; - sha256 = "18dpm0r4nnvmxrask6rv5dkniwna9hh72ffdnvjgrh8p5djs9szi"; - name = "kconfig-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kconfig-5.28.0.tar.xz"; + sha256 = "0kdsaqv880wihxv6il8wailmymh0rh0jrbhg8iz2ljf3ir7g56zy"; + name = "kconfig-5.28.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kconfigwidgets-5.27.0.tar.xz"; - sha256 = "0sbhirfsjmsxiwaqqh5jh85bhwmij93gj5knnb0bs0al4hy29918"; - name = "kconfigwidgets-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kconfigwidgets-5.28.0.tar.xz"; + sha256 = "0cy53jaq15n8hw2m67l0y6x722ywg0ijfz5ak5vq3fjjhc9fmq8d"; + name = "kconfigwidgets-5.28.0.tar.xz"; }; }; kcoreaddons = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kcoreaddons-5.27.0.tar.xz"; - sha256 = "0rzpxajv041kdbk92rwxq1qnvzyrxfjy154d8257yj2fj76w1gnw"; - name = "kcoreaddons-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kcoreaddons-5.28.0.tar.xz"; + sha256 = "10x2sgd1acsg1kmb741zk8sbss1j9nncfr1ac2pq0fc236ivkiyb"; + name = "kcoreaddons-5.28.0.tar.xz"; }; }; kcrash = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kcrash-5.27.0.tar.xz"; - sha256 = "09wf4dzckc9l8dyl8qs1wc54h4rm38i2blzyyicm4iazi420lysk"; - name = "kcrash-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kcrash-5.28.0.tar.xz"; + sha256 = "0gsly5wvyh0d6yfk5yyv1pgaazwlwvahz245y9sliwzrbxhgj1yv"; + name = "kcrash-5.28.0.tar.xz"; }; }; kdbusaddons = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kdbusaddons-5.27.0.tar.xz"; - sha256 = "1vgdl9z5xyfr2b5z7n2vdh0s6zab6ccxp30p1cy8hhhrsf04663m"; - name = "kdbusaddons-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kdbusaddons-5.28.0.tar.xz"; + sha256 = "07mzb1xr8wyiid25p8kg6mjp6vq8ngvv1ikhq75zvd2cbax530c8"; + name = "kdbusaddons-5.28.0.tar.xz"; }; }; kdeclarative = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kdeclarative-5.27.0.tar.xz"; - sha256 = "1a8pqwrwgmzarinhr9xxviqh9417p8icj8lwqg9ly0q0j3yv20dh"; - name = "kdeclarative-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kdeclarative-5.28.0.tar.xz"; + sha256 = "1g7bf3smdiwgfhdzwskp3l7l4bn838q1cdy4hp9mzqdssz956wmn"; + name = "kdeclarative-5.28.0.tar.xz"; }; }; kded = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kded-5.27.0.tar.xz"; - sha256 = "14f4qxia9p3vynv2ch9rs67zaxn9kpbas0fn0vwag1ikxb8qz0c2"; - name = "kded-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kded-5.28.0.tar.xz"; + sha256 = "115ywk3vdyhwzna59bpiqfffcc128vafl823yh5fzkwbp8w7qdn5"; + name = "kded-5.28.0.tar.xz"; }; }; kdelibs4support = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/portingAids/kdelibs4support-5.27.0.tar.xz"; - sha256 = "17b8d5b9w27251k4r5xc17115nc3k1agv7j7gkmdiybjyilj1n91"; - name = "kdelibs4support-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/portingAids/kdelibs4support-5.28.0.tar.xz"; + sha256 = "1l6r2812173p8svazq7sam8c2pgh83hdwf35hv3qn7qw30dpg8jl"; + name = "kdelibs4support-5.28.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kdesignerplugin-5.27.0.tar.xz"; - sha256 = "157lny5v8js63nvw2iyc9j4cinqmyj75a389s46n8wqyygrz5v0v"; - name = "kdesignerplugin-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kdesignerplugin-5.28.0.tar.xz"; + sha256 = "12v9pbfniljp23bllxxq6hfv6qnp2q8yjsix6fy6hwf8yrsq42m3"; + name = "kdesignerplugin-5.28.0.tar.xz"; }; }; kdesu = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kdesu-5.27.0.tar.xz"; - sha256 = "1l501z102ygibz4000jnngm0cggh2kaf6hzra1ngv5nxqxzkh31a"; - name = "kdesu-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kdesu-5.28.0.tar.xz"; + sha256 = "1f6awbnqs14si13n1ryibb0z3mj90bg0vk320hgabd2zxma00vwp"; + name = "kdesu-5.28.0.tar.xz"; }; }; kdewebkit = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kdewebkit-5.27.0.tar.xz"; - sha256 = "0ff6xnfc5airadk32s2d3jmmmzilgnwc9r6bvmvnai0f7c4db48f"; - name = "kdewebkit-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kdewebkit-5.28.0.tar.xz"; + sha256 = "19nq6dghnxdzq6xbry283gijsvnzpgp4sl5l3b6xi9n1iq4f91w9"; + name = "kdewebkit-5.28.0.tar.xz"; }; }; kdnssd = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kdnssd-5.27.0.tar.xz"; - sha256 = "0dq2i4f4ny5cwgd41mjw5i7cf23ns55s2m13cjvxvy90nwhlymqp"; - name = "kdnssd-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kdnssd-5.28.0.tar.xz"; + sha256 = "1gkqfcz8glfa6krbayaay4kyq3zazcyr21zjg78la76vfnranh0r"; + name = "kdnssd-5.28.0.tar.xz"; }; }; kdoctools = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kdoctools-5.27.0.tar.xz"; - sha256 = "1hgg19da0918mx8z2614qljvj9j8bny78mwlyljf42814f3ycpam"; - name = "kdoctools-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kdoctools-5.28.0.tar.xz"; + sha256 = "1mndmxy7vgdkii8axzkzclqqimg0ksn2dmwiqsljcjcik0zfx47c"; + name = "kdoctools-5.28.0.tar.xz"; }; }; kemoticons = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kemoticons-5.27.0.tar.xz"; - sha256 = "0rjw2g3lfdxiy56x61d0sdcmcs8rml6h29a05fp6xww2bqcvr9wq"; - name = "kemoticons-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kemoticons-5.28.0.tar.xz"; + sha256 = "10qxm9q7bsbbg419f8d0703mikd8w99a8fh501fpm3sgh6k7pbyv"; + name = "kemoticons-5.28.0.tar.xz"; }; }; kfilemetadata = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kfilemetadata-5.27.0.tar.xz"; - sha256 = "1la6h05izgnps10py2gcn4xnwz3fm7dyswib57flc8phzipxbg5q"; - name = "kfilemetadata-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kfilemetadata-5.28.0.tar.xz"; + sha256 = "0sxifxzyqq0haxfira8ldq9gwali7p5vbbh8jslj8wlxm0dczyw6"; + name = "kfilemetadata-5.28.0.tar.xz"; }; }; kglobalaccel = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kglobalaccel-5.27.0.tar.xz"; - sha256 = "1z2knfxcla1f191cifij1fzw88b076yx6qjxraqfsmkc6g6i2bmj"; - name = "kglobalaccel-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kglobalaccel-5.28.0.tar.xz"; + sha256 = "0a60f2bs7dhx0rsrgva2p97dcala6jrjfg4z2nv0m4bv82i4kchc"; + name = "kglobalaccel-5.28.0.tar.xz"; }; }; kguiaddons = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kguiaddons-5.27.0.tar.xz"; - sha256 = "1skvlcj0fgb4am02vlm4fyd52f9yn4y0aj5arcfz3qps5cjzr6xg"; - name = "kguiaddons-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kguiaddons-5.28.0.tar.xz"; + sha256 = "1f3k6g8cqgq49ka9wsfflp0vnqgk81nlp012lb5v875yil6f9m3f"; + name = "kguiaddons-5.28.0.tar.xz"; }; }; khtml = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/portingAids/khtml-5.27.0.tar.xz"; - sha256 = "05ssmgk2gr5v1x1lsvyyspvnlknmkxivgx1g210i9ayl08v8v3c0"; - name = "khtml-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/portingAids/khtml-5.28.0.tar.xz"; + sha256 = "17dgxicfbpik65m2bjc07qnp2s54wj4zx4czci7v9chfy23d52sb"; + name = "khtml-5.28.0.tar.xz"; }; }; ki18n = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/ki18n-5.27.0.tar.xz"; - sha256 = "0a66z325bvdv7g6ysml2bf8559nkjhv2fxwj1ja6vsxkn95d54ff"; - name = "ki18n-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/ki18n-5.28.0.tar.xz"; + sha256 = "0ymg8mnpvas101war3pgm3wv8ssf1wxa6mxg9ym1xx24mx7xzhzw"; + name = "ki18n-5.28.0.tar.xz"; }; }; kiconthemes = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kiconthemes-5.27.0.tar.xz"; - sha256 = "0m70vcrxp0vvqw5grlsn19d2hgdhky8iv2pr0xwzw8v5yrnl1hh2"; - name = "kiconthemes-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kiconthemes-5.28.0.tar.xz"; + sha256 = "1i5cpsqfn1vcch8izbrgig2km580gdxf02qmib4ynbwzcfvrnbqc"; + name = "kiconthemes-5.28.0.tar.xz"; }; }; kidletime = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kidletime-5.27.0.tar.xz"; - sha256 = "1cv6d2vylz7vymn4v0brv2jp1kzscvm9wh1ylp3wyi1jqyblgjfw"; - name = "kidletime-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kidletime-5.28.0.tar.xz"; + sha256 = "0cwq8jvsimxriiazivls8yix9jyglk2giqwv34a1ic1cnackhwq7"; + name = "kidletime-5.28.0.tar.xz"; }; }; kimageformats = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kimageformats-5.27.0.tar.xz"; - sha256 = "0ijy7di9p37l6fjrmsday402vq4zibq1m37jghkvdymawxcrd22h"; - name = "kimageformats-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kimageformats-5.28.0.tar.xz"; + sha256 = "1h17jm55r9ijmng5mb1w9nqk2hw6h965j9c2nrd8wl9dzy616kra"; + name = "kimageformats-5.28.0.tar.xz"; }; }; kinit = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kinit-5.27.0.tar.xz"; - sha256 = "0sbpl1sp1ajarjmnvx2l3dr09afsay28kp2sf4yacrm4lrmhwzip"; - name = "kinit-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kinit-5.28.0.tar.xz"; + sha256 = "0hwa4anljh5v53gswziacwr6ryvhp136k6y85d10074lrckdr912"; + name = "kinit-5.28.0.tar.xz"; }; }; kio = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kio-5.27.0.tar.xz"; - sha256 = "129sglaw1480v3i1xdyv6k1w3spbj8s00rkdr5mzlcdaqiig69rn"; - name = "kio-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kio-5.28.0.tar.xz"; + sha256 = "1hqc88c2idi9fkb7jy82csb0i740lghv0p2fg1gaglcarjdz7nia"; + name = "kio-5.28.0.tar.xz"; }; }; kitemmodels = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kitemmodels-5.27.0.tar.xz"; - sha256 = "00qgp5i35r7k9gy43wypn9fa7zxiqqip89dzbw8r6rabinihqzy2"; - name = "kitemmodels-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kitemmodels-5.28.0.tar.xz"; + sha256 = "0zi7wsqcmjd7fms8r2vqvwwvzw75p275qyn6whpgblb09l0pn78z"; + name = "kitemmodels-5.28.0.tar.xz"; }; }; kitemviews = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kitemviews-5.27.0.tar.xz"; - sha256 = "1469i10y2c3i1pdhzl9nk177y4n1mlc7p5w7kivdcrvf9ilxvbkx"; - name = "kitemviews-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kitemviews-5.28.0.tar.xz"; + sha256 = "0wrlwawgnz1yjav4hfirc3lcki0hqy0cgr8bwhr9nhm27ndgv28p"; + name = "kitemviews-5.28.0.tar.xz"; }; }; kjobwidgets = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kjobwidgets-5.27.0.tar.xz"; - sha256 = "05c6jzl2a37bfz5i7hzsjmrhh8ajx1gbz7j05wgal811m5m4ww8l"; - name = "kjobwidgets-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kjobwidgets-5.28.0.tar.xz"; + sha256 = "0xh62bjd6qqbmx1jbv9qac1ng0h056mwrs8rkdqd8k10ghmsfx6a"; + name = "kjobwidgets-5.28.0.tar.xz"; }; }; kjs = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/portingAids/kjs-5.27.0.tar.xz"; - sha256 = "18x4az3v4pbg77sxhmrdrfwrc9d9fw7l40m6p18k1khxn86hsp9j"; - name = "kjs-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/portingAids/kjs-5.28.0.tar.xz"; + sha256 = "0w6zijdk4rabsda9msp5dd2kgg8xrh000chmx17xjqa661bgsfql"; + name = "kjs-5.28.0.tar.xz"; }; }; kjsembed = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/portingAids/kjsembed-5.27.0.tar.xz"; - sha256 = "1j42v2l41mwn0ms29b94py21dh7kiipkgdnigpbn89v7nkhwlq2b"; - name = "kjsembed-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/portingAids/kjsembed-5.28.0.tar.xz"; + sha256 = "0mgcdpmk7sprxk58c63b9c5maz9pyi4b77332ci4ixz9pi94899j"; + name = "kjsembed-5.28.0.tar.xz"; }; }; kmediaplayer = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/portingAids/kmediaplayer-5.27.0.tar.xz"; - sha256 = "003jvd2lzp70ywhnkpzgalzqkjpy3d9flkl144z2hfdwm011d58x"; - name = "kmediaplayer-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/portingAids/kmediaplayer-5.28.0.tar.xz"; + sha256 = "139fbhqdhg2pgqadfbig27cnh2p9bds50c0nc9b6pnrwlirl7sm2"; + name = "kmediaplayer-5.28.0.tar.xz"; }; }; knewstuff = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/knewstuff-5.27.0.tar.xz"; - sha256 = "05ikb7cvyx3cmrrjh2ss6439a49vmzbi3chjj23ffdz2nd2k7r2f"; - name = "knewstuff-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/knewstuff-5.28.0.tar.xz"; + sha256 = "0p5a6zprqfnhiim0l0qigjy7kky0m4w2nykhllwvr6lda1rg8qs3"; + name = "knewstuff-5.28.0.tar.xz"; }; }; knotifications = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/knotifications-5.27.0.tar.xz"; - sha256 = "09v122nxfgqjzr2azfn2nh4q9l22i5wnsz9prs0i7s3m7y0d7pxn"; - name = "knotifications-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/knotifications-5.28.0.tar.xz"; + sha256 = "1a55c0abs9yg7qaajgidj8bmfbwkysf24300532lnia71n1ms25s"; + name = "knotifications-5.28.0.tar.xz"; }; }; knotifyconfig = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/knotifyconfig-5.27.0.tar.xz"; - sha256 = "088p19ynjs79zf7mq3gkds93dg72jj8pfya53xyhzdg8s6vyns9n"; - name = "knotifyconfig-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/knotifyconfig-5.28.0.tar.xz"; + sha256 = "0riia9lvp33lqh8ld5r1r0adnfnxikbvmdi4k7kfc4pzra93h10f"; + name = "knotifyconfig-5.28.0.tar.xz"; }; }; kpackage = { - version = "5.27.0"; + version = "5.28.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kpackage-5.27.0.tar.xz"; - sha256 = "0y07zh8ryibm69ljp9f169qfal6r4lngz1ljxgrr6qw15cjkjygk"; - name = "kpackage-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kpackage-5.28.1.tar.xz"; + sha256 = "0ym5fhhigp7argk7c1zyn2fvfjykgxh3miipidf142c8y3d98vbp"; + name = "kpackage-5.28.1.tar.xz"; }; }; kparts = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kparts-5.27.0.tar.xz"; - sha256 = "0rfsyr96s59ljp3jgmcwlvwzbgmlx7fvr62xswwmsnb8ah14k5rh"; - name = "kparts-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kparts-5.28.0.tar.xz"; + sha256 = "1jghgddgz0ghq6n51l1i6jc1s10g0ckda5nlwh4myziv229g9pik"; + name = "kparts-5.28.0.tar.xz"; }; }; kpeople = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kpeople-5.27.0.tar.xz"; - sha256 = "1w6sbd6djcpv36m9my4drqkrs1l3cryshpz1dx9z8p7afr296n8j"; - name = "kpeople-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kpeople-5.28.0.tar.xz"; + sha256 = "0dqz6varz3nrnp8jfysdsp2r2mm46hn3vfcqcyyqk3nmv6sd9mpp"; + name = "kpeople-5.28.0.tar.xz"; }; }; kplotting = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kplotting-5.27.0.tar.xz"; - sha256 = "1qp9q8g9yxy359bylyqyqxjq9wjismajrg4xhxx5xn4s6znyrxny"; - name = "kplotting-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kplotting-5.28.0.tar.xz"; + sha256 = "1vmwxj03qhrfnz3jg30ka28afpqg0hlgm46dbzyg86kg8hc2hgb2"; + name = "kplotting-5.28.0.tar.xz"; }; }; kpty = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kpty-5.27.0.tar.xz"; - sha256 = "06pka8cbw6a9rk2j5pkz34rfy10bv6il3wqyf7ala32ynv5rcgc3"; - name = "kpty-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kpty-5.28.0.tar.xz"; + sha256 = "1q22wzx5xpmbj56xg4miiscb1xqqk2lfkljfdi87zl05vwmnc7hn"; + name = "kpty-5.28.0.tar.xz"; }; }; kross = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/portingAids/kross-5.27.0.tar.xz"; - sha256 = "13karf890afk3dplxgsjx48vjz1ka12pgsi8qw369xbff5nqy2vj"; - name = "kross-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/portingAids/kross-5.28.0.tar.xz"; + sha256 = "06qx87v090d5wxbpqj2sgwhpha7gqmamdx4zffdvc0xa6g1mm6x4"; + name = "kross-5.28.0.tar.xz"; }; }; krunner = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/krunner-5.27.0.tar.xz"; - sha256 = "1yyxyippmn0d9ycj1hdjvhl1zd31yxwg89a9zwmj8v8gdfr9flj9"; - name = "krunner-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/krunner-5.28.0.tar.xz"; + sha256 = "1mmbrpgw090z41l2vg350hmm3ya2qkfkjmq7v5d90jpb7z7y6pr9"; + name = "krunner-5.28.0.tar.xz"; }; }; kservice = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kservice-5.27.0.tar.xz"; - sha256 = "129bjdr272qkz2inmagy8jnxasifrl4d82x8rp9akfar29qsj6x6"; - name = "kservice-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kservice-5.28.0.tar.xz"; + sha256 = "0mlc3vw0vq1rwcg803dsybzlwxj1n6hg13z9sg0h28wsbyss3l4l"; + name = "kservice-5.28.0.tar.xz"; }; }; ktexteditor = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/ktexteditor-5.27.0.tar.xz"; - sha256 = "127wp4dg72skd6abn2vqffxg91bn59z8yxwy6lxyzvck2pc5v1ss"; - name = "ktexteditor-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/ktexteditor-5.28.0.tar.xz"; + sha256 = "1sl152xasbhgpph4f6apkc54b26smgxbd3cxbvch2hfi5cxgb8fq"; + name = "ktexteditor-5.28.0.tar.xz"; }; }; ktextwidgets = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/ktextwidgets-5.27.0.tar.xz"; - sha256 = "0aq2qx64wylxj5q5sr0dxv9h8bmn725llxyi7iwz31dg2ngfr7m4"; - name = "ktextwidgets-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/ktextwidgets-5.28.0.tar.xz"; + sha256 = "0gwjb0isjfrqd15lvln6bwql1lpk2r1vp5f72zxygz2ay8ar1wxp"; + name = "ktextwidgets-5.28.0.tar.xz"; }; }; kunitconversion = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kunitconversion-5.27.0.tar.xz"; - sha256 = "11rn6813jz7clb6fjp9nbdg1c350zh0yiprbr053wkdjrb3aca7c"; - name = "kunitconversion-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kunitconversion-5.28.0.tar.xz"; + sha256 = "0n6ndy1yarilnk2l09h92qk32v02hknafif1i9mmwcibldvc963q"; + name = "kunitconversion-5.28.0.tar.xz"; }; }; kwallet = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kwallet-5.27.0.tar.xz"; - sha256 = "1mlrkzvbqk6r43yqrvv6jsc66brzjd321fp7mg7g3ny47va7hbc2"; - name = "kwallet-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kwallet-5.28.0.tar.xz"; + sha256 = "0n25mvjwy3sv5bg2x75psz6d6f8yl53j3wfmx9ayh57jk4rq24rm"; + name = "kwallet-5.28.0.tar.xz"; }; }; kwayland = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kwayland-5.27.0.tar.xz"; - sha256 = "0va1kmki2xr4mx2918h333mfkqs5v1mhbzyf71hq190izdz0jdss"; - name = "kwayland-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kwayland-5.28.0.tar.xz"; + sha256 = "0xm4agsv8hyx8aaiv4zpa121s08ayhbps3pbfbds2ckk57k6ba8k"; + name = "kwayland-5.28.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kwidgetsaddons-5.27.0.tar.xz"; - sha256 = "0p9gxna7y7nigpi0ri7k45g4pf1svq0kxrhk4wf7rj58rilhcfrl"; - name = "kwidgetsaddons-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kwidgetsaddons-5.28.0.tar.xz"; + sha256 = "1p22s1cbwpwbm03qxs0wqb1i7w1s19b119diwkmb8xl90cqfdwnn"; + name = "kwidgetsaddons-5.28.0.tar.xz"; }; }; kwindowsystem = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kwindowsystem-5.27.0.tar.xz"; - sha256 = "0w49lpwicl71gyyf2aisvmfjpvjl3w1rqpx4a42ph0aywjihjmhx"; - name = "kwindowsystem-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kwindowsystem-5.28.0.tar.xz"; + sha256 = "0lzafiwj58gg5vccnvwrhiwjq67y8cn3gllirgw13vz3f69sbr3i"; + name = "kwindowsystem-5.28.0.tar.xz"; }; }; kxmlgui = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kxmlgui-5.27.0.tar.xz"; - sha256 = "0hf55ip2irbsbg59r36njgb0h5ygpaspa4x6jfyi4bxj852c3hw1"; - name = "kxmlgui-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kxmlgui-5.28.0.tar.xz"; + sha256 = "0plw6fckpssgwf18f5i4vhfp55jmdvfh2rc5lg8fwmlqgqkvrbac"; + name = "kxmlgui-5.28.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/kxmlrpcclient-5.27.0.tar.xz"; - sha256 = "17bavm8qj4r1kc67x5g20v1pl8arjqpn69hg7icp2b1b0vnfvav1"; - name = "kxmlrpcclient-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/kxmlrpcclient-5.28.0.tar.xz"; + sha256 = "1xrdh5ipldahcv0pxp7dnzjz1ihnkg4r2hpylg6bwvq81clw8xd1"; + name = "kxmlrpcclient-5.28.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/modemmanager-qt-5.27.0.tar.xz"; - sha256 = "1zw5frscvbsp0jpb071ssqgvm097ylw3zy69y7f0dybhps6lv2jv"; - name = "modemmanager-qt-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/modemmanager-qt-5.28.0.tar.xz"; + sha256 = "1yfqqp596srvsi0yqrkpm5gzlwjf4szk6hy0wszr12gjjzqprilq"; + name = "modemmanager-qt-5.28.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/networkmanager-qt-5.27.0.tar.xz"; - sha256 = "0fnj0b2j4v51f12b3v59psdza2krdkidj22b9a9jwn224lg4852y"; - name = "networkmanager-qt-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/networkmanager-qt-5.28.0.tar.xz"; + sha256 = "1iq8xrw55k2k9af57l4lfrw72gjxgk7pp7k3m7amjfp0hdqw8602"; + name = "networkmanager-qt-5.28.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/oxygen-icons5-5.27.0.tar.xz"; - sha256 = "1lb09ykj5ayj5lv7w2k2pqis7z61clr3gkinf6n7jghnlc96222g"; - name = "oxygen-icons5-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/oxygen-icons5-5.28.0.tar.xz"; + sha256 = "05bypc4k86lsjp7d4lpbpsnms7k1gnjyahdbks420585ca0v4qkp"; + name = "oxygen-icons5-5.28.0.tar.xz"; }; }; plasma-framework = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/plasma-framework-5.27.0.tar.xz"; - sha256 = "11apg7h636dshswikjpz0qkapv8izqjjz47k7vs49x0byp802s5i"; - name = "plasma-framework-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/plasma-framework-5.28.0.tar.xz"; + sha256 = "0j4mfd8wzrspvyy281lww981fly2rkbhnixb9b0pj5k9i8gvkh7q"; + name = "plasma-framework-5.28.0.tar.xz"; }; }; solid = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/solid-5.27.0.tar.xz"; - sha256 = "01qlfj30n8sr8xd8l8fimg7hs7h70ynhalk2m9l8dz2qay2pdl27"; - name = "solid-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/solid-5.28.0.tar.xz"; + sha256 = "0g6frc7hckbkvzgq40qrymllgp56a3v39l5d2ajqipwb4kabhdpy"; + name = "solid-5.28.0.tar.xz"; }; }; sonnet = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/sonnet-5.27.0.tar.xz"; - sha256 = "07i3gng309vsf5kp5dlwca0lpi3iqc0lp0ixdvx75q832gk8ivrv"; - name = "sonnet-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/sonnet-5.28.0.tar.xz"; + sha256 = "1vzn3kvi126jnkq2s5110yii8946kaxp452735fx0l0jqjn92dy8"; + name = "sonnet-5.28.0.tar.xz"; + }; + }; + syntax-highlighting = { + version = "5.28.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.28/syntax-highlighting-5.28.0.tar.xz"; + sha256 = "0gf1ldlk4gav6bg5b1231hphaal4simyngirvr1yizcb1rrlygdy"; + name = "syntax-highlighting-5.28.0.tar.xz"; }; }; threadweaver = { - version = "5.27.0"; + version = "5.28.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.27/threadweaver-5.27.0.tar.xz"; - sha256 = "0mg5i125b008x6162a5h2q14fg81m17md00017n09xljw3099kqy"; - name = "threadweaver-5.27.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.28/threadweaver-5.28.0.tar.xz"; + sha256 = "10hy4pvw84l2z8778gsfv5i8pqrfjidvlgd5rc8xffx65s3f28b5"; + name = "threadweaver-5.28.0.tar.xz"; }; }; } From 2f0cc0d3f055d64ca3f4c8664c12e8f02a833d0d Mon Sep 17 00:00:00 2001 From: Erik Rybakken Date: Sat, 10 Sep 2016 15:24:57 +0200 Subject: [PATCH 0965/1749] unclutter-xfixes service: init Closes #18398 --- nixos/modules/module-list.nix | 1 + .../modules/services/x11/unclutter-xfixes.nix | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 nixos/modules/services/x11/unclutter-xfixes.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 16d723bf5649..5ae69ffd2230 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -524,6 +524,7 @@ ./services/x11/colord.nix ./services/x11/compton.nix ./services/x11/unclutter.nix + ./services/x11/unclutter-xfixes.nix ./services/x11/desktop-managers/default.nix ./services/x11/display-managers/auto.nix ./services/x11/display-managers/default.nix diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixos/modules/services/x11/unclutter-xfixes.nix new file mode 100644 index 000000000000..bd02c5ed9895 --- /dev/null +++ b/nixos/modules/services/x11/unclutter-xfixes.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.services.unclutter-xfixes; + +in { + options.services.unclutter-xfixes = { + + enable = mkOption { + description = "Enable unclutter-xfixes to hide your mouse cursor when inactive."; + type = types.bool; + default = false; + example = true; + }; + + package = mkOption { + description = "unclutter-xfixes derivation to use."; + type = types.package; + default = pkgs.unclutter-xfixes; + defaultText = "pkgs.unclutter-xfixes"; + }; + + timeout = mkOption { + description = "Number of seconds before the cursor is marked inactive."; + type = types.int; + default = 1; + }; + + threshold = mkOption { + description = "Minimum number of pixels considered cursor movement."; + type = types.int; + default = 1; + }; + + extraOptions = mkOption { + description = "More arguments to pass to the unclutter-xfixes command."; + type = types.listOf types.str; + default = []; + example = [ "exclude-root" "ignore-scrolling" "fork" ]; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.unclutter-xfixes = { + description = "unclutter-xfixes"; + wantedBy = [ "graphical.target" ]; + serviceConfig.ExecStart = '' + ${cfg.package}/bin/unclutter \ + --timeout ${toString cfg.timeout} \ + --jitter ${toString (cfg.threshold - 1)} \ + ${concatMapStrings (x: " --"+x) cfg.extraOptions} \ + ''; + serviceConfig.RestartSec = 3; + serviceConfig.Restart = "always"; + }; + }; +} From b04e23bbb8fa254c6b438ccc7f9c7bccd723356e Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 29 Nov 2016 08:33:44 -0500 Subject: [PATCH 0966/1749] firefox: 50.0 -> 5.0.1 for CVE-2016-9078 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index e0689206382c..15849b1f1edb 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -147,8 +147,8 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "50.0"; - sha512 = "cc325515e238cc3b78cb2cffcc2d80c9f233c0adf750c10100f0dccbab2aec6794f737d7374e600d547d5306de966dd00a0bf40a2dd71ec9dfacb6b157300a76"; + version = "50.0.1"; + sha512 = "3gz7z5vk5zzwy6zzay4s72rbjmlgdgbij859ppzx6h38vhljj4vl7s9g5rg2byx9vjar593i9jhx46mr8bzr3530291aq8a7qmss4hw"; }; firefox-esr-unwrapped = common { From 06c594304ca82c58e9986f5f65d64c78a53dccb9 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 29 Nov 2016 14:53:28 +0100 Subject: [PATCH 0967/1749] nettle: 3.2 -> 3.3 This is a bugfix release. See http://lists.gnu.org/archive/html/info-gnu/2016-10/msg00003.html for release announcement. --- pkgs/development/libraries/nettle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 152c592f591a..3923daad6f4b 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.2"; + version = "3.3"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "15wxhk52yc62rx0pddmry66hqm6z5brrrkx4npd3wh9nybg86hpa"; + sha256 = "07mif3af077763vc35s1x8vzhzlgqcgxh67c1xr13jnhslkjd526"; }; }) From e710edeecfd6152c0b67357555663e5dbec2c787 Mon Sep 17 00:00:00 2001 From: michael bishop Date: Tue, 29 Nov 2016 10:31:07 -0400 Subject: [PATCH 0968/1749] make the /nix/store writable under netboot images --- nixos/modules/installer/netboot/netboot.nix | 28 ++++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 366591a81148..5908ff6cb940 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -26,11 +26,6 @@ with lib; # here and it causes a cyclic dependency. boot.loader.grub.enable = false; - boot.initrd.postMountCommands = '' - mkdir -p /mnt-root/nix/store - mount -t squashfs /nix-store.squashfs /mnt-root/nix/store - ''; - # !!! Hack - attributes expected by other modules. system.boot.loader.kernelFile = "bzImage"; environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ]; @@ -42,13 +37,34 @@ with lib; options = [ "mode=0755" ]; }; + # In stage 1, mount a tmpfs on top of /nix/store (the squashfs + # image) to make this a live CD. + fileSystems."/nix/.ro-store" = + { fsType = "squashfs"; + device = "../nix-store.squashfs"; + options = [ "loop" ]; + neededForBoot = true; + }; + + fileSystems."/nix/.rw-store" = + { fsType = "tmpfs"; + options = [ "mode=0755" ]; + neededForBoot = true; + }; + + fileSystems."/nix/store" = + { fsType = "unionfs-fuse"; + device = "unionfs"; + options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ]; + }; + boot.initrd.availableKernelModules = [ "squashfs" ]; boot.initrd.kernelModules = [ "loop" ]; # Closures to be copied to the Nix store, namely the init # script and the top-level system configuration directory. - netboot.storeContents = + netboot.storeContents = [ config.system.build.toplevel ]; # Create the squashfs image that contains the Nix store. From c9b8a6585df2f3ac0c8713b4efc4eaaf72e7b52f Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Tue, 29 Nov 2016 17:32:21 +0300 Subject: [PATCH 0969/1749] Add tools/networking/polysh --- pkgs/tools/networking/polysh/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/networking/polysh/default.nix diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix new file mode 100644 index 000000000000..b94ec8e429fa --- /dev/null +++ b/pkgs/tools/networking/polysh/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, python2Packages }: + +let + inherit (python2Packages) buildPythonApplication; +in +buildPythonApplication rec { + name = "polysh-${version}"; + version = "0.4"; + src = fetchurl { + url = "http://guichaz.free.fr/polysh/files/${name}.tar.bz2"; + sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4"; + }; + + meta = { + description = "A tool to aggregate several remote shells into one"; + longDescription = '' + Polysh is a tool to aggregate several remote shells into one. It + is used to launch an interactive remote shell on many machines + at once. + ''; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + homepage = http://guichaz.free.fr/polysh/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 187e8de8e7c8..d8c427744e7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3330,6 +3330,8 @@ in polkit_gnome = callPackage ../tools/security/polkit-gnome { }; + polysh = callPackage ../tools/networking/polysh { }; + ponysay = callPackage ../tools/misc/ponysay { }; popfile = callPackage ../tools/text/popfile { }; From d7afb872cda9a94a1f19e328e376ed64aeacef1b Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sun, 18 Sep 2016 14:29:32 -0400 Subject: [PATCH 0970/1749] secp256k1: 2016-05-30 -> 2016-11-27, more flags (#18637) --- pkgs/tools/security/secp256k1/default.nix | 43 ++++++++++++++++------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index 1b982bf06d1b..83a23744c2e9 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -1,32 +1,49 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, ... }: +{ stdenv, fetchFromGitHub, autoreconfHook, jdk + +# Enable ECDSA pubkey recovery module +, enableRecovery ? true + +# Enable ECDH shared secret computation (disabled by default because it is +# experimental) +, enableECDH ? false + +# Enable libsecp256k1_jni (disabled by default because it requires a jdk, +# which is a large dependency) +, enableJNI ? false + +}: + +let inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { name = "secp256k1-${version}"; - # I can't find any version numbers, so we're just using the date - # of the last commit. - version = "2016-05-30"; + # I can't find any version numbers, so we're just using the date of the + # last commit. + version = "2016-11-27"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; - rev = "b3be8521e694eaf45dd29baea035055183c42fe2"; - sha256 = "1pgsy72w87yxbiqn96hnm8alsfx3rj7d9jlzdsypyf6i1rf6w4bq"; + rev = "2928420c1b8e1feee8c20dff4e3cc41a0de2fc22"; + sha256 = "1djsr2vrhh88353czlwb8bwlyabf008w1f7xg0fs3q33rf42w5gm"; }; - buildInputs = [ autoconf automake libtool ]; + buildInputs = optionals enableJNI [ jdk ]; - configureFlags = [ "--enable-module-recovery" ]; + nativeBuildInputs = [ autoreconfHook ]; - preConfigure = "./autogen.sh"; + configureFlags = + optionals enableECDH [ "--enable-module-ecdh" "--enable-experimental" ] ++ + optionals enableRecovery [ "--enable-module-recovery" ] ++ + optionals enableJNI [ "--enable-jni" ]; meta = with stdenv.lib; { description = "Optimized C library for EC operations on curve secp256k1"; longDescription = '' - Optimized C library for EC operations on curve secp256k1. - Part of Bitcoin Core. This library is a work in progress - and is being used to research best practices. Use at your - own risk. + Optimized C library for EC operations on curve secp256k1. Part of + Bitcoin Core. This library is a work in progress and is being used + to research best practices. Use at your own risk. ''; homepage = https://github.com/bitcoin-core/secp256k1; license = with licenses; [ mit ]; From e43f2fc868f00db1f225aa4e9ee325d4ba7f4368 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 29 Nov 2016 15:38:08 +0100 Subject: [PATCH 0971/1749] Revert "lxc: 2.0.4 -> 2.0.6" This reverts commit 5d804566dfecaa3928893244399b86453edcacb3. This was an error on my part. I had the commit sitting on my local master and pulled upstream to rebase my commit before pushing. I didn't notice there was a commit bumping lxc and the auto-merge on the rebase. --- pkgs/os-specific/linux/lxc/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 79f6b4d5043f..3c413ca2426f 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { "bashcompdir=\${out}/share/bash-completion/completions" "READMEdir=\${TMPDIR}/var/lib/lxc/rootfs" "LXCPATH=\${TMPDIR}/var/lib/lxc" - "bashcompdir=\${out}/etc/bash_completion.d" ]; postInstall = '' From 75f131da02c00027b9a8240fb74d117cb0f9d9cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 29 Nov 2016 15:55:33 +0100 Subject: [PATCH 0972/1749] acme: ensure nginx challenges directory is writeable --- nixos/modules/security/acme.nix | 1 + nixos/modules/security/acme.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 12736e57b4a6..726e54711410 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -178,6 +178,7 @@ in path = [ pkgs.simp_le ]; preStart = '' mkdir -p '${cfg.directory}' + chown '${data.user}:${data.group}' '${cfg.directory}' if [ ! -d '${cpath}' ]; then mkdir '${cpath}' fi diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 226cf0382da7..6fddb27e6a34 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -75,7 +75,7 @@ options for the security.acme module. security.acme.certs."foo.example.com" = { - webroot = "/var/www/challenges"; + webroot = config.security.acme.directory + "/acme-challenge"; email = "foo@example.com"; user = "nginx"; group = "nginx"; From 88063446186da227a995d8d9432b5bda10f3dc3a Mon Sep 17 00:00:00 2001 From: joachim schiele Date: Fri, 25 Nov 2016 09:46:40 +0100 Subject: [PATCH 0973/1749] rust: Updates & rename `rustUnstable` to `rustNighly`. --- pkgs/development/compilers/rust/beta.nix | 16 ++++++------ pkgs/development/compilers/rust/default.nix | 2 +- .../compilers/rust/{head.nix => nightly.nix} | 12 ++++----- .../development/compilers/rust/nightlyBin.nix | 6 ----- .../patches/disable-lockfile-check-beta.patch | 25 +++++++++++++++++++ .../disable-lockfile-check-nightly.patch | 25 +++++++++++++++++++ ...ch => disable-lockfile-check-stable.patch} | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 ++--- 9 files changed, 69 insertions(+), 24 deletions(-) rename pkgs/development/compilers/rust/{head.nix => nightly.nix} (68%) create mode 100644 pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch create mode 100644 pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch rename pkgs/development/compilers/rust/patches/{disable-lockfile-check.patch => disable-lockfile-check-stable.patch} (100%) diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix index db19391575f9..a4e55f970eba 100644 --- a/pkgs/development/compilers/rust/beta.nix +++ b/pkgs/development/compilers/rust/beta.nix @@ -3,13 +3,13 @@ rec { rustc = callPackage ./rustc.nix { - shortVersion = "beta-2016-08-17"; + shortVersion = "beta-2016-11-16"; forceBundledLLVM = false; configureFlags = [ "--release-channel=beta" ]; - srcRev = "822166b842e4d0b32fafc8b077fb927ec281253d"; - srcSha = "1zkv7hyjvcj7kvbngf309skgllk6rd7727a6hkvhd3hg8jlz0d00"; + srcRev = "e627a2e6edbc7b7fd205de8ca7c86cff76655f4d"; + srcSha = "14sbhn6dp6rri1rpkspjlmy359zicwmyppdak52xj1kqhcjn71wa"; patches = [ - ./patches/disable-lockfile-check.patch + ./patches/disable-lockfile-check-beta.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; inherit targets; inherit targetPatches; @@ -18,10 +18,10 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "beta-2016-07-25"; - srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0"; - srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155"; - depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4"; + version = "0.14.0"; + srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55"; + srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s"; + depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index dd2d47e940d1..c090cc07d01f 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -15,7 +15,7 @@ rec { srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp"; patches = [ - ./patches/disable-lockfile-check.patch + ./patches/disable-lockfile-check-stable.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; inherit targets; diff --git a/pkgs/development/compilers/rust/head.nix b/pkgs/development/compilers/rust/nightly.nix similarity index 68% rename from pkgs/development/compilers/rust/head.nix rename to pkgs/development/compilers/rust/nightly.nix index 2288a360a518..81741105e261 100644 --- a/pkgs/development/compilers/rust/head.nix +++ b/pkgs/development/compilers/rust/nightly.nix @@ -3,13 +3,13 @@ rec { rustc = callPackage ./rustc.nix { - shortVersion = "master-1.13.0"; + shortVersion = "nightly-2016-11-23"; forceBundledLLVM = false; configureFlags = [ "--release-channel=nightly" ]; - srcRev = "308824acecf902f2b6a9c1538bde0324804ba68e"; - srcSha = "17zv1a27a7w6n3a22brriqx5m6i4s3nsj7mlnpliwghlbz8q7384"; + srcRev = "d5814b03e652043be607f96e24709e06c2b55429"; + srcSha = "0x2vr1mda0mr8q28h96zfpv0f26dyrg8jwxznlh6gk0y0mprgcbr"; patches = [ - ./patches/disable-lockfile-check.patch + ./patches/disable-lockfile-check-nightly.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; inherit targets; inherit targetPatches; @@ -18,10 +18,10 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "master-2016-07-25"; + version = "nightly-2016-07-25"; srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0"; srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155"; - depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4"; + depsSha256 = "055ky0lkrcsi976kmvc4lqyv0sjdpcj3jv36kz9hkqq0gip3crjc"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix index eff5db9143f1..47d918ddf3e6 100644 --- a/pkgs/development/compilers/rust/nightlyBin.nix +++ b/pkgs/development/compilers/rust/nightlyBin.nix @@ -48,12 +48,6 @@ rec { --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustc" ''} - - # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc - # (or similar) here. It causes strange effects where rustc loads - # the wrong libraries in a bootstrap-build causing failures that - # are very hard to track dow. For details, see - # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 ''; }; } diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch new file mode 100644 index 000000000000..a6fe3413fd21 --- /dev/null +++ b/pkgs/development/compilers/rust/patches/disable-lockfile-check-beta.patch @@ -0,0 +1,25 @@ +From 5702d7cdb2bed7ac3af3c01087b181da35f6e108 Mon Sep 17 00:00:00 2001 +From: joachim schiele +Date: Thu, 24 Nov 2016 22:25:48 +0100 +Subject: [PATCH 2/2] asdf + +--- + src/tools/tidy/src/main.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs +index cabaee5..685df94 100644 +--- a/src/tools/tidy/src/main.rs ++++ b/src/tools/tidy/src/main.rs +@@ -48,7 +48,7 @@ fn main() { + errors::check(&path, &mut bad); + cargo::check(&path, &mut bad); + features::check(&path, &mut bad); +- cargo_lock::check(&path, &mut bad); ++ //cargo_lock::check(&path, &mut bad); + pal::check(&path, &mut bad); + + if bad { +-- +2.10.0 + diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch new file mode 100644 index 000000000000..c89d22dcb1ea --- /dev/null +++ b/pkgs/development/compilers/rust/patches/disable-lockfile-check-nightly.patch @@ -0,0 +1,25 @@ +From ac204f8be95cdb2350a1dd893641e38528aaf01d Mon Sep 17 00:00:00 2001 +From: joachim schiele +Date: Fri, 25 Nov 2016 02:17:02 +0100 +Subject: [PATCH] asdf + +--- + src/tools/tidy/src/main.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs +index cb11fe2..c9b7d2a 100644 +--- a/src/tools/tidy/src/main.rs ++++ b/src/tools/tidy/src/main.rs +@@ -45,7 +45,7 @@ fn main() { + bins::check(&path, &mut bad); + style::check(&path, &mut bad); + errors::check(&path, &mut bad); +- cargo::check(&path, &mut bad); ++ //cargo::check(&path, &mut bad); + features::check(&path, &mut bad); + pal::check(&path, &mut bad); + +-- +2.10.0 + diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch similarity index 100% rename from pkgs/development/compilers/rust/patches/disable-lockfile-check.patch rename to pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b825c1132450..905ff02d000b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -91,6 +91,7 @@ doNotDisplayTwice rec { rekonqWrapper = rekonq; # added 2015-01 rssglx = rss-glx; #added 2015-03-25 rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; + rustUnstable = rustNightly; # added 2016-11-29 rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 saneBackends = sane-backends; # added 2016-01-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8c427744e7b..78090a8c205c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5217,16 +5217,16 @@ in }; rust = rustStable; - rustcNightlyBin = lowPrio(callPackage ../development/compilers/rust/nightlyBin.nix {}); - rustcNightlyBin-2016-11-26 = rustcNightlyBin; + rustcNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix {}); rustStable = callPackage ../development/compilers/rust {}; rustBeta = callPackage ../development/compilers/rust/beta.nix {}; - rustUnstable = callPackage ../development/compilers/rust/head.nix { + rustNightly = callPackage ../development/compilers/rust/nightly.nix { rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta); }; cargo = rust.cargo; rustc = rust.rustc; + rustPlatform = recurseIntoAttrs (makeRustPlatform rust); makeRustPlatform = rust: lib.fix (self: From 3000ae86025843c5343bc945fe84b34120027e83 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 29 Nov 2016 17:41:44 +0100 Subject: [PATCH 0974/1749] gitlab service: fix sidekiq queue config --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index cb8fa901bbd2..1fc3a5cc8691 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -428,7 +428,7 @@ in { TimeoutSec = "300"; Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; - ExecStart="${cfg.packages.gitlab.env}/bin/bundle exec \"sidekiq -q post_receive -q mailers -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.statePath}/tmp/sidekiq.pid\""; + ExecStart="${cfg.packages.gitlab.env}/bin/bundle exec \"sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production -P ${cfg.statePath}/tmp/sidekiq.pid\""; }; }; From 0f7f0ced81f0be4f42de7d260a75253cda585d11 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Wed, 23 Nov 2016 14:34:21 +0100 Subject: [PATCH 0975/1749] libuv: 1.9.1 -> 1.10.1 Taken from #20650. --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 3c47a0453dea..96d66e18f7c2 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -3,14 +3,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.9.1"; + version = "1.10.1"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "1kc386gkkkymgz9diz1z4r8impcsmki5k88dsiasd6v9bfvq04cc"; + sha256 = "0gna53fgsjjs38kv1g20xfaalv0fk3xncb6abga3saswrv283hx0"; }; buildInputs = [ automake autoconf libtool pkgconfig ] From 56366b5e668d4d5086cbadbb04c5dbc01a798581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Nov 2016 18:40:30 +0100 Subject: [PATCH 0976/1749] libuv: enable checks and parallel building --- pkgs/development/libraries/libuv/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 96d66e18f7c2..db77a6fefc3a 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { sha256 = "0gna53fgsjjs38kv1g20xfaalv0fk3xncb6abga3saswrv283hx0"; }; + # these checks are probably network-dependent + postPatch = lib.optionalString doCheck '' + sed '/getnameinfo_basic/d' -i test/test-list.h + ''; + buildInputs = [ automake autoconf libtool pkgconfig ] ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; @@ -20,6 +25,10 @@ stdenv.mkDerivation rec { LIBTOOLIZE=libtoolize ./autogen.sh ''; + enableParallelBuilding = true; + + doCheck = true; + meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = https://github.com/libuv/libuv; From f0d7e808b28282a9cd4b8eaffd02418dae8b1779 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 Nov 2016 18:11:54 +0000 Subject: [PATCH 0977/1749] camlp5: 6.16 -> 6.17 --- pkgs/development/tools/ocaml/camlp5/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 3e37de9bd100..12148625a05b 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, transitional ? false}: +{ stdenv, fetchzip, ocaml, transitional ? false }: let metafile = ./META; @@ -6,11 +6,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-6.16"; + name = "camlp5${if transitional then "_transitional" else ""}-6.17"; - src = fetchurl { - url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.16.tgz; - sha256 = "1caqa2rl7rav7pfwv1l1j0j18yr1qzyyqz0wa9519x91ckznqi7x"; + src = fetchzip { + url = https://github.com/camlp5/camlp5/archive/rel617.tar.gz; + sha256 = "0finmr6y0lyd7mnl61kmvwd32cmmf64m245vdh1iy0139rxf814c"; }; buildInputs = [ ocaml ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation { Camlp5 is a preprocessor and pretty-printer for OCaml programs. It also provides parsing and printing tools. ''; - homepage = http://pauillac.inria.fr/~ddr/camlp5/; + homepage = https://camlp5.github.io/; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ From 431c5649930ec48260204cd3afca9c03e75f6ff7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 Nov 2016 18:30:15 +0000 Subject: [PATCH 0978/1749] hol_light: fix build with Camlp5-6.17 --- pkgs/applications/science/logic/hol_light/Makefile.patch | 4 ++-- pkgs/applications/science/logic/hol_light/default.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch index b572001a75d6..5c1ec4f7aaf1 100644 --- a/pkgs/applications/science/logic/hol_light/Makefile.patch +++ b/pkgs/applications/science/logic/hol_light/Makefile.patch @@ -6,8 +6,8 @@ Index: Makefile then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \ else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \ then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \ -- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" ; \ -+ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.16" ; \ +- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" ; \ ++ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" -o ${CAMLP5_VERSION} = "6.17" ; \ then cp pa_j_3.1x_6.11.ml pa_j.ml; \ else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \ fi \ diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index bc391c47b8bc..fbd732595e6c 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { buildInputs = [ ocaml camlp5 ]; + patches = [ ./Makefile.patch ]; + installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" cp -a . $out/lib/hol_light From 18a3225dace3cde74d60dc0b8840c07a2ded511a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 29 Nov 2016 17:40:17 -0500 Subject: [PATCH 0979/1749] linux: 3.12.67 -> 3.12.68 --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index afdc8b82fbdc..72fbe15b02dd 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.67"; + version = "3.12.68"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "18laiqnqfabrqc6dw2pkimcg30hs865kgaflflav6zz9lb3ls1d5"; + sha256 = "0k4kwxmm6vj840k4v6iyswsajaxsb5g9vrc7mzr4grflfbjrgh14"; }; kernelPatches = args.kernelPatches; From f1a0cadaec82ed63559727c8b6ceb8e33f4b4f6b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 29 Nov 2016 18:37:24 -0500 Subject: [PATCH 0980/1749] git: 2.10.2 -> 2.11.0 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index cd737cdf4e6b..c77c746c88f0 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.10.2"; + version = "2.11.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; + sha256 = "02zx368id8rys0bh2sjrxz0ln2l2wm5nf1vhp1rj72clsilqszky"; }; hardeningDisable = [ "format" ]; From ac51528df83401ff357d08ee69d31b5a6d421279 Mon Sep 17 00:00:00 2001 From: danbst Date: Wed, 30 Nov 2016 01:44:28 +0200 Subject: [PATCH 0981/1749] shadow: fix collision with coreutils (man groups.1.gz) The `groups.1.gz` collides with one from coreutils. The code to fix this was already present in expression, but wrongly assumes that share/man/man1 directory will be copied to `man` output after `installPhase`. It turned out, that man directory is set at configure step, so we should remove file from `man` output. --- pkgs/os-specific/linux/shadow/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index e56f285d526c..e99d7d86bfb9 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -43,7 +43,8 @@ stdenv.mkDerivation rec { postInstall = '' # Don't install ‘groups’, since coreutils already provides it. - rm $out/bin/groups $out/share/man/man1/groups.* + rm $out/bin/groups + rm $man/share/man/man1/groups.* # Move the su binary into the su package mkdir -p $su/bin From 5c0367ee5b80bb7322cfc696a43d0eabd0506f9c Mon Sep 17 00:00:00 2001 From: danbst Date: Wed, 30 Nov 2016 03:38:11 +0200 Subject: [PATCH 0982/1749] urxvt: add vtwheel extension This allows to scroll content in less, screen, nano, tmux and others (the ones, who create so called "secondary screens"), similar to VTE-based terminals. Note, however, that mouse wheel won't work in `less -X`, which is used by basic `journalctl`. Fix it with `export SYSTEMD_LESS=FRSMK` --- .../rxvt_unicode-plugins/urxvt-vtwheel.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix new file mode 100644 index 000000000000..000828ddb7fd --- /dev/null +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, perl }: + +stdenv.mkDerivation { + + name = "rxvt_unicode-vtwheel-0.3.2"; + + src = fetchgit { + url = "https://aur.archlinux.org/urxvt-vtwheel.git"; + rev = "36d3e861664aeae36a45f96100f10f8fe2218035"; + sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7"; + }; + + installPhase = '' + sed -i 's|#! perl|#! ${perl}/bin/perl|g' vtwheel + mkdir -p $out/lib/urxvt/perl + cp vtwheel $out/lib/urxvt/perl + ''; + + meta = with stdenv.lib; { + description = "Pass mouse wheel commands to secondary screens (screen, less, nano, etc)"; + homepage = "https://aur.archlinux.org/packages/urxvt-vtwheel"; + license = licenses.mit; + maintainers = with maintainers; [ danbst ]; + platforms = with platforms; unix; + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51a7dea2e684..27088e83dd7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14475,6 +14475,7 @@ in urxvt_tabbedex urxvt_font_size urxvt_theme_switch + urxvt_vtwheel ]; }; @@ -14484,6 +14485,7 @@ in urxvt_tabbedex = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-tabbedex { }; urxvt_font_size = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-font-size { }; urxvt_theme_switch = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-theme-switch { }; + urxvt_vtwheel = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix { }; uade123 = callPackage ../applications/audio/uade123 {}; From 0028abeb4ed1432b99c0b977825c577b3baff3d1 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 30 Nov 2016 06:00:52 +0100 Subject: [PATCH 0983/1749] libffcall: 2009-05-27 -> 1.10 Use the release tarball provided by the clisp maintainer. Tested build by nix-build -A clisp -A clisp_2_44_1 -A gtk-server; only clisp run-tested. Of particular note is that the .so files no longer have executable stacks. This also avoids executable stack in clisp lisp.run Before: $ readelf -lW $(nix-build -A clisp)/lib/clisp-2.49/base/lisp.run|grep GNU_STACK GNU_STACK [...] RWE 0x10 After: $ readelf -lW $(nix-build -A clisp)/lib/clisp-2.49/base/lisp.run|grep GNU_STACK GNU_STACK [...] RW 0x10 --- .../libraries/libffcall/default.nix | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 530b04e8b42e..47814ef2f253 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -1,27 +1,29 @@ -{ stdenv, fetchcvs }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libffcall-${version}"; - version = "2009-05-27"; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.savannah.gnu.org:/sources/libffcall"; - module = "ffcall"; - date = version; - sha256 = "097pv94495njppl9iy2yk47z5wdwvf7swsl88nmwrac51jibbg4i"; + version = "1.10"; + + src = fetchurl { + urls = [ + # Europe + "http://www.haible.de/bruno/gnu/ffcall-${version}.tar.gz" + # USA + "ftp://ftp.santafe.edu/pub/gnu/ffcall-${version}.tar.gz" + ]; + sha256 = "0gcqljx4f8wrq59y13zzigwzaxdrz3jf9cbzcd8h0b2br27mn6vg"; }; - configurePhase = '' - for i in ./configure */configure; do - cwd="$PWD" - cd "$(dirname "$i")"; - ( test -f Makefile && make distclean ) || true - ./configure --prefix=$out - cd "$cwd" - done - ''; + NIX_CFLAGS_COMPILE = "-Wa,--noexecstack"; + + configureFlags = [ + "--enable-shared" + "--disable-static" + ]; meta = { description = "Foreign function call library"; + homepage = http://www.haible.de/bruno/packages-ffcall.html; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; From cb74fd75d700228b441b87a6dc46fba663821a97 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 29 Nov 2016 23:58:21 -0500 Subject: [PATCH 0984/1749] login test: Create and use direct reads of the TTY contents. --- nixos/lib/test-driver/Machine.pm | 25 +++++++++++++++++++++++++ nixos/tests/login.nix | 5 +++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 1a243918c22f..274b16164db3 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -504,6 +504,31 @@ sub screenshot { }, { image => $name } ); } +# Get the text of TTY +sub getTTYText { + my ($self, $tty) = @_; + + my ($status, $out) = $self->execute("fold -w 80 /dev/vcs${tty}"); + return $out; +} + +# Wait until TTY's text matches a particular regular expression +sub waitUntilTTYMatches { + my ($self, $tty, $regexp) = @_; + + $self->nest("waiting for $regexp to appear on tty $tty", sub { + retry sub { + return 1 if $self->getTTYText($tty) =~ /$regexp/; + } + }); +} + +# Debugging: Dump the contents of the TTY +sub dumpTTYContents { + my ($self, $tty) = @_; + + $self->execute("fold -w 80 /dev/vcs${tty} | systemd-cat"); +} # Take a screenshot and return the result as text using optical character # recognition. diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index e793d89567bf..a6a460fb0a7d 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -33,10 +33,11 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: # Log in as alice on a virtual console. subtest "virtual console login", sub { - $machine->sleep(2); # urgh: wait for username prompt + $machine->waitUntilTTYMatches(2, "login: "); $machine->sendChars("alice\n"); + $machine->waitUntilTTYMatches(2, "login: alice"); $machine->waitUntilSucceeds("pgrep login"); - $machine->sleep(2); # urgh: wait for `Password:' + $machine->waitUntilTTYMatches(2, "Password: "); $machine->sendChars("foobar\n"); $machine->waitUntilSucceeds("pgrep -u alice bash"); $machine->sendChars("touch done\n"); From fb9f9926cdbb2c6e66dcf28aa105d483d2bce0ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Nov 2016 09:46:44 +0100 Subject: [PATCH 0985/1749] ghc-8.0.2: drop use of the obsolete response file patch Our gcc wrapper has been fixed to deal with those files properly. --- pkgs/development/compilers/ghc/8.0.2.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 9ff94f204eb2..6407c9b56ddd 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { }; patches = [ - ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 - # Already applied? # ./relocation.patch # Fix https://ghc.haskell.org/trac/ghc/ticket/12130 From 2605149d158a0247a344b7f484071a677d71bc82 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Nov 2016 09:47:37 +0100 Subject: [PATCH 0986/1749] ghc-8.0.2: cosmetic --- pkgs/development/compilers/ghc/8.0.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 6407c9b56ddd..5a4355084357 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -9,7 +9,7 @@ let downloadToTemp = true; postFetch = '' ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out" - ''; + ''; # fix syntax highlighting: */ }); in stdenv.mkDerivation rec { From 07dcc4f43aeb3703cf55002dc00af89cc3585a69 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 30 Nov 2016 10:03:57 +0100 Subject: [PATCH 0987/1749] pythonPackages.Theano: move and rename variants We have two derivations, one that supports Cuda, and one that does not. The names, TheanoWithCuda and TheanoWithoutCuda, now reflect that. Furthermore, a boolean passthru.cudaSupport was added. In the future the two derivations should be merged in one, with a parameter `cudaSupport`. --- .../theano-with-cuda}/default.nix | 4 +- .../Theano/theano-without-cuda/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 32 ++------------ 3 files changed, 49 insertions(+), 31 deletions(-) rename pkgs/development/python-modules/{theano/cuda => Theano/theano-with-cuda}/default.nix (96%) create mode 100644 pkgs/development/python-modules/Theano/theano-without-cuda/default.nix diff --git a/pkgs/development/python-modules/theano/cuda/default.nix b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix similarity index 96% rename from pkgs/development/python-modules/theano/cuda/default.nix rename to pkgs/development/python-modules/Theano/theano-with-cuda/default.nix index bf49d3918611..c9ea79bef9a8 100644 --- a/pkgs/development/python-modules/theano/cuda/default.nix +++ b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage , fetchFromGitHub -, blas , numpy , six , scipy @@ -45,7 +44,7 @@ buildPythonPackage rec { dontStrip = true; propagatedBuildInputs = [ - blas + numpy.blas numpy six scipy @@ -59,4 +58,5 @@ buildPythonPackage rec { libgpuarray ] ++ (stdenv.lib.optional (cudnn != null) [ cudnn ]); + passthru.cudaSupport = true; } diff --git a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix new file mode 100644 index 000000000000..6efa945b0e61 --- /dev/null +++ b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetchurl +, buildPythonPackage +, isPyPy +, pythonOlder +, isPy3k +, nose +, numpy +, pydot_ng +, scipy +, six +}: + +buildPythonPackage rec { + name = "Theano-0.8.2"; + + disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); + + src = fetchurl { + url = "mirror://pypi/T/Theano/${name}.tar.gz"; + sha256 = "7463c8f7ed1a787bf881f36d38a38607150186697e7ce7e78bfb94b7c6af8930"; + }; + + #preCheck = '' + # mkdir -p check-phase + # export HOME=$(pwd)/check-phase + #''; + doCheck = false; + # takes far too long, also throws "TypeError: sort() missing 1 required positional argument: 'a'" + # when run from the installer, and testing with Python 3.5 hits github.com/Theano/Theano/issues/4276, + # the fix for which hasn't been merged yet. + + # keep Nose around since running the tests by hand is possible from Python or bash + propagatedBuildInputs = [ stdenv nose numpy numpy.blas pydot_ng scipy six ]; + + meta = { + homepage = http://deeplearning.net/software/theano/; + description = "A Python library for large-scale array computation"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.bcdarwin ]; + }; + + passthru.cudaSupport = false; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c1831b2ce094..8854e227c3f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23350,37 +23350,11 @@ in { }; }; - Theano = buildPythonPackage rec { - name = "Theano-0.8.2"; + Theano = self.TheanoWithoutCuda; - disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); + TheanoWithoutCuda = callPackage ../development/python-modules/Theano/theano-without-cuda { }; - src = pkgs.fetchurl { - url = "mirror://pypi/T/Theano/${name}.tar.gz"; - sha256 = "7463c8f7ed1a787bf881f36d38a38607150186697e7ce7e78bfb94b7c6af8930"; - }; - - #preCheck = '' - # mkdir -p check-phase - # export HOME=$(pwd)/check-phase - #''; - doCheck = false; - # takes far too long, also throws "TypeError: sort() missing 1 required positional argument: 'a'" - # when run from the installer, and testing with Python 3.5 hits github.com/Theano/Theano/issues/4276, - # the fix for which hasn't been merged yet. - - # keep Nose around since running the tests by hand is possible from Python or bash - propagatedBuildInputs = [ stdenv ] ++ (with self; [ nose numpy numpy.blas pydot_ng scipy six ]); - - meta = { - homepage = http://deeplearning.net/software/theano/; - description = "A Python library for large-scale array computation"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ maintainers.bcdarwin ]; - }; - }; - - Theano-cuda = callPackage ../development/python-modules/theano/cuda ( + TheanoWithCuda = callPackage ../development/python-modules/Theano/theano-with-cuda ( let boost = pkgs.boost159.override { inherit (self) python numpy scipy; From 705bdce17ecfd5dcc0e66f4b942e3841cda7fbf1 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Wed, 30 Nov 2016 11:02:46 +0100 Subject: [PATCH 0988/1749] hexRegistrySnapshot: d58a937 -> e5e494a --- pkgs/development/beam-modules/hex-registry-snapshot.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/hex-registry-snapshot.nix b/pkgs/development/beam-modules/hex-registry-snapshot.nix index 9f5cc3a63e6e..f283b429b963 100644 --- a/pkgs/development/beam-modules/hex-registry-snapshot.nix +++ b/pkgs/development/beam-modules/hex-registry-snapshot.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "hex-registry"; - rev = "d58a937"; + rev = "e5e494a"; version = "0.0.0+build.${rev}"; src = fetchFromGitHub { owner = "erlang-nix"; repo = "hex-pm-registry-snapshots"; inherit rev; - sha256 = "11ymmn75qjlhzf7aaza708gq0hqg55dzd3q13npgq43wg90rgpxy"; + sha256 = "0877dragfxs22a05d8mv42z5535kfx9rs4y7fwwbd1ybphczf8za"; }; installPhase = '' From 10cf3b150ee4e6eacbb6592dab3406820cb19fe9 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 30 Nov 2016 13:04:48 +0100 Subject: [PATCH 0989/1749] haskellPackages.HDBC-odbc: remove haddock fix again --- .../development/haskell-modules/configuration-common.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0498bcb27772..4b3a16de26d9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1068,15 +1068,6 @@ 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 de4dba37a1b2947494d51291a38155208e838b42 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 30 Nov 2016 13:11:36 +0100 Subject: [PATCH 0990/1749] pythonPackages.pytest_30: 3.0.3 -> 3.0.4 --- 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 92f8b301b9e4..e558c7d43aeb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4866,12 +4866,12 @@ in { }; pytest_30 = self.pytest_27.override rec { - name = "pytest-3.0.3"; + name = "pytest-3.0.4"; propagatedBuildInputs = with self; [ hypothesis py ]; src = pkgs.fetchurl { url = "mirror://pypi/p/pytest/${name}.tar.gz"; - sha256 = "1rxydacrdb8s312l3bn0ybrqsjp13abzyim1x21s80386l5504zj"; + sha256 = "03d49xc0l4sdncq47rn1p42ywjnxqrvpc160y8dwvanv3wnfx7w7"; }; }; From 58faa138d404f231cc6004f95d13a9001cf51923 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 30 Nov 2016 14:17:36 +0200 Subject: [PATCH 0991/1749] syncthing: 0.14.12 -> 0.14.13 --- 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 d46120e00888..ee4bb586d552 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.12"; + version = "0.14.13"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "09w0i9rmdi9fjsphib2x6gs6yn5d1a41nh1pm4k9ks31am9zdwsm"; + sha256 = "0gq218f1rhzjrqh2gjyvqksa7a1agwhm8rfqf5jw58pncblrn6v4"; }; buildInputs = [ go ]; From a9611a52f3f01f0366cb7c08fab45c09a64e19b7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 08:23:42 -0500 Subject: [PATCH 0992/1749] mcabber: 1.0.3 -> 1.0.4 for 'roster push attack' --- .../networking/instant-messengers/mcabber/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 3ae3f7bb3dd1..ca752ccf8269 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mcabber-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; - sha256 = "16hkb7v1sqp1gqj94darwwrv23alqaiqdhqjq8gjd6f3l05bprj4"; + sha256 = "02nfn5r7cjpnacym95l6bvczii232v3x2gi79gfa9syc7w0brdk3"; }; buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-openssl=${openssl.dev} --enable-modules --enable-otr"; doCheck = true; - + meta = with stdenv.lib; { homepage = http://mcabber.com/; description = "Small Jabber console client"; From 0707962235faaf499c47c0d24e1fec53399c4f7b Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 08:29:44 -0500 Subject: [PATCH 0993/1749] mujs: 2016-09-21 -> 2016-11-30 for multiple CVEs - CVE-2016-7504 - CVE-2016-7505 - CVE-2016-7506 - CVE-2016-9017 - CVE-2016-9108 - CVE-2016-9109 - CVE-2016-9294 See more information: https://lwn.net/Vulnerabilities/707361/ --- pkgs/development/interpreters/mujs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index b8359488725a..0a87d037454d 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, clang }: stdenv.mkDerivation rec { - name = "mujs-2016-09-21"; + name = "mujs-2016-11-30"; src = fetchgit { url = git://git.ghostscript.com/mujs.git; - rev = "5c337af4b3df80cf967e4f9f6a21522de84b392a"; - sha256 = "1x5g6nycggc83md2dbr2nahjbkkmmn64bg25a8hih7z72sw41dgw"; + rev = "a0ceaf5050faf419401fe1b83acfa950ec8a8a89"; + sha256 = "13abghhqrivaip4h0fav80i8hid220dj0ddc1xnhn6w9rbnrriyg"; }; buildInputs = [ clang ]; From 7d09138caec41f53fa34dce47c56436283dd9a40 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 08:37:48 -0500 Subject: [PATCH 0994/1749] perlPackages.DBDmysql: 4.033 -> 4.039 --- pkgs/development/perl-modules/DBD-mysql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index 14ed14e34afd..0e1db7e234d3 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, DBI, mysql }: buildPerlPackage rec { - name = "DBD-mysql-4.033"; + name = "DBD-mysql-4.039"; src = fetchurl { url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz"; - sha256 = "0769xakykps0cx368g4vaips4w3bjk383rianiavq7sq6g6bp66c"; + sha256 = "0k4p3bjdbmxm2amb0qiiwmn8v83zrjkz5qp84xdjrg8k5v9aj0hn"; }; buildInputs = [ mysql.lib ] ; From 0cff959e790c5ee6612cbba44d709aa3e71f6c16 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 09:07:17 -0500 Subject: [PATCH 0995/1749] maatkit: update URL --- pkgs/development/perl-modules/maatkit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix index e301bd1009fb..fabb3824129c 100644 --- a/pkgs/development/perl-modules/maatkit/default.nix +++ b/pkgs/development/perl-modules/maatkit/default.nix @@ -4,7 +4,7 @@ buildPerlPackage rec { name = "maatkit-7540"; src = fetchurl { - url = "http://maatkit.googlecode.com/files/${name}.tar.gz" ; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/maatkit/${name}.tar.gz"; sha256 = "1a7rxrddkrsfxb2wj01ha91ld0vapfkqcy8j9p08l76zz2l8p2v1"; }; From e3a873479eee4e19a852011d45b0fb653f6c9e89 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Nov 2016 15:14:30 +0100 Subject: [PATCH 0996/1749] Remove fetchMD5warn Deprecation warnings should not be used in Nixpkgs because they spam innocent "nix-env -qa" users with (in this case) dozens of messages that they can't do anything about. This also reverts commit 2ca883338389b7ab995924a0cab0211993bdf1da. --- lib/trivial.nix | 3 --- pkgs/build-support/fetchdarcs/default.nix | 3 +-- pkgs/build-support/fetchegg/default.nix | 3 +-- pkgs/build-support/fetchgit/default.nix | 3 +-- pkgs/build-support/fetchhg/default.nix | 3 +-- pkgs/build-support/fetchsvn/default.nix | 3 +-- pkgs/build-support/fetchsvnssh/default.nix | 3 +-- pkgs/build-support/fetchurl/default.nix | 3 +-- pkgs/top-level/make-tarball.nix | 5 +---- 9 files changed, 8 insertions(+), 21 deletions(-) diff --git a/lib/trivial.nix b/lib/trivial.nix index 39cbd67fba36..7860b9499390 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -138,7 +138,4 @@ rec { */ warn = msg: builtins.trace "WARNING: ${msg}"; info = msg: builtins.trace "INFO: ${msg}"; - - fetchMD5warn = name: context : data : info - "Deprecated use of MD5 hash in ${name} to fetch ${context}" data; } diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index ecec51590b95..3c2e0524eea5 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -7,8 +7,7 @@ stdenv.mkDerivation { outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then - (stdenv.lib.fetchMD5warn "fetchdarcs" url md5) else sha256; + outputHash = if sha256 == "" then md5 else sha256; inherit url rev context; } diff --git a/pkgs/build-support/fetchegg/default.nix b/pkgs/build-support/fetchegg/default.nix index e82d4d95ac26..3e0d5d566ad7 100644 --- a/pkgs/build-support/fetchegg/default.nix +++ b/pkgs/build-support/fetchegg/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation { outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then - (stdenv.lib.fetchMD5warn "fetchegg" name md5) else sha256; + outputHash = if sha256 == "" then md5 else sha256; inherit version; diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 982229cf8a5f..e40b460d390a 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -50,8 +50,7 @@ stdenv.mkDerivation { outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then - (stdenv.lib.fetchMD5warn "fetchgit" url md5) else sha256; + outputHash = if sha256 == "" then md5 else sha256; inherit url rev leaveDotGit fetchSubmodules deepClone branchName; diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index b30a3556b0fe..79f610166a79 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation { outputHashAlgo = if md5 != null then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = if md5 != null then - (stdenv.lib.fetchMD5warn "fetchhg" url md5) else sha256; + outputHash = if md5 != null then md5 else sha256; inherit url rev; preferLocalBuild = true; diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index b6f68e21384d..85ec52c4bde0 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -29,8 +29,7 @@ stdenv.mkDerivation { outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then - (stdenv.lib.fetchMD5warn "fetchsvn" url md5) else sha256; + outputHash = if sha256 == "" then md5 else sha256; inherit url rev sshSupport openssh ignoreExternals; diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/pkgs/build-support/fetchsvnssh/default.nix index 2d151fad07cb..6c6c03d68732 100644 --- a/pkgs/build-support/fetchsvnssh/default.nix +++ b/pkgs/build-support/fetchsvnssh/default.nix @@ -8,8 +8,7 @@ stdenv.mkDerivation { outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then - (stdenv.lib.fetchMD5warn "fetchsvnssh" url md5) else sha256; + outputHash = if sha256 == "" then md5 else sha256; sshSubversion = ./sshsubversion.exp; diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 2cc45ca4bbf2..00f485ce6975 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -112,8 +112,7 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; outputHash = if outputHash != "" then outputHash else - if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else - (stdenv.lib.fetchMD5warn "fetchurl" (builtins.head urls_) md5); + if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 8b3b67f4b05e..2fe69390ec5b 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -63,15 +63,12 @@ releaseTools.sourceTarball rec { fi # Check that all-packages.nix evaluates on a number of platforms without any warnings. - # Filter out MD5 warnings for now for platform in i686-linux x86_64-linux x86_64-darwin; do header "checking Nixpkgs on $platform" NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \ --show-trace --argstr system "$platform" \ - -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | - (grep -v '^trace: INFO: Deprecated use of MD5 hash in fetch' || true) | - tee eval-warnings.log + -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log if [ -s eval-warnings.log ]; then echo "Nixpkgs on $platform evaluated with warnings, aborting" From c0da5f78d646b31d17a4b6f611fb77cdeed5ab7c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Nov 2016 15:21:30 +0100 Subject: [PATCH 0997/1749] make-tarball.nix: Don't check broken packages They're broken after all. In particular, this prevents us from evaluating packages that are unsupported on a particular platform. Reverts a147ddc42ce96608aa424f7b8b8784bd938958c7. Fixes #20817. --- pkgs/top-level/make-tarball.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 2fe69390ec5b..88f027157968 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -66,7 +66,7 @@ releaseTools.sourceTarball rec { for platform in i686-linux x86_64-linux x86_64-darwin; do header "checking Nixpkgs on $platform" - NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \ + nix-env -f . \ --show-trace --argstr system "$platform" \ -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log @@ -76,7 +76,7 @@ releaseTools.sourceTarball rec { fi rm eval-warnings.log - NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \ + nix-env -f . \ --show-trace --argstr system "$platform" \ -qa --drv-path --system-filter \* --system --meta --xml > /dev/null stopNest From 18757f3a11e93e65d4ac6432103f7c27466ee8b3 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Nov 2016 22:59:50 -0200 Subject: [PATCH 0998/1749] XFCE plugins: update, taken from #20410 xfce4-embed-plugin : 1.4.1 -> 1.6.0 xfce4-eyes-plugin : 4.4.3 -> 4.4.4 xfce4-fsguard-plugin : 1.0.1 -> 1.0.2 xfce4-verve-plugin : 1.0.1 -> 1.1.0 xfce4-xkb-plugin : 0.5.6 -> 0.7.1 --- pkgs/desktops/xfce/default.nix | 4 ---- .../xfce/panel-plugins/xfce4-embed-plugin.nix | 6 +++--- .../xfce/panel-plugins/xfce4-eyes-plugin.nix | 4 ++-- .../xfce/panel-plugins/xfce4-fsguard-plugin.nix | 4 ++-- .../xfce/panel-plugins/xfce4-verve-plugin.nix | 6 +++--- .../desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix | 12 ++++++------ 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 991ed0eb6bee..609ed57ab3cc 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -100,7 +100,3 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od }; # xfce_self in xfce_self - - - - diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix index 0acf503abe79..d7c5f53d2ee7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-embed-plugin"; - ver_maj = "1.4"; - ver_min = "1"; + ver_maj = "1.6"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0s0zlg7nvjaqvma4l8bhxk171yjrpncsz6v0ff1cxl3z6ya6hbxq"; + sha256 = "0a72kqsjjh45swimqlpyrahdnplp0383v0i4phr4n6g8c1ixyry7"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index 29b23767eb09..6e0f98156f09 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-eyes-plugin"; ver_maj = "4.4"; - ver_min = "3"; + ver_min = "4"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0z4161i14m73i515ymhj34c1ycz5fmjmbczdd8plx3nvrxdk76jb"; + sha256 = "1jh02hylvsvfpxrx0bq6fzgy6vnxf9qakgpbfvr63lfkd1dyh314"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix index 539f13320046..3e3861b7604c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-fsguard-plugin"; ver_maj = "1.0"; - ver_min = "1"; + ver_min = "2"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1dxa6gpw4a07ixccafd9fnk38r4fax4bhll73fchpv39jzh7xyzz"; + sha256 = "1bj021h4q68bc03f32pkyqy4gfd1sz6s21nxdg7j6gdfhs9xbj52"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix index 442690706094..334d6f4943fd 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-verve-plugin"; - ver_maj = "1.0"; - ver_min = "1"; + ver_maj = "1.1"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1y4vvk3nk1haq39xw0gzscsnnj059am1p3acgq9mj0miyiz8971v"; + sha256 = "114wkmgjxkim1jkswih20zg9d7rbzmlf30b5rlcpvmbsij0ny6d3"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix index b9bd520f0011..42c54bf46b36 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4panel -, gtk, libxklavier, librsvg, libwnck +, garcon, gtk, libxklavier, librsvg, libwnck }: with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-xkb-plugin"; - ver_maj = "0.5"; - ver_min = "6"; + ver_maj = "0.7"; + ver_min = "1"; name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "198q6flrajbscwwywqq8yv6hdcwifahhj9i526vyfz4q6cq65r09"; + sha256 = "10g65j5ia389ahhn3b9hr52ghpp0817fk0m60rfrv4wrzqrjxzk1"; }; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk - libxklavier librsvg libwnck ]; + buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel garcon + gtk libxklavier librsvg libwnck ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; From 54e2973533dd95eee14088e68d50b6ab1ee21199 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 30 Nov 2016 19:10:12 +0100 Subject: [PATCH 0999/1749] docker-machine-kvm: init at 0.7.0 --- .../cluster/docker-machine/kvm-deps.nix | 21 +++++++++++++ .../networking/cluster/docker-machine/kvm.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 53 insertions(+) create mode 100644 pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix create mode 100644 pkgs/applications/networking/cluster/docker-machine/kvm.nix diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix b/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix new file mode 100644 index 000000000000..709491a76f8a --- /dev/null +++ b/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix @@ -0,0 +1,21 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/alexzorin/libvirt-go"; + fetch = { + type = "git"; + url = "https://github.com/alexzorin/libvirt-go"; + rev = "9359c4feb97212380aa05213fa30c4b7348365f0"; + sha256 = "02ipw28pjl5ng2xk63r279apc2py1yr5brcpnsc0cnd2imd51fqa"; + }; + } + { + goPackagePath = "github.com/docker/machine"; + fetch = { + type = "git"; + url = "https://github.com/docker/machine"; + rev = "bb37dc7806687013c0c3097342ef7db4257655d2"; + sha256 = "0wgyxpwis4hyknqalal1cnvb0v3j8f6lscchhk9ch6i69ngiaf03"; + }; + } +] diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix new file mode 100644 index 000000000000..46105f34b5b7 --- /dev/null +++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -0,0 +1,31 @@ +# This file was generated by go2nix. +{ stdenv, buildGoPackage, fetchFromGitHub, libvirt }: + +buildGoPackage rec { + name = "docker-machine-kvm-${version}"; + version = "0.7.0"; + + goPackagePath = "github.com/dhiltgen/docker-machine-kvm"; + goDeps = ./kvm-deps.nix; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "dhiltgen"; + repo = "docker-machine-kvm"; + sha256 = "0zkwwkx74vsfd7v38y9sidi759mhdcpm4409l9y4cx0wmkpavlv6"; + }; + + buildInputs = [ libvirt ]; + + postInstall = '' + mv $bin/bin/bin $bin/bin/docker-machine-driver-kvm + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/dhiltgen/docker-machine-kvm; + description = "KVM driver for docker-machine."; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 816fa30d4c32..90a5705825be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12565,6 +12565,7 @@ in docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; + docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { }; docker-distribution = callPackage ../applications/virtualization/docker-distribution { }; From fa4212e76340ca2d8b855a00d33aa90c15df7b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 30 Nov 2016 21:05:01 +0100 Subject: [PATCH 1000/1749] cheat: 2.1.26 -> 2.1.27 --- pkgs/applications/misc/cheat/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 09bc8f25b261..246a50842c66 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -1,15 +1,17 @@ { python3Packages, fetchurl, lib }: python3Packages.buildPythonApplication rec { - version = "2.1.26"; + version = "2.1.27"; name = "cheat-${version}"; propagatedBuildInputs = with python3Packages; [ docopt pygments ]; src = fetchurl { url = "mirror://pypi/c/cheat/${name}.tar.gz"; - sha256 = "0yilm9ba6ll9wzh20gj3lg9mnc50q95m6sqmjp2vcghwgipdixpm"; + sha256 = "1mrrfwd4ivas0alfkhjryxxzf24a4ngk8c6n2zlfb8ziwf7czcqd"; }; + # no tests available + doCheck = false; meta = { description = "cheat allows you to create and view interactive cheatsheets on the command-line"; From 3675631f63901635d94aa6dab984d606653ec0ae Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 30 Nov 2016 23:28:18 +0100 Subject: [PATCH 1001/1749] convoy: init at 0.5.0 --- pkgs/tools/filesystems/convoy/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/filesystems/convoy/default.nix diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix new file mode 100644 index 000000000000..fe713556577d --- /dev/null +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -0,0 +1,26 @@ +# This file was generated by go2nix. +{ stdenv, buildGoPackage, fetchFromGitHub, devicemapper }: + +buildGoPackage rec { + name = "convoy-${version}"; + version = "0.5.0"; + + goPackagePath = "github.com/rancher/convoy"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "rancher"; + repo = "convoy"; + sha256 = "0ihy0cfq7sa2wml904ajwr165hx2mas3jb1bqk3i0m4fg1lx1xw1"; + }; + + buildInputs = [devicemapper]; + + meta = with stdenv.lib; { + homepage = https://github.com/rancher/convoy; + description = "A Docker volume plugin, managing persistent container volumes."; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 816fa30d4c32..6250a77f267a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1278,6 +1278,8 @@ in convmv = callPackage ../tools/misc/convmv { }; + convoy = callPackage ../tools/filesystems/convoy { }; + cool-retro-term = qt55.callPackage ../applications/misc/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { From 288e75c5f9c45062f7401f40d11b0c04199eca4c Mon Sep 17 00:00:00 2001 From: lbonn Date: Wed, 30 Nov 2016 23:54:14 +0100 Subject: [PATCH 1002/1749] wireguard: remove dependency on ip-up.target It was deprecated and removed from all modules in the tree by #18319. The wireguard module PR (#17933) was still in the review at the time and the deprecated usage managed to slip inside. --- nixos/modules/services/networking/wireguard.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 35918e42b402..52dd5502147e 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -151,7 +151,8 @@ let nameValuePair "wireguard-${name}" { description = "WireGuard Tunnel - ${name}"; - wantedBy = [ "ip-up.target" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; From eba91fa2bdc130da4ca35a2f60b9d30d90d284f9 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 18:20:21 -0500 Subject: [PATCH 1003/1749] tomcat6: 6.0.45 -> 6.0.48 For CVE-2016-8735, a remote code execution vulnerability. --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 00aaff899dc4..66613335166a 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -33,8 +33,8 @@ in { tomcat6 = common { versionMajor = "6"; - versionMinor = "0.45"; - sha256 = "0ba8h86padpk23xmscp7sg70g0v8ji2jbwwriz59hxqy5zhd76wg"; + versionMinor = "0.48"; + sha256 = "1w4jf28g8p25fmijixw6b02iqlagy2rvr57y3n90hvz341kb0bbc"; }; tomcat7 = common { From 3d0310daf383efb0357e483a082cafcf43d45ae1 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 18:21:01 -0500 Subject: [PATCH 1004/1749] tomcat7: 7.0.72 -> 7.0.73 For CVE-2016-8735, a remote code execution vulnerability. --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 66613335166a..5c22278cf62a 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -39,8 +39,8 @@ in { tomcat7 = common { versionMajor = "7"; - versionMinor = "0.72"; - sha256 = "1nx5pmz3bq3n20fdspqh8ljqy1nj67rwi1vsqjpkrvd996x7p73p"; + versionMinor = "0.73"; + sha256 = "11gaiy56q7pik06sdypr80sl3g6k41s171wqqwlhxffmsxm4v08f"; }; tomcat8 = common { From 80a475042c4be3bb564a4a2d609a9f66ae906574 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 18:21:16 -0500 Subject: [PATCH 1005/1749] tomcat8: 8.0.37 -> 8.0.39 For CVE-2016-8735, a remote code execution vulnerability. --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 5c22278cf62a..e22f27612316 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -45,8 +45,8 @@ in { tomcat8 = common { versionMajor = "8"; - versionMinor = "0.37"; - sha256 = "0f9d4yxjzwdrayj5l3jyiclnmpb5lffvmsnp54qpf6m3gm7cj5i6"; + versionMinor = "0.39"; + sha256 = "16hyypdawby66qa8y66sfprcf78wjy319a0gsi4jgfqfywcsm4s0"; }; tomcat85 = common { From 42f1ae1911421e5fa886432aae38a52a6b343490 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 18:21:27 -0500 Subject: [PATCH 1006/1749] tomcat85: 8.5.5 -> 8.5.8 For CVE-2016-8735, a remote code execution vulnerability. --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index e22f27612316..7d972ba3486e 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -51,8 +51,8 @@ in { tomcat85 = common { versionMajor = "8"; - versionMinor = "5.5"; - sha256 = "0idfxjrw5q45f531gyjnv6xjkbj9nhy2v1w4z7558z96230a0fqj"; + versionMinor = "5.8"; + sha256 = "1rfws897m09pbnb1jc4684didpklfhqp86szv2jcqzdx0hlfxxs0"; }; tomcatUnstable = common { From 5f789809736002bd973f9e98685366249222de58 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 18:21:39 -0500 Subject: [PATCH 1007/1749] tomcatUnstable: 9.0.0.M10 -> 9.0.0.M13 For CVE-2016-8735, a remote code execution vulnerability. --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 7d972ba3486e..edf1e59931ed 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -57,8 +57,8 @@ in { tomcatUnstable = common { versionMajor = "9"; - versionMinor = "0.0.M10"; - sha256 = "0p3pqwz9zjvr9w73divsyaa53mbazf0icxfs06wvgxsvkbgj5gq9"; + versionMinor = "0.0.M13"; + sha256 = "0im3w4iqpar7x50vg7c9zkxyqf9x53xs5jvcq79xqgrmcqb9lk91"; }; } From 9c71508c95482139f3fb1fef2cc5f3cb20600ad5 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 18:34:35 -0500 Subject: [PATCH 1008/1749] bzip2: patch for CVE-2016-3189 --- pkgs/tools/compression/bzip2/CVE-2016-3189.patch | 12 ++++++++++++ pkgs/tools/compression/bzip2/default.nix | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/compression/bzip2/CVE-2016-3189.patch diff --git a/pkgs/tools/compression/bzip2/CVE-2016-3189.patch b/pkgs/tools/compression/bzip2/CVE-2016-3189.patch new file mode 100644 index 000000000000..eff324b32503 --- /dev/null +++ b/pkgs/tools/compression/bzip2/CVE-2016-3189.patch @@ -0,0 +1,12 @@ +diff --git a/bzip2recover.c b/bzip2recover.c +index f9de049..252c1b7 100644 +--- a/bzip2recover.c ++++ b/bzip2recover.c +@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv ) + bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); + bsPutUInt32 ( bsWr, blockCRC ); + bsClose ( bsWr ); ++ outFile = NULL; + } + if (wrBlock >= rbCtr) break; + wrBlock++; diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index cabd412fe65d..51f478110659 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, fetchpatch , linkStatic ? (stdenv.system == "i686-cygwin") }: @@ -20,10 +20,16 @@ stdenv.mkDerivation rec { sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c"; }; + patches = [ + ./CVE-2016-3189.patch + ]; + + postPatch = '' sed -i -e '//s|\\|/|' bzip2.c ''; + outputs = [ "bin" "dev" "out" "man" ]; configureFlags = From ddeb0d2d6b2e71cf98ab50ab376f802cf29c7c22 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 13 Nov 2016 10:38:41 -0800 Subject: [PATCH 1009/1749] top-level: Stop exposing all stdenvs --- pkgs/stdenv/cross/default.nix | 2 +- pkgs/stdenv/custom/default.nix | 4 ++-- pkgs/stdenv/default.nix | 7 +++---- pkgs/top-level/stdenv.nix | 6 ++---- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 0cde6a05943e..4b7d81879b1f 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -8,7 +8,7 @@ rec { }; vanillaStdenv = (import ../. (args // argClobber // { allPackages = args: allPackages (argClobber // args); - })).stdenv // { + })) // { # Needed elsewhere as a hacky way to pass the target cross = crossSystem; }; diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index 2f2f495b388b..6d2aa8c59b3f 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -1,10 +1,10 @@ { system, allPackages, platform, crossSystem, config, ... } @ args: rec { - vanillaStdenv = (import ../. (args // { + vanillaStdenv = import ../. (args // { # Remove config.replaceStdenv to ensure termination. config = builtins.removeAttrs config [ "replaceStdenv" ]; - })).stdenv; + }); buildPackages = allPackages { # It's OK to change the built-time dependencies diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 4be34a35acb3..ac84ea0f9a0b 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -8,7 +8,7 @@ { system, allPackages ? import ../.., platform, config, crossSystem, lib }: -rec { +let # The native (i.e., impure) build environment. This one uses the @@ -43,7 +43,7 @@ rec { inherit (import ./custom { inherit system allPackages platform crossSystem config lib; }) stdenvCustom; # Select the appropriate stdenv for the platform `system'. - stdenv = +in if crossSystem != null then if crossSystem.useiOSCross or false then stdenvCrossiOS else stdenvCross else @@ -60,5 +60,4 @@ rec { if system == "i686-cygwin" then stdenvNative else if system == "x86_64-cygwin" then stdenvNative else if system == "x86_64-freebsd" then stdenvFreeBSD else - stdenvNative; -} + stdenvNative diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix index 9f485b8c90ef..adb8bdde6ad0 100644 --- a/pkgs/top-level/stdenv.nix +++ b/pkgs/top-level/stdenv.nix @@ -1,12 +1,10 @@ { system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun }: rec { - allStdenvs = import ../stdenv { + defaultStdenv = import ../stdenv { inherit system platform config crossSystem lib; allPackages = nixpkgsFun; - }; - - defaultStdenv = allStdenvs.stdenv // { inherit platform; }; + } // { inherit platform; }; stdenv = if bootStdenv != null From 2df990967be3c21f074c56682f8fa47bdd7cba7b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 30 Nov 2016 19:03:22 -0500 Subject: [PATCH 1010/1749] Move up `inherit` binding for consistency --- pkgs/stdenv/cross/default.nix | 2 +- pkgs/stdenv/custom/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 4b7d81879b1f..e48124f1c4db 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -17,10 +17,10 @@ rec { # be used to build compilers and other such tools targeting the cross # platform. Then, `forceNativeDrv` can be removed. buildPackages = allPackages { + inherit system platform crossSystem config; # It's OK to change the built-time dependencies allowCustomOverrides = true; bootStdenv = vanillaStdenv; - inherit system platform crossSystem config; }; stdenvCross = buildPackages.makeStdenvCross diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index 6d2aa8c59b3f..4c14d6411f10 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -7,10 +7,10 @@ rec { }); buildPackages = allPackages { + inherit system platform crossSystem config; # It's OK to change the built-time dependencies allowCustomOverrides = true; bootStdenv = vanillaStdenv; - inherit system platform crossSystem config; }; stdenvCustom = config.replaceStdenv { pkgs = buildPackages; }; From 07a2b17cbf541c485e04f1a8ec98ffe8c24ac713 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 27 Nov 2016 12:32:56 -0800 Subject: [PATCH 1011/1749] top-level: Split some of `pkgs/top-level/default.nix` to `pkgs/top-level/stage.nix` This is preparation for the latter just building a single stage, and the former building a package set with the bootstrapped stdenv. --- pkgs/top-level/default.nix | 98 +++------------------------------ pkgs/top-level/stage.nix | 107 +++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 90 deletions(-) create mode 100644 pkgs/top-level/stage.nix diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 831b1db0cea3..c5b8bbac31c0 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -4,37 +4,22 @@ packages in the Nix Packages collection for some particular platform. */ - { # The system (e.g., `i686-linux') for which to build the packages. system -, # The standard environment to use. Only used for bootstrapping. If - # null, the default standard environment is used. - bootStdenv ? null - -, # This is used because stdenv replacement and the stdenvCross do benefit from - # the overridden configuration provided by the user, as opposed to the normal - # bootstrapping stdenvs. - allowCustomOverrides ? (bootStdenv == null) - -, # Non-GNU/Linux OSes are currently "impure" platforms, with their libc - # outside of the store. Thus, GCC, GFortran, & co. must always look for - # files in standard system directories (/usr/include, etc.) - noSysDirs ? (system != "x86_64-freebsd" && system != "i686-freebsd" - && system != "x86_64-solaris" - && system != "x86_64-kfreebsd-gnu") - , # Allow a configuration attribute set to be passed in as an argument. config ? {} , crossSystem ? null , platform ? null +, ... } @ args: +let # Rename the function arguments + configExpr = config; + platform_ = platform; -let configExpr = config; platform_ = platform; in # rename the function arguments - -let +in let lib = import ../../lib; # Allow both: @@ -72,75 +57,8 @@ let # deterministically inferred the same way. nixpkgsFun = newArgs: import ./. (args // newArgs); - stdenvAdapters = self: super: - let res = import ../stdenv/adapters.nix self; in res // { - stdenvAdapters = res; - }; + pkgs = import ./stage.nix ({ + inherit lib nixpkgsFun config platform; + } // args); - trivialBuilders = self: super: - import ../build-support/trivial-builders.nix { - inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; - }; - - stdenvDefault = self: super: - import ./stdenv.nix { - inherit system bootStdenv crossSystem config platform lib nixpkgsFun; - }; - - allPackages = self: super: - let res = import ./all-packages.nix - { inherit system noSysDirs config crossSystem platform lib nixpkgsFun; } - res self; - in res; - - aliases = self: super: import ./aliases.nix super; - - # stdenvOverrides is used to avoid circular dependencies for building - # the standard build environment. This mechanism uses the override - # mechanism to implement some staged compilation of the stdenv. - # - # We don't want stdenv overrides in the case of cross-building, or - # otherwise the basic overridden packages will not be built with the - # crossStdenv adapter. - stdenvOverrides = self: super: - lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides) - (super.stdenv.overrides super); - - # Allow packages to be overridden globally via the `packageOverrides' - # configuration option, which must be a function that takes `pkgs' - # as an argument and returns a set of new or overridden packages. - # The `packageOverrides' function is called with the *original* - # (un-overridden) set of packages, allowing packageOverrides - # attributes to refer to the original attributes (e.g. "foo = - # ... pkgs.foo ..."). - configOverrides = self: super: - lib.optionalAttrs allowCustomOverrides - ((config.packageOverrides or (super: {})) super); - - # The complete chain of package set builders, applied from top to bottom - toFix = lib.foldl' (lib.flip lib.extends) (self: {}) [ - stdenvAdapters - trivialBuilders - stdenvDefault - allPackages - aliases - stdenvOverrides - configOverrides - ]; - - # Use `overridePackages` to easily override this package set. - # Warning: this function is very expensive and must not be used - # from within the nixpkgs repository. - # - # Example: - # pkgs.overridePackages (self: super: { - # foo = super.foo.override { ... }; - # } - # - # The result is `pkgs' where all the derivations depending on `foo' - # will use the new version. - - # Return the complete set of packages. Warning: this function is very - # expensive! - pkgs = lib.makeExtensibleWithCustomName "overridePackages" toFix; in pkgs diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix new file mode 100644 index 000000000000..9ab9d22e54fe --- /dev/null +++ b/pkgs/top-level/stage.nix @@ -0,0 +1,107 @@ +/* This file composes the Nix Packages collection. That is, it + imports the functions that build the various packages, and calls + them with appropriate arguments. The result is a set of all the + packages in the Nix Packages collection for some particular + platform. */ + + +{ # The system (e.g., `i686-linux') for which to build the packages. + system + +, # The standard environment to use. Only used for bootstrapping. If + # null, the default standard environment is used. + bootStdenv ? null + +, # This is used because stdenv replacement and the stdenvCross do benefit from + # the overridden configuration provided by the user, as opposed to the normal + # bootstrapping stdenvs. + allowCustomOverrides ? (bootStdenv == null) + +, # Non-GNU/Linux OSes are currently "impure" platforms, with their libc + # outside of the store. Thus, GCC, GFortran, & co. must always look for + # files in standard system directories (/usr/include, etc.) + noSysDirs ? (system != "x86_64-freebsd" && system != "i686-freebsd" + && system != "x86_64-solaris" + && system != "x86_64-kfreebsd-gnu") + +, # The configuration attribute set + config + +, crossSystem ? null +, platform +, lib +, nixpkgsFun +}: + +let + stdenvAdapters = self: super: + let res = import ../stdenv/adapters.nix self; in res // { + stdenvAdapters = res; + }; + + trivialBuilders = self: super: + import ../build-support/trivial-builders.nix { + inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; + }; + + stdenvDefault = self: super: + import ./stdenv.nix { + inherit system bootStdenv crossSystem config platform lib nixpkgsFun; + }; + + allPackages = self: super: + let res = import ./all-packages.nix + { inherit system noSysDirs config crossSystem platform lib nixpkgsFun; } + res self; + in res; + + aliases = self: super: import ./aliases.nix super; + + # stdenvOverrides is used to avoid circular dependencies for building + # the standard build environment. This mechanism uses the override + # mechanism to implement some staged compilation of the stdenv. + # + # We don't want stdenv overrides in the case of cross-building, or + # otherwise the basic overridden packages will not be built with the + # crossStdenv adapter. + stdenvOverrides = self: super: + lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides) + (super.stdenv.overrides super); + + # Allow packages to be overridden globally via the `packageOverrides' + # configuration option, which must be a function that takes `pkgs' + # as an argument and returns a set of new or overridden packages. + # The `packageOverrides' function is called with the *original* + # (un-overridden) set of packages, allowing packageOverrides + # attributes to refer to the original attributes (e.g. "foo = + # ... pkgs.foo ..."). + configOverrides = self: super: + lib.optionalAttrs allowCustomOverrides + ((config.packageOverrides or (super: {})) super); + + # The complete chain of package set builders, applied from top to bottom + toFix = lib.foldl' (lib.flip lib.extends) (self: {}) [ + stdenvAdapters + trivialBuilders + stdenvDefault + allPackages + aliases + stdenvOverrides + configOverrides + ]; + + # Use `overridePackages` to easily override this package set. + # Warning: this function is very expensive and must not be used + # from within the nixpkgs repository. + # + # Example: + # pkgs.overridePackages (self: super: { + # foo = super.foo.override { ... }; + # } + # + # The result is `pkgs' where all the derivations depending on `foo' + # will use the new version. + + # Return the complete set of packages. Warning: this function is very + # expensive! +in lib.makeExtensibleWithCustomName "overridePackages" toFix From 892a9b1f0faf9553234784f5569a883c6f4f34ce Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 19:05:52 -0500 Subject: [PATCH 1012/1749] icu: patch for multiple CVEs - CVE-2014-6585 - CVE-2015-4760 - CVE-2016-0494 - CVE-2016-6293 - CVE-2016-7415 --- pkgs/development/libraries/icu/54.1.nix | 5 ++-- pkgs/development/libraries/icu/default.nix | 34 +++++++++++++++++++++- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/icu/54.1.nix b/pkgs/development/libraries/icu/54.1.nix index cd4398b3cc03..a2465ce930ff 100644 --- a/pkgs/development/libraries/icu/54.1.nix +++ b/pkgs/development/libraries/icu/54.1.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, fixDarwinDylibNames }: +{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: let - icu = import ./default.nix { inherit stdenv fetchurl fixDarwinDylibNames; }; + icu = import ./default.nix { inherit stdenv fetchurl fetchpatch fixDarwinDylibNames; }; in stdenv.lib.overrideDerivation icu (attrs: { src = fetchurl { @@ -9,4 +9,3 @@ in sha256 = "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl"; }; }) - diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index ba8fe038ffac..d4a4c2a500c1 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fixDarwinDylibNames }: +{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: let pname = "icu4c"; @@ -25,6 +25,38 @@ stdenv.mkDerivation ({ echo Source root reset to ''${sourceRoot} ''; + # This pre/postPatch shenanigans is to handle that the patches expect + # to be outside of `source`. + prePatch = '' + pushd .. + ''; + postPatch = '' + popd + ''; + + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2014-6585.patch"; + sha256 = "1s8kqax444pqf5chwxvgsx1n1dx7v74h34fqh08fyq57mcjnpj4d"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2015-4760.patch"; + sha256 = "08gawyqbylk28i9pxv9vsw2drdpd6i97q0aml4nmv2xyb1ala0wp"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-0494.patch"; + sha256 = "1741s8lpmnizjprzk3xb7zkm5fznzgk8hhlrs8a338c18nalvxay"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-6293.patch"; + sha256 = "01h4xcss1vmsr60ijkv4lxsgvspwimyss61zp9nq4xd5i3kk1f4b"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-7415.patch"; + sha256 = "01d070h8d7rkj55ac8isr64m999bv5znc8vnxa7aajglsfidzs2r"; + }) + ]; + preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure ''; From 6393ca650eb9ef5f045905600c4256a0d0bf20b7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 19:06:43 -0500 Subject: [PATCH 1013/1749] Revert "bzip2: patch for CVE-2016-3189" This reverts commit 9c71508c95482139f3fb1fef2cc5f3cb20600ad5. --- pkgs/tools/compression/bzip2/CVE-2016-3189.patch | 12 ------------ pkgs/tools/compression/bzip2/default.nix | 8 +------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 pkgs/tools/compression/bzip2/CVE-2016-3189.patch diff --git a/pkgs/tools/compression/bzip2/CVE-2016-3189.patch b/pkgs/tools/compression/bzip2/CVE-2016-3189.patch deleted file mode 100644 index eff324b32503..000000000000 --- a/pkgs/tools/compression/bzip2/CVE-2016-3189.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/bzip2recover.c b/bzip2recover.c -index f9de049..252c1b7 100644 ---- a/bzip2recover.c -+++ b/bzip2recover.c -@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv ) - bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); - bsPutUInt32 ( bsWr, blockCRC ); - bsClose ( bsWr ); -+ outFile = NULL; - } - if (wrBlock >= rbCtr) break; - wrBlock++; diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 51f478110659..cabd412fe65d 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ stdenv, fetchurl , linkStatic ? (stdenv.system == "i686-cygwin") }: @@ -20,16 +20,10 @@ stdenv.mkDerivation rec { sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c"; }; - patches = [ - ./CVE-2016-3189.patch - ]; - - postPatch = '' sed -i -e '//s|\\|/|' bzip2.c ''; - outputs = [ "bin" "dev" "out" "man" ]; configureFlags = From 097a8ee174ab006a9b6de1065b140177aed163ae Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 1 Dec 2016 09:05:00 +0900 Subject: [PATCH 1014/1749] firefox-bin: 50.0.1 -> 50.0.2 Critical security fix https://www.mozilla.org/en-US/firefox/50.0.2/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2016-92/ --- .../browsers/firefox-bin/sources.nix | 366 +++++++++--------- 1 file changed, 183 insertions(+), 183 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index cee9f16390b7..cb85d83065f2 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,189 +4,189 @@ # ruby generate_sources.rb 46.0.1 > sources.nix { - version = "50.0.1"; + version = "50.0.2"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ach/firefox-50.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "79fca7e28b71bcf665021ebd54bf8acb80d6d598a2abd6235d455dd64085ebb4b26ec14341a3139a70ddd96f8e5861b7f2685cd1f5cb909af0f12d21d1bffc11"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ach/firefox-50.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "07af694903d677e11d6266d251bb7aad31e0c21e0bc7af67cb4888af20c38aa02c001799b93836553a9699d038ae896337d75ba4dacd47aba02b979097a4863c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/af/firefox-50.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "ed0afc72579b59cd59be409dd35d18becd8eb7a8bbaf4fb1de451cc29cf8464a528f4bd78fd914f1951ac9b9f45ec8f12291f1487ed9c5f0dbcf4a2fdb821c82"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/af/firefox-50.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "18d387115da72dc1312864cb67f0ba40e94546bfe1cd4530ae97c5f58443508fd0bd94e91a9f2e6bcc528b115449ae2abc53f6c318cbfc0d1db5415f80ef8ada"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/an/firefox-50.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "deb7a2e2cebb721e90d19820b4489ad64f90603dc7d88596083c7bea9cca7910e2d17d502329fa1a427d08d5ba6dacbd34a1e7855ff7a48933fde61d2650ff0d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/an/firefox-50.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "c9cfc8237a0415ee375a2a8dd08f83ac039fad866da05a55cb2adc2a3bfcfc2293f9059139588e93ee25568c5099d80a9dc56321e7dae92bcd0b076d7d1a8062"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ar/firefox-50.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "ce2418f967e8ea03acfc2c8b47dd4460127865917134f555e44c834ec4eb5cc1bcce6fbfedaffdfcc372fd40d757693fea5dad570730b3fe1e69e8ebea732d8c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ar/firefox-50.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "cfc8ab9c94df5c60881b48ec32807128597c528fb22ccd08afaa643a232f6e793ea04263e445ba468099e58a7f81bf5721b839ea6adf75f201521bbd59ae0fa1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/as/firefox-50.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "41057a92d38896a11eecabab4d85cc08765764f0f33581d604fa4e76ddd1600030033309cefe62c1e8d43b45ca1a25a079c522d54329b6aaf59b7a17c76b6991"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/as/firefox-50.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "1feb97f7553d4aa4ab914806bbdaa16bfbcf192b002f4875f8796389a7f9b892c4dbf4f04fb52f17d062d9e555831d6eb31ed32714f0bd45d3e629aa65f0abaf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ast/firefox-50.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "2d5ba2c2682276eb58c92c7a45e4c6e8341dcbda1eb01214b4e912ba7aba084357e35e35a03e51e51d246f72d25293482ad60dfc6bcbef1710b1df10b1f63893"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ast/firefox-50.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "0ffef374f47f8525d02e578e5cceee5821ed1319368e3cb9c78e8037f4089e3113db156bd77437c7c41af8dc57538d27484fc405791f39f0a431b72cb199b7c6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/az/firefox-50.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "c95091418cceeca6f5d84e65200566bef4b1b316f78177cacd2191ce9c6637cea5bc53a2f44f318edb04bd1e08a2976afd8d8e523ff65e471f71576a62c10207"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/az/firefox-50.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "ee8557e2a39f6f04d6269ff6dc09fb17ffe383b9441c499b626f8c0ede6e0984b9c338e30d356d13b1a7d226c72b949a0a868d6baf542726a972e1655b3de868"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/be/firefox-50.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "0617722ffb61b7a732a1d2b448ff5f513effcab4ec2eaf1d97ebbeb69ed8cd693f20137d4e1d83e128bb7cfeeacb98b4c149a0a51935010f00b3e554d00d740f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/be/firefox-50.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "2fe7086dbbc7886a0bbb2b75f493c3c4d45497f1de9625e2a64c4cc506d8f73e42000d3ba3d81e39861817e7545f9b29ea3a41f27440d1587c0a4f04a99e5f84"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bg/firefox-50.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "ecf746ac12b5508d143e98252a121d246f00776daac2d1c972978a37701ddd2132d562ab328bbc2cc4cdc74e02232ff70efaa8ba5ad50769994d1b393eabb8db"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bg/firefox-50.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "7e04449f5e3934e73357622c9d1819cb84111a963ddb59b06e1b266d6f56afa78cbb88da7a41fedb7ab695149900fac70e5b379171accabd6c903dc211d2eff2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bn-BD/firefox-50.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "75198737ab142988f034ea78a3e289992107da83b115ad671487320a0fb6af4f3aab1589676542725d25e9b0f43ec30da41bc95c63597228337d25ff73baa8cf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bn-BD/firefox-50.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "c1096bae08cad67205dab2b81d25b8cfe835eb3a2657701d6f89fa978f92d5c45b5a3e9dfe90f3cf78158f5fc68922da4c235d57dd837d4b00933207265ddc23"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bn-IN/firefox-50.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "a0fe8351efd9ebf9c3441a831a50aa1d5eb413b5d9f1a7f57e068a25c00c2efc062c71bfe47501ca5016138fb22762a3a37dd90e50113bb038fd1566adc36fc6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bn-IN/firefox-50.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "2cfcfa36468f16c7f3b32d98ecb51c432a8ccb19a91cfa8e99974b21a60851c1b73aa4e9261b10cc9ea0bdc4c862c9db6dc9cacd46d2070abaf991812e680d45"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/br/firefox-50.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "9c6acb0013921bd51ba7caf4016a75ee6f02e7388cca676fad6ef7e330f984ef28667da14a777740f9d7d03659fd74c0621a2ecb2b447106998362815dd74fbb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/br/firefox-50.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "828599a94a461ebed9fce77e0968741cfc0e79375cc9bc0584d1fabfa11fd7a5300406298ddd0b9650548c18db5873376cef155807b62a110ede500d62e2effe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/bs/firefox-50.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "6581af0e61dc1286af63f7ff18270a7a8326679f8090f3dda07917cd3bce0febbce45b30e8d819231fd91e1d15eed394525d24afe79fbc8841148e85f332940a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/bs/firefox-50.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "89d0c07943c2c7ec8052289afdedb9483ed5752a5967795938d12fb87b8ab80248058f2162e84a9bf526d1165b4f7d651f39e7dd9eda9b4455565f8f48f1a4e1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ca/firefox-50.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "b879086f33d86da437d4839c6c3443b8b4bb524ea1645b460a8f7a90c2d3e3aeab540daad501b7ba2c9960eb625e74ece8cbbffc39e6931e0421beafba0969eb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ca/firefox-50.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "5b2a622224c0b0fd9f6e003a051bcbc25c9282e464f21c16495779f22c5f64275ee3e5c10afe31802b8badd99b7346533b7999e7e525f24f7e3a78450ffc0ac5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/cak/firefox-50.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "961eac523fd0402c9f1b4532c00661df5391a08f3af6180007f5f59e754fa795063c188491614f2e7ff1d253fcb04b34216a95718edac035df3c62f6714c8906"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/cak/firefox-50.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "9768209346ccb052e92e44833a5672dd032f5915106b7884f6b4c363a257010d284120ff20931f0c6f68c0f4c72b4818408bd8f723d24879932fc598aea4f06b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/cs/firefox-50.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "b1d788775f15216273338c9f12a61712b546acd6b353681adf44d19c5349ae35d201737c69c19c0e7ef3abb8d3df36e07093523eb8af7cb81d56cadf5906d52e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/cs/firefox-50.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "b54c884cea39defa105556302e483f4f39d96f413df8eb94e8232d0b5832ab760d2affa2ff248851fc8a060dcbeed84b9ec58b4fe2dbed963b19a497bdaf7ebb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/cy/firefox-50.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "98c249ee8a67bd48e6368033c5b7b06ea0940ee66568d6105b13ae7a3d58fac6e1135376962958a4a290bdabc43fa0a0ee8fb32429e3c2c7e5dd0296ba0f55ad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/cy/firefox-50.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "1fe74bfa41d59ef31384ee5f819ec284d1dde33f62da767699f0decff49a1f00a4fe44860546aa20a404a743420c5bcc20b7a67ae9bb7c01b072f113edc90ac0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/da/firefox-50.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "444287facf993cf321dd477d366498beb4a834ef6977b71a6e328566a16c6a17aa3d5f67b5bae26cd4476b85e1271f72b9223939db528b2998d21bf5237a9d05"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/da/firefox-50.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "c087db44747af90822881d7e466f8246df0d5bce957aa93ff9c27da16cab195f29121cc67d1de9099c3e018c6ff2a6f22435b2c1ea3a5e99bb8592dc0a8bb0d5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/de/firefox-50.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "9d8ee1ae3b1a8072b9ffc7162707ab8b5881d96970c72ff5d27dd78f37527f163ee30feb64121e9b7eba6ba0002ac7a6ba511364770f2c9759781cd6435d8d06"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/de/firefox-50.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "83f05cf00a86f26c414b11227c3a893608a218cfbfde29b67ec7d10fbadaad95dd59402557d1a58dc15a4cd50e27f8c15ad067b9cd3387f5e1080c280377c6d9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/dsb/firefox-50.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "1dbabac6ef0365dcced762805a25dfcc867185430dbf87a0affbe0eda4e37fb0100844b9ef7418fcea54f1950779a57afefd9fc2b8c3b9777df08134dd8b172d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/dsb/firefox-50.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "86c145eb3e031f677bd3e66e3e52442d85e02d2350b3c281094e8f72279b0edb19ec4bfae15819d4c7b483f0bdd00c324cafaed4cf924af606be1f29da19ff87"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/el/firefox-50.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f217dd91412f709055f085e747593a1c06f71f23cf87afd04685ff4f9dc7511d2aa0ca60f6ed9e7751ce9d18dd801788a0981deb9233b6457eb294b9d3a6803d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/el/firefox-50.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "b15189ccbc478ac7eb57c1a3027fc4865a87490cd0ce6023110793bfa2451d64d98e6ef70d9c33e42b2fe50a042b140961b6cda1e9e44d787045bcd880fac7a6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/en-GB/firefox-50.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "289efe9e1046a3367ae7f379c86405808acbcd7478a10af0a785f8cbba2a0645888bf5dc180b6a3ebe300a69a0ebfc12b211b1b6901ff4343da88a0ce17b9161"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/en-GB/firefox-50.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "df65892afd9e6e13e5ef6b6e94a453a6402286171f87bdbda21d51abb2d8a2900aa1cecf01cba9216ebdb8ccc60d7d40c9e6ba2710de2e170b223c18b7030708"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/en-US/firefox-50.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "e768d47528799f22c291abef82ff372f9f7a60a844f26c61e94ed39c0998f0fda4abaa3e27f520079b741c0cdcfd973e9745a5c39cba02d9de3bfe74ee06e9a6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/en-US/firefox-50.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "56bc42624be4e27a086f4a38cdc1613a291a5ab22859bca25e39651b23854d596c68f7ab930026bf7a7df590bfb429538ff8bc59f6a6cf6f5249768fc1dc414f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/en-ZA/firefox-50.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "f89f6a75878b89c0c1252c17d3baad19a4f44ed9e64880c345521be8ca643f5edc83097261f849b2b46eab3923bacc17c9f9e143a7ca98b702c53a5151e0d4e0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/en-ZA/firefox-50.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "7a518aebce8a27b9561c576054dff8e58759f56bc986a3a0626e2de7053ec69677f57b22e56ee54e6eb2ee1ed06d9ce650300731602b19f85cfb17d3c6ebc891"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/eo/firefox-50.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "76e24f56a9072c88207221ed4f607d4f03144581301ccb8eaca66ac9d0fafc4c2ef67c446b6bf4001586de943336d854e0d950b3e5aebbc167c43422d484cbef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/eo/firefox-50.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "76f65744d90c79393f1ab4ce35ce86f8e970c35675761bc74aad07c66e69e0a403261c502d697497c0034c4bfa1043decb9f3fc83a7aa8c386d2ebc7b6b422b1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-AR/firefox-50.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "c577bddd6b71d93772abe83c2a4b7ecc26bab5e3f53d7a8ebdf820f4694173603d969e8baded32eb5e0a750c5f8da2afa829341685c78e4f83396739dd340e8a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-AR/firefox-50.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "38e55ee251bbae1d96008742c5c6a3b4eb5150c442d6b0728849dfaf444d77fdac9c11865388fa224633668de578c66d0ae16192dc1fec7930d4cc7684369f1b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-CL/firefox-50.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "382e026173aa82f00bc817704f2acc030ab2f939bce4f6e6ed039b1d4f917c57e35be5812ab57616097ec9e27a81c36517bd7977b777dd6bbec5f347bd985645"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-CL/firefox-50.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "dfbce27fb2bece1f32b5c10d93c48c927d2c60673240e4ae65f33c5658aabb682f3dbae0fb2c44c8465e54711ba879afdd4ec09feb04b9b4b7b9f73675eeb878"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-ES/firefox-50.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "bf49fd10f7e70e419d2a4eac4277066121a54ed588533523412d5286613459b74086cd49b44e77266217444c851a9d78497e0ab3bf821db86038f948bec40011"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-ES/firefox-50.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "6fd53b36740c0bc2ed524b3cfdc1cf6baad630304a67543695ddd8dcf3d5e254cf5b754d188dfd93a4d27848ab99c89e1a473435dc32513bec0c7464c5f523f7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/es-MX/firefox-50.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "15d08e8ab252be103741f40ec36f2a782372c29ad8ccb6af7b79557d1aba7381d4ab7186247702772777fd68c31dd0de6a78c7117f33c90f8ab58ceab8b7445a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/es-MX/firefox-50.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "f5f4e74d181bfee27d402b5d2123934480eff95c0240d762f7f648e4220fe3c9c154df8b849d9ea27bd4d0b53997d3175f7f3b7bc8ee70be7086d0bf676a729b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/et/firefox-50.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "7eb67ca81cfd0ee4a19b98cc00db084a2d29f1b335bb51ecf75a833f1133ff31345726292bb03c777a6654070685c78774c53a263fede51c4c101f6bd22249d7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/et/firefox-50.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "a91f4ae5ec30fd2447521984432ea1997796f6569e99c2763364ff6857e579f1c0631addd4fc8f0faed5f489efef6bd29d817de58dc1b432abb0698a5b0291ad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/eu/firefox-50.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "7f9318bc697e5654f0585f18fe9525c1eaf24de3e9e33c87a7d0471ec8d41552798d9149cc58f3849a0cfa5850639ec95332df861f9215061bb3eb9af78fedf0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/eu/firefox-50.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "6a1fdf302c54afdc25e1b2e3c055044b8c37eeba5e51fab0ff3df9517f3137482f9daf28da4cd62072845e368260986e9d03593074e4b448f3aa23de5c7a3dd2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fa/firefox-50.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "c07bf9368b8c49936dbd4f36aa01f40d10c23edddc14526177e2ea98bdf7f36e482eece3e2f3ff16f04f0078f7c993833c52014514cdad4d1c476f326fcd8482"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fa/firefox-50.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "0fd3b4e08cf0ce0f3d68880564f1c14bdef198f0140404ecdf4cf9c8d48cc7dff0dcda9be0b3af274878efc9ca3b764cead6430d0e348c550cd5abc23dda16ea"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ff/firefox-50.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "0395d9d46363a2f598615551aba6ed3b0419f83038c7744dc29253469a52c318c474bc564fd1560d9f5bf9375bde1a9f4013dcefcc781ebc82bfbfec6c910ec2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ff/firefox-50.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "3c804f341dbe6d69e2cdfdd2dc1bc294dc04c4ea3bfd4a62e4de6edbca0be00f76a3112a56c9e5b3ae0929cf01168cadf7242246fbdbe25ff74bb088714c05a8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fi/firefox-50.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "056cb941c6ad6b9445a896d3cf948c942aa5c2f9506b80b72f1a3926e33c2f0798c6ef437152637a3a137f6b6e8d8f0eaef869788e7925282705a00d3d5ab01c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fi/firefox-50.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "325baae030a6b23bb4dbc8bf51a87dbc27c6349b3d56366730d2aee975aabf9f1d9af505b7fb1ea6aeab4f5891ac74166c5acbf72b503accf5614480d57c7402"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fr/firefox-50.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "f5c475b7c0c8d7ff4426c840189fa6b6e2a39ad64b1ba24477ed5cf164e55c4ea7065ca3785d9c56d5d35503c26bf52a00d491b3557b307f437a0744d7cd100d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fr/firefox-50.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "603b0bd1087e63f2d0e0ac26266cdc7e038e8faa014d80f9f0e194b2878886b466a541c8c4b79a1026ccc60cec6d0f555d6e65a7a53dacdb7cb595a7f877f6f5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/fy-NL/firefox-50.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "4abf78014ad6eaa93c9ddfca43f24c9f4e160b8f9619ddffd57a31a30721ad8d11e7f3b4697de76b30ea6a3a07973b460febca607000a48da7e6d422548e1ef0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/fy-NL/firefox-50.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "1614556b3b9ac0ed6be7ca4455882fe57a9644dfed95b0b3818498d4b47cde9c95fcca66d820802154721ab90ecff8e662f3670ffc6f4f5224dc35139fbc6fed"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ga-IE/firefox-50.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "d38810c0bb088c999079575253492df0fa57d1995c2e88c5a49ec57e858e3c550bf86a4e834037f6ab11b1d956b941557cf44d562c8214ece0175c61b6de34d1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ga-IE/firefox-50.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "d498f468ed487c5dfb70cd8e831d7694665e9cdc2a9eb0fd7526e4f7c3f97873af87fd919990b03e921dabdcf35859840f263fd071ec4151f5812461c97c8179"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gd/firefox-50.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "1f2f939987840e0e845238a4123d81c698b528474b81facb7a296d80be023aee8b3036db095709167ea3da310a9040d7bbee5d16f7c7aad6444f3c1e078b2ce2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gd/firefox-50.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "29954be29ffcf9dce21f53fb674d5d14f17ba04315dcb114756478e0cb4c6b58e61ec1c1fbdc7a25808a1ca347b512691481090504b1ac85e6998950edd043bc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gl/firefox-50.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "92fcdffc99f3d7b6bd70889b3ad6bb661ea7071be6ce65461dfb1a93b4a566ab5b5f24c7cfefe6c2d6515e8f42b3d04ec01a13c2919e47daeffdb5034ebd5e36"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gl/firefox-50.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "66adebeb4bcdac0060b8cf562607deb8956588d86a04fee35f23b753614aba9588e74e2d389055c5186099bc200fde27529a26392ba08c0aa69ccd9be12a5eb0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gn/firefox-50.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "4ddfe0518a1487479c0c68b53cf24f9eebdcd91cde738053cb3e796f9373a0147f980a3dd7356ab92083f2b8975379c42691e7dd9cf5d78075a86cfe5a83d8e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gn/firefox-50.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "3fc217727c139a11ab77218428269851df78ae42fc34e4deb34ba48733bee2af878aadc5a90578c467072ac4f328ba5db3f1588069573521e951aecae25552ab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/gu-IN/firefox-50.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "6bd026db0390d79a142954b2c8feae4f884cacfd5f8418e31b7c6b88ec171160054424c87af81ca8701a32065e9de3d469699471a99aed498683296765d22033"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/gu-IN/firefox-50.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "751fc9580027ae5dbd05202578dfe059b1c849dac79975da4245c94e5fa7089a7f189fe1510341072b41fbe8e1fa5e22217a9876cd033e062fb6c567523e3326"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/he/firefox-50.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "1c229bf7dfec02cf035a2b6d2b17b55d24fc7ad6b36f1c2be7f08898a94c02e31e1812e1232e348907e177038d935b0f90f800165314eea3a7605616f828d493"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/he/firefox-50.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "563f92a47fb7f4d86d39e88458f38aabfd5f64cd3fd54e51a5572eeedc57a5b0b3bb86bc26837b2438623edf3d06ab37a94064ae9ac5a2431c3038dd75a71913"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hi-IN/firefox-50.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "568d0da98615df8489a04dfc277235d39ffca0a6cf78e15eb04f7784be3b2a3a7480dc0f3e04a2d22bc35e6b77c0f23a9d90bc8c8786812c89454086d5723445"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hi-IN/firefox-50.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "2079fe3f54992ea7a7d2ce90c9615e748896c595115958e5dd018d33f743ab79b3325242171bdcdc49818692088698aab1e351d35c535cc854904d42e4ef78c5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hr/firefox-50.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "10fa4e95d71a5a12f2c4cbc2b97c2bbc1301902d76b6dec99f16f55e73a4a8dfa560e4d8f2dffc347918405749c1b32c3c55b70e6b3b5d9e45566785ecb8d009"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hr/firefox-50.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "eb00d3f069d8eaad95a4534cfc422722977856af50d7477a427372ebbb1dc0f1606dae97f05457e6a5da3b7e1bd7689ece4ebbf7592bf7439a495170be6c52e0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hsb/firefox-50.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "11ddfff8f81de369d721a24c61696fbf80d636396b9b7464c2ec163f8009961599b06c97df6dd1a4494478f7741728c6220292b762d0f7273dc68be65ab05a6c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hsb/firefox-50.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "f8b13383b7f67512312fa8d82cffe4fa21ce1aa64e04d75171faff12c0aa3311ba57e0875ab4dec47e2c1db057a041b921dfd0919587494e571c57a14461ae5a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hu/firefox-50.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "76631fb790cf3ea88f35dd5aff6243f7577e200ad16699c206206e02a30b472004712e78b563f115124d3c7bcaf8fdd07f98e731a78629f93accae55a4baacb9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hu/firefox-50.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "8bd8ad5efcc8e8cef7d59f9be575e5314b2a02dd16e8244bae80864ea684649af8a8eaa2ee40cfff426ef6472802fefaa98d9a7389d2a5be870cae9b4581eebb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/hy-AM/firefox-50.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "863f9b6f99a2f025351b7dc3f4796d8b04f2506424ca39fb5bbffe46d123b5f2d74a773af0e2d28b646164e52c1e9efdb097c91ddbf2bf1ab912c787e575f89a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/hy-AM/firefox-50.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "934c47c03281e90ca801e87594e0710208bb5f308a10fac386343492581d918e6342bbbabf57c2be959b9c894454d2dcce38923307f036a759e80b1d31d89cd4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/id/firefox-50.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "4d56f033f9b397bcce792017166db2ec5e589d5bc7a3b20e8eb4ca534db11f570df7fbaaebe60d64370325b8ba07c98874aa1d74b58a979090696a0e0bf77f71"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/id/firefox-50.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "e9eb7539cfd92cac77c44c9ec99cf9bf2c9b3d6a1e014d3a8e0b084cef05fd32bb215ff66323618ee9a7c4312732e8a471df5e63710b172eda304ffbac7e8075"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/is/firefox-50.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "9dec3fb45cbb51c101e8b2c22ad68ad508d865f6f903be9dfd8d818ef907e6d4d377a7b075ada729fb66e98187dffde59e5e669349ec0e02e632d47921586f8c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/is/firefox-50.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "ed8d2995ee07a66e5be3b72c2dac6d0fba53613983ba8a76ce01c169033d6b9014de514bfbd9592f0eb6835884f56ff1ff7ef9e2ebd5f0dbb347f6f95db47f7c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/it/firefox-50.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "d180080acd094e6bb7d5e5f2a3e8f13b0e4d672f4f4640786b14a481e52bdec7b865e9f9c970eb8f8987764cdb4155a2964fd8ad8f5c4c3a8d3929b3002f48ef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/it/firefox-50.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "f158b113ca2c05539c032b8c416c8f5ed022c81bc56f20a95e38e5ea641255b8f780d85c641e5bee2ad347f7b8e3cacf26e18a5c4095c7bc588f4e54784d3028"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ja/firefox-50.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "b964b35ec30fc17965483085fea1cd09450dae10602e04495bd50855fae48b44893f825decd0bbad81fed42d211d85fdcada39b24d07d48236ba208275be6215"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ja/firefox-50.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "3c92f3e9bb5203a2c316e95e2dbb0f94607eaf96c125b7bb96f2962b9bdb5cc2f5d1df44f02fc2154c6da8b5b359177c1cd7cf5379139f43d3f0f0531fd8a03d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/kk/firefox-50.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "e27c1b36220d344746fafeaed2a92639f938abbc268f30efe3665c3da1f01a5990e961686cddc4143e4b33126606728cc4b70ae1031d8e628d156f1b2895c624"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/kk/firefox-50.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "f021cc29f230113577026052c5350d0196e144675dea80248c3449974b7bcbe7e19310c9324cc3b779d50c50a1445793001049c11dedb8841b9f57c26abe5dbf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/km/firefox-50.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "760cbfd406fd8771897b7e5f8646efb30f8ef769e48045b1f26f38fd70efd0def8e03804b649bc838815063c75c1e8309858b80a54301411e91271811d86560b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/km/firefox-50.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "813b0510a7bd3a1f6d6a2da8d408d038d577d051f600a195068edf7679868a259bdc25b6d3225aa52a3d83278625764deb4918a7649c2cfbb565e88b9a0c587a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/kn/firefox-50.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "e20012964a11e4d3d05fcd3107bbb9449d023b2749e4fb41a7f84d1d7c9ddd686be46dea9eb589e2e99ba60832cae7e673f8dcf9ea96b8219ffb7b6be3f82430"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/kn/firefox-50.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "7b1b2c23baad1ddf53e1ac3e10ae7dbe8d963f2d7bd4f1b0dd1f06c1c3162cb415c3b11a2c08e4bc689c296cc1304b970d376a77b253ddafd92e54ec35d2bb3b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ko/firefox-50.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "5304b7bb4e3cf2e97c8eb8a5704dd10c8abf8416b12003b85368154f17d777bcf50fc5b725acf3a2570c17db1327564e854e934a7364b67a4276d77d28c486e1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ko/firefox-50.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "9c2d778bb1b8db25ec8aad1566f2c1c05484a604cfc388ca2bc9c6fa1128ebc4a298e5c5ba4be416e7ef22e1c995b529903855154e4e732d5f3df33bbddcb555"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/lij/firefox-50.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "6d04c7a7f2019fcb5a726f3d1f1c4e26530b6c19a4f7fa353f40c5ce5d79792270bbfdf2b3c03d0c092bbd908b0525fc4cef24ac7550a06c9b052bad6770e618"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/lij/firefox-50.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "5ce1c0588b6e1e4e9336d937c5b8669698eaf88c3fc3a72a528cc1e18e5ad2141056efe96daeb892d86553211679a4c34e15839e6057ff9c891de3cfa4d89cbd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/lt/firefox-50.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "5eca438952f9158863f72e69d9a76a63d02e1ff7bfb63bfdaa52a21c6ac1d7b693ef996b4dca6e869a688d2b829b563550a7623f38b15a6f900de24d696e9bb5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/lt/firefox-50.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "e5f65271adf2744ad36b4c453e3691cc14c067550c0f720797c3b7f92e74abb47d48db3b0d1c24df9285d1b88692aa18b1fa35902ea1bb08367a89cf238bf75d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/lv/firefox-50.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "e9e8e1c989af0374af8d33cfc2ad35bb07351214316065162eafe395d54c6b8b0560b0447b41814967cb70639ac95f34f80251d48bda0c2b55647850aac77728"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/lv/firefox-50.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "44687873e3fc48153c2685855fc1dd3f81ceb2ac4e363f7dae3e5a09700baae3c073de6cc35ac40bc8f1634daa446a8747d28aa6d0c8d50819e9691ba5be14eb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/mai/firefox-50.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "97184b1d0b7e959f6b29be6fd040e9e2dbb9a6c95a94b314103ab4e45fd369c3cbf6a755d229f4c5d862fbe31aa911d8c2fa2e191f929fb9fc456f1da46b324a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/mai/firefox-50.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "073a4b720bff6e703b77ee7b66ec636868acbb9fdb508146e87ee6d5762caf9c03b835ad6f8556fd3485e9830a7194baf3e7cd3119bacd3e7d4ec8084805d7ea"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/mk/firefox-50.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "86548875a1e5ad4fcd514545369affcbeb0a1a1cb4f9ed95be3c811659013ab134466a80ac2f8e085b77c409d8b657d39d9eeef289b7d2c3ae49a04315439c87"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/mk/firefox-50.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "79f42dae37ce34f2ccbc59efdbdf582ab5ad73eb9df8ac655b3e0a986077a5dfffabe7c11fdcce4660217343bcced993076caae14c3fc88e14d5545110252641"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ml/firefox-50.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "227375f9866434b5810c74a9664b913b567291c1efe5f8eb970a092d7eb6fcb8c70b99ace68460a8276af11dce88998aed9f194a7e9abda6383b56d6632fb624"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ml/firefox-50.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "bb5c9a2fde5e9e56d96bc9a0331a2a19e44f93e0f3ddab699e02f281313a9b19bbb3734e936d49d80dad5027443f40603184fac710adda1f5f2338cff138f54f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/mr/firefox-50.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "cd723149ede0b48f3d44977be1ef8033f3b070a037a60bbe6af475a2975f207aafa73a78bd12b272ea85cd841007cdd825f00592c7c563c5275423115442345e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/mr/firefox-50.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "af4216cb3be0967ef5df8cb17b7e720ae4a967dc2b9695d83ceb39c48734472f25063e1e9f2b791b7893dc7a44a99658ee9374a85d33fd77b143eeb2a09e4afb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ms/firefox-50.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "8654d082075f93c31c1ea1feeaa7383c0103475e3e2f129a92c1f27ccdcf8a3cb72b17c380c31b5b62cb37cf3bb5be95383359c6792ed7f5657d6f7c279f2c18"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ms/firefox-50.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "9b23dd532d029322cd686d0cf0362ebb0205dfc56499331fcaa29f038aa2671cfa6d5f395e04e47147a7870852e1d026a9a018a417bc5a5447f82acbfd9f12b9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/nb-NO/firefox-50.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "65358e65b06ef09431fc15f9b6d6cfef343f8bb4ba4c5f6f773f8122f15e2242f2d26a8d6953d6fb25404d68e61c166d79b00483875cefda0f097c0d75bf4cf5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/nb-NO/firefox-50.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "3832d0f87032cbddb0ec42518732f8fb9a253341c33159f152ebad59a7d83234d56f0fe76c48503619bb13a59f2512691d94c3a32d0e85f7874a0886ad189f2c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/nl/firefox-50.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "82972732af96b74b5f69892e7a60d3a03446cb2b048c70f3462fd10d18110c0bffd7e5a9e4b36493d35f701e38dfee7a716cb979bb087bfec7c91d12a4e7702f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/nl/firefox-50.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "9681c8d3e09a69e32d174129b45f49d422bef74c107139e5cfc5448429692d22aeff795b3ec457b2732473f4531c6ab0a3324d235fc9ff827a5b18aaa12829fe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/nn-NO/firefox-50.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "0ca3c8044825907e543255ba66b4679924583cfa82cc15d59afad0d58b493a899025db15d24c69da7b4c4ddb1c83980dbe6132041955475f08816465bc1b2806"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/nn-NO/firefox-50.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "ff470ff06a878fc1237446d8a2411be11513b8431860ab02d4d7b5e617683408bd97ada6dc4a85c2607e1bb7123132bba16d3f94ce9fd989526469420ac322c1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/or/firefox-50.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "2ae92c249786115aba2baaf5aeb0e0b50aae1d089e42e42c332062b245c34518ba0ba26db626ebb252c976cd970fb7fa7bf161f860ff53cb4b20dec73a17d3c4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/or/firefox-50.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "aa9de9557d2c9da388c40fc2bda1c0bcd52e1c7a069cfa3b2936b3c32d3f8af3bf5d385428f9eafc0106f4212def5f11621a52118283f787ee823beee59ae2e4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pa-IN/firefox-50.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "bf2af6ba5d17ddb9112c1abbd7e3c7f5c936e7b88023b24329b1ae24b2283baa9a691a5d8f9a807ad23d679c3e37516fecf8a8fe05331e1531ee0f3edeafafab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pa-IN/firefox-50.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "04406c356da280bafd94e8dfae6c0d667b15d179106a60087a8fc798a2dcb1562e279c6591ef11e4f4783025699e29868054eff96c540cf88803ef13fb658820"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pl/firefox-50.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "03ce9231a3a2e01ff15f5e85a729ec40a38c6424ca51858740f0dd903936e428b611e594486c25d9583987af535133705d83353198f77009862dfb56675b0a1c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pl/firefox-50.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "a62c52e5186084d1c99f54f3f5eea6218b1d6b424e51eed851acba784d16f3845bc8d119fd03737a3404710ff9f3883676642704431d3d7df462452130d50387"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pt-BR/firefox-50.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "c0a627bc9760b3f7a96a5e16fa9b13a356292cbd1abc5be795eb656c1099ef8408be04b090f4f32039485ab43697f811ee5eb1f70324d79304a57cdff14b57ca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pt-BR/firefox-50.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "3e0e840aef1063ac7c553a1bf9ba5a5db63cb2553c0af61b9401a01c84d5e6af74ec1b7b8b260471f2d40101770e9ee6bafd11c842a0eca47b28dd83314d47f9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/pt-PT/firefox-50.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "5985b798a7d634d01a427028a847ad4f76000a8f7ed2c1c14b0a68088837bed2e157c66137408e2a0b4567fd2bd4bf63b4717d893c88aab879d8f9c583f73c5b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/pt-PT/firefox-50.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "b75b1119708c4bbbcd41b88747a3c2dc22b090d2920831cac56373311e1a996ad558021a85446d5d9ac762ec95cc2ef736692a3c65a20f632693d51a6c1f2ce7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/rm/firefox-50.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "3d375b16a4785fe3af8061ca7759dbccfbeb120b8bdc35a455e411be0a961d9a65345f5aff6b0c01bb7dbcaa4d4a7173117aea52ccb5099bd4ed714f38fcce36"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/rm/firefox-50.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "66a1aaf6d1805be3f6bf4bc71bdb30b7a44e916ccabbb57fb09aec109a3bbab62a8a1a669b6c1806a7959879700a0ac6c97c196d5a75079dcc4042ed789ee922"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ro/firefox-50.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "11f84f8b93db54c88a3d4b0ff155ec69998033ef2cc592dc4d1736129be62249b722a2d7817f3172fe5bad2418980fb57a48d3bec656837c03580ad9e65eedc7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ro/firefox-50.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "c9c3d4d54e5002aec6cb202f7e1269344eea1e9b969fa972000dfc85ccd2f1aed93de52176622f055a9bc5d639b0cce60af69b4507d0f9ebcce77b34f87350c5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ru/firefox-50.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "e8faeee4ed9f69c0f6b3542fa077d50ae3c432709ff1449a91d190e0880d37f849bad199c1dc6d0f6d436203a1e0f8302f6fd082f23bdd8f3338e8cd8c938d4a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ru/firefox-50.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "bfea8fe2273960e84dc3b3dac18d83b36cd0ec9f7d22d25733b36079cb31c76215bdc1862214fe7180229e6163154eef65aeb2b54f94895954d7ff5e4afec813"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/si/firefox-50.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "7995eb7ef1cc5768052bd28c86b547b60c949ce3c0f8089324af4ef0d654bce6c48750ae579f20442f5aaa0c69853290ecabe28f29f2796eacaf2af83e3bed87"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/si/firefox-50.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "9488b18fddb35142a0a88ccc05bac3eb4ab3fc6415736d9a36d58f3bc88016ee8ce1b66e86739c34cabfcc89d2e17a46c282f9495599b8b3fc39be8e6f10b7d8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sk/firefox-50.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "c9694b5aea764255eaa38db4091da6d9fad85d7fa1a67d1529ca66f9dd337818b21c4afda5bcd3fa11c6116bd65ef6c9cb3c7217290982ec10af5ab9b31bbcd4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sk/firefox-50.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "d3186e2c3c3eb3b907fc34aacb9dcb55cbc8433431bb76ac2870bd6823d7261d347819d6d8ea24ac042401d76c155d7efaa00bb81f03ca2991f16aa36bb87b8f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sl/firefox-50.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "b09296856db8af2a61ecb2cf7b27da8ee7fac4598f88be504547f912aaf367a250c66c4dccde77c74588e9319cfd802ca296fbe178b1f7442076f67690f356ab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sl/firefox-50.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "7cdcbf8199fd98e33a509043aee60a40df1ce734067a0a519770466e7eaf20d15d7f4b9942e0b589bedb67f7ba51ac1242bc452c1f79f2449421281d00606433"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/son/firefox-50.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "c8431622708478816c8e0176b8f55c3ae5a32d2a94c24c6ddb059322f0747b55c85a12be869afe41f30c03d769cedbe62c097626d6554de29e47d672d0dae502"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/son/firefox-50.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "79d6c04f251ea26cd78c095f4dab2252162b0c1107e73642836da53504929f775403e4f1872ceb8dccbf45b5c52487c7fd2a58c182b6e006e6307d5b1f854a5f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sq/firefox-50.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "1420ebabc1d5f95db723a1493988d3e3e07354c92256dbed3ef9505d0fd8ce7270c49fa2401de1fe9fe53992c83e81debcdff87b2163eec1ac1ab2f860d8060b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sq/firefox-50.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "9e42c2ed46ec6ec8c0b33a51577e841fe8bcb36fbab369ad7b65d77029f7ca06ad58fdd52343db2e34f64ec2f85224af15a8a3e43f3112beac7c7434dbcacfe9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sr/firefox-50.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "f7726bf8745554d426321add7fd64407d80fbe36c47ba209e837ba8de0392a7db38b386cd5b5b104484b614a497b8792985347260f4c0465878c51f5396e96fa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sr/firefox-50.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "cb0143438cac468d2e70bb53eff678ffb8b831a735c4af0f4aa6ae4b0d7431ff88b33d100d82c3af4d0d4d5bc79dfb8d4c4ad2f8b2ee8c0527cd998f286fe2c8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/sv-SE/firefox-50.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "e1321a23d72d292b50fada4d2e468924304787f107f4111a9c51be5a05098ecd8cb3ad6235e26ad5b60a264ad387264b0955cbd8596e8cfc6202acb937029c52"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/sv-SE/firefox-50.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "e9dfea71269ce2bb4fd44f613477cf202aab03268c87d0cfef6c05c4c3a36d1a5cf4b5d5a2987265e21722aaf81b1217d81d94f4b79ae447a0df34cda01a2b19"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/ta/firefox-50.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "196de192baa7abb85389257adcba33b09a1489971c6c2c92ee9166578a24aaef19fbd42fb039f671ff590ba74ba7fb1a0ffb90f2956369a14e08c04845833943"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/ta/firefox-50.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "61f5bad2236cb7a95a9910814fe23cbbfd81e039e9ad4e7218de7f49ba6db604a1376c1a0ec42a866a2fc693778e155a821fcc654443647557899427d1e4c2ad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/te/firefox-50.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "a823be574db87212d9f822dbaa32cfa885647ec78cf10e465033afd6cac8adeb98c4b1c3ab358d10db76b4a02a73819df28ba4e446b2e4db42c406a434a5c2d7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/te/firefox-50.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "c432aaa53bbbcfe0c38c0cd5748d0b34dfea245302407e3367b05cb35d979b16a7eb669819a62aa0cf3582ba31ce328dd21e812a129101242b1543e8782c4a97"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/th/firefox-50.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "5734973be02d5929354e8dd710b03367cbdc1b7b25f2341057b5e7421d3c8b5ebef7f4674015f385aaf0d8d47efed4db7f1dd17fa53220f62e15c1ecc81a9889"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/th/firefox-50.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "b1f9a0b32b09f2658544cea4995344b8faf0033133a84c996b65d73dca608d8260f257ed2b981a3afa761d02d0669be866c9bce7324956767e154f637b3bbcbc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/tr/firefox-50.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "911497ec90ecdb400c7f43e711ba9e0b6ab1160288d45c3d1d293e9c847fe98167bd3400983915383ccb6f21d057374ade755b0c8e42d229cd178a2fbfd0d397"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/tr/firefox-50.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "b2b5abc20a1fda08c2dbdbb9f0ffac768a2902db330f0646920dcc8b72052893ec59c861d8b26515143290454e20e64bef28617f79e885a9e884088c74f20138"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/uk/firefox-50.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "5816d9f28ea308a3b5910ab718898cd6a36bb27a9f9f273970c8ba86eb7db0be2d39b7e616299c2adf84770da4d98442005d1a87503083da0970a05947cb14ee"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/uk/firefox-50.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "1761fd41f5d1c413fa4f35545f5a95df91bd5625be110dc1257b9ee4b3480c2a1ce3e7294dcf4825a412b43fcbdc2da86147fb6d8b004137ae0bcec4cda2ebd2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/uz/firefox-50.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "83f2f053b5a592fe8070d5c01d17a3ca4df988257f19e4dfd17fed6cdee3886cb42701d3aece737817e1cfae7f580c63250b404ad847dc408e2f967b7b70ee32"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/uz/firefox-50.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "ad87b6ae4340041aa7335b69b50f3ddc4731934d25136a0815531708197db9c6b4496ce855d3ce4ec9cf942b594ebd18ccf997e28ea7e625caa7629ca5714fb9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/vi/firefox-50.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "3825405b73375aef6c391cf0e6520f3c9283178b8a2daaf3f5a287a9398c9978d90ac33066fbd114728e7805555cd440a9e2d123c62f099e71a77b13f959dc13"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/vi/firefox-50.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "221029fa0cde5873cd3908c445bdcab03cdf3fc5298203772b6157342f73be7d60e460546f373a50bb2ec308038238da5906374dad326de9f950f838e73b18a9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/xh/firefox-50.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "017bad22c732c2c5d1d1fd44dfc6423eff52f489513e05ae178c61a48376a6353243c2fa095c3acd3a8bfcc032532ef1b046600a625775e6ec5a0b408845aac2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/xh/firefox-50.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "a38742529cfb00c78d3603aba4d1091c4c26b7a4124afe6a976487d3685e92fa3393d2b006ebd34315c9cf8e5b07e8b2e72eaf75669e1195bdcefe86331827fc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/zh-CN/firefox-50.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "0e0e785028fa438957f33f9041be50d0912ba1ba6fd4f5b12b752de9aee8883d6b02af3f62397b656ea802f9c2e0606211bfaa96d7efc47afc44cbe35e18e6ba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/zh-CN/firefox-50.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "4d9ac8495985147af065da832cccb059b211b0fe66bf171450d207daff175ee04388e499f4f70dd656590689f1fb1d21cd364045b77a96f0304632325ca2d53b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-i686/zh-TW/firefox-50.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "1b46da4872b9b79854dba843f1a340b01969a9c6a9142b0d39a9f9bd7b984f36fac21cf3097d75855e818f34db87792bbf6801746b5a59936b598942c387d44c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.1/linux-x86_64/zh-TW/firefox-50.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "3a9966017d4f55fe07cf31f251374281e827bdbdf6f88b65236e14e1a7cb10f09de8a8610d2d21a991896854140907d6a7e8f9caa34e22c614aa403558644e6c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ach/firefox-50.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "21cb43e55ff902380463a2ac896d64625d2e65bb824b49063675c80049d0230cae089736445910d84d0123e474d6e8455ef310593beda8b1bfe950e5b0fcb6c5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ach/firefox-50.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "0e1e297d8efd180c8312311854b54c9f64367e5fc3fd96cdae55d47001807eda48c8e2bc9568219dab453e2324b2b5c6c51b72e38c15d4e2c2a5a5fd881527a0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/af/firefox-50.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "c3a35b53d04472c58714a6fcc775283754df51055e2afdb1765a8879d5b1af20ce37e6100535cb0687712a96b02ae41875c9fddf85b6322ccd3725824a1d804d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/af/firefox-50.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "efca6bdc66cb175e4fa6c263099c3aa6407dca7a9cbb0cda9f00ca4ad2944745c0ae576848e0d58b4af59d66b5f9ed8a426d9674d2cd24b8e4d04874763b4324"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/an/firefox-50.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "565f18d139594b5cef133bdb2f873f6eea41d0b6345393bb825847dd59b60da8798ecd3be71bccf7cbb95829b668a0950caa5129d912ce534850ca76aebb52e8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/an/firefox-50.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "a1ba2af26f386ed8cf2263e32867fbb162df85f6992109926d5cd102026aa554f246ef3770f3a81effc9019cdd3efe9e7c4713e43c778714394ea981b53f9c30"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ar/firefox-50.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "0698e8f4c618ffa6db6d2675ad2752cfd8187373c43f815d20ad92bd1d534ea4f4ff3fc97c0a9c5774a58c63dc5faf024158ff91e402a2f1ba5d1c06550970c5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ar/firefox-50.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "b94f265ac682bd5c879b13f02189afe1aafb6a8e668b39bd3ed5fe145aecc54b1ca62004ba7d770fccad6abf0e259a1b1e41a4e6558a03b856dcebfbb8f21c2f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/as/firefox-50.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "e2644b2613f1c36549cdadca6cc9339b1b2f60eb83cdbe5400663bfc681b6c096ea610279f66969272f2e766ad7829da06716eaac13606ba21e3351521846b68"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/as/firefox-50.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "46cf0673b2776526920030a9698077ad375af2eaba80e153ffe56e34b7066e7c1731d9ded70530df9db37f3b99c658dfad9451f32f8344a37acef38444baf6f3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ast/firefox-50.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "3995e32ed9acdc2a481599adb2d6ed608e1820aa914da2b6da3cebf0d229f89b19f1355de7953d74de6815cf0eac5381a4d99db5a5b76c3874076ee800a88ca9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ast/firefox-50.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "dbe3807aed7ba5717197ae2f7c8c59b5aec752ab32093a0a103ab6f6f34c298fdc7718bf1f367aff1539871077857ddbec53068fea27c4c716eea0bab6f4eeab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/az/firefox-50.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "311be32d836f56d49d6d7cacab0208702870063d1569a83f30006b641586ac2beee32583cad31a75638745e196a6d2d309eee731dda5acbcaef865380c3940a0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/az/firefox-50.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "37d165529b6b8a34f35065d2d5971892c95c9537b24f20125242a8ddbf250efd5049c82299c70694fb5e591fa8acfeb68e3cc6222c6d60544448331c199d3f8a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/be/firefox-50.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "23737d6c1bdd91c9bb0256ef9ff9708a8b082461e62198bbb90fac31e4a6d077b059e8da7d0b4ba63d52e0a6cd6b244eab8b0c038fc65cd3da66a0cdd5fe6bd5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/be/firefox-50.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "fdfa30d26dc561f829c56acadaaa7dbb53def9c6213efe493d26954a621291d609d1e1400d13081621efe5a949ac33cb89655f1715430ee74c6d43518c35f95c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bg/firefox-50.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "b0b7e7b790183c949418d67716326b0ae13597ae21f45ce15d0d9bf62f09f5f9e66908b236f5d5e8d81362d193e1c19da7307dd2528cdedff50ece1310f8cb13"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bg/firefox-50.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "cc7690fe45edf2173f1a681e5a0507e31fd2b4a347da5fabf4272355001d9f09058666671356cf76ddcf9c98344921bf36a8b1f94eac6ebd484348d73a64506a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bn-BD/firefox-50.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "b599c718fc82cafafea71db2122cbf5f99c7e64029956f475ff5ef40959de07bb8b9b880459e5462c49283a9d94763457e6a9199cd4c88117a66d7732357a507"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bn-BD/firefox-50.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "7b974ea9526d431edd2663dfa14852a517546ce222834d7b50ca132abd787a86dbe4b4bd0b347ad016bf458551ed275517a45fd4322783f78de4e82a6ae88365"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bn-IN/firefox-50.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "1d6f4256ac05bdf62397e243ccd2057d9a0920bb9aa9edd0f91aef1bff4f3cd1302acd8ad212e9508b903a97815ad9488730c7795538daf42d4521e7bd47f57c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bn-IN/firefox-50.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "a7bd4c547335e3e54cf035219410ffb60a5f8e621c4b8459a2e01f3956168d8677e7d1892f509d7f1c2b823dccbcca71e21d47a83b189846a2dedebe9caa345c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/br/firefox-50.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "b539ffd5a34956580f884505245ccc64d3b15192b27aea72191a923065a671c1a24077fe7092405dac05b081b98016b096145fd096847abc3b3144f0e927ea75"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/br/firefox-50.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "0befd224443852cbbc861e72405326f957637554e66041376799ce0f498877a14bf63d892b3e779a182f7f4cdeb5e8d8b688625a7d5f7529ae6fc680cf35a01f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bs/firefox-50.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "016957d9cb2208da775061c40a0baf66fa348d5426d6ac5801d9c07cb984f6faf85013fe9508c41281a5f66011ee75b28d4c02ac5d37a1fa4d030e9ac640990a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bs/firefox-50.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "0192f63869f98f0ea09aef814f2f52f7d07d6e42e2d4d31ce020a9670df04808e3a2baba0865ec8f685a9a5156c7648282acd16b4227d461496e6d76c6ab2247"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ca/firefox-50.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "d9aa202a12bbb81e2e17f6252261ec22c570f03a2b178b73ccd316c05da2c50fb590ba3ef78b067f681342b596fe887d33f3977dd9fa54b9fa5f78c0a36d9931"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ca/firefox-50.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "d39aeaa7cc01181914445d5e3cfc55288373a05e6987e4c8e3be37743fc99df6c85c47337560f9faa38b826a041c52f6314ffbb3fa4e2593d126dff4b0bc55ba"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/cak/firefox-50.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "05d043e48522191a959da5276add9ff88fd009c64b705397abf546567c677f874f640addb206e35c762b5ad614c9b4dddb0162beb9668ad28b4620aa5a2395d4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/cak/firefox-50.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "7c2e513d00c092d205e0b9360dd907454b87f705b2db6b0cb88226ea3456aa1a0d7d45bf7560861b27fade669c226c48bf08d24b28459c0eadb4baf3fe947433"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/cs/firefox-50.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "cd37b2be51aa96a3848c1058fa523062d79422e120a74eee2cf0b032002a80db2c07fd8b43fe374e0aeaf2425a72db75fe77d3e5928d1f8c4798a763d33c13cf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/cs/firefox-50.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "4132edd33d3b1195e5774cb4add6b121ade7dbc3592dea69c5f45fb74da5b3b2e851e38df05173b11a011c1366fd2ab000ed4ce1d9eb7a1b6d0deb0f1d8296d1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/cy/firefox-50.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "b2e00d3f5eaf76862270efc672f50043cb928abefa02b299ce519d420ef6ee5c65ce8710a5a49b4ff6c72762c7df0386c2d4f155ac88f3853206c6d7e0d0e36c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/cy/firefox-50.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "a8ab381099673212aa9370365aa26099f418560c12bec5b1094cb7228cf2828ed396da60fa7d45b6bb3c2126b69d03a2fa76124d7df345673b86ad5434c59ab8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/da/firefox-50.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "c61e353e30656039adba5264e32d2f95d0d2f2195e21250134b3408a62f936fff3d26caed1122964f6cf4b1120dddd6b17631323d21c93d7c18402559a0e40f8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/da/firefox-50.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "f3dd25ce556793bbebb5e23ae0b380bbac13ac75a4a3e7c23103a8e6aaada84173f67153dba2bcdc40e2f73b9f6faca40ed1932fe5e3e5e3dd9edff67b7eda53"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/de/firefox-50.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "11ac4020f61a185ea24c3ab3ee3361c11275e44908cc4be1650b523bfd356dfb3b8b065ffa69d32ad7b1d4f54d0d2369b1a18779e27871971bdd9be680aeb140"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/de/firefox-50.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "5e338e90d23326d7d81289ef44d688d8d45d26ccc57a8888be64a1fba85277527c05a7bce0395852a15a1b4707e146503d881e0a718303cba37213c8ad85189f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/dsb/firefox-50.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "7157d02ac19602acfdf67df8ec4696d13cdb433beab2be997d0996b45d89778fa435c2f92bbb7374503d1241d8a9c62a5f3cbcd278df5dd9279cce8f75481c21"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/dsb/firefox-50.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "8d70071d127efbb5b7591966e615ad8c49a01166c654d601520b72b04170523f8b5e63bdffc92e8a34b28d214d0a683bdc3a9655c4295c3c98f87f510b0de7ee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/el/firefox-50.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f1323f32618bb81dc0cf566a9341311050364b68c51d51531a17133b7b039853d94b80eec21f1ea9f76607d9cbda46ad15b4eb378016e753f3900bb060b66a35"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/el/firefox-50.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "6ee87d5d96419749638ab4adcae63f3d9e6e397ef9f8cc30ad93d51adb5ee08e2381f48153a785f5e4694686dbb7d43bef3bf8a5ad161f02f3ef9f2f18324592"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/en-GB/firefox-50.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "6b9bb4aed532011ec4a66d7a19be6d68b7efc699e56388141d0a2895d52936b2c5037e44978a67cbb82e5d0098270e4615315ed2162a6f4f112ec0bbc5c773b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/en-GB/firefox-50.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "2f1dd9d6c43fc8a49262b3ed3899a1ad1933ffe3491f5af7e3c3071b68fc8f1926efe2d0c159d8e614eafdc365e0dcb572b01b6d874c404fa17024c38ad7950e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/en-US/firefox-50.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "ccd6e9e49c5c784da30e47cbdb275318b857d8da1cbba6df1210890f6a3e027d791e176eab60964904c0c27ab33fbaa29001119f7ed928e2978a8bc6f9b6e309"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/en-US/firefox-50.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "388e7cd5c6914d889c44a1246b056d6a2f4b9c1f38d08db34209b3d0e76a3caea0269d137ea66890dfd3f53f404ca101bfdb27666484936e49a73be01af5e677"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/en-ZA/firefox-50.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "ad41de1ffe0b2358f9ddca8a0e161119933e966380cbea6648216938371b2cb49c9d4f9646b4d8c194830c0f20b95c3f5d74d674316fe684bab1668bdcc88f17"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/en-ZA/firefox-50.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "0ea2b935a8bef6e75b1ffe0ad783217dbbe1511480aa8824f3b1cadc1bf67327b45d77c1fff7d27cc2e4d1def0e49a8dd4638781631774dcb6d08a56d06aa96c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/eo/firefox-50.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "ad48892743f3a804776be094d06ce69187e1fdfb625def2aa33cacb5353521ce5ffb3eb142b96d08a4700264e9a6d47f70fafbba1d851b44f7e90f52143f4334"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/eo/firefox-50.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "7a1b83a505bc6af3c856bcf33652925cb3450a5dbbf3eceaf06ee82236cf359bbb1ead70d97a4338df56bdaf07e668d8fc82dcb9335c51f4ea2fee4d51bff711"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-AR/firefox-50.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "e7b53e5c35b63cc46626896d69b01a30630d4a4bb700cd824d96221cd3f20d51edc298149842a8b23d069d2e02ff7905722e93fa9267c72dfa82ffb8f711d930"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-AR/firefox-50.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "536bf789f33ad59d890cede2583af3952c5ec18a159e5f8385b7acc50149d398da91bb8259cf8ccbba2740d0cce497cbc9d354d75dcccc4998ca04e1f2c51ede"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-CL/firefox-50.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "9c13de853952915cbfde787bd8e66c5e1f331069f3fc462f3944228fc552fb5016a908eb28c8bc30f8ff298e0f188f07e2ff8b1141d5cb575f8ee9e0e38e3bef"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-CL/firefox-50.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "0bdf31dc9eef5ee0d8ccb5da3001c0fb0dfa4613311bb3a389cc12c4cf370180ac8b0917980cbf2df3ab9205eaae35edbec60dca88624ef13437795c174e8c2f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-ES/firefox-50.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "18d8012a9e9d55b93aebda9abacfcdcd2935d9019f77d6978fb8b02b5c16c07197eb7f08bcefa86813fba195df87d22d5007f6c1d208c37381204e6c03175b68"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-ES/firefox-50.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "77b547dd21e645aaed68e1a263bcf91b2101f05c96cb051b787707911ea9b047f73256b26b28efb790d0abadc46c44f304cc3f2f80472778b5a1e45d294d9b23"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-MX/firefox-50.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "60507ea94627f172cbed941ed084e803ff5ae814f838f9b0b55993878acc78fc9bf73e53de2f0314fb59572109da57860a5df9b7f7815273a8db73d70c400d59"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-MX/firefox-50.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "d920f13bc0bcdef484194a6b3a48195f5d3e7686a828b963a8d7b22b43b024b53eb284cab548b55de81c97831b6d3ccb2e88eb79cf715c94ef4680a4b12a5b7d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/et/firefox-50.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "1b9cd4182f45785b927da9e78e52ee6966194ec4482fe6547d7b0e1d6bf3bc66d1a67c683c1f716199db354a373d425f32861d3fbc4ad2ab38aa1b9c21b847df"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/et/firefox-50.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "9da2ad5723dc8d5c0570afb906b0e5808110702ca634a631454b082dc70c8fd97a9977a7c2e656d5e259db7d584dba3ed3cba9b2f45183fa63c03b2a3605c0db"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/eu/firefox-50.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "c05a6ec69e1cdb8493adda32ff9ddda4fbe03d1c23fb6007b67ec693a13bd50bb18f6f821c4789ae40746f4753c39eedb514c7581ad51323e8f9ae2c284766e4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/eu/firefox-50.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "2ebb5e755115c19961a25b9ad4598a03b3263f1fdc096b873577c2b5846d4c11b94cc002e2305729d96be146f13db5daacbf0575f7931594f4e49adfa597faa3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fa/firefox-50.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "26e1674500b1b15c79fb87a103d742fdef100dc6a2895d4884626d27c94a1c897335263dfe583878ed92bf4e66e9a3f194b2985bb487560317bd340bf8c1ba69"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fa/firefox-50.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "e6b94b200294d7fc6b8be442dbce0424cebd039ae840453bee17ffa8ef14a2785636f548b7e79e25ecafae202fcb53211b4fa37c29cd3b2a24383a1c54d78462"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ff/firefox-50.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "166e20eaf5250e307dd2878156f325cdde93b10f947e7fee461ee5fce4be61519ee07260231e99024167cbf509c88828dfad072cdb38749669cca2438699e29a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ff/firefox-50.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "dbbca6eba73d6d5ee158b08dcef536563ff6a9f537126858786e6a39ac161469268c26c92b6c1e89a546e1fd68e14759253100459e66352b263cee5cfa6ddde2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fi/firefox-50.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "ad006b74b3891a7bb6b59b4ea4bd70575c670b6acbc337bf6da14c0e464b47c55ce63aef05a2a68f915a9d32e455b2c0a27927135c809f2ef3035e75a3c60f5f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fi/firefox-50.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "8d4a273f5e9e0a6d43260d11914b8e52b62cf0aefb45fb6da8705ded079c6db0af5d7a7ee70cf908459cb76dbcdaed2be2a09e8f8b3f0c7b689ce910a35ddbd6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fr/firefox-50.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "8339683787463649ea6dbc0f761e658fa92b6fd8c8a9160f95686a37d10170adba6cb64ca550ba5cfe774e3700ac8bb95b33737aec9887eeee86f4323365c0a0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fr/firefox-50.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "893358e845b50f024b61444ba608314a574e91943440a40a214d69a233b3ff5f4854d86e5a2b90813ab50fc7ca01a009bbb22d69b1b5b5d3b3603a45e30dc512"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fy-NL/firefox-50.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "a1c88e244c73de9922487f00336215c79dab047cf2c57fa4a8188e434489163bbb7da586daf0ad051510278bf0af703a26a76d65d265d0dba23d524a53e4c11f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fy-NL/firefox-50.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "1c400ef2dcad7680b65fb50560929c73d9395fc10300c1aab13e4a1c4381514f0fbaf9b192952a5320c6e39db002629f0d27b3b1f4d10ea41324dd4c97fc40ff"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ga-IE/firefox-50.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "eb6fc7526c9aec0a9a2634d83ea7a086890a61112b2a66747e7bc6b94cb0ce07b48e362cad7873d409a893dec712bee5ad210fa10806354d6dce60dc7daaec2e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ga-IE/firefox-50.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "6d06c32a47d7def8017e933b6e03cc01fc35ca7dc32eb6931ec6c749b6b65d59a6dcff119b9a51fa949d893d0f30fac45bb0b52be3ccf1c519ee1c469cff1e24"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gd/firefox-50.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "b768ccd8724854a810f0a9b53c5bcfc1db6373575e0a7c9d9143b674e1aadc5dec614528340732630fc26a227007a0aafc99223c4e377bd1b9d16ba78f6a699a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gd/firefox-50.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "0445c45bc17a57022f09df0e9b3545c27fe55a69a431ed6feac4523b632617895c48f2b68c8d0c9a92b0f86a345bbe8821f5be6ae072e76af5d7829d59d5dd9b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gl/firefox-50.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "1bddebdc108787ad9d07d3b782a1ff6188e88108a508eae890d3588cb89bd03dd8c84a099f5aed8696cf15acc2573f112ffd352247470a5f04bdc439ed8a8e69"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gl/firefox-50.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "7aaac17918fa6e595820828049952da22be67cc6cd248acfe89c47d8f92af35983d79128d980e889ffff809b1af385086e71d3d637cbb672df36209a1bda90a2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gn/firefox-50.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "09cd1a3961a2636f257eb0edc073960368d784ba4f5b456339b213044898526ace726406a47430f75b7f4950f5e721c5f5eb59fcda65133dcefb5157b3e4c258"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gn/firefox-50.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "8cc67393779a6062799dd89c656790a0bf63d3354423298156bba87357f94e0421853795bb1af95bae932ce2541abff620918ab5ef3711e48ef1687af9dff2a3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gu-IN/firefox-50.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "5dc4ab917fd86cbfad7734ebfe57b21a0546c7c5b5eaedf55424165b88d5e847c512c27fa94f6be45825c198dd2d625c18b6f536aa03b686e33b8920cc71105b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gu-IN/firefox-50.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "81a6d8df939702ec5c02c4474a1a4122c6f622c09a53da83abef08993e10aefaca3f3e0837919b7c5dd198c524a5fc53567ae41010c9194739d18c7d7ccdcc09"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/he/firefox-50.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "884f9effac55f297f40725a480b388eaf28e15deb4e462ab615c2c97e44827492cd52f5ec9c6b0eb0f8adb0c8b5e41385f2f6125d5a9ba00d6ae7beb044f0d62"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/he/firefox-50.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "629138d559596bb7c9791b33ee3a5c81fd0805ec033d7e6f125cee4eecdfb3cc9337b5069f143c1f56433a6c663bef28c70f08b422ee37ace80888add3747d3c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hi-IN/firefox-50.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "ff94c3b07a985bd184d6b17144284eaf60604845a7854c7aaa4cea552682b4340dabc24f1b65641f45b17253eb9239cb0c4468d282f2715ebeb24b993f17d96e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hi-IN/firefox-50.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "638325ace5de570b0d31b72caf54a82c406146d13328ad0c9d1bafcb19331e181f53f1db55ad406ae50f1aac8390df1b3f8f51381897b5a226359d7188cb1eb7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hr/firefox-50.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "4bba9232f6a55f28403a66e7a72decb2a212a716ff80a14daae6798939e0e2593d926e25c55262d43e35844442480dd358149dc674f62314b6ff858d917e9fa2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hr/firefox-50.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "aad773e41b35978d00f991011276c70773fa78760f40de4b2f2ddd6216f6bbd503dc5a9e834a21466379499a8af06707ce4b44ee27f624a68fbcef808e2f87a6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hsb/firefox-50.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "d642de8c388a27f59f3f7b54d3d497d9eb1444d5c6af69bdd761f9e1e92ff381e7ff8f0005b5d9a2ad796acfd9adf64d2620a48ac654c161529fa88a9ce97495"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hsb/firefox-50.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "b8d8f2fd30350b759b05a8485f98645a91ead02389e93dfaa6eeaa63f65b6d75a58bdb8e462d96fa79b61a161f82f1b31bbbaefdff99e703294ae407c60aeec4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hu/firefox-50.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "acfd42a744185b84018869d278b1139c9d72edf23a5529acbc35cb57253f897caae2b3c296b32131897d8072e8bdba4beb1e5134b7a740f40697b0a78fb95073"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hu/firefox-50.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "62c000fbbade7c1f5dddaadfd0d718faa6150fe6deb759e76cc0e02d05827f5669b1c5e3f3dedb6e70e4d5f900951af644729edc3e34b665679c42667dc3085f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hy-AM/firefox-50.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "433cb00cc5ae251c7b9668217835cb7bd359641a7e25089d9bfbc8f2621624359b0b2a2590c08068a8700d32c94547492c12fe89678d64df376a182020adc382"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hy-AM/firefox-50.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "53d4dbb289a4615aca4583edf503cbbd5439a8a89567029f3aa894ad4d7a2f8ea3db42982574aba21b91fb14af6615dc145ab99237d612370b2db93016066927"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/id/firefox-50.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "dc23b6ea54d06f35e81146f562a18e9d83fe50ae7d52d98425ce1c313e44f7e45b09546c3542ee025dd4348c17ed20383ba7204a9ecb6af2345db196a14e6df3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/id/firefox-50.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "6226010373c387143794ae1e7ac0816405d62e648d3466677c3ed0a6ff42de78ae76d7cfbacb94caeefccaad38b6c3df921dcd4d6358b9764b3dfc124b8008dd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/is/firefox-50.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "bec1ceedb067b1e3ffa168205c3badb4ae9bb1d9829bb9ea848e7d0e70db91fe3e6d814c24149bf16862dcf24cc66b529323f438aca181b1e6636c69faaac510"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/is/firefox-50.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "0e6b15139883ca0d58d05b065c79c7fb6b6c2eff404061f329d9086d63e9e7c9b693fd16fb3a356fa0ecce43d640039b1e92a020fe0569b8ad8eec3d92ae16f1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/it/firefox-50.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "317cbbd21ad133ea44818429d5b3e7c8053395d69c5528a14b44e823b24deeab1acf66eeeafbc61a9bc502eca0790ac2bd18a8e6bd24bf2a19b6f9b7eb74eee6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/it/firefox-50.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "d9b518614de4247694d62871cae1f7e4e66af848bb7e0f4b1c0cbf77806e06a9d3d8062a6baa8b518f824d4f0759bdd76551525e55676870d3b18731eda2ec45"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ja/firefox-50.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "33064b1626d1f91781b85227142f912c93454582f0d220c09ca9cf5abbb3d31d3481d342ac91a7b79845b9f86755464cd717008084da56c05fc6f78215366b2d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ja/firefox-50.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "eaa227e027416aa7fa8f654d3067284ab7b7afee042d69af1f0a5d873257cff50e73b13744118cef0b0426e1e5f4884b7bb43adfc1c03cd317eb50d4131e05be"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/kk/firefox-50.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "0c8f3381e15495c57a5ddb66d01a73d5923905a02ae58d0a11b9f983291ae6b254defc40e285e1b0c3e154ba2ec3e3342231601b43f12d705fdf5b500108cd5f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/kk/firefox-50.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "55e0e3ddc0491ebb0c95278fdfe69c7a807d6e06544120398685f7856ba9a5fc45f491aca364049a2994641ae1d28fae856086dd0bc32a0f50e9919fff585002"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/km/firefox-50.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "4f563ef8581404f24fd7bccb4860df6f7175a5992bd432a1a39f4984f67d33642255dea8bda3f319b505a0750c91b0bace18f674d1dfc6d85b5671e5069fa5c6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/km/firefox-50.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "8b3ffe3626f6520cf421a4b41f4852fd09043d917b586677af9781154fef96c721a2d799e11179d867c38cba5cf1826a4e17569d0165fa99f2e2e006ae5ad371"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/kn/firefox-50.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "a543b8ade4ccfe8d1ff0d107d9b9f86715c9dc2dd633025f82d47f9aab260415f2117f15f7481c6313d3f71ce455c9adc1607ed38a12bd90717e67aa987290bf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/kn/firefox-50.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "4c56c4804b9296766413c503cbfb4db42c2237dbc87cccdbf991ce7cd57553e08b4c67dd77cdeb34695d34145dcec71a61107af3687203bb21ec773d322a03ee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ko/firefox-50.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "76a41e342280307d732ce4f6b4f35834367f3585568fbb0c36e70f64b3f274eca94392a0f46e8a646acfb900b1c6005117d508a258a4989758c89ad08f34bcf8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ko/firefox-50.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "bd5e0abed8992cba6532d32e84919e77de01691845045f98c3c9d4f312e48d83ea1bbff27567aa9f4f9f486dc3a0e7254bc5fa75606f1880de085adcc1d08285"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/lij/firefox-50.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "880f88cdda17b0eaaeefa35640b09690b5410a4111d02e7260c3d57bc4bc4389731707f183abd34365af5a4937b34c58d31db210370146855827463307e2bd54"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/lij/firefox-50.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "8c1ae96efafc8edda4b23e8393011daa7c801376dd67a49cfb2d509d8fb3029ca75942dd5d275ebb0f29997462381068c09fb3fddd93556de3b5acb1fb6b8561"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/lt/firefox-50.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "c5382bb928d5ee83aa5e122df3723126eb1151d3a26ab2c364c32c05e3f5345ef420825c67c4da32467aac123f8e245dbd0675bd16e9638ac29f0508bbb7f2d3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/lt/firefox-50.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "8d889c17ef408f7095c451f896d5b1e5f73fd5db42ae1a3fe9a0eae12580c6c96e0ae61e3b78de99460efb2f02dc035c71c96f137b16661e310b8d7635914303"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/lv/firefox-50.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "f30d33f57481d68632830804e1b75f730368954e23ec7ebb1e907abfe5d9eb9059e3288dae0d27a6298fd6a658412b66706d81843537967f92c04b11abdcfe59"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/lv/firefox-50.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "6b743281af9c2bfb40d02b92a4d4b0d2abb23942032590f55cb86515c71e42868eb680ca8ab44c46a0610b7fd877cc95efe28047bb95523cc2d13538e9de68c6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/mai/firefox-50.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "70822ebeb495fbfc7cba878e379ffeb3395ad90381d21472f242f12607ea95fa6a6bcd2d8a9b87e2eb42156d2cbc7fd90abd144ea47baf9d445249a78d3eb6bc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/mai/firefox-50.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "c2f20a9bbf1f8781ac11a396bd5580f171c025f1f4abec85ee4b96314ffdfe14cc8b4abf4de8a3907065f5b1bca55b39590a5d58c06cb77e22d636604f9a7ed8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/mk/firefox-50.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "ed6c3b7f023e479a7c5bbf89ee1769534d697b8b5da3f1ee9f37c2b112adc44cf4c61861eea4de5889ee07aa2c26aa078572afa60facfdf9bfc9245339657d29"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/mk/firefox-50.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "b826a6780d39b036c5ca9a34f3192dba8f0503f046bb20e96e9f71dd0d43b5a34f8f3998a83f3eef43b8fdace8d3ba87ccd740983b093c6007bed00b9a4e3292"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ml/firefox-50.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "f7f9a2a255465f99ee6870e5a92f11315dbbad0bef26f1f1a1c406bd3c17a52a1304fdf174fa50f80c22fe014f025c28a8b061395cc71ff4552718af45cfa48a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ml/firefox-50.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "5960f783f95b5abb5321dcb0dee13a678f82c1e5bd314e1964b34cb9bd2f982149764cbe388aae4f0f727207874feb71749322e0dbc517d5195760d524650cee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/mr/firefox-50.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "5f67df3d948ba0b4f8a77df006d6810497984863abd3f63dcbd46d4794be333a3cf7e19b22cdf70ade8b3cf64561c71faea6da34787aea5f750c588604778156"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/mr/firefox-50.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "242ac952a3709580f355313751d17a5194d059851c243ec0cef702984ccf131985ac0ddaad7bcba8d3e8ef4faac56c660dd2ada65555ba199c9b5b0c38d1ea68"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ms/firefox-50.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "3058646c2b1933036118e4cefb5fd2325c41ecce7a03f2516c041cb1a09b12988c2301b97ec1ab359bc351800865e3a652bcd0b78ce5858738e81366ef62fa29"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ms/firefox-50.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "cd1700ef9ba9b0554ceb404674ff19cd48d54ab811edac3112984029b96ecd2da34c4f7f691d2e2559e4d6c9a3f312eeb4df20c58203c1345d7eac9fd3880856"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/nb-NO/firefox-50.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "1c827b5805c84c14dcf6a0ccb30601aacbf67cdd546560a53451daa223bc4d903d3165ec4dcc20d8a6d5f8679a9cf5fd325a8ae3f463711311702ecf2e5665ec"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/nb-NO/firefox-50.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "aa4d58092339a8506cd3c07ed15bce36f56975320e53b480d84f1c3130ad895cff1d1b9cd02bd405f09e4d8f9e0d37f9e29dc6fc3102f58a75fc2c69f2673210"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/nl/firefox-50.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "2b673ca58695ba9a7fcaa2570521529d380e725be60091191a373dce6f1e0986714b22827054580aaec7b756b4a5ab7bf88957ff7b473b0b775cf3e32ef1a67c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/nl/firefox-50.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "5a3fc957a8abfb7343f78a61e68ed31513b3c25e8211203ad78719bc8c1bb42b4a1740ec8557da77340558844bce07a1daa3d95333331c0e39839cc6733096f8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/nn-NO/firefox-50.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "fa455a9c2bc429c09aed09fc307c1aa9c5cf285c62bd01348d733c82af840d851d3568dbe5c5d3b543d999e61508f19f2ab744a5dc34350d31471ea1b0179c9a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/nn-NO/firefox-50.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "2b07ce2526bde8dea2ffc7afb9a0c6b97f9ad8a3203588419be84ef2b5bbd9064339782cf00007b3c520e61207ceeac37841008a057f663f2e19d03ce22bbadd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/or/firefox-50.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "88a70b7eac8987782fb63821d4ad9513a493b0f75e51b04cb8ceaf3034a4d1148bfa75bb588c128862706b009cba24f2e0091f511d542958672d6417e252ddca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/or/firefox-50.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "b924191e6358f23da98f55dcfd2a282598db723d2b2fcb0864e91e77e220e9c6a2b9c7ac37db11230ff206d383e87ae8bb6df4d799e6bca87f8ee006fd2cffd6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pa-IN/firefox-50.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "fc7606d53076e1972c09cbf3ec300a596732e301ec3a847030fc9286e87385fb017672210dfed4a5c3f0acd0e3243abe11b845632c89cc082d2118aaf69daa68"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pa-IN/firefox-50.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "821ce0d7c4983793da61fdd1c056072c7ab2548d75eadf511a1bb1fa7d155b2908874e4d6420d803069e47af8f6271df38bb572f6eb181224800546d82fd6c4c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pl/firefox-50.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "19bcaa93dcc165a274826e8d646abc91913f586ffebae5283e608955bc0ad7ffff0ce94cd497544134863368b9761aa0c9f29403c176064381b45d108ad8b80e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pl/firefox-50.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "0e5a248810ed4300ea8d6f07ccf2192edfe1c4465bd192ccaaffbaa64e9a1d0128bc63d7aadb2977c05bc4d99654abb7f30d2ebadac6e164d0f77c058d20df6a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pt-BR/firefox-50.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "7b9b805324da5492ae85a0a8776d13f342c2222dd2c905af162fdcaa74d634891cc6ac2efbc79d39dbae333a6d8e0c49a2315b326323ebd6ddf724ce3067996d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pt-BR/firefox-50.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "08078f738b76f32d1658a26f8ad0d16bf74c397d35ca57631281eb0d651a1f3cb04f7a3e428eea143520126fcd5ed7786f2c8d89c5863795ac807eb9d214d5fe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pt-PT/firefox-50.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "908419fe59a3a1186fa79aa8a2f6ffc7f55c0bfa32c4d9ef2ef29e921e0acaa23f85071eb7657716c602b2368f7b28b775ff772b26d8ac46ad630258488b01cd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pt-PT/firefox-50.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "15bd2c20f3d04f0ff4d1f47391114fdbefa46013928f825daccba8915b97bbc99d03b3c8fd80ed147ccb00cf1338a9220bb6eb4d09ea2ca7f16d97571d36baa2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/rm/firefox-50.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "44126c01c9033b8a8f260940710774285dfa6ff35493b35b735d83858827b94bae0323148f0c95e87976156ecf0cc9a833ec52d882571a13784f74b12067d557"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/rm/firefox-50.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "a167029d21205c7b452b569aeabb75a05f6f6f498a7b861fd5b0bc803d411b0522137de86feb618a247e33556964da3645bb91d45f1cca020b6453eedcf238a0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ro/firefox-50.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "56636b9a33a5f681cbd2ec6d4fde8decf1ebe6477108bfbe54c13c29c15a2b5ab91875b407c8fcd7f272328dbddf10b36f2cfe6148b3a77f93acf22de0f29481"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ro/firefox-50.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "f9d79d3901821c6813d4f204a6760abe219448e0fdf568953d7ac04d4d87113daccb69eadf9503f842bbd13f7ce6a83e4fbdeb31d1a6c70051050bfba56ed025"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ru/firefox-50.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "2ca3b158a45b6b3943adc21d56cddf451a3ab7521af3934ea0759ade5136290afa8ff2c7ebe7bee04537c869d665cc0843ce471a2a8582d998d32f38680bc587"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ru/firefox-50.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "306a01f372b1ba8c59cbb1d67834d2e1d9a255ac0bc784c180c1da67857b439cbee253642e30fcf400dc8d988886403fdeb432fadee5dbe297bce6ddfb9fbf74"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/si/firefox-50.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "55fb61f100fbdfd77e716f11aa603b27e992037fce2d4555389ab4a40edb537621741a8b18fcdf150625a7daad4395d806f4348a364db37c708e199768e91488"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/si/firefox-50.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "5096ad17de32e339a3bf4556ccfdd50f8f8e738c49a0da1cdd35f04af4e33c0fafffc48f71bb97b6fdd72f420ae3c5853b3be5c79ea48b5e75d85170c6565a4c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sk/firefox-50.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "b9a993e9a84b93030e86e2a89b8b93d4c4544e4f1aff0d5c9be31369e9a5176cb256567b5032ab93e959ebd4ab3ed25db21fe890fa75112730ff4dd814029e02"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sk/firefox-50.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "2ed8b33ff8bd34d546ac7b0dd63d7ba01e39be07f5f5a23098eab5016d487f28b1b0563afa2101d1575a3a1c7abb1e61b8d8e46ed75d8c2b8f3c55e750cb2455"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sl/firefox-50.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "310e913b6bb487c78969d5d5cf9318a6c347f70e914d87747a2ec03a6db643a1b3816d4258b1d258fd15842850af48dee96a231e998434834d8999b8461de784"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sl/firefox-50.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "42273338e5f38824555acfa9372e9651ed2037fd9fb5bdfb9d09ef7f87aceacd3e802b3ca058282ee82c59a4d26e5f7fbab7756b7bb681371d498b82d9970186"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/son/firefox-50.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "25b81dad69c1665116f2de6801c7acb3353e25d4d72a2edebb766119482038bb378c3e15cc9d24d7b3719912067dc4646ba814b75da2f5a702902ffa73fca32a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/son/firefox-50.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "043aa96de8257c490c7837250de922934ea465c6b7cc0a313da21c2b4a0fea337e3b3b1d76e027fd3174f66781a9c7503b5e8e36912673fd822615da1da7720c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sq/firefox-50.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "ad136f59248c3496c5790e721433d743b5d7b52c6b83f89b7adba0bee2c70a2569e39afc2f32d2be0305c3f44ceb8c75b8fb2da980a98eec201a23297abb4ec4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sq/firefox-50.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "38f41c7b2aad097bd8eb6542793382c039ea84d0c6eb8835b9f26f3dd6f71b0d9b35ae2e56beecbbe52e9f3908727f66138beae020f6dd2b5b3ae1aa026bbb6f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sr/firefox-50.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "b8ac56113b49e063898f22e164f0408501ff6836fac7e2319c1dfb9714e0ee409c403a30fdf33a530a53ab5150f54c4a759134238865e92d15208a7f0eea47a9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sr/firefox-50.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "e2be4dfce210c00f61bd4f84f0500e7f5288e35c9683c5320777dafe6120009acd9018f4cc9071cda7261ca3e2a9008c3ee5f77278a874caf2545b5fedb85d47"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sv-SE/firefox-50.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "e183da3b542bbc848518df674f53f8023055299f47a4b5c6519431a2ad2db12deb156d239f8feb48603f39fbd7964aed8d5eac7ae74f08b8915625a187c11d3d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sv-SE/firefox-50.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "e3a98a8f0e1191cefa214161c2365066b82bd77d205206d7284d63572f54a2d60980de1054a3f4cd53be138e2237eae3ffe313dde5c8bfb2b1a24c4753416593"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ta/firefox-50.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "11211f37217e1a531786240258676207b061c0ae5569e548dfff185aeda10646954bd3af5ad18795e7c90c640b9a7159130d8ca52bce6b83c4b2333984bc7ccb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ta/firefox-50.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "790d6cad2823ee3bdf977854013510e45f738c3fe08ed468caabf2a9b523a8678b35c69d4cfab081e38cc9bf3068a2db800d3c475bb9fc590e357bf62db8096d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/te/firefox-50.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "6a75467766b47156d767068890254e4c14652fe9cf0c70165828162d9d8aba7080694467b6c0bf2cbbe8bd625f89404f5c56ffb3558d894230fbee62d17b7040"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/te/firefox-50.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "9180a50aab3df40cba5706acb9630aec80fa54a7ba4326ba690cf8d6a84783fb233525477fe59e373f336f79b10289dadd14166cb1c6274b3655265aef2d3f9e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/th/firefox-50.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "694f7f12b9de658e449b08112c2afb1695926957170394d722c4c44a1b4e1e3e909ac936e1223f0913c1fe88d500adc88fad785bd8954afbe9b5903073666c1c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/th/firefox-50.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "36548e75ed1a538eb84dc6878bcc5c3d04a6303c48fb419159539560b2c35abaa2fcb7c77630afb02416076dc32246aef5c4366c4711148e06f6fe09471be353"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/tr/firefox-50.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "2b5eb631d823ff0a61e0662d50413adaa92dd4aa08aef86f8c3581397565f5305b4055aeeea9398d12be40ebe5ad16098c64392733f5c0cef3cc242129afb6c3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/tr/firefox-50.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "9f0e88b63156fe961a7d2a1ab8ffa88f35243231ac4e812fa5949ac3e8ed4341a41a9891c21cb225a72ffed86824ee925510b13bb3873c019bdf25f972cb7625"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/uk/firefox-50.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "2dfc608eebe30a740c4550ce9a467d4aabf358e0aef23fc01a19d8b2638531f5736879e317ac09e19926d708c67a584ab5507c6eb503fd0b8833f51da9a630f3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/uk/firefox-50.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "a7537d803fa199e49501b0fae17a6461e71452eb0244780166de59a7991e21ea2c09a68b53d338e507bbf7031b460c9ba5d051733ba5b8c6c01db9168916e7ee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/uz/firefox-50.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "75fb452b696aaa68bd541042dfb5c5a4b360478dc4d5d0a3ee938825b0ba1eae0e99d1a42a2dc558a4425a9c5ae9add92e96fc71de1a3a41d6390e7d06050fed"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/uz/firefox-50.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "c4868931765948352117bb50e685f3694209eb04b6ebddf20528777caff57a4145e19e649e9220d590c2f9b1fec3664a5dbde5f0ba3ea063cea0902f49c7c3b0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/vi/firefox-50.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "942e8fc6f19c307cd3d403cd545dec8355f045b3a83d469632af7f2150d76bf2b33d61027c34166a86bcce0bab35a1d5b431b96e18c951307dbe947ba95e902c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/vi/firefox-50.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "7e8b2872b63d25a6ec8789fea550ff86e607e1d01c44c9ae20ac05fb4d305e497491d27a35478b975daa034a631b87b11c510ff5216ffb0a3999cb0feff07b0c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/xh/firefox-50.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "0f53d538665e46f89a3bf3c480f6ba8b74e648c3539680d0a033a21e9d5cdfee578dbeffcb5e445e36511928e31c5c9419e3843db5a02afdcb365c116d467986"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/xh/firefox-50.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "c464681fa140659fb6dc071074279fdde8156bacde02d0a5f91570feeba6b504163b6551f2f4930b1b8be5fdd89b81956f720f80cb98aba6a9db5d47e287855e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/zh-CN/firefox-50.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "deb26dc8560aa7cbfae2d23bc2fe8a7fe9ab417a7c6eb90bfe8229fa0231edf22c5ecebc8d63eac0fd183b4a17e5403998bc44c4ef78632f89e38b49b908f438"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/zh-CN/firefox-50.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "418d5e1f87cae02f2155a5f97b17242b8f7589b146475bfdccd5ab5a6d5d37719f008550357b289e353e4ae940cfb2c61229df3aa8f91c318497b668bde0e069"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/zh-TW/firefox-50.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "cd65efea75a85ac5e30103335a747449c23b5bfa8e1b476540c6cf4bf46596565c74c1e86b3494f0d9e197ba284cb813df63d7809f7edaf709ad9dce7c272b25"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/zh-TW/firefox-50.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "daddb4ab22650b3c69b09eff9634bd90a0b8e623309b944daced02eae82459405cd47ac5fc0d00a03dd84ef9953efd9aeac21a73a72a5441ad85444c1e1cf93c"; } ]; } From c97fda0bcf925426a6d57d300deca4da2feedaa2 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 19:10:06 -0500 Subject: [PATCH 1015/1749] Revert "icu: patch for multiple CVEs" This reverts commit 892a9b1f0faf9553234784f5569a883c6f4f34ce. --- pkgs/development/libraries/icu/54.1.nix | 5 ++-- pkgs/development/libraries/icu/default.nix | 34 +--------------------- 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/pkgs/development/libraries/icu/54.1.nix b/pkgs/development/libraries/icu/54.1.nix index a2465ce930ff..cd4398b3cc03 100644 --- a/pkgs/development/libraries/icu/54.1.nix +++ b/pkgs/development/libraries/icu/54.1.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: +{ stdenv, fetchurl, fixDarwinDylibNames }: let - icu = import ./default.nix { inherit stdenv fetchurl fetchpatch fixDarwinDylibNames; }; + icu = import ./default.nix { inherit stdenv fetchurl fixDarwinDylibNames; }; in stdenv.lib.overrideDerivation icu (attrs: { src = fetchurl { @@ -9,3 +9,4 @@ in sha256 = "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl"; }; }) + diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index d4a4c2a500c1..ba8fe038ffac 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: +{ stdenv, fetchurl, fixDarwinDylibNames }: let pname = "icu4c"; @@ -25,38 +25,6 @@ stdenv.mkDerivation ({ echo Source root reset to ''${sourceRoot} ''; - # This pre/postPatch shenanigans is to handle that the patches expect - # to be outside of `source`. - prePatch = '' - pushd .. - ''; - postPatch = '' - popd - ''; - - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2014-6585.patch"; - sha256 = "1s8kqax444pqf5chwxvgsx1n1dx7v74h34fqh08fyq57mcjnpj4d"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2015-4760.patch"; - sha256 = "08gawyqbylk28i9pxv9vsw2drdpd6i97q0aml4nmv2xyb1ala0wp"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-0494.patch"; - sha256 = "1741s8lpmnizjprzk3xb7zkm5fznzgk8hhlrs8a338c18nalvxay"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-6293.patch"; - sha256 = "01h4xcss1vmsr60ijkv4lxsgvspwimyss61zp9nq4xd5i3kk1f4b"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-7415.patch"; - sha256 = "01d070h8d7rkj55ac8isr64m999bv5znc8vnxa7aajglsfidzs2r"; - }) - ]; - preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure ''; From d240a0da1ab03ef8838553229b72b9b37a0ef3e7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 27 Nov 2016 12:35:58 -0800 Subject: [PATCH 1016/1749] top-level: Remove cycles: stdenv calls in top-level but not vice versa This commit changes the dependencies of stdenv, and clean-up the stdenv story by removing the `defaultStdenv` attribute as well as the `bootStdenv` parameter. Before, the final bootstrapping stage's stdenv was provided by all-packages, which was iterating multiple times over the top-level/default.nix expression, and non-final bootstrapping stages' stdenvs were explicitly specified with the `bootStdenv` parameter. Now, all stages' stdenvs are specified with the `stdenv` parameter. For non-final bootstrapping stages, this is a small change---basically just rename the parameter. For the final stage, top-level/default.nix takes the chosen stdenv and makes the final stage with it. `allPackages` is used to make all bootstrapping stages, final and non-final alike. It's basically the expression of `stage.nix` (along with a few partially-applied default arguments) Note, the make-bootstrap-tools scripts are temporarily broken --- pkgs/stdenv/cross/default.nix | 2 +- pkgs/stdenv/custom/default.nix | 2 +- pkgs/stdenv/darwin/default.nix | 5 +++-- pkgs/stdenv/default.nix | 5 +++-- pkgs/stdenv/freebsd/default.nix | 2 +- pkgs/stdenv/linux/default.nix | 3 ++- pkgs/stdenv/native/default.nix | 3 ++- pkgs/top-level/default.nix | 37 +++++++++++++++++++++++++-------- pkgs/top-level/stage.nix | 27 ++++++++++++------------ pkgs/top-level/stdenv.nix | 13 ------------ 10 files changed, 55 insertions(+), 44 deletions(-) delete mode 100644 pkgs/top-level/stdenv.nix diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index e48124f1c4db..fcf06bcf1daf 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -20,7 +20,7 @@ rec { inherit system platform crossSystem config; # It's OK to change the built-time dependencies allowCustomOverrides = true; - bootStdenv = vanillaStdenv; + stdenv = vanillaStdenv; }; stdenvCross = buildPackages.makeStdenvCross diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index 4c14d6411f10..e8f203d69cf8 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -10,7 +10,7 @@ rec { inherit system platform crossSystem config; # It's OK to change the built-time dependencies allowCustomOverrides = true; - bootStdenv = vanillaStdenv; + stdenv = vanillaStdenv; }; stdenvCustom = config.replaceStdenv { pkgs = buildPackages; }; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 1bc983d63129..49c4d9b8b2bc 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -22,7 +22,7 @@ let (import "${./standard-sandbox.sb}") ''; in rec { - allPackages = import ../../..; + inherit allPackages; commonPreHook = '' export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" @@ -101,7 +101,8 @@ in rec { thisPkgs = allPackages { inherit system platform; - bootStdenv = thisStdenv; + allowCustomOverrides = false; + stdenv = thisStdenv; }; in { stdenv = thisStdenv; pkgs = thisPkgs; }; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index ac84ea0f9a0b..bd515181fc6e 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -5,7 +5,7 @@ # Posix utilities, the GNU C compiler, and so on. On other systems, # we use the native C library. -{ system, allPackages ? import ../.., platform, config, crossSystem, lib }: +{ system, allPackages ? import ../top-level, platform, config, crossSystem, lib }: let @@ -19,7 +19,8 @@ let inherit (import ./native { inherit system allPackages config; }) stdenvNative; stdenvNativePkgs = allPackages { - bootStdenv = stdenvNative; + allowCustomOverrides = false; + stdenv = stdenvNative; noSysDirs = false; }; diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 4c7ebc16239b..13cb21fe1d88 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -5,7 +5,7 @@ }: rec { - allPackages = import ../../..; + inherit allPackages; bootstrapTools = derivation { inherit system; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e3aeafe178d3..e0a68bdca2f3 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -107,7 +107,8 @@ rec { thisPkgs = allPackages { inherit system platform; - bootStdenv = thisStdenv; + allowCustomOverrides = false; + stdenv = thisStdenv; }; in { stdenv = thisStdenv; pkgs = thisPkgs; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index fcd0805275be..22b4dc1400fe 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -127,7 +127,8 @@ rec { stdenvBoot1Pkgs = allPackages { inherit system; - bootStdenv = stdenvBoot1; + allowCustomOverrides = false; + stdenv = stdenvBoot1; }; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index c5b8bbac31c0..d1e824a8070b 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -1,8 +1,21 @@ -/* This file composes the Nix Packages collection. That is, it - imports the functions that build the various packages, and calls - them with appropriate arguments. The result is a set of all the - packages in the Nix Packages collection for some particular - platform. */ +/* This function composes the Nix Packages collection. It: + + 1. Applies the final stage to the given `config` if it is a function + + 2. Infers an appropriate `platform` based on the `system` if none is + provided + + 3. Defaults to no non-standard config and no cross-compilation target + + 4. Uses the above to infer the default standard environment (stdenv) if + none is provided + + 5. Builds the final stage --- a fully booted package set with the chosen + stdenv + + Use `impure.nix` to also infer the `system` based on the one on which + evaluation is taking place, and the configuration from environment variables + or dot-files. */ { # The system (e.g., `i686-linux') for which to build the packages. system @@ -12,7 +25,6 @@ , crossSystem ? null , platform ? null -, ... } @ args: let # Rename the function arguments @@ -57,8 +69,15 @@ in let # deterministically inferred the same way. nixpkgsFun = newArgs: import ./. (args // newArgs); - pkgs = import ./stage.nix ({ - inherit lib nixpkgsFun config platform; - } // args); + # Partially apply some args for building bootstraping stage pkgs sets + allPackages = newArgs: import ./stage.nix ({ + inherit lib nixpkgsFun config; + } // newArgs); + + stdenv = import ../stdenv { + inherit lib allPackages system platform crossSystem config; + }; + + pkgs = allPackages { inherit system stdenv config crossSystem platform; }; in pkgs diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 9ab9d22e54fe..0c621b81c7ed 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -1,21 +1,24 @@ -/* This file composes the Nix Packages collection. That is, it - imports the functions that build the various packages, and calls - them with appropriate arguments. The result is a set of all the - packages in the Nix Packages collection for some particular - platform. */ +/* This file composes a single bootstrapping stage of the Nix Packages + collection. That is, it imports the functions that build the various + packages, and calls them with appropriate arguments. The result is a set of + all the packages in the Nix Packages collection for some particular platform + for some particular stage. + + Default arguments are only provided for bootstrapping + arguments. Normal users should not import this directly but instead + import `pkgs/default.nix` or `default.nix`. */ { # The system (e.g., `i686-linux') for which to build the packages. system -, # The standard environment to use. Only used for bootstrapping. If - # null, the default standard environment is used. - bootStdenv ? null +, # The standard environment to use for building packages. + stdenv , # This is used because stdenv replacement and the stdenvCross do benefit from # the overridden configuration provided by the user, as opposed to the normal # bootstrapping stdenvs. - allowCustomOverrides ? (bootStdenv == null) + allowCustomOverrides ? true , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc # outside of the store. Thus, GCC, GFortran, & co. must always look for @@ -45,9 +48,7 @@ let }; stdenvDefault = self: super: - import ./stdenv.nix { - inherit system bootStdenv crossSystem config platform lib nixpkgsFun; - }; + { stdenv = stdenv // { inherit platform; }; }; allPackages = self: super: let res = import ./all-packages.nix @@ -81,9 +82,9 @@ let # The complete chain of package set builders, applied from top to bottom toFix = lib.foldl' (lib.flip lib.extends) (self: {}) [ + stdenvDefault stdenvAdapters trivialBuilders - stdenvDefault allPackages aliases stdenvOverrides diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix deleted file mode 100644 index adb8bdde6ad0..000000000000 --- a/pkgs/top-level/stdenv.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun }: - -rec { - defaultStdenv = import ../stdenv { - inherit system platform config crossSystem lib; - allPackages = nixpkgsFun; - } // { inherit platform; }; - - stdenv = - if bootStdenv != null - then (bootStdenv // { inherit platform; }) - else defaultStdenv; -} From 39753f5360134f1aab1a949260374a876c0983eb Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 27 Nov 2016 12:37:45 -0800 Subject: [PATCH 1017/1749] top-level: Close over fewer arguments for stdenv stages This makes the flow of data easier to understand. There's little downside because the args in question are already inspected by the stdenvs. cross-compiling in particular is simpler because we don't need to worry about overriding the config closed over by `allPackages`. --- pkgs/stdenv/cross/default.nix | 12 ++++++------ pkgs/stdenv/custom/default.nix | 9 ++++++--- pkgs/stdenv/darwin/default.nix | 2 +- pkgs/stdenv/default.nix | 10 ++++++---- pkgs/stdenv/linux/default.nix | 2 +- pkgs/stdenv/native/default.nix | 2 +- pkgs/top-level/default.nix | 5 +++-- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index fcf06bcf1daf..10e2a7663563 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -1,14 +1,14 @@ -{ system, allPackages, platform, crossSystem, config, ... } @ args: +{ lib, allPackages +, system, platform, crossSystem, config +}: rec { - argClobber = { + vanillaStdenv = (import ../. { + inherit lib allPackages system platform; crossSystem = null; # Ignore custom stdenvs when cross compiling for compatability config = builtins.removeAttrs config [ "replaceStdenv" ]; - }; - vanillaStdenv = (import ../. (args // argClobber // { - allPackages = args: allPackages (argClobber // args); - })) // { + }) // { # Needed elsewhere as a hacky way to pass the target cross = crossSystem; }; diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index e8f203d69cf8..174b8593c0aa 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -1,10 +1,13 @@ -{ system, allPackages, platform, crossSystem, config, ... } @ args: +{ lib, allPackages +, system, platform, crossSystem, config +}: rec { - vanillaStdenv = import ../. (args // { + vanillaStdenv = import ../. { + inherit lib allPackages system platform crossSystem; # Remove config.replaceStdenv to ensure termination. config = builtins.removeAttrs config [ "replaceStdenv" ]; - }); + }; buildPackages = allPackages { inherit system platform crossSystem config; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 49c4d9b8b2bc..6182c8cc0c74 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -100,7 +100,7 @@ in rec { }; thisPkgs = allPackages { - inherit system platform; + inherit system platform config; allowCustomOverrides = false; stdenv = thisStdenv; }; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index bd515181fc6e..246e656f33bf 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -5,12 +5,13 @@ # Posix utilities, the GNU C compiler, and so on. On other systems, # we use the native C library. -{ system, allPackages ? import ../top-level, platform, config, crossSystem, lib }: - +{ # Args just for stdenvs' usage + lib, allPackages + # Args to pass on to `allPacakges` too +, system, platform, crossSystem, config +}: let - - # The native (i.e., impure) build environment. This one uses the # tools installed on the system outside of the Nix environment, # i.e., the stuff in /bin, /usr/bin, etc. This environment should @@ -19,6 +20,7 @@ let inherit (import ./native { inherit system allPackages config; }) stdenvNative; stdenvNativePkgs = allPackages { + inherit system platform crossSystem config; allowCustomOverrides = false; stdenv = stdenvNative; noSysDirs = false; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e0a68bdca2f3..e4bf87c52024 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -106,7 +106,7 @@ rec { }; thisPkgs = allPackages { - inherit system platform; + inherit system platform config; allowCustomOverrides = false; stdenv = thisStdenv; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 22b4dc1400fe..0f9aee214b30 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -126,7 +126,7 @@ rec { } // {inherit fetchurl;}; stdenvBoot1Pkgs = allPackages { - inherit system; + inherit system platform config; allowCustomOverrides = false; stdenv = stdenvBoot1; }; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index d1e824a8070b..9464a8012b31 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -69,9 +69,10 @@ in let # deterministically inferred the same way. nixpkgsFun = newArgs: import ./. (args // newArgs); - # Partially apply some args for building bootstraping stage pkgs sets + # Partially apply some arguments for building bootstraping stage pkgs + # sets. Only apply arguments which no stdenv would want to override. allPackages = newArgs: import ./stage.nix ({ - inherit lib nixpkgsFun config; + inherit lib nixpkgsFun; } // newArgs); stdenv = import ../stdenv { From 5f4b3cd34b2f49a3ad26a76c4958451a496d2e0d Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 1 Dec 2016 09:08:39 +0900 Subject: [PATCH 1018/1749] thunderbird-bin: 45.5.0 -> 45.5.1 Critical security fix. https://www.mozilla.org/en-US/thunderbird/45.5.1/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2016-92/ --- .../mailreaders/thunderbird-bin/sources.nix | 234 +++++++++--------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 967ae7914e91..8f74fd2f53bc 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -4,123 +4,123 @@ # ruby generate_sources.rb 45.1.1 > sources.nix { - version = "45.5.0"; + version = "45.5.1"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha512 = "bd6c633bd3ac5fc26f98ba1183f51b4380826d40762b1a28aa2fb6cda2ae776e3dc7909024d7f66b771323d489510c5237977e1380f33e5ac6ece933336e75c5"; } - { locale = "ar"; arch = "linux-x86_64"; sha512 = "bfe82d658ce9950bde473836f2cfcc1319d22939a5fad3804808258faee4e96b0cb208ba386c102e41633137c19d071da3868868ccda8155d2ee02d71c05b132"; } - { locale = "ast"; arch = "linux-i686"; sha512 = "99870cc67812e321dd2338f68612b63a31803065021fcec02b205f45f9cf263ef535421c249ba4a6a7205979679436a746300902b5c716ec333de0b9769d4f47"; } - { locale = "ast"; arch = "linux-x86_64"; sha512 = "911ea7a1852bd61695058f68ae2ad991fd10107d876cf95b95f7df4b42ffe45a787aeee9241e1824281dbd3b1e32d8d815369f674bcaa21ad9268fc2f104a646"; } - { locale = "be"; arch = "linux-i686"; sha512 = "3faa1393235b24a73e04be481601552acd28620807a64129061a4fee18d42022e7765a510b61d17193066feeb99a8f3ca2fac405056f66a401c35f23791c8f83"; } - { locale = "be"; arch = "linux-x86_64"; sha512 = "d2118deecf5ff12d6e9b2807ff3129bd33e3d8d24ef0db067b031894c266636c103efe8e1d0103f41eaf2e1ae6edfa51bbac11973c082a1ad2339c992e7fd856"; } - { locale = "bg"; arch = "linux-i686"; sha512 = "2123fc69d26ed28c6f4a2a8e6ffa3294e594e87608f9c7da3f4a811e39e58e59e1a50af616a6df810f3c8e0872eabcfc4708c4590530d780a52a2200e4a321c3"; } - { locale = "bg"; arch = "linux-x86_64"; sha512 = "bf11f9106525f5e02ee26b89560136a07e142aced7abb3b7d9d7578e413ce24abc20995afe054ce32d3d9b6e4fb68a254bbf6a268658c908b33e2da26efdec03"; } - { locale = "bn-BD"; arch = "linux-i686"; sha512 = "1823ada3babc79e5d38f1012723c3c7eab2f885a7159d3b6b9d54573fb8c8d849799aebf60a66914cb545095894402cae6acf4b49e99d77e3b1a49b5418c04c7"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "737d2557dade96501f4442001a803eafb5c872967850cc875b902acb17b1133fdf0d0248271ff225babb29b937d744ed3294e4e73e82fef96d07a63fab80ba92"; } - { locale = "br"; arch = "linux-i686"; sha512 = "8e4377c42db9535a708a18d0b4d251d0bc14da24bf8cbf5fcb318d77f4a90e26f535f46642c9b940b3ee8887fdfeb218aaa9f846dd3b9cf89ce9d4e6035518af"; } - { locale = "br"; arch = "linux-x86_64"; sha512 = "4720d43ca4bdb2d809b4ed36352c03f05c823485951aee8943c24952aa493ed570c4eaecd83920c6ebc112d71e6afddb7b2851ee5a72faf3b4536fd23b35678e"; } - { locale = "ca"; arch = "linux-i686"; sha512 = "94132e06f04bdd7928090944d3ae65440e15d15ec1f690d157809d5c524b071ea3c0f3f12b6b6987becdbcb33324d7471fd23feffd3f4f136e9f485b5dfc964d"; } - { locale = "ca"; arch = "linux-x86_64"; sha512 = "84e4e65bdab737a8f5663dbcc1116b55a8ef88d9401f30a6a8acbff156913aade12d7b0aa61d9678811032b2e3a905d50ecaf0c9a9653500034e2f90f8ccc510"; } - { locale = "cs"; arch = "linux-i686"; sha512 = "a51b94013fe020edc5b3f75f950fd6bb626c8ad18c73e8884ced1d74feaa97d899482e213639bb26496cada97cfbf4024380c49a45547b9e65c033f8ec09c2f2"; } - { locale = "cs"; arch = "linux-x86_64"; sha512 = "50214c46072d17c30f19f0ce8a15a68a20839b5f985ce3a4c995c9739fc1290ca2d40601b7349c2af2214aef3207fcfda2a9115dfcef9ee1b005523b23a22317"; } - { locale = "cy"; arch = "linux-i686"; sha512 = "a528980e1ca863c47d8b8a8e5b5891916d3de78bd20c1236b9d1954d0f057fb2c247b303eeb8643b6be0fac46a1c665da487c9a5b57f974066a5e3007df92123"; } - { locale = "cy"; arch = "linux-x86_64"; sha512 = "fb3b1f14d55d32afcd22f3fa57736fcd820dbf06e6a92b72b8b1ca2f33df9156a0ffd8d0ada11bc86e11359add9d5c225aa07f4b1321464486cd75ca276594dd"; } - { locale = "da"; arch = "linux-i686"; sha512 = "1519def46f7b154a517344fff1ec076b5288cde722aeffa683dc3f990434fab4558b63d8062306c5a68d1efd3e30c983f3deced50043fac24c256f7b58542498"; } - { locale = "da"; arch = "linux-x86_64"; sha512 = "c5c0e24a0359a0ab178c369d3fcc7bfdf15411088033646d4e699f6e2e3ca8bc8a4719f8c214442661dcdc34e5e1f577dddbda40363cb9824fc9e378ff2444e6"; } - { locale = "de"; arch = "linux-i686"; sha512 = "83f7bc92338a30ed183dc9ee67d94e02dd8c659b8a711adad023f79a6253530cb6f530a4f31ad90796cb78566f2e280cf4ee19060b59323c22ed9bc678bee85f"; } - { locale = "de"; arch = "linux-x86_64"; sha512 = "6163afd45c2730e8970eddd8f5c159d4a0b4c48684fd6900a0b61eff1ba683a320a6ead6cd0052f0b9cb04f7a54f8e6b633c2bf6a594ed9c94afd7fa742e9061"; } - { locale = "dsb"; arch = "linux-i686"; sha512 = "9772c7bbcb2ffd475aba6c00dd527defcc7d2618e6537029abb49a47038c0c16b32f1c35ca4acad2ec53a7e5265598b0a32bad615281cc96afec819eaac32d9c"; } - { locale = "dsb"; arch = "linux-x86_64"; sha512 = "99a29d265454eeeac1f80e91913fdf4c6ec850532dea4a3891d0c0ab0a68e5391b9fb42640269c95214131c63e37e4ff7a2b6ea93c609e7b1ea02a04cabb0749"; } - { locale = "el"; arch = "linux-i686"; sha512 = "b6878a4ef1b32ac0390feffe6da0dc2c5c88e0bb6c88505e653a630eaa47432be1bd2903d97bed855c41dbbd5f5babf7b0b747b8afdc0675ed670c6bf5a69649"; } - { locale = "el"; arch = "linux-x86_64"; sha512 = "a11f653ef20c76187c9a794b70d876f9b2244c5bf9a10a9f7b41969bf35d36b1d75b319bab6cb9b29616546d68be4b587c47e9f54e8cb93f861f1bbfb9c2c1bd"; } - { locale = "en-GB"; arch = "linux-i686"; sha512 = "88f1754d40cabbd473dcd5a24a7a91f7bd625b83b91223eafe78271409720ac9d4cfcf32711f36f72cb8b3269275d950ec55d2f11377880b8fddedd2cb04348b"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "b754899626a8bc0fa7e491e6d18b84e8900266cbd39ab619e8a9821825614a46c6bf42ea490e56a8d25b5467e5e9280936f5a5034e055bfe736140f4bb9c1ce3"; } - { locale = "en-US"; arch = "linux-i686"; sha512 = "a66a92dbc8c2093d7498934c5f8d5a0e68ec3649b74d60d98775e33832902796667f2c06b2001faf07a535de18b6a2cca6f61dac4f8e8173040cdc9eeebbac88"; } - { locale = "en-US"; arch = "linux-x86_64"; sha512 = "4d5c6ce9f3e2a6fa9c44d6b8bc2cc50a2c129037f9a16833cc767efa379c2c2db27b2576c7a8cf93e87646244839614577230161f1bc813755f8fc43ffbafc7b"; } - { locale = "es-AR"; arch = "linux-i686"; sha512 = "317865e753dcf03cbb0acaf67e0a34843e6f3264322e2fe63a1eec916bec07678026e6be4f7ce49626bef945a6f34125f28077ab367f954d11ba6f082014b4e5"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "cfd16a5ec21a1ca13fb5e882a75a767da1387c5f4adbeb3a9f608f0035ba60003650e6d3be57b2af8efba2d0bb8ed94ac879ad5f5e2039fddc6d9228f8ae0336"; } - { locale = "es-ES"; arch = "linux-i686"; sha512 = "7017c9da2dbeb468c2ff3ebba91c2e83a6a233940296fd5bb03b4d1e5531fae189240f630055ab2d6324a0dcece5d2e80d32d7d9ab17a81709985325d5fe505a"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "920dd641893de2e7b7692af104402e9898c3b8e3311960b5f3072cba07e0f8f918932be591cec92ca3a3aa9be6f17d605c55be5d2445864cc8ae025cef83dac2"; } - { locale = "et"; arch = "linux-i686"; sha512 = "0a24d1680b27a1e79985b9f124bc3742f2d4ecaaf2d4742db9ee1f9841d1d4b7d08ba60e71baf50ec6c593bd1a8f51d768a22b364e681b8c8a3651e37735f5f5"; } - { locale = "et"; arch = "linux-x86_64"; sha512 = "5c56cff2cd868985800c95eecffce5fc8d18def49b2c553b5c26decb364ce087d74220b2db78bb4c88c18a06eee4c5d0f3e49f17e54b67bce81083da465b53f7"; } - { locale = "eu"; arch = "linux-i686"; sha512 = "c903ccbcadb68d951442051e558ab657c337713207887c32383902cf82a32cfb04a60ce03a5cc02fc2cd9542ded108beb433eb32270fceb25e8dc29135d2f4ba"; } - { locale = "eu"; arch = "linux-x86_64"; sha512 = "9b782390d45dea01944c1ae29350cf01ee4bbab6ee94d00549aea195e4731b0c410b96f5101c44013352e8323f0baf27bd076a017456f6cc7a221c505fc7883f"; } - { locale = "fi"; arch = "linux-i686"; sha512 = "5b33f4d58604138ffc098e9f3e4284f11ec97e58d0586cfcfb89c0114c61b07c2e1ba0051c5751101838d3a1125fd0dd81ca818d59e967dcc7a6cb166c01b27e"; } - { locale = "fi"; arch = "linux-x86_64"; sha512 = "41ffde0d385bb3f7d271b11e470614e63f3e25e718f5f0eaca383794543c45a067989f7e153c4d48ec59199d2209e1394f89a14f4b776a0a8d1dc58466f91a80"; } - { locale = "fr"; arch = "linux-i686"; sha512 = "2c1e6151f256b4e7b934830c84edd0faa942ad49ee7ee29b767bb75182f296a6a24bc5cd00e9649c78ec649c879fc4c0030d1a73a68b215e72132d0149361b89"; } - { locale = "fr"; arch = "linux-x86_64"; sha512 = "ba12fc325112ac1076a9dbb56db5c9b7c03ba67e196d90529cabc3499ea5f479c5ad4cf3360bc891dad8c76a9cf846e1bc99f775d7ad83c45215261731530e13"; } - { locale = "fy-NL"; arch = "linux-i686"; sha512 = "0588462a5b0777f77dfde87be365beb5864e4a89b11cb869b18b47d2a600fb25287ac01a9e0b74156c0d35cf9e05e14815b3395a9fcb19030300ec74c3697931"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "2333728d503d8d171009258f6b59f41c20175e3ffde9ab65da3199825901e1c10adbab7d83eed5485608203d8e985ba9fae392971a11070b9fa3ab8a257cc28c"; } - { locale = "ga-IE"; arch = "linux-i686"; sha512 = "f43b95950532e23d1ed3a45c309d1e6dd5d79b56ef4b06a44a02485a58aa306a810360349ff2dbb617709785c4633ec3c79ab930752d112e9f971ba2244882b6"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "4fc095fe246ca02ddba8f005ab95dc77b41ed766fff1b0d947f78db1e3fb09a1454d1f3f83b3160127e985a3256d630176f7e6076b4eb936d2529b5f86d1018b"; } - { locale = "gd"; arch = "linux-i686"; sha512 = "72e6c4b9e7afd114690f5416d4018eb72ccdd4f2e71e60328e4df92a4043c19bb1ef917661abb8476fe68068754b17b18f7b8178494ad7f7278568919123f495"; } - { locale = "gd"; arch = "linux-x86_64"; sha512 = "dcd069d8c4b2d096a01b2f24dd4acd60dbedc1b8511d1fa4346be9342b99b81b6252032470733385e70dfadf9cc755c1f4878542d275a17740290a35dabf6285"; } - { locale = "gl"; arch = "linux-i686"; sha512 = "f1e9d759fe8fe2d613bc640d519a73ce843776ab6f7511734522a8728bae07762705b1698a0526accdf9c0c3a9bd233649a01931af2a653d17ae368399df0a1a"; } - { locale = "gl"; arch = "linux-x86_64"; sha512 = "16953e45d9c3618c394e4150c58ca7fca45d90beab9a2253ee6cfe58a85e66aa2c5788fc4988c38b1c70470dc3fb9bb96a09daa354c88160d53739ce95ea25c7"; } - { locale = "he"; arch = "linux-i686"; sha512 = "89a6e7a06694e55128fa584cb6fac0c459d21c6f795caf581532b7ce69e0ba1954029667d5d3afb5835ffad1bc0d7444ab0c59cff2873870aad6bb232ede542a"; } - { locale = "he"; arch = "linux-x86_64"; sha512 = "183ce0c71d7852490f1f78d8a6380c7909f4462d238ecb342e35a8fe5b369161b9399c704011a0741bf0694b67713f93ec187331c414a72e0d77202382a99c7f"; } - { locale = "hr"; arch = "linux-i686"; sha512 = "03c6d917c230cb9075958a6317599efcdecba5d8623a2664342bdc3c450662be64d69c7136c4f7ee6c10b4c7cdad8ea5a19cff2862f1e8aed9e3df3687abe182"; } - { locale = "hr"; arch = "linux-x86_64"; sha512 = "b26d084369b30bd33011b9761b16769795e529575174f5533174bf7fd71ac387708942cb3e709398bd401341c7ca59486e203865adea58e89743520f0557d94a"; } - { locale = "hsb"; arch = "linux-i686"; sha512 = "06dfe62b99b8a52d0d2835c83e9becdd3af3b278e1fc8f7985f2d3883c25ff2e65d55a841c1040816d64faf4115f867c1c18a771e6139ea40fe770cc4dc137f5"; } - { locale = "hsb"; arch = "linux-x86_64"; sha512 = "e303bfc9ce30479d1d79611d29dc95cbdd3ea4a6abdd1df6961cc7e4d832c6b44f6010f5a7e74485b4648e781aae2cfd2da78bbae6ef09e0cac6e5b980abfdc4"; } - { locale = "hu"; arch = "linux-i686"; sha512 = "f454805664f2aa7262449acb74d78fba411e5de175076a50758f149fc4c1b4f5c76f2a36b253acc18bcc809172db3fea17c6cba524918dd80f2b17bad97e237a"; } - { locale = "hu"; arch = "linux-x86_64"; sha512 = "0e8a0a2eefacd575fc52e6a761be481b1a4fe29eab0aaf8d51e2aa624f4cf1f5fae2cc9dfa1f68af83b82813cb8cdb8da3e454711f611a621cc22b33acc44e98"; } - { locale = "hy-AM"; arch = "linux-i686"; sha512 = "3ed1482d68759f143f403c935af3412ab819b6801e13bcaf123ef910db0bbe2c7523b52f1dc5c4a93b1a087f3d78162f2b8c04930abe89abf9536abcea374dc8"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "bb43898b0953dbde2837906da9edeb0924a65488715d8e3cf22698ddf665a8037ec758ed6df4ca04ff2f04df437eb8c71d98496147bd5f92b22246bf967be769"; } - { locale = "id"; arch = "linux-i686"; sha512 = "c2800b997e412cfabd39d7c8412c02817121383ae477cade3db1d75f7be47091b84179e54e3bd968ca79c41199fbc1f5ece63cb2b9eef038e9af6e4034326db0"; } - { locale = "id"; arch = "linux-x86_64"; sha512 = "b5cddfb6c6e8a6fccf6ef4ccd78734e766c081ae5fe3d2a3ad73852d453fdd71eda917eb29ec3bbd2398c7c810c0e61195680de1cded8f4394322a12ce84e0f7"; } - { locale = "is"; arch = "linux-i686"; sha512 = "9ab50f7d7ea5450bfd984ef180eeef8672e21e5d1610def3f3725589740ce57486985706713bb292a1a577dae1f9b6106c568fb2acc11f4bb92c1801af444c8f"; } - { locale = "is"; arch = "linux-x86_64"; sha512 = "39b6c5ae33b191334d0867d031b59b06a86311527f19b1fa8f0bbe0dfbf90f4f2cf952b8d6ed22851828b16aa3019a8208e6f7b603a6d94741ba66111af00955"; } - { locale = "it"; arch = "linux-i686"; sha512 = "13899d6940dd4840566def16ad5d36b6c992349d68bc4d9dbb9c9b73bf53310401e687bf9a4b9837205f5a527f3b7ba1270bb4e4ebb46c129496d49b0b19f2e5"; } - { locale = "it"; arch = "linux-x86_64"; sha512 = "c1434939ff690a4036271c013f926230c7e612a64e41aad6e0885109eb5767fa0639286fd44e370f24cae1d4e70a72be8bb04f5533c66c7fb52ac0d1986a767e"; } - { locale = "ja"; arch = "linux-i686"; sha512 = "7b6464fd5fc2b0c0a54f760df62c9f08c94662d00e98d9d7a58844d189c765d780798a64079507aa84532e91b28a92e4d6f21c51bd9abf8263e8c4267ba2f9b2"; } - { locale = "ja"; arch = "linux-x86_64"; sha512 = "3545594699f209bc78353b3f4b17df5b31f1283e826937cbbd83f34a32aee658c67dffe4cc77a7ea055f09e6d966768715deb7037372d29796a1fddab89383ca"; } - { locale = "ko"; arch = "linux-i686"; sha512 = "df238479c6d58be8986a1ea581e63dd7e42a0c6d4a8fe2b3ef66ceeee34c68a4b02f689844e0a19d59d65abb175cbd95387a4e2d0041e7b126cf7728badaa0df"; } - { locale = "ko"; arch = "linux-x86_64"; sha512 = "e05d44fc6a66c79ca50cc2bfd88d39112783ed636370ea2927cc2202c8b5829f05aa1e6fd9083c4c5a37c8bb873aadc5aa81d0522abed5742fe78ea3258f8e15"; } - { locale = "lt"; arch = "linux-i686"; sha512 = "219d2030e11fdfe5f68f703e6141038177257025b5f1039776cc9093c35b9ac03d197488ceb960d1b2b5c9abc12ac2b4895990afbd430170499d3639476eff5d"; } - { locale = "lt"; arch = "linux-x86_64"; sha512 = "6221204aad7b62fd540a5776ac67ca968c5f7f436d260664184c871f8ecdccac6542f306c2d34ba8b74c17b15caf549ad30852fd003b711572ea3eba0c2a32bc"; } - { locale = "nb-NO"; arch = "linux-i686"; sha512 = "54b3db811b3573cf0084cd5a5df45e33c6540b1d6df301023853b1fb023f786e70b9f6d2b827273504e70809096d392b0fb91ff89ad363c051ddbfbb6dcf8099"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "8ccafab65ece0dbc9d7ea7067846d3a45df6b4a78d543d54f87a52f359a759dd4d3f0272ca3ce8c792feb643c5d3871ed411d0b8719527969acc1cde39577768"; } - { locale = "nl"; arch = "linux-i686"; sha512 = "4ac1dddb4f65c05306738fdfff6b939e4678a59282519a053ae3b919e2c9d0cd4f72f93f6c5925efad101c64a32ec10187fce6734dbdb8002ed05bb1690d8cc0"; } - { locale = "nl"; arch = "linux-x86_64"; sha512 = "58555fc9e43b9599486b25fdf8b0e4e27a0592f52db730123ea0513be255f026a35a2d9ac9be84be158e94c3f95fa5ce9dc531dc94bc839e36092ce6ad560b6e"; } - { locale = "nn-NO"; arch = "linux-i686"; sha512 = "102ff8f498c9acd7fec58973bde3807f2821723a223ac7646985faf1342eeba15b438b57a6c1e64005ebd86b97cd37555ab568ed96c228ca825651e9133c2696"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "eeda11d9e76e713a287130e1c0cfbc8507c0a148061dab878891af0c7751fb517a0f9d3d49c31ae69514e5caafb212c5e23b6254dc310b63c2f241741c8edf29"; } - { locale = "pa-IN"; arch = "linux-i686"; sha512 = "94dcd33d5a992ffd7a47114555d1a12d31e235eec60fa6792fe041154c27dd0d97bf55d0c8bff763502d07a9b458402322a54b0b1943ef7a55457d32360135f7"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "e7a5fd70e80c34c12650fc85af282dffce6fdcaa95c177e18930212605510858d4f71fe0600bccde80aa59bd81f22b4425830fc4c0c689c636105512fb55b0fe"; } - { locale = "pl"; arch = "linux-i686"; sha512 = "a056b9ddf6a2a04adf786bad7cecf4d4c02c0ddf8584ef602e390a2157073a654473f2262a4e418fb31ac0a198fd212ac67a2c9e9e52490b3d4236fc6c73edb6"; } - { locale = "pl"; arch = "linux-x86_64"; sha512 = "081cbbc49b12223e9a9f860fc6072ceb855634419bbb4d1e2923342c7f4f0b634443a0c1f9f60bf8622b9176412c4216d555d7d075bdc120d0c4bd2d809201db"; } - { locale = "pt-BR"; arch = "linux-i686"; sha512 = "22b4194129af89e81e1fa7ab38c2905169ca73c8656c6a7b718cf4013dbc0bcc4336ef68303506894e871487092f8ae7b2a05f914242dd2ea61109e3f969476a"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "c6a5556ceb64c4559e1ce92019312a9b862efe6e5c93380859f8e2787b54cc5e12796446d7effd3bf8c47704e6fadfd80da9261d30c1ab666ebb7a34ac15c525"; } - { locale = "pt-PT"; arch = "linux-i686"; sha512 = "46c292e1daa7755332f29e2e6e785013badb3bd869d497cd8fd85c107e9412bfac9ffe1e14f99addaac3d413e9ac7dcb2ee4ba4dc5dddaeee0fefddf0256e281"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "8c1e72eea7b4d30ffc6e5915d51289abce564674231f80ac0e5e03a45cc971683232ba08893672e424fa1bca75ebcc2847d18f044e2762c16f0d955f56895140"; } - { locale = "rm"; arch = "linux-i686"; sha512 = "0b3305f2c7d2626d2fe57484c694e5400f6d60dcfb62e65ca925501dc1c1ba3a9ab3f71f2d5584a5d6b49567aedd7188582967f0ad6e7a461034e50cfb577d32"; } - { locale = "rm"; arch = "linux-x86_64"; sha512 = "6c875b6806dda0ef2b140ae3a3bb47ae6f5b93a0b6d7b9b2d0e2182b6f3f356c85cbe60c9c79bac51f46a2c1adb59f240f7d1c45be203b38a25832be178cc0a9"; } - { locale = "ro"; arch = "linux-i686"; sha512 = "6043a890614495cf28a1271716e6add0229f8d5ed911fe04152503a20a26e7b4da03475e4a1c08b93cf512bde19916ca1a53d41094ffa8a2d48e4cbc71fcbc33"; } - { locale = "ro"; arch = "linux-x86_64"; sha512 = "9a5a81fd713ffde8e38aa9ed7557a9a8b6b902e8ba316e5bcd5c4af2f73a1fe67a226a9401ddabdf76086af6c8432d00d02cbafc250f03190878deca1bd69588"; } - { locale = "ru"; arch = "linux-i686"; sha512 = "aa205e2f3bc4a4e22520a41c9ba516f6360e062da74a180221b5236cf10d0a30e1ce3b5eec1081a8a9b4de3331fa3f289dfccc0b6785363b3411f77d8832f7c0"; } - { locale = "ru"; arch = "linux-x86_64"; sha512 = "7c8d7402949f34cbf9ba3eb32fe1fa1c225296bd179854a199968f012c64fa3a016dcaa922d0dc0abbe1fb0bae438030f7096aaf79be2c7822df2f529e1fa46a"; } - { locale = "si"; arch = "linux-i686"; sha512 = "841897e3a07a0a6dbb4e912e424ea52b17631549176995e3c8ab1581bbc4e565be084ffd686ae6a4596224a642213477d40a5b2aa702ac6679e1ae71bdd88516"; } - { locale = "si"; arch = "linux-x86_64"; sha512 = "618b49c54e2057c10e3ea5441e2e960e4581589fc2685ca2f42cb1cfb5defd9f26e60d3f7af603757aaf73021133a0bab94ddf3c0cded1442523a55661395720"; } - { locale = "sk"; arch = "linux-i686"; sha512 = "e00c42e2adf10e9d19d434bf67be2ff75f47ba11fb2a5d00d62f9946c3c274795fe2fa83b718cf21cc4ac396f10212ab459c81fa7d866ff6a9af8754b0663db0"; } - { locale = "sk"; arch = "linux-x86_64"; sha512 = "48a0277c6082e84dc51df64c9e726843d1361edee39e27e625f09cecd56c7b82e31d31e121799f34da4e85177506af680dc893b8f305d24ae7f6276146842120"; } - { locale = "sl"; arch = "linux-i686"; sha512 = "585fbe3e399d857ff21307a0ed53c5ea9aabb68232da44febd3c52297e7f9636f6aab6c8f698e2714a83632c48b4b60933568d6dcead5a614fbdc4b90be416c6"; } - { locale = "sl"; arch = "linux-x86_64"; sha512 = "e84ff51b3feb54408e6abaddaf23bddab85d6a3cf78286dcc13da43e743306addcd2dd6fd58419d2e5dfe2e5d63c0ba51810fdd9ec080427d26ab8ec7535eba6"; } - { locale = "sq"; arch = "linux-i686"; sha512 = "9ca817ada82c6f2199b0c357164fc28b98351c69a8cbfd98048eee407ddc05dc90714e7dfca4059a55ce2bcbc133ae22c8f26a8bd632d60b7bb561221d4fcc81"; } - { locale = "sq"; arch = "linux-x86_64"; sha512 = "707088e8fd72c8bf598108f57d684369ff5b1c996e39c88a002f724324b111b2d7c00cfb649eddedbd70dd0df22d10f2f83f9114a71031f33e9adc250a193402"; } - { locale = "sr"; arch = "linux-i686"; sha512 = "243baec5e5daca6cc7410bc3079db3e5201b49f7ea1b76bfdc84fcdfc50c3327e886ce7e008c9350c7bf5128f61c34ae543200bc11ae0d3cfa9166a3000b243d"; } - { locale = "sr"; arch = "linux-x86_64"; sha512 = "212ce66af4689db19b234b463b0f29b01c7ceebf1d4c67a10351f06f2e71b32d050e5232fe0e61e15fa30a852107ca7a1fd80475fac7d2b877074de3b40e6bdc"; } - { locale = "sv-SE"; arch = "linux-i686"; sha512 = "31637fef31f0e1d08ea528bd7b917c6d67ab047c3d1856fd60b8a1de20afec567aed093e27c938aee4c8b1b4269cda5f43a127cc3284deb3db4f0d98a8d23a8a"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "81b745a763fcf3b60b84ddae56cf59e363269986734f26275ad3e32320b8d5ac1a4a714a03861ccd0fdae499767a93b53f5717ca78074c79ca2c9b303406a5ec"; } - { locale = "ta-LK"; arch = "linux-i686"; sha512 = "c35956a5aacdbb2eec20feb41fac23349c621624ccc792c9f6e711935c45afaced43e8c75d00c4c59d0279d62d5092798c3200d25730a1fa15ad03682b5f0d86"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "5bfeaf3ec0ad5ae56b540337b72795e11fe66846df72ec849b51db32091df8ea8a9ba4b2e6c46f2cca2f672419c6ca6fe23de8c7668edce53c38c5587b83c075"; } - { locale = "tr"; arch = "linux-i686"; sha512 = "b617860d43de6c1f191ec0a021b86e49217310fb8aaf1ce5d8be11eb27e77f6cf7338f8e675dd25a53c298b4fc7e5228c289aff86b23b81c8176ac55953ddc03"; } - { locale = "tr"; arch = "linux-x86_64"; sha512 = "f421c0889af9229e7081bb9f4f5a6cced6647bb230b7dd5d14f46bc5a0ba4c36f7a711e9b9df446ee69e165953d1405c1b11c9912447194518bf9c9b58a5da53"; } - { locale = "uk"; arch = "linux-i686"; sha512 = "f33c519ea5fb12e5f98cab4d3de4bc23e8277db9534b765820f8cbe1c24d6d33a033b0ec357f8b13d9d16915f6d677b5b206cdceac86b9f8a09aa1d9e016a510"; } - { locale = "uk"; arch = "linux-x86_64"; sha512 = "1964f6597ba11f10010275f7ff256f8fb86bcafc426c81c4f2d55f5202b0d19bc978a1be24e2b204612bf19097afb0709f00de263fc34dbd43eb6b331f85b9ef"; } - { locale = "vi"; arch = "linux-i686"; sha512 = "4ca3d166fdfa02bdf8581bbe29b1d067011d4922b5308af369407da7e7a00239b75da739f4be88a158e29b939516095101cc03602545900f87d91455ad716c0e"; } - { locale = "vi"; arch = "linux-x86_64"; sha512 = "5e335a87ee0d5ec63e45c2570f628d0ca1cd5577b39f7469aef2367632c10df16525bfffe2a4f80f473d7faacf9e96986130e6548978d9b4f606de3a25a12cc0"; } - { locale = "zh-CN"; arch = "linux-i686"; sha512 = "de86ee26774483a31e74a9f89e144d5bb4eb5493f27cb1b5a21902b8e8cdc0322f15d38498b8d6005b59296715b9d9125676b26661433e280a2f1807fedc3df3"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "291074caef4a1a1162d0c3f90e630985978ddd731fde7d9d1d576c065ee8b89af5cd10196c4b05c537996ab99d00d78119af00bd1cd77e85b567303c38d1e792"; } - { locale = "zh-TW"; arch = "linux-i686"; sha512 = "6873ff342439247d5bda3e3065998b33bdf03f1d80d15a2f733a79eb7ede188a71e628ec3af6a67354f9adab9f67d79a86310060b20de09c623c342e3b894f2b"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "c60f4ef8b1dd22db617e8d6381f2e0ebd37fd8503c363548b5affda704d483432369138943f84ca07c89a15dcf72b9a081f8db6f1c202558050ec997b9389ecd"; } + { locale = "ar"; arch = "linux-i686"; sha512 = "a2495d8d9a56104b5c5d87e795689d0334563fdb98fa751a2d7bedc9993ba66d3b1cfdc9d0d3711b8c8a2f91d8267c97035d1120051baa4aefcba1b968b9edc8"; } + { locale = "ar"; arch = "linux-x86_64"; sha512 = "b5760210c14df4648d6bbd48136dbb3221c682ecebb649be848f8fbecf89d2251630c8d8208438f0ab66b73964bbdf8e05035bb88f0c773ea253cab163b569b1"; } + { locale = "ast"; arch = "linux-i686"; sha512 = "b1ccb4d51d9f5aec0cef3ccb0d5fcd14ca69a446cb18fc8b9f22d98325c0be45ea608f9c9ac15fb33e2b426b84c53e908a05331e360af728e088ad9c3cc77107"; } + { locale = "ast"; arch = "linux-x86_64"; sha512 = "64028617fe76832663fd69e2305ca84dfd576507348dcffc680d94d6d1de640fdd13874a73638767d3aedd2c84d38fd370e57ba3f95281a0fc0ad9d21b4d727d"; } + { locale = "be"; arch = "linux-i686"; sha512 = "32d89785e95667d17b7b4d19d37557c7d592370e42613c8c171e1b816d38a16197fdf8397211f61a9261457ea426f6de84af721462e4296c825f931655e64e66"; } + { locale = "be"; arch = "linux-x86_64"; sha512 = "932f0dbe85e6cf43c70ea6f9537785322bc5280106c97b4e21ea828ebc5d997d027c260f4e1b4441909c3a3b7e61f51b95167cf6a632bce98fd2b6aa33eb413d"; } + { locale = "bg"; arch = "linux-i686"; sha512 = "b5d2ed68959cc6a473e83db35634c6322f4638edae1a19f81d5ae1ab0080aed0940b751e96d3d3a562aa1811ca3c5435f2f3b0a205948f06c2d479cd98109e88"; } + { locale = "bg"; arch = "linux-x86_64"; sha512 = "359973dc382c7565623f63ede93e37b1d1a2bbcf9690710e05fc066a8c7f67b059b9d14c978c93741d65544029e5970f520d7a64dd07902d89f0331b9a3330f3"; } + { locale = "bn-BD"; arch = "linux-i686"; sha512 = "a76fb786e1cb0485b4e212097685fa259ff76386bce3cbbec1d47e061c7116df76adb8bf419e51ade098fdb9b55a7aad5348e13917104d22a0aa39518205ca47"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "f2d5b0c3fadb19d89733feecb50a7507b1c29dd93b5064a0db95292be1635c29bb3d98b84fb29ac38224c97dc7af29ff6024652562273eeca2a6ee38a0d19de3"; } + { locale = "br"; arch = "linux-i686"; sha512 = "51c1402350cec63a60f4ea96cdaedb1aa74250583a3cfed575060fb5990294446a8254108fcbd99607a286b8bde43357ccc8e0195330352d1497b8c173a7b283"; } + { locale = "br"; arch = "linux-x86_64"; sha512 = "3d1aba23ef4d969548b2fa729ad1795496f7123b4437f7692bfcbda4c87b0bd7edd1caf00cdb207eb4aaaf6c8ec8d0554d553a7db5a85e1e24d07c401d507794"; } + { locale = "ca"; arch = "linux-i686"; sha512 = "1df09781962fdfc7abc425f9f96d2efcc7471bb9bb8cf2c0152846673c7fbfc86b6b4c05d73d3c949607d056478661be0e0d24b769f816820d1e4670fdf240f7"; } + { locale = "ca"; arch = "linux-x86_64"; sha512 = "a1c04f9846edba32587b1f62379e703a62af0b9886f1e56e86854629a034657d86a4f06ace3bca9f75a21c734b559f17522692e4c90607ab353669bfe02a3dc4"; } + { locale = "cs"; arch = "linux-i686"; sha512 = "463f336f49ababdb13397a10db3b189e3d364b07f9f42a4d31e770edd846c56fdb81f79228ffa51ab7f6555818bc3a0a3e5f1e546727bb3cd81f95f2264c392d"; } + { locale = "cs"; arch = "linux-x86_64"; sha512 = "f93ab27ec7e126aa309ba4d6d5900be7c427a29ccbbe141cd4e7f211daaeca6459163711204f02fafda285020173417d89a9c46f593114c81b73ce430a2c7743"; } + { locale = "cy"; arch = "linux-i686"; sha512 = "8a4802763162dd32577e02f878482094b3bae4c51b9ac7c109d188c8b5ab9fd0053c34eb2fabaed873e0ba9e7f5fac2ebe6604a0da00b806594e28fd0f823721"; } + { locale = "cy"; arch = "linux-x86_64"; sha512 = "9166a6c737dde179411e1a0d509141f29c7df7e3fe7e4f6def229be08bba4ccf5963804a86490d08e5ae3dd602f246c2fdce717562616445257b81b8c17ee795"; } + { locale = "da"; arch = "linux-i686"; sha512 = "bc430839b463ee22e4d1736be48f8f9e958307c3069b337b0ad816e3f88274b22b98ce66fec267f4ed134750fed656b1ebad0bce29637594d053bd82d1be3d34"; } + { locale = "da"; arch = "linux-x86_64"; sha512 = "6965968613889d69182ddf3dadf7e109e958d7561cb2b1a3936d9302b725d9c59c8cb8730ecf62e422a38c108da2ffa6ae5b012df348dd9250047a15b046e760"; } + { locale = "de"; arch = "linux-i686"; sha512 = "0a9ac8af9a823d69c8b2671f24bb203239a888d1423656241926dc5fa978e989ca5df303211e4a5208624d01ba34dd93915463eb88b0ee8ed027dad592a057c0"; } + { locale = "de"; arch = "linux-x86_64"; sha512 = "2a33d8104e1149181e91e9588a4236b481a8837835af2a1b08f3cc2dd55eecb3059aafbabccae8b0dbb8cfc632bdc8fc6198bb600b60a9dbff5a96a8609699d1"; } + { locale = "dsb"; arch = "linux-i686"; sha512 = "9f089cc93ed4660250ebb0d4c677d36515d9dbf29f78947c88558c69362663fffff293fbb3acaf4fca2e40a88d093d7637e385db757812cad29c31b6b746e87c"; } + { locale = "dsb"; arch = "linux-x86_64"; sha512 = "91314f8c8c7a9e1d13f618a1b71df8141933e6fe5f3317da06ac84ce1ea269bfe0740d94b2d8e240005a315a469cab39e79f70c06169712fdf318c9b3b5ac9c8"; } + { locale = "el"; arch = "linux-i686"; sha512 = "1099c8443c089ac7f430023960802ab2ce914f103983d68dd283f0f1bb7d36ff8b35e44b7e766237cf19e9c6f02e5dbbab5f62e4cfdd8b80816d0892779732bd"; } + { locale = "el"; arch = "linux-x86_64"; sha512 = "601ed7cd8f6f1e867647036ab3f8fadca0507f4441998ac29dfd15a6c8cf0c65b94cd647b0b4602d7624f041a8fd14a8210fde26a7c09763746d31008699e0d3"; } + { locale = "en-GB"; arch = "linux-i686"; sha512 = "1efadd60994808919b24214c1610dccda0a76bf0de6cf3518b6eb665d035272f1a2e5e4e9e09fc2d4eb5a7021bdfaf3c3391e166737824355bb859b1d3fa54b8"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "07222127e045d41f912baa160b08e22a373ba605f857d001c92792ebbcf789e1094c68e0f16bf9c609fda0321ee0a0f702c7d47481f4da6a9cb80071b7e21095"; } + { locale = "en-US"; arch = "linux-i686"; sha512 = "663ff453dfc556bd85633030e271174d96f039d8ea77bb1a338df02298feaea297ca7b4010d9c2973d19ba988b6e2b807486ca40f69bbfce84d0b7f8b21f7c32"; } + { locale = "en-US"; arch = "linux-x86_64"; sha512 = "3dfeaa5e64b4063e0b5ae552bc47db1ab06e4381c55ccd35b05766aeac5add880804f07a40d39db08395a467ffa96d67261971359c46bce8d9ec6adde5948f2a"; } + { locale = "es-AR"; arch = "linux-i686"; sha512 = "34fbd5a614ef5a0b9c46b63c80292dfe7caf2f65758a52d130ad4567311cde3e84ca1ab41d5fa87509b5ad9c6ce4ab136a4c08f1977b3695e5471265a758bd7d"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "087caecb722222c3950c8a644cf7af37cd356b62b4802fcac1a4b93620fa086e2b3e97a6c5f6b22aa61d3478dad41bc7b8ab39d31bf76b710f2e53b36cea2049"; } + { locale = "es-ES"; arch = "linux-i686"; sha512 = "e429e936f7d022b421c995ea8df18d72a3abf8a9dd2a0a6ae87435333c94a8abdcfa3c2416e36f883b1d2b5f573a17d8a38161fed5ff323767fc25756dc72d69"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "f335002365f68e28cf0e28c407843f8de3184b33a7e57638104d1ac3515cfcbd14842ecc6d61a7de012e2cb1d7c5ff170598b5f81dbcbb71b81549f6a8bb5531"; } + { locale = "et"; arch = "linux-i686"; sha512 = "3ec9056dc49cbc6b7734498ab5522fef93eeb6f08668cd04bb610bf0d2519759c614de07562706a3efc2b5e64325a70c04b18fb3138c2ce3cabe6ba1a51bdde5"; } + { locale = "et"; arch = "linux-x86_64"; sha512 = "555874dfde25076892647a451bd9e02879eb5c8584dd22d5bb73f9c5deab5f64103d80c57292ed6a04b73fe27aa28d78210a1a5da7147fdae0980faaa8d19641"; } + { locale = "eu"; arch = "linux-i686"; sha512 = "951a9fcb82f77cb45a5ccaf300d0516da7d1be069931fde87e729b9c9d99a0a07ee810a4bf4791698741ff52128f66d6ecc3d8c7887cf22462006929c582cacf"; } + { locale = "eu"; arch = "linux-x86_64"; sha512 = "5f4361f43bca179613f24045835fe31e17fe949da0e2f9e470635d714f521abac45d0104e663ab44806a7e45f4d44d515b002508e8388c2c72e0b91c793ec8bf"; } + { locale = "fi"; arch = "linux-i686"; sha512 = "e28371194085e689d6445ce3a0de77c7b8127aeb740769ff2aaa8f0345cfbc7b3e8ad5f2d891c8ca34c2fa004cfcaace649b900248493e5c6ac4404b6f581e19"; } + { locale = "fi"; arch = "linux-x86_64"; sha512 = "5ee311ba705cdfd7a6687a1a17e7c5b40fda22fa7acb3a9a0c236e2aa3d8037bbf568d9be29853abf3d52d6840ea96b7ee59cf9264709973aee3bc43e8c07979"; } + { locale = "fr"; arch = "linux-i686"; sha512 = "f135ff1b365df65cc9fab35941628be6f6264d2c91d8394d22fc35e945207640c8238cf2e0046598348d7521c1684eccdae0d7f0dc2bb22f415a862cad72d67a"; } + { locale = "fr"; arch = "linux-x86_64"; sha512 = "ffa44a92d3ab3ac8bcdd945b910e6da6a4c0b05f4c95572fd2a56fe73f935f7a387fb98100c7a84e4adc22c9b1cf8a0aa84ac04eb14c4b60b7989053c2021a0a"; } + { locale = "fy-NL"; arch = "linux-i686"; sha512 = "c90579ec9607992f4e551d327a3122d6bfd87ef3f1fb4708579c1a07deb2270a252c7443f3a3551bb725ef46a8cd9fa61cf59910260f9775eb8805e5e8acd61e"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "3cf5e391adca05195ea24be90a2414640f0fd72ffc858e971fc82675f49def7238c30f3ac48c08312414f436f9bde0ac2b05e11db94b40079c9d37f3d1a8ac5c"; } + { locale = "ga-IE"; arch = "linux-i686"; sha512 = "a6a9f52acd576b615075f8829cff2ed085e7254e8a4a2380c0eb088cba1986ac81f9d0badecbf0ece1f7ba7b7b169c8cda23fb32a9e79fa78d29fe8c0cb4c8de"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "4260f3a7245d8c7f0b6f3a0a47793c84eb83be44e19105a3efbc35ef1a1455f872a987c714eb95a1cfd4157816cd9eb09c5a6098460e90584e9d630812d66716"; } + { locale = "gd"; arch = "linux-i686"; sha512 = "12edcfd67dbc5d093d1c22eb707668e4f534a6baf96986e436684c9271d165fb2f422a2e84ef35b72063f1a91100230c92df2b08aee428ea0b384d6658f6bcb3"; } + { locale = "gd"; arch = "linux-x86_64"; sha512 = "b9ce9839cd3a4e8fbbba4f107a934ab4733b1feb65dd1e40a1c064f39026d03d1208b67b413ed4c643c7039f91e1ceb8747f3a46cc44d1bedb22275512f867b8"; } + { locale = "gl"; arch = "linux-i686"; sha512 = "d357cc4f8a9ba8ff47458b03d17e4d10dc7be8bb16493ac3e896f63a3229962034012c7ecda4a70d4dd1d9c4aa76c349bf21725c6164fc96e6fc36f9b0fea9ea"; } + { locale = "gl"; arch = "linux-x86_64"; sha512 = "fbd8a4eae6a94d966f8e1e9e2bcc7a6aed8b5a9991fc8367de28c11fc7b341fcf745c983f8259b89767a762604e55ade6212f5c1496dbf843c8eb49f89e8810c"; } + { locale = "he"; arch = "linux-i686"; sha512 = "440a86fb6a94657f05eda2bde2a2e74d17398468a0b603866a03a7f37458e69a921e81d2ac1af2718f1168a56ee03ad596c39e8d88c933576efecb99a724957e"; } + { locale = "he"; arch = "linux-x86_64"; sha512 = "51f3acbaf8971bd0bc93502605526f6d0be5093810f8a91f43c2597541dc23eb590a10b4f2839cd9ce1e13685fc7e38668184b12a23ae99356ffacf3f6481d83"; } + { locale = "hr"; arch = "linux-i686"; sha512 = "1b5960e4df8a6247c63fb3f5e80b1795b4e098f446debd96b6344dbf97694337d6437dad53635fac57036ed6551b8a780ca4880dc35626aee83860a5934f3f9f"; } + { locale = "hr"; arch = "linux-x86_64"; sha512 = "65110b98cea4a6174dd31de4aea53d2efb1fee822025f9a7ccd6ef3ac80c0baa605fefd7078c3528451ffad7d9e86400c5b7b527b026aaca022a0099673442af"; } + { locale = "hsb"; arch = "linux-i686"; sha512 = "bba6aa43cfee2422414c526f0c40fdc70984acb54e25e5eb75ef684e674b17a8dbf606e31d5d609bd572647ab3a9bbd78c76669156a1d2d4d45d8402650148b5"; } + { locale = "hsb"; arch = "linux-x86_64"; sha512 = "d50057bc3cdff3820f0bc09679f672d14a35240fc3e997836f9c04bd8aa922e41b627e0f632c2e76982439d4510262618d7d59adaa530708cadaf1fb111159e3"; } + { locale = "hu"; arch = "linux-i686"; sha512 = "026a686dbe81a4c52bd3997de66e0919ea870954a3d14c4483f5f76f618424013b82a2478ec9eb3f506a1f666ef3333832a3e4533adcce41901db79120d2a454"; } + { locale = "hu"; arch = "linux-x86_64"; sha512 = "bbff40d50155756c0d06fc4c9f7bf31f770901139b0a8d475ee0d8bd7ff1b2d4e8f5f3343fffd7af83f5f53f0567845f6c7ddde8abbd3f9f004c31a1479ec4ed"; } + { locale = "hy-AM"; arch = "linux-i686"; sha512 = "a798c9581cdb2debbe773ed952bbc56f7d7444eac5a448fce0f17ba2b260405526cdcec306c39c39b2e80ce7addba810bc659312505af8c0a928c8a2f8107245"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "570815807b0ea61bcf506effb2acc52ee6e8089b1328a046a8c55de0e3e72227a2d097ffe61f383733ca6f11405e5689595bc31f931f41e854f71770e18230de"; } + { locale = "id"; arch = "linux-i686"; sha512 = "ce54045626941976435a94bc5cf7513b79bc4e3e6a3b03bf1036ce9433cc6042689735b95d60afc4bf1de2ea31fe0ebc55b856bb51f0ba468744931a8c0727fa"; } + { locale = "id"; arch = "linux-x86_64"; sha512 = "ac9a78df1a8c6228560247e07cd7695eedf9ef0afd2c25a770aaffc8d96555f229e9332204e73ba803df2b8a7f590b970020b277123668ff20375608b093dc8c"; } + { locale = "is"; arch = "linux-i686"; sha512 = "7e0a2c31968102010d1fba379a25c4bcbbf447f2a0005e01271faf1e19dc7e71a5f8cfcfbf36ed510743d53886864aa4164284e99f7ab86ac27629ffaca6000a"; } + { locale = "is"; arch = "linux-x86_64"; sha512 = "cb78e3c2e1824d1da479e8ca5cdbdf420f7e046895a60b8912d44cbecf6966a32acbe2811545961a6da72f22052d8d2bed8d8ee1208b9c4e16250e6900265335"; } + { locale = "it"; arch = "linux-i686"; sha512 = "4852e13d1be422f107e18537bb364b04fb06fbb4854bb30f97753b0e0138ca2d9073e29c4b5905154fcd215701b300c0680025310479c6dca4294e3a591ff841"; } + { locale = "it"; arch = "linux-x86_64"; sha512 = "84c053e27ecd67a15d84bb2c222ed97061c130fde590db558c7f5919dd8acc8bcc5f032f84c53fe364f95607aa04bcf43375d2cc9fac2d4990535aa38d939793"; } + { locale = "ja"; arch = "linux-i686"; sha512 = "c539473ab434e20528f252f76f542f1938accde06b7d460b8e4a767a2721cded73710cca2264d2b18cd533a6118dfa9ae1c2701a6e1b18afe398f42a109439e9"; } + { locale = "ja"; arch = "linux-x86_64"; sha512 = "dada1c9e859b27a1bad7ba277749e77d68a20ad4c033861ee5ec54f78627efcaf336d082b1a8f9e4dfc91f6b16adde3eda873ae261351c3292c73c7f7ff05526"; } + { locale = "ko"; arch = "linux-i686"; sha512 = "59421684c74f6c9fce41c4769ef725445bc84224357db21f1f4c9f5154c695a337445bfa05fca1f045d0e05ce64faf2d2e5a9be8cac0d62dfa17bf1571f9db57"; } + { locale = "ko"; arch = "linux-x86_64"; sha512 = "3eead074a7c82570db1923b8a64afdd8d8d802d33c4087c8b647f905f580d27ede2913e1323b98c46fdeb83a91db1a43dd155d013d3f42b54a7daac1d541b449"; } + { locale = "lt"; arch = "linux-i686"; sha512 = "317315c0c436ddf882ac2d5a5c76a942f0fe04f80c1d7634ff7223b363b5fedd0778b127e1cbe21e737acdb869e770b9c828a9df075eb19f4d4870767297b912"; } + { locale = "lt"; arch = "linux-x86_64"; sha512 = "2926b5ec95101dc682723a3157de86fcfd9974a7a74486c1d80481145feeb49264bc661621fed4739238e852ca2759dda155a2c22094da90c6d5dcf43107b3d4"; } + { locale = "nb-NO"; arch = "linux-i686"; sha512 = "36638e01b76b608c2af0dd6f6336877fab6e0c8b8d16c5f90095c0bb24d475bf5486782fc26061dea134e7817288d84b8b805351411b7e70f39f3a76c9354b92"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "cde8fcd4b1cd8202085aa7a04b5781cd561a2d2ad3e1551af420397816addee8d57f4c49036ba79e49bd6f4452107cf8f3acc7c238beca5814ac5522aff2195d"; } + { locale = "nl"; arch = "linux-i686"; sha512 = "03aa22ab612c39e9a7df2a346a338b70c6ee13802860ab9359322e6fae425c1f8416cab762b9e061e3d8b34417043c3979e49a5c7079bc8327c0a317e5b98abf"; } + { locale = "nl"; arch = "linux-x86_64"; sha512 = "a78658fcd3cd6c9cf5c775d37e5ebb38f72e0317e30abf7dcbd57c0f400355bbe242ae4ae9862eeeccdfe0fe2cdfe6c6b1c06b8bda3010e941041bdeb6a51fab"; } + { locale = "nn-NO"; arch = "linux-i686"; sha512 = "4594fdc88d66a61567652f4ef7fbf43b55853933f098526671801e0fcd6256367e71c5a179419b1015d410b49a26505879ba0397013c8b510a2462798e5b3821"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "e76bbf55d900e8c7c92e3ad130e58c061685f2abeb2f3ced71e52c36bd0d979eca58cc3a74daa394469281011e7339c15b423847bc43631bd6b3da7f1d4aecd5"; } + { locale = "pa-IN"; arch = "linux-i686"; sha512 = "590b974b9785db9843b35dfdd9aa9d8422379570b6511a02564d5a0edbaeafad38f99aba403cb996ed47416a9944ca7fcc74d8aacda74c8113de7f112b10f397"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "0de6495b746c39e5117f5662b4896b206cb7a4f22a8a8c4f6c080f434b856fdf1f4029c7b8aa9a3372b6bd66d883c26ec82dc2aa17ce89005f462d58b6e3ecea"; } + { locale = "pl"; arch = "linux-i686"; sha512 = "f03e723aebf1c7709a0f08b9416acef98b5e4082b981fae3276d26e3c11650153cc56fd8f96653eb9d2b5213f5ccc42e062b42cf6182dc910c56a24f07440102"; } + { locale = "pl"; arch = "linux-x86_64"; sha512 = "4179561c6fdb2b48a0ab87ac6d823b702181b18c3ca7f28f28a546cd7bbd7453a525e80600a5cebd89912fd69b78d768e136bf12398e5b0471a6fac310fafbe9"; } + { locale = "pt-BR"; arch = "linux-i686"; sha512 = "906510719e6d7149fe2c8cee9d5a88ae0a86cbd4bb6e2c4ec0bc4d77b252f71b98939f4002dab69a24db75d022e485d1711350ca1f26b3b55b05701dfff6f9da"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "ed1c438050b3e0a22d61f39b9771f22e2425a9b7cca1fc9ae41606f708b32354f5cfe7321f87f3a77dd50270a7e38554215c6f8fbaa0ffbbc1a1c7f01c8c4c6c"; } + { locale = "pt-PT"; arch = "linux-i686"; sha512 = "1ed53b8ac706dc2750276928b507c072e3b2e49f7df2ab6d382b31b0618da6e41ce3fcf50f7815b4736859fe899017ea4a646f4594f4ac7ef5c272ccdd6d69a7"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "07b00355b73786d61dfa2cf1752fe42f8c464291f77f8192117414b66ef5f3c627064a608abb18c6938c8a2b1e4dfe223ebeb4f1c4590bb8c80dadb0b77841d7"; } + { locale = "rm"; arch = "linux-i686"; sha512 = "6fa680229b2dadfe6984af37d1ec93ef9d5f2d9014bc62618690c2e71a6bf8bd7d945fb0312553f0f2858fee89b454b84375a65fbb90f8479d1812d838ef1109"; } + { locale = "rm"; arch = "linux-x86_64"; sha512 = "b95336e5ae9bf794e35dcf58fb8b4c17c4b4e58b4fd8552d708f15e6d9518640f42599350fcb6f140bac57e7d54d49946ab5c910ed67ac453b0c1c3150a195ed"; } + { locale = "ro"; arch = "linux-i686"; sha512 = "102b3a1c23742bf9fad04c1d87a43cf4b6f805b93528ec7139d5b3eecf141990594f32c2c89a7a950aa4257801ec2e5aa91ca6fcf2e1a067978f47cec500f6b3"; } + { locale = "ro"; arch = "linux-x86_64"; sha512 = "8a613cf9fbf8a96ee2b3a6610ad2638f388530601cb7af4bf9c44f73e92f21e97ea3a147887ebcb5080570bf6f7d9c0965e834eec011c646fc57100d8fcb7df1"; } + { locale = "ru"; arch = "linux-i686"; sha512 = "6d2a1bb3db76516f1011b701827b43e66099a50d575facd3b5be9718be21d4b7ef80feba091e4273960af8f56f416514c2d308877b039be06898bb50365e9e27"; } + { locale = "ru"; arch = "linux-x86_64"; sha512 = "e74578096eca86f68e993f620eaf66f220cc577522e73592092b6c63657640cea95d0b41ea035d505580aee258629e2f36e2abca9952372d102bcb0136e995d8"; } + { locale = "si"; arch = "linux-i686"; sha512 = "9900c9462c97d7e783dc9893a4a6f87a0e000866ddb3dffefd67548b30ffa4e9db8a2e93247027a45aae03c9d0bac305991a1684de17e8bd28f3c2d3e5a38309"; } + { locale = "si"; arch = "linux-x86_64"; sha512 = "00666797cc9b4ba2b3ec7c9914639ef5fda3df3c124aaa3255b37f721289f1b2e33a99e6e68d40a66daf96860b21c6af10a68a216b6e3a35d8261ba704be7081"; } + { locale = "sk"; arch = "linux-i686"; sha512 = "ca001243f8359c38b781fea53c3ede7baabea25af516d852e75b6beaca9ea1b9ce4964c345ff5754657a1a953a18bef2c631e962d92f699e2dc5a31a9d594d39"; } + { locale = "sk"; arch = "linux-x86_64"; sha512 = "5ce7dbdf5f9ac2b46c1a27aace9607011dd064de64a778ae39009d9ae6d729da903f5a3c09def1ad7d571a8b717a3f66889053abb38eddfe4146b04597fc2a0c"; } + { locale = "sl"; arch = "linux-i686"; sha512 = "ff9784d31a9233c925d1745752497cbe055df378b702169ed4cf1df144b00936566d9dbef4ae5ed9821933e70bec3ef71de4086b0a89f639df2bd57e1796ef3c"; } + { locale = "sl"; arch = "linux-x86_64"; sha512 = "673413e23de2de7daa9c4230105c6e58f21d4ebfc55b1df58c0351448d2f252e128c03ee59ba43525d6c92e2578af4c073e08f6250b4c94bb42beba81ae20f7a"; } + { locale = "sq"; arch = "linux-i686"; sha512 = "f2e3bccba1c8ad67d696e54e2001726cabe6f61e41daaa9dab2eee00cac7877a8af15c4876993ebed6042fe540c68b25fcee52888a6bd5ad6726875bb4489e05"; } + { locale = "sq"; arch = "linux-x86_64"; sha512 = "aa560ee3859d3bed0c5d5c4203b05ff47f7357b674c9d4ddad403a5f0c403994ecb982ca15b542ec9a32d0f27a5e04f41c574a1cbdc5f056c8a57e62de778f7b"; } + { locale = "sr"; arch = "linux-i686"; sha512 = "9739c33d30b7e6d6c28fc29f8f1badb06d32ae686fc684ec6743a5ffc4ba42d6060ba95c2bd1e3c2486c4d36ee0f14a1201f74768197073136991e49acec79ff"; } + { locale = "sr"; arch = "linux-x86_64"; sha512 = "5a86b2a9c67d489b21077eda647585291ddea2ea98d678b60fda134e11ee074ee39b06f84d3263d04b43358a10c04d4b238a65e9e3015801847e319850643bd3"; } + { locale = "sv-SE"; arch = "linux-i686"; sha512 = "e394654340d4f2da306149ed7cf0413ac0d40fb1488402e12e15c09c831585ecfcf6c355b420a902d76ec0aea7a5c9e234004f1ee19ed295d7b52343ab67c9a6"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "5d044f32243d99ffa8ab0b7345b0ea1a78d83cf6a921af0e89154c4f9f7caa21260f1e3c2c8287050dc44381f2979af51ab028efca7d197310d175dc86aecfcc"; } + { locale = "ta-LK"; arch = "linux-i686"; sha512 = "08154b5030c58cb52ef6b6584fc3d20d62e02cc0ee919f37c3a2e97f5afdac777f9dc6dd5881e3a87e5c20dfefdf816c068da014e42e111a3a8c7043b6e9002a"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "e8f88dbf82414cf680d9748c606ef73fef11a37bafd82a3cd79b5c5abebedf629993e7ecb3e3d6dcd3524fbda10b8b0af743e2948ac49141c76d008432706c4f"; } + { locale = "tr"; arch = "linux-i686"; sha512 = "63bcbce3c8f6e635cbfc73f83b33c6c6e9fd5f45f8878aa500772f807f1acdf611dcf4002084902937f95cd1abab1a76e00822327235e7b61ffb369b327974de"; } + { locale = "tr"; arch = "linux-x86_64"; sha512 = "cc5c84cd0854c0626e6c880e1abf4090f5488c84f39f52d466f2deb871ed55ad9890bf9f4a104c182ec292979eda56e4de114d328deddac5746ec9e969b6ecc6"; } + { locale = "uk"; arch = "linux-i686"; sha512 = "c55ae7ae3e388ec11d8c9bbeb3f18fa5883a5ea5b90d924e5f9a7d61876142a7b336eb50d35e54a405cee803ab7ad4d754a7ceb02cb9a2b9adeb415c44bd0c88"; } + { locale = "uk"; arch = "linux-x86_64"; sha512 = "42e535767e82c01868d2cd574805c814e7d67caaab9e531d0b82d36df92a2e42e19d8d6593b28c237b645e60035100d85a54b8acaba8c7a48ef83e865553cfc8"; } + { locale = "vi"; arch = "linux-i686"; sha512 = "52e05acb6c681ba62b608cb60d24816aaa35f296b6552b7006fe56b2f2d908a71736490c85e8bfb350d468510a031deedad65f691e4b77fc1dfee26bd30bdb41"; } + { locale = "vi"; arch = "linux-x86_64"; sha512 = "9a5b7cae14bcb8e390f7c8b7924a107058dc382e2627984f8c9eb5f380eb1d38b1152c928a5852d387d5d2b7ef7aa0d7393176a03dec0d3f1c1fade399149b7d"; } + { locale = "zh-CN"; arch = "linux-i686"; sha512 = "caa4533f57b85ed57ef66fe4807f8079d8bef73ad9a454e23a90154253c205a110e13fe1376c0a7d644b326f7dde888d8ed97ffedb8282d8887bb7131749f510"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "d025a3d878c6bf3ae9c1d07c023d89fc83b1c1314179f986fdac46066d334e209689d662bc7fef0fb7bfd7943cc741db5f397188b258ab42247a85c559ac27d7"; } + { locale = "zh-TW"; arch = "linux-i686"; sha512 = "d3e44f2f92ec4bf6b4a5dfebbcd2f05b323050ff88a1eb3b19301224a6815051e0e884e663dde834cef0a6889217ae94e446669aa0c97201c2d1f1bc2729c1b3"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "6c750b1f7f1253f1702178cdc80a1f8962961e16fd1f2e3f2f9d91062785349183e52799a399e60dcf7a3b7208a0755c3d7c137c28ee0b6ac99ccfa75e63b60f"; } ]; } From 7e40e89273df9ed15dc563401cd7c1343bcd0188 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 19:18:08 -0500 Subject: [PATCH 1019/1749] rpcbind: patch for CVE-2015-7236 --- pkgs/servers/rpcbind/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index ba2e1447ffe5..744763c43f11 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -1,10 +1,10 @@ -{ fetchurl, stdenv, pkgconfig, libtirpc +{ fetchurl, fetchpatch, stdenv, pkgconfig, libtirpc , useSystemd ? true, systemd }: let version = "0.2.3"; in stdenv.mkDerivation rec { name = "rpcbind-${version}"; - + src = fetchurl { url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2"; sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq"; @@ -13,6 +13,10 @@ in stdenv.mkDerivation rec { patches = [ ./sunrpc.patch ./0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch + (fetchpatch { + url = "https://sources.debian.net/data/main/r/rpcbind/0.2.3-0.5/debian/patches/CVE-2015-7236.patch"; + sha256 = "1wsv5j8f5djzxr11n4027x107cam1avmx9w34g6l5d9s61j763wq"; + }) ]; buildInputs = [ libtirpc ] From 16995fc57bbf0147b4b43d467f03dfeb4cb877a7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 19:19:25 -0500 Subject: [PATCH 1020/1749] boehmgc: 7.2f -> 7.2g --- pkgs/development/libraries/boehm-gc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index b0eec4e130b6..fb1f177d9695 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, enableLargeConfig ? false }: stdenv.mkDerivation rec { - name = "boehm-gc-7.2f"; + name = "boehm-gc-7.2g"; src = fetchurl { - url = http://www.hboehm.info/gc/gc_source/gc-7.2f.tar.gz; - sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16"; + url = http://www.hboehm.info/gc/gc_source/gc-7.2g.tar.gz; + sha256 = "0bvw6cc555qg5b7dgcqy3ryiw0wir79dqy0glff3hjmyy7i2jkjq"; }; patches = if stdenv.isCygwin then [ ./cygwin.patch ] else null; From ea07ad6bd9e3144248864a21b4999f32b78c2857 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 19:29:51 -0500 Subject: [PATCH 1021/1749] Revert "Revert "icu: patch for multiple CVEs"" icu: patch for multiple CVEs - CVE-2014-6585 - CVE-2015-4760 - CVE-2016-0494 - CVE-2016-6293 - CVE-2016-7415 --- pkgs/development/libraries/icu/54.1.nix | 5 ++-- pkgs/development/libraries/icu/default.nix | 34 +++++++++++++++++++++- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/icu/54.1.nix b/pkgs/development/libraries/icu/54.1.nix index cd4398b3cc03..a2465ce930ff 100644 --- a/pkgs/development/libraries/icu/54.1.nix +++ b/pkgs/development/libraries/icu/54.1.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, fixDarwinDylibNames }: +{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: let - icu = import ./default.nix { inherit stdenv fetchurl fixDarwinDylibNames; }; + icu = import ./default.nix { inherit stdenv fetchurl fetchpatch fixDarwinDylibNames; }; in stdenv.lib.overrideDerivation icu (attrs: { src = fetchurl { @@ -9,4 +9,3 @@ in sha256 = "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl"; }; }) - diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index ba8fe038ffac..d4a4c2a500c1 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fixDarwinDylibNames }: +{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: let pname = "icu4c"; @@ -25,6 +25,38 @@ stdenv.mkDerivation ({ echo Source root reset to ''${sourceRoot} ''; + # This pre/postPatch shenanigans is to handle that the patches expect + # to be outside of `source`. + prePatch = '' + pushd .. + ''; + postPatch = '' + popd + ''; + + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2014-6585.patch"; + sha256 = "1s8kqax444pqf5chwxvgsx1n1dx7v74h34fqh08fyq57mcjnpj4d"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2015-4760.patch"; + sha256 = "08gawyqbylk28i9pxv9vsw2drdpd6i97q0aml4nmv2xyb1ala0wp"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-0494.patch"; + sha256 = "1741s8lpmnizjprzk3xb7zkm5fznzgk8hhlrs8a338c18nalvxay"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-6293.patch"; + sha256 = "01h4xcss1vmsr60ijkv4lxsgvspwimyss61zp9nq4xd5i3kk1f4b"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-7415.patch"; + sha256 = "01d070h8d7rkj55ac8isr64m999bv5znc8vnxa7aajglsfidzs2r"; + }) + ]; + preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure ''; From 390f6a985bea5183e9e15d9dfe17e61aac86dd00 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 19:30:52 -0500 Subject: [PATCH 1022/1749] Revert "Revert "bzip2: patch for CVE-2016-3189"" This reverts commit 6393ca650eb9ef5f045905600c4256a0d0bf20b7. --- pkgs/tools/compression/bzip2/CVE-2016-3189.patch | 12 ++++++++++++ pkgs/tools/compression/bzip2/default.nix | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/compression/bzip2/CVE-2016-3189.patch diff --git a/pkgs/tools/compression/bzip2/CVE-2016-3189.patch b/pkgs/tools/compression/bzip2/CVE-2016-3189.patch new file mode 100644 index 000000000000..eff324b32503 --- /dev/null +++ b/pkgs/tools/compression/bzip2/CVE-2016-3189.patch @@ -0,0 +1,12 @@ +diff --git a/bzip2recover.c b/bzip2recover.c +index f9de049..252c1b7 100644 +--- a/bzip2recover.c ++++ b/bzip2recover.c +@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv ) + bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); + bsPutUInt32 ( bsWr, blockCRC ); + bsClose ( bsWr ); ++ outFile = NULL; + } + if (wrBlock >= rbCtr) break; + wrBlock++; diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index cabd412fe65d..51f478110659 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, fetchpatch , linkStatic ? (stdenv.system == "i686-cygwin") }: @@ -20,10 +20,16 @@ stdenv.mkDerivation rec { sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c"; }; + patches = [ + ./CVE-2016-3189.patch + ]; + + postPatch = '' sed -i -e '//s|\\|/|' bzip2.c ''; + outputs = [ "bin" "dev" "out" "man" ]; configureFlags = From a0f05feddffbfc3f399a324dfb167cdc25f74c94 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 29 Nov 2016 07:59:55 +0100 Subject: [PATCH 1023/1749] gtk3: 3.22.1 -> 3.22.4 Fixes #19945. --- pkgs/development/libraries/gtk+/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 9882cd7692c1..b50264f3a02a 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,7 +13,7 @@ with stdenv.lib; let ver_maj = "3.22"; - ver_min = "1"; + ver_min = "4"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "127c8c5cfc32681f9ab3cb542eb0d5c16c1c02faba68bf8fcac9a3cf278ef471"; + sha256 = "0zrq3wq4x0vcrzapps0608d5ywcrwk9xb2rmg32h2g8kzvyad53h"; }; outputs = [ "out" "dev" ]; From fe63e45c08d13a73ce3a94a5f94c43c771017c45 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:33:39 +0100 Subject: [PATCH 1024/1749] grafana: 3.1.1 -> 4.0.0 --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index de9f75b87cc9..821d049c2974 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "3.1.1"; - ts = "1470047149"; + version = "4.0.0"; + ts = "1480439068"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -10,12 +10,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "066qypjl9i0yl9jgqxh2fk6m4scrf84sfdl7b1jxgyq3c7zdzyvk"; + sha256 = "0ps9bi4mnb3k6g2824crhyb804srk2b4d2j9k306vg0cizirn75c"; }; srcStatic = fetchurl { url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-${ts}.linux-x64.tar.gz"; - sha256 = "0zywijk9lg7pzql28r8vswyjixkljfjznbqy7lp5wlq1mmihmxr0"; + sha256 = "10n3vmmyr1rvq29r5cz1rwz60smavj6fahz4vaqldh1v0qyqzjlm"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; From ca46d05f18666442b7160d17d58851ee3df31479 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:34:06 +0100 Subject: [PATCH 1025/1749] prometheus: 1.3.1 -> 1.4.1 --- pkgs/servers/monitoring/prometheus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 7f66aef9d111..a5fc6e4d94e6 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }: +{ stdenv, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "prometheus-${version}"; - version = "1.3.1"; + version = "1.4.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/prometheus"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "1q29ndi6dnflmv18y2qakipvialy7yfl308kv2vq9y2difij4pwi"; + sha256 = "05yd3y1b0406qdmx7p27pya9kzcrv66069z1y8dqwj3bf9c7csnm"; }; docheck = true; From 741bdeea389aae88f1120ed46ed4a8f51ba69b27 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:33:51 +0100 Subject: [PATCH 1026/1749] prometheus-alertmanager: 0.5.0 -> 0.5.1 --- pkgs/servers/monitoring/prometheus/alertmanager.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index fcdc4beb3c33..8bf9eef6cd09 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }: +{ stdenv, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.5.0"; + version = "0.5.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "1k30v0z5awnd6ys2ybc2m580y98nlifpgl7hly977nfhc6s90kvh"; + sha256 = "1z0f8jqbd4v00634qcs41h1zb70ahl63svlzn33gavripk84hwzq"; }; # Tests exist, but seem to clash with the firewall. @@ -31,7 +31,7 @@ buildGoPackage rec { description = "Alert dispatcher for the Prometheus monitoring system"; homepage = https://github.com/prometheus/alertmanager; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; }; } From 96137a6abd831ebbb6f87f8a9af6863654f84ec0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:34:21 +0100 Subject: [PATCH 1027/1749] prometheus-node-exporter: 0.12.0 -> 0.13.0 --- pkgs/servers/monitoring/prometheus/node-exporter.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 161b56c1d2dd..1115ca85f23f 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "node_exporter-${version}"; - version = "0.12.0"; - rev = version; + version = "0.13.0"; + rev = "v${version}"; goPackagePath = "github.com/prometheus/node_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "0ih8w9ji0fw1smsi45jgvrpqfzm3f5bvk9q3nwrl0my5xkksnr8g"; + sha256 = "03xk8zns0dvzs13jgiwl2dxj9aq4bbfmwsg0wq5piravxpszs09q"; }; # FIXME: megacli test fails @@ -21,7 +21,7 @@ buildGoPackage rec { description = "Prometheus exporter for machine metrics"; homepage = https://github.com/prometheus/node_exporter; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; }; } From ad5486689648e84b7f1317dec14b455e5628c148 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:37:37 +0100 Subject: [PATCH 1028/1749] prometheus-collectd-exporter: extra deps not necessary --- .../prometheus/collectd-exporter.nix | 4 +- .../prometheus/collectd-exporter_deps.nix | 65 ------------------- 2 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 6c703e5fa7bf..2bd9b6af0748 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -14,13 +14,11 @@ buildGoPackage rec { sha256 = "1p0kb7c8g0r0sp5a6xrx8vnwbw14hhwlqzk4n2xx2y8pvnbivajz"; }; - goDeps = ./collectd-exporter_deps.nix; - meta = with stdenv.lib; { description = "Relay server for exporting metrics from collectd to Prometheus"; homepage = https://github.com/prometheus/collectd_exporter; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix deleted file mode 100644 index 92523d699375..000000000000 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; - sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; - }; - } - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "hg"; - url = "bitbucket.org/ww/goautoneg"; - rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } -] From b24b6bbfb0efe9928c68aa98c1b7ddf5e1a792e5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:38:03 +0100 Subject: [PATCH 1029/1749] prometheus-blackbox-exporter: init at 0.3.0 --- .../prometheus/blackbox-exporter.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/blackbox-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix new file mode 100644 index 000000000000..00292afb8ce9 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "blackbox_exporter-${version}"; + version = "0.3.0"; + rev = version; + + goPackagePath = "github.com/prometheus/blackbox_exporter"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "prometheus"; + repo = "blackbox_exporter"; + sha256 = "0imn7ggxl5zqp8i4i8pnsipacx28dirm1mdmmxxbxc5aal3b656m"; + }; + + meta = with stdenv.lib; { + description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP"; + homepage = https://github.com/prometheus/blackbox_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ globin fpletz ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d9a1f1eb12e..e45c01bd821d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10359,6 +10359,7 @@ in prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; + prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-cli = callPackage ../servers/monitoring/prometheus/cli.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; From 30d974e68bd37dd099dc49843c078a0f115e9487 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:41:36 +0100 Subject: [PATCH 1030/1749] prometheus-haproxy-exporter: 0.7.0 -> 0.7.1 --- .../prometheus/haproxy-exporter.nix | 12 ++-- .../prometheus/haproxy-exporter_deps.nix | 65 ------------------- 2 files changed, 5 insertions(+), 72 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index ec63d5e63522..3a61480aea58 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "haproxy_exporter-${version}"; - version = "0.7.0"; - rev = version; + version = "0.7.1"; + rev = "v${version}"; goPackagePath = "github.com/prometheus/haproxy_exporter"; @@ -11,16 +11,14 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "haproxy_exporter"; - sha256 = "1jkijdawmnj5yps0yaj47nyfmcah0krwmqsjvicm3sl0dhwmac4w"; + sha256 = "1svwa1cw4yc5k8acj2r2hkall9csxjw51hgmwkmx5dq55gr9lzai"; }; - goDeps = ./haproxy-exporter_deps.nix; - meta = with stdenv.lib; { description = "HAProxy Exporter for the Prometheus monitoring system"; homepage = https://github.com/prometheus/haproxy_exporter; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix deleted file mode 100644 index 92523d699375..000000000000 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; - sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; - }; - } - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "hg"; - url = "bitbucket.org/ww/goautoneg"; - rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } -] From a07912203eadc22fa88a9df9dc96a18270af144b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:45:14 +0100 Subject: [PATCH 1031/1749] prometheus-mysqld-exporter: 0.8.1 -> 0.9.0 --- .../monitoring/prometheus/mysqld-exporter.nix | 10 +-- .../prometheus/mysqld-exporter_deps.nix | 74 ------------------- 2 files changed, 4 insertions(+), 80 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 5a274435e3da..ff6eca621e84 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mysqld_exporter-${version}"; - version = "0.8.1"; - rev = version; + version = "0.9.0"; + rev = "v${version}"; goPackagePath = "github.com/prometheus/mysqld_exporter"; @@ -11,11 +11,9 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "mysqld_exporter"; - sha256 = "0pwf2vii9n9zgad1lxgw28c2743yc9c3qc03516fiwvlqc1cpddr"; + sha256 = "0ldjrbhm6n7in4lj6l78xii10mg162rsp09ymjm7y2xar9sd70vp"; }; - goDeps = ./mysqld-exporter_deps.nix; - meta = with stdenv.lib; { description = "Prometheus exporter for MySQL server metrics"; homepage = https://github.com/prometheus/mysqld_exporter; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix deleted file mode 100644 index 4910832a62cc..000000000000 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; - sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; - }; - } - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "hg"; - url = "bitbucket.org/ww/goautoneg"; - rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "fb7299726d2e68745a8805b14f2ff44b5c2cfa84"; - sha256 = "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w"; - }; - } -] From 398bf54f639c1b028e77d118417e8010ff32ac7d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:51:30 +0100 Subject: [PATCH 1032/1749] prometheus-nginx-exporter: 20161104 -> 20161107 --- pkgs/servers/monitoring/prometheus/nginx-exporter.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 4c369f406100..013f80411ad6 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -1,16 +1,16 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "nginx_exporter-${version}"; - version = "20161104-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "1b2a3d124b6446a0159a68427b0dc3a8b9f32203"; + version = "20161107-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "2d7dfd13458c0d82671c03dc54f3aa0110a49a05"; goPackagePath = "github.com/discordianfish/nginx_exporter"; src = fetchgit { inherit rev; url = "https://github.com/discordianfish/nginx_exporter"; - sha256 = "19nmkn81m0nyq022bnmjr93wifig4mjcgvns7cbn31i197cydw28"; + sha256 = "17mjbf8v4h7ja87y02ggmyzl3g8ms8s37mcpcq1niijgli37h75d"; }; goDeps = ./nginx-exporter_deps.nix; @@ -19,7 +19,7 @@ buildGoPackage rec { description = "Metrics relay from nginx stats to Prometheus"; homepage = https://github.com/discordianfish/nginx_exporter; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; }; } From e945c7032dd24c5f7bac48af073019fa421a048e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 1 Dec 2016 01:52:07 +0100 Subject: [PATCH 1033/1749] prometheus-pushgateway: 0.3.0 -> 0.3.1 --- .../monitoring/prometheus/pushgateway.nix | 16 ++-- .../prometheus/pushgateway_deps.nix | 74 ------------------- 2 files changed, 7 insertions(+), 83 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/pushgateway_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 6a742796f308..ccddb078f474 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, go, buildGoPackage, go-bindata, fetchFromGitHub }: +{ stdenv, go, buildGoPackage, go-bindata, fetchFromGitHub }: buildGoPackage rec { name = "pushgateway-${version}"; - version = "0.3.0"; - rev = version; + version = "0.3.1"; + rev = "v${version}"; goPackagePath = "github.com/prometheus/pushgateway"; @@ -11,11 +11,9 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "1bj0s4s3gbcnlp2z2yx7jf3jx14cdg2v4pr0yciai0g6jwwg63hd"; + sha256 = "0ax83yy5hbfppcr66l9al7wxibcqfnyps05jdscvpwvgrg4q7ldk"; }; - goDeps = ./pushgateway_deps.nix; - buildInputs = [ go-bindata ]; preBuild = '' @@ -29,9 +27,9 @@ buildGoPackage rec { -ldflags= -X main.buildVersion=${version} -X main.buildRev=${rev} - -X main.buildBranch=master + -X main.buildBranch=${rev} -X main.buildUser=nix@nixpkgs - -X main.buildDate=20150101-00:00:00 + -X main.buildDate=19700101-00:00:00 -X main.goVersion=${stdenv.lib.getVersion go} ''; @@ -39,7 +37,7 @@ buildGoPackage rec { description = "Allows ephemeral and batch jobs to expose metrics to Prometheus"; homepage = https://github.com/prometheus/pushgateway; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix b/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix deleted file mode 100644 index 33795927ed90..000000000000 --- a/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; - sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; - }; - } - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "hg"; - url = "bitbucket.org/ww/goautoneg"; - rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7"; - sha256 = "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl"; - }; - } -] From f1fd88f7f43c89bb3136c6c1978ed3f614868109 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 30 Nov 2016 22:17:04 -0500 Subject: [PATCH 1034/1749] guile: apply patch fixing 00-repl-server.test stability --- pkgs/development/interpreters/guile/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 97f8f61a98e6..b0adb00cb87d 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring -, libffi, gawk, makeWrapper, coverageAnalysis ? null, gnu ? null }: +, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }: # Do either a coverage analysis build or a standard build. (if coverageAnalysis != null @@ -31,7 +31,13 @@ # libguile/vm-i-system.i is not created in time enableParallelBuilding = false; - patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch ] ++ + patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch + (fetchpatch { + # Fixes stability issues with 00-repl-server.test + url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4"; + sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v"; + }) + ] ++ (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); # Explicitly link against libgcc_s, to work around the infamous From 75cdbf48aecc55e8789efe7b4c6c71fe909efdb2 Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Wed, 30 Nov 2016 23:59:05 -0600 Subject: [PATCH 1035/1749] torbrowser: 6.0.6 -> 6.0.7 --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index be93b291dcc2..13f2b145663a 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "6.0.6"; + version = "6.0.7"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "0ydcbkpyrdwsqn841cxzpbr05nzly720xhsin89gjc1sirvmlxmx" else - "0q8ygkgs47wjq12l37kwm93v1420gzrlacwqc0yz4b3b58aa1d4z"; + "1llgqvxmn572wyxk7r1hf3j6ldi9hkgahm7918rsmsvk66i187h4" else + "16z8qfmcgxbvmv5hriv1gq4lpz54fy04mhhwdd6s72y52dfcvfy3"; }; desktopItem = makeDesktopItem { From e39584c67d24f38c1b050a599d162eb3e764a9bf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 09:36:31 +0100 Subject: [PATCH 1036/1749] pythonPackages.pyjwt: 1.4.0 -> 1.4.2 --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e558c7d43aeb..81f183e48769 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20249,14 +20249,15 @@ in { }; pyjwt = buildPythonPackage rec { - version = "1.4.0"; + version = "1.4.2"; name = "pyjwt-${version}"; src = pkgs.fetchurl { url = "http://github.com/progrium/pyjwt/archive/${version}.tar.gz"; - sha256 = "118rzhpyvx1h4hslms4fdizyv6mnyd4g34fv089lvs116pj08k9c"; + sha256 = "06vg84aicwkv0kli8i4jhg0kc6298cmh38ib058q01yxzk6q17gn"; }; + buildInputs = with self; [ pytestrunner pytestcov pytest_27 coverage ]; propagatedBuildInputs = with self; [ pycrypto ecdsa ]; meta = { From d22432880b83367a6e7b901427e48f1b70551727 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 09:36:46 +0100 Subject: [PATCH 1037/1749] pythonPackages.oauthlib: 0.7.2 -> 2.0.0 --- 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 81f183e48769..94c503964430 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16039,17 +16039,17 @@ in { }; oauthlib = buildPythonPackage rec { - version = "0.7.2"; + version = "2.0.0"; name = "oauthlib-${version}"; src = pkgs.fetchurl { - url = "https://github.com/idan/oauthlib/archive/${version}.tar.gz"; - sha256 = "08b7swyswhxh90k9mp54rk1qks2l2s2pdcjap6x118y27p7dhp4h"; + url = "https://github.com/idan/oauthlib/archive/v${version}.tar.gz"; + sha256 = "02b645a8rqh4xfs1cmj8sss8wqppiadd1ndq3av1cdjz2frfqcjf"; }; buildInputs = with self; [ mock nose unittest2 ]; - propagatedBuildInputs = with self; [ pycrypto blinker pyjwt ]; + propagatedBuildInputs = with self; [ cryptography blinker pyjwt ]; meta = { homepage = https://github.com/idan/oauthlib; From 1e17f21b3e844b28cb78142dd304b98a20fc8b3f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Dec 2016 12:55:24 +0100 Subject: [PATCH 1038/1749] firefox: 50.0.1 -> 50.0.2 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 15849b1f1edb..3ab8ced9fc82 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -147,8 +147,8 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "50.0.1"; - sha512 = "3gz7z5vk5zzwy6zzay4s72rbjmlgdgbij859ppzx6h38vhljj4vl7s9g5rg2byx9vjar593i9jhx46mr8bzr3530291aq8a7qmss4hw"; + version = "50.0.2"; + sha512 = "cfcc3e5a703e4d3284e3b3dcb34e5f77825e5a98b49a75bf22f8ac431c0429e6cd21c4e1f5e046fe82899cb4d2bc5b7a432b306c4af35034d83a9f351393f7fd"; }; firefox-esr-unwrapped = common { From b221fc137c76bbc118639f323bfaadfe04dd1456 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Dec 2016 13:02:35 +0100 Subject: [PATCH 1039/1749] nss: 3.27.1 -> 3.27.2 --- pkgs/development/libraries/nss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index ff8b0fec0a12..72f57dff1ce3 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.27.1"; + version = "3.27.2"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_27_1_RTM/src/${name}.tar.gz"; - sha256 = "fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b"; + url = "mirror://mozilla/security/nss/releases/NSS_3_27_2_RTM/src/${name}.tar.gz"; + sha256 = "dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524"; }; buildInputs = [ nspr perl zlib sqlite ]; From f4aab5b211e3302d81612bdc76aa8164c913ed8b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Dec 2016 13:06:41 +0100 Subject: [PATCH 1040/1749] thunderbird: 45.5.0 -> 45.5.1 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 9e2baf94527f..fb78c3cca24a 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -let version = "45.5.0"; in +let version = "45.5.1"; in let verName = "${version}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz"; - sha512 = "719469c4f66a9e4b09c360056c63ef2e1803334901dd4a23f12e455fe8ae4d0aba0a6273b3cf2796c925dc93f0add3df011ffe40148ef0b3f226d0b1a1c37b6a"; + sha512 = "f6dc5f526e50facb9947627fcbc8db222cc20438fa62c552090dcabeabcc31dba2c66c20345090deaf5b58fd42b54938935eb1b3904528dce5949fd4cfc1ceb7"; }; buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx From d42cfcec928982b86c3f263d7f2684741f2f71d6 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Thu, 1 Dec 2016 14:10:09 +0100 Subject: [PATCH 1041/1749] all-packages: move terminus-ttf beside terminus --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97c306e6a69e..c470ea24b8ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12023,6 +12023,8 @@ in terminus_font = callPackage ../data/fonts/terminus-font { }; + terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; + tipa = callPackage ../data/fonts/tipa { }; ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; @@ -17643,6 +17645,4 @@ in fpm2 = callPackage ../tools/security/fpm2 { }; simplenote = callPackage ../applications/misc/simplenote { }; - - terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; } From d2523a4f3db5fa80f835c10188dd59a25be0c2ee Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Thu, 1 Dec 2016 13:51:47 +0100 Subject: [PATCH 1042/1749] rssh: Make rssh a valid shell The rssh package did not have the 'shellPath' attribute, so it could not be used as the default shell for a nixos user. I fixed this by adding the attribute. --- pkgs/shells/rssh/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix index 8aa6c2608fa1..f1fb4d03121d 100644 --- a/pkgs/shells/rssh/default.nix +++ b/pkgs/shells/rssh/default.nix @@ -79,4 +79,8 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ arobyn ]; }; + + passthru = { + shellPath = "/bin/rssh"; + }; } From cef18b345d06791833f571568a2b88889aa7d780 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 1 Dec 2016 11:57:32 -0200 Subject: [PATCH 1043/1749] enlightenment: 0.21.3 -> 0.21.4 --- pkgs/desktops/enlightenment/enlightenment.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index e3d676fd4f6e..d2091eeb8e95 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -4,11 +4,11 @@ mesa_glu , xkeyboard_config }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.21.3"; + version = "0.21.4"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "1ljzcq775njhbcaj8vdnypf2rgc6yqqdwfkf7c22603qvv9if1dr"; + sha256 = "085zn6vdy904fxa9krx7ljv61yg96b2xk56g0bx2lyq1d33sgl8f"; }; nativeBuildInputs = [ pkgconfig ]; From 58d2d460d0bc11083ac2f547228fc11f589120a5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 1 Dec 2016 17:30:51 +0300 Subject: [PATCH 1044/1749] pythonPackages.pyrsistent: propagate six --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94c503964430..0808f6093879 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20512,7 +20512,8 @@ in { sha256 = "0jgyhkkq36wn36rymn4jiyqh2vdslmradq4a2mjkxfbk2cz6wpi5"; }; - buildInputs = with self; [ six pytest hypothesis ]; + propagatedBuildInputs = with self; [ six ]; + buildInputs = with self; [ pytest hypothesis ]; checkPhase = '' py.test From e72b7ebd980c1c9a0cac0b9499ab88105416d663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20G=C3=B6tz?= Date: Thu, 1 Dec 2016 15:40:37 +0100 Subject: [PATCH 1045/1749] youtube-dl: 2016.11.27 -> 2016.12.01 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index c1d4d3c15567..9dff0c8214f8 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.11.27"; + version = "2016.12.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "6ecc3996e28b6274d159643641a964098549b4cb8b33a3a3481148b88166e2cc"; + sha256 = "ddff281a251c7a40bf8c28afa1df63e9a64ff61b6b8097535fbbe587e8ccaef7"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From 16eb67ac9ca52d56ff13fb3cda2e4644df9f387b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 1 Dec 2016 17:20:33 +0100 Subject: [PATCH 1046/1749] hdf5: 1.8.16 -> 1.8.18 For release announcement, see https://support.hdfgroup.org/ftp/HDF5/current18/src/hdf5-1.8.18-RELEASE.txt --- pkgs/tools/misc/hdf5/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 0fd33fc3e394..7215cccbfed8 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -15,11 +15,11 @@ assert !cpp || mpi == null; with { inherit (stdenv.lib) optional optionals; }; stdenv.mkDerivation rec { - version = "1.8.16"; + version = "1.8.18"; name = "hdf5-${version}"; src = fetchurl { - url = "http://www.hdfgroup.org/ftp/HDF5/releases/${name}/src/${name}.tar.bz2"; - sha256 = "1ilq8pn9lxbf2wj2rdzwqabxismznjj1d23iw6g78w0bl5dsxahk"; + url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${name}/src/${name}.tar.bz2"; + sha256 = "13542vrnl1p35n8vbq0wzk40vddmm33q5nh04j98c7r1yjnxxih1"; }; passthru = { From 05c12f147e932c990f4b026b9efe0b7a1985461e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 26 Nov 2016 15:13:43 -0800 Subject: [PATCH 1047/1749] top-level: Move default-choosing logic to top-level/platforms.nix This mirrors stdenv/default.nix --- pkgs/top-level/default.nix | 24 +++++++----------------- pkgs/top-level/platforms.nix | 8 ++++++++ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 9464a8012b31..6b61110f1e73 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -24,12 +24,11 @@ config ? {} , crossSystem ? null -, platform ? null +, platform ? assert false; null } @ args: let # Rename the function arguments configExpr = config; - platform_ = platform; in let lib = import ../../lib; @@ -42,21 +41,12 @@ in let then configExpr { inherit pkgs; } else configExpr; - # Allow setting the platform in the config file. Otherwise, let's use a reasonable default (pc) - - platformAuto = let - platforms = (import ./platforms.nix); - in - if system == "armv6l-linux" then platforms.raspberrypi - else if system == "armv7l-linux" then platforms.armv7l-hf-multiplatform - else if system == "armv5tel-linux" then platforms.sheevaplug - else if system == "mips64el-linux" then platforms.fuloong2f_n32 - else if system == "x86_64-linux" then platforms.pc64 - else if system == "i686-linux" then platforms.pc32 - else platforms.pcBase; - - platform = if platform_ != null then platform_ - else config.platform or platformAuto; + # Allow setting the platform in the config file. Otherwise, let's use a + # reasonable default. + platform = + args.platform + or (config.platform + or (import ./platforms.nix).selectPlatformBySystem system); # A few packages make a new package set to draw their dependencies from. # (Currently to get a cross tool chain, or forced-i686 package.) Rather than diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index efeae9a9d202..671aaea4491a 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -443,4 +443,12 @@ rec { }; }; + selectPlatformBySystem = system: + if system == "armv6l-linux" then raspberrypi + else if system == "armv7l-linux" then armv7l-hf-multiplatform + else if system == "armv5tel-linux" then sheevaplug + else if system == "mips64el-linux" then fuloong2f_n32 + else if system == "x86_64-linux" then pc64 + else if system == "i686-linux" then pc32 + else pcBase; } From a55d1ecc9050a50904a13e3a34535990b9e61ae3 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 26 Nov 2016 15:34:13 -0800 Subject: [PATCH 1048/1749] top-level: Document why `nixpkgsFun` doesn't close over inferred default arguments --- pkgs/top-level/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 6b61110f1e73..a1f3a1c38c5c 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -55,8 +55,15 @@ in let # whatever arguments it doesn't explicitly provide. This way, # `all-packages.nix` doesn't know more than it needs too. # - # It's OK that `args` doesn't include the defaults: they'll be - # deterministically inferred the same way. + # It's OK that `args` doesn't include default arguemtns from this file: + # they'll be deterministically inferred. In fact we must *not* include them, + # because it's important that if some parameter which affects the default is + # substituted with a different argument, the default is re-inferred. + # + # To put this in concrete terms, this function is basically just used today to + # use package for a different platform for the current platform (namely cross + # compiling toolchains and 32-bit packages on x86_64). In both those cases we + # want the provided non-native `system` argument to affect the stdenv chosen. nixpkgsFun = newArgs: import ./. (args // newArgs); # Partially apply some arguments for building bootstraping stage pkgs From 4751d9e5ad124284dbd719d3a58f42d56f1b9514 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 30 Nov 2016 18:51:13 -0500 Subject: [PATCH 1049/1749] top-level: turn the screw - Non-cross stdenvs are honest and assert that `crossSystem` is null - `crossSystem` is a mandatory argument to top-level/stage.nix, just like `system` and `platform` - Broken default arguments on stdenvs for testing are gone. - All stdenvs (but little-used stdenvNix) take the same arguments for easy testing. --- pkgs/stdenv/custom/default.nix | 2 ++ pkgs/stdenv/darwin/default.nix | 10 +++++----- pkgs/stdenv/default.nix | 16 ++++++++-------- pkgs/stdenv/freebsd/default.nix | 8 ++++---- pkgs/stdenv/linux/default.nix | 10 +++++----- pkgs/stdenv/native/default.nix | 8 ++++++-- pkgs/top-level/stage.nix | 2 +- 7 files changed, 31 insertions(+), 25 deletions(-) diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index 174b8593c0aa..188d00277731 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -2,6 +2,8 @@ , system, platform, crossSystem, config }: +assert crossSystem == null; + rec { vanillaStdenv = import ../. { inherit lib allPackages system platform crossSystem; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 6182c8cc0c74..b9044f25cd7a 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1,7 +1,5 @@ -{ system ? builtins.currentSystem -, allPackages ? import ../../.. -, platform ? null -, config ? {} +{ lib, allPackages +, system, platform, crossSystem, config # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? let @@ -17,6 +15,8 @@ } }: +assert crossSystem == null; + let libSystemProfile = '' (import "${./standard-sandbox.sb}") @@ -100,7 +100,7 @@ in rec { }; thisPkgs = allPackages { - inherit system platform config; + inherit system platform crossSystem config; allowCustomOverrides = false; stdenv = thisStdenv; }; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 246e656f33bf..3b49d0de8306 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -9,7 +9,7 @@ lib, allPackages # Args to pass on to `allPacakges` too , system, platform, crossSystem, config -}: +} @ args: let # The native (i.e., impure) build environment. This one uses the @@ -17,7 +17,7 @@ let # i.e., the stuff in /bin, /usr/bin, etc. This environment should # be used with care, since many Nix packages will not build properly # with it (e.g., because they require GNU Make). - inherit (import ./native { inherit system allPackages config; }) stdenvNative; + inherit (import ./native args) stdenvNative; stdenvNativePkgs = allPackages { inherit system platform crossSystem config; @@ -28,22 +28,22 @@ let # The Nix build environment. - stdenvNix = import ./nix { + stdenvNix = assert crossSystem == null; import ./nix { inherit config lib; stdenv = stdenvNative; pkgs = stdenvNativePkgs; }; - inherit (import ./freebsd { inherit system allPackages platform config; }) stdenvFreeBSD; + inherit (import ./freebsd args) stdenvFreeBSD; # Linux standard environment. - inherit (import ./linux { inherit system allPackages platform config lib; }) stdenvLinux; + inherit (import ./linux args) stdenvLinux; - inherit (import ./darwin { inherit system allPackages platform config; }) stdenvDarwin; + inherit (import ./darwin args) stdenvDarwin; - inherit (import ./cross { inherit system allPackages platform crossSystem config lib; }) stdenvCross stdenvCrossiOS; + inherit (import ./cross args) stdenvCross stdenvCrossiOS; - inherit (import ./custom { inherit system allPackages platform crossSystem config lib; }) stdenvCustom; + inherit (import ./custom args) stdenvCustom; # Select the appropriate stdenv for the platform `system'. in diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 13cb21fe1d88..ea2ebcc7917a 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -1,9 +1,9 @@ -{ system ? builtins.currentSystem -, allPackages ? import ../../.. -, platform ? null -, config ? {} +{ lib, allPackages +, system, platform, crossSystem, config }: +assert crossSystem == null; + rec { inherit allPackages; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e4bf87c52024..34196359f525 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -3,11 +3,9 @@ # external (non-Nix) tools, such as /usr/bin/gcc, and it contains a C # compiler and linker that do not search in default locations, # ensuring purity of components produced by it. +{ lib, allPackages +, system, platform, crossSystem, config -# The function defaults are for easy testing. -{ system ? builtins.currentSystem -, allPackages ? import ../../.. -, platform ? null, config ? {}, lib ? (import ../../../lib) , bootstrapFiles ? if system == "i686-linux" then import ./bootstrap/i686.nix else if system == "x86_64-linux" then import ./bootstrap/x86_64.nix @@ -18,6 +16,8 @@ else abort "unsupported platform for the pure Linux stdenv" }: +assert crossSystem == null; + rec { commonPreHook = @@ -106,7 +106,7 @@ rec { }; thisPkgs = allPackages { - inherit system platform config; + inherit system platform crossSystem config; allowCustomOverrides = false; stdenv = thisStdenv; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 0f9aee214b30..8396bd0cb017 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -1,4 +1,8 @@ -{ system, allPackages ? import ../../.., config }: +{ lib, allPackages +, system, platform, crossSystem, config +}: + +assert crossSystem == null; rec { @@ -126,7 +130,7 @@ rec { } // {inherit fetchurl;}; stdenvBoot1Pkgs = allPackages { - inherit system platform config; + inherit system platform crossSystem config; allowCustomOverrides = false; stdenv = stdenvBoot1; }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 0c621b81c7ed..1d6305151ca6 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -30,7 +30,7 @@ , # The configuration attribute set config -, crossSystem ? null +, crossSystem , platform , lib , nixpkgsFun From 9e4538112ac0b2579cb140abb7798becb3af100e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 17:49:30 +0100 Subject: [PATCH 1050/1749] pythonPackages.acoustics: init at 0.1.2 --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0808f6093879..09f35be2798a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -41,6 +41,30 @@ in { setuptools = callPackage ../development/python-modules/setuptools { }; + acoustics = buildPythonPackage rec { + pname = "acoustics"; + version = "0.1.2"; + name = pname + "-" + version; + + buildInputs = with self; [ cython pytest ]; + propagatedBuildInputs = with self; [ numpy scipy matplotlib pandas tabulate ]; + + src = pkgs.fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "b75a47de700d01e704de95953a6e969922b2f510d7eefe59f7f8980ad44ad1b7"; + }; + + # Tests not distributed + doCheck = false; + + meta = { + description = "A package for acousticians"; + maintainer = with maintainers; [ fridh ]; + license = with licenses; [ bsd ]; + homepage = https://github.com/python-acoustics/python-acoustics; + }; + }; + agate = buildPythonPackage rec { name = "agate-1.2.2"; disabled = isPy3k; From d80d92793e75daba2ce5e941a0515ea8e3364639 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Nov 2016 12:27:59 +0100 Subject: [PATCH 1051/1749] LTS Haskell 7.11 --- .../configuration-hackage2nix.yaml | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ab42bbd08368..265edae2157b 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.10 + # LTS Haskell 7.11 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -380,7 +380,7 @@ default-package-overrides: - cpu ==0.1.2 - crackNum ==1.5 - criterion ==1.1.1.0 - - cron ==0.4.1.2 + - cron ==0.4.2 - crypto-api ==0.13.2 - crypto-api-tests ==0.3 - crypto-cipher-tests ==0.0.11 @@ -467,7 +467,7 @@ default-package-overrides: - djinn-lib ==0.0.1.2 - dlist ==0.8.0.2 - dlist-instances ==0.1.1.1 - - dns ==2.0.9 + - dns ==2.0.10 - do-list ==1.0.1 - dockerfile ==0.1.0.1 - docopt ==0.7.0.5 @@ -480,7 +480,7 @@ default-package-overrides: - double-conversion ==2.0.1.0 - download ==0.3.2.5 - dpor ==0.2.0.0 - - drawille ==0.1.0.6 + - drawille ==0.1.2.0 - DRBG ==0.5.5 - drifter ==0.2.2 - drifter-postgresql ==0.0.2 @@ -552,7 +552,7 @@ default-package-overrides: - fay-text ==0.3.2.2 - fay-uri ==0.2.0.0 - fb ==1.0.13 - - fclabels ==2.0.3.1 + - fclabels ==2.0.3.2 - feature-flags ==0.1.0.1 - feed ==0.3.11.1 - FenwickTree ==0.1.2.1 @@ -578,20 +578,20 @@ default-package-overrides: - fmlist ==0.9 - fn ==0.3.0.1 - focus ==0.1.5 - - fold-debounce ==0.2.0.3 + - fold-debounce ==0.2.0.4 - fold-debounce-conduit ==0.1.0.4 - foldl ==1.2.1 - FontyFruity ==0.5.3.2 - force-layout ==0.4.0.6 - forecast-io ==0.2.0.0 - foreign-store ==0.2 - - formatting ==6.2.3 + - formatting ==6.2.4 - fortran-src ==0.1.0.4 - Frames ==0.1.6 - free ==4.12.4 - free-vl ==0.1.4 - freenect ==1.2.1 - - freer ==0.2.3.0 + - freer ==0.2.4.1 - friendly-time ==0.4 - frisby ==0.2 - frontmatter ==0.1.0.2 @@ -652,7 +652,7 @@ default-package-overrides: - glabrous ==0.1.3.0 - GLFW-b ==1.4.8.1 - glib ==0.13.4.1 - - Glob ==0.7.12 + - Glob ==0.7.13 - gloss ==1.10.2.3 - gloss-rendering ==1.10.3.5 - GLURaw ==2.0.0.2 @@ -934,7 +934,7 @@ default-package-overrides: - htoml ==1.0.0.3 - HTTP ==4000.3.3 - http-api-data ==0.2.4 - - http-client ==0.4.31.1 + - http-client ==0.4.31.2 - http-client-openssl ==0.2.0.4 - http-client-tls ==0.2.4.1 - http-common ==0.8.2.0 @@ -1249,7 +1249,7 @@ default-package-overrides: - ObjectName ==1.1.0.1 - octane ==0.16.3 - Octree ==0.5.4.3 - - oeis ==0.3.7 + - oeis ==0.3.8 - ofx ==0.4.2.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 @@ -1257,7 +1257,7 @@ default-package-overrides: - once ==0.2 - OneTuple ==0.2.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.5.2.1 + - opaleye ==0.5.2.2 - opaleye-trans ==0.3.3 - open-browser ==0.2.1.0 - OpenGL ==3.0.1.0 @@ -1441,7 +1441,7 @@ default-package-overrides: - readable ==0.3.1 - ReadArgs ==1.2.2 - readline ==1.0.3.0 - - rebase ==1.0.3 + - rebase ==1.0.6 - redis-io ==0.7.0 - redis-resp ==0.4.0 - reducers ==3.12.1 @@ -1488,7 +1488,7 @@ default-package-overrides: - result ==0.2.6.0 - rethinkdb ==2.2.0.7 - rethinkdb-client-driver ==0.0.23 - - retry ==0.7.4.1 + - retry ==0.7.4.2 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - rng-utils ==0.2.1 @@ -1590,7 +1590,7 @@ default-package-overrides: - snap-core ==1.0.1.0 - snap-server ==1.0.1.1 - snowflake ==0.1.1.1 - - soap ==0.2.3.1 + - soap ==0.2.3.2 - soap-openssl ==0.1.0.2 - soap-tls ==0.1.1.2 - socket ==0.6.1.0 @@ -1771,12 +1771,12 @@ default-package-overrides: - transformers-compat ==0.5.1.4 - transformers-lift ==0.1.0.1 - transient ==0.4.4.1 - - transient-universe ==0.3.5 + - transient-universe ==0.3.5.1 - traverse-with-class ==0.2.0.4 - tree-fun ==0.8.1.0 - tree-view ==0.4 - tries ==0.0.4 - - trifecta ==1.6 + - trifecta ==1.6.1 - true-name ==0.1.0.2 - ttrie ==0.1.2.1 - tttool ==1.6.1.2 @@ -1798,7 +1798,7 @@ default-package-overrides: - typelits-witnesses ==0.2.3.0 - typography-geometry ==1.0.0.1 - tzdata ==0.1.20160614.0 - - ua-parser ==0.7.1 + - ua-parser ==0.7.2 - uglymemo ==0.1.0.1 - unbound ==0.5.1 - unbound-generics ==0.3.1 @@ -1828,7 +1828,7 @@ default-package-overrides: - unix-time ==0.3.7 - Unixutils ==1.54.1 - unordered-containers ==0.2.7.1 - - uri-bytestring ==0.2.2.0 + - uri-bytestring ==0.2.2.1 - uri-encode ==1.5.0.5 - url ==2.1.3 - urlpath ==5.0.0.1 @@ -1846,7 +1846,7 @@ default-package-overrides: - uuid-types ==1.0.3 - vado ==0.0.7 - validate-input ==0.4.0.0 - - validation ==0.5.3 + - validation ==0.5.4 - varying ==0.5.0.3 - vault ==0.3.0.6 - vcswrapper ==0.1.3 @@ -1910,7 +1910,7 @@ default-package-overrides: - weigh ==0.0.3 - werewolf ==1.5.1.1 - werewolf-slack ==1.0.2.0 - - wikicfp-scraper ==0.1.0.5 + - wikicfp-scraper ==0.1.0.6 - Win32 ==2.3.1.1 - Win32-extras ==0.2.0.1 - Win32-notify ==0.3.0.1 @@ -1928,8 +1928,8 @@ default-package-overrides: - Workflow ==0.8.3 - wrap ==0.0.0 - wreq ==0.4.1.0 - - writer-cps-mtl ==0.1.0.2 - - writer-cps-transformers ==0.1.0.2 + - writer-cps-mtl ==0.1.1.0 + - writer-cps-transformers ==0.1.1.0 - wuss ==1.1.1 - X11 ==1.6.1.2 - x509 ==1.6.4 From 10b832e4645d379def491a91428e5fc8d9c36e22 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 27 Nov 2016 17:36:27 +0100 Subject: [PATCH 1052/1749] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-11-g4525071 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/7c09fb8e04139674e977af03bfeb1a586e0d1a95. --- .../haskell-modules/hackage-packages.nix | 2094 +++++++++++------ 1 file changed, 1425 insertions(+), 669 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bd046c77d50b..4640b607e7ce 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1768,8 +1768,8 @@ self: { }: mkDerivation { pname = "BlogLiterately-diagrams"; - version = "0.2.0.3"; - sha256 = "a7aeaa8154c62fb6e64f661c34bc28f35b02ec5a8d87f6100a8d945b59db82c1"; + version = "0.2.0.4"; + sha256 = "392de367b3caaa293a6a1d341217c8c08e58c14b3cddd3943b88b59a3b848b6e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6142,29 +6142,6 @@ self: { }) {}; "Glob" = callPackage - ({ mkDerivation, base, containers, directory, dlist, filepath - , HUnit, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, transformers, transformers-compat - }: - mkDerivation { - pname = "Glob"; - version = "0.7.12"; - sha256 = "c7ca5459b2d98ae9f5db56351a512680c4375cfdf907073848aaf15d6b92c175"; - libraryHaskellDepends = [ - base containers directory dlist filepath transformers - transformers-compat - ]; - testHaskellDepends = [ - base containers directory dlist filepath HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - transformers transformers-compat - ]; - homepage = "http://iki.fi/matti.niemenmaa/glob/"; - description = "Globbing library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Glob_0_7_13" = callPackage ({ mkDerivation, base, containers, directory, dlist, filepath , HUnit, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers, transformers-compat @@ -6185,7 +6162,6 @@ self: { homepage = "http://iki.fi/matti.niemenmaa/glob/"; description = "Globbing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GlomeTrace" = callPackage @@ -7363,7 +7339,7 @@ self: { "HJVM" = callPackage ({ mkDerivation, base, Cabal, containers, filepath - , haskell-src-exts, HUnit, jvm, mtl, parsec, process + , haskell-src-exts, HUnit, jdk, mtl, parsec, process , test-framework, test-framework-hunit, transformers }: mkDerivation { @@ -7374,7 +7350,7 @@ self: { base containers filepath haskell-src-exts mtl parsec process transformers ]; - librarySystemDepends = [ jvm ]; + librarySystemDepends = [ jdk ]; testHaskellDepends = [ base Cabal haskell-src-exts HUnit mtl parsec test-framework test-framework-hunit transformers @@ -7383,7 +7359,7 @@ self: { description = "A library to create a Java Virtual Machine and manipulate Java objects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {jvm = null;}; + }) {inherit (pkgs) jdk;}; "HJavaScript" = callPackage ({ mkDerivation, base, pretty }: @@ -12149,8 +12125,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, net_snmp, process }: mkDerivation { pname = "NetSNMP"; - version = "0.3.2.4"; - sha256 = "45ee5a82f1cecc381299d1998ae194ee05348a30cfa827cd5aea277310bf5c5b"; + version = "0.3.2.5"; + sha256 = "e036a091b68190b8a6491cde1e14189f00c0c04de05a07a12678dc48d587543f"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ net_snmp ]; testHaskellDepends = [ base bytestring HUnit process ]; @@ -12802,6 +12778,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) mesa;}; + "OpenGLRaw_3_2_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, fixed, half, mesa + , text, transformers + }: + mkDerivation { + pname = "OpenGLRaw"; + version = "3.2.4.0"; + sha256 = "e3f9910be96b375fdf30db5a2cb6d55869eab11d507aa14edee177495c7dcb2e"; + libraryHaskellDepends = [ + base bytestring containers fixed half text transformers + ]; + librarySystemDepends = [ mesa ]; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A raw binding for the OpenGL graphics system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) mesa;}; + "OpenGLRaw21" = callPackage ({ mkDerivation, OpenGLRaw }: mkDerivation { @@ -18324,8 +18318,8 @@ self: { pname = "ZEBEDDE"; version = "0.1.0.0"; sha256 = "27b4f25adda6a500627a9311fe4c74c92dae0a18789cc7ea8e828c74a0ba05c5"; - revision = "3"; - editedCabalFile = "bd302015dbeab652042fed7c86f942d1cdf28d365de82e742290d5aac13d97c2"; + revision = "5"; + editedCabalFile = "5974fb98c510f354b64292143938ae0ccaebf69acd95400b5ac0cdb1d7deba9d"; libraryHaskellDepends = [ base vect ]; description = "Polymer growth simulation method"; license = stdenv.lib.licenses.bsd3; @@ -19521,8 +19515,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "acme-year"; - version = "2015"; - sha256 = "3b8b506b4d38b3e781aa3296f10643e76214a3a80e023c653951c41d8aefbafa"; + version = "2016"; + sha256 = "b43d1f33434930d8f6f2971eef34bd12c305f3976d7115688b87b00c85f170ff"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; homepage = "http://github.com/joeyadams/hs-acme-year"; @@ -20146,8 +20140,8 @@ self: { }: mkDerivation { pname = "aeson-filthy"; - version = "0.1"; - sha256 = "d4dc207915fca4e65a2de331898ea870c9e09247a93dd0bc0abe159b932ee0b4"; + version = "0.1.1"; + sha256 = "58fda3fb2ba49a952242d570bce4fa2cae47c0a47957e5f4b9ef66b9de5663cb"; libraryHaskellDepends = [ aeson base bytestring text unordered-containers ]; @@ -20845,8 +20839,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "0.3"; - sha256 = "400b00cde06525918c0ece01f1a5c411b27c4d5f45d9316ccb03380255e1a911"; + version = "0.3.1"; + sha256 = "e5db4e1da578aa873d1777a82ce3ab84af8fc58cc55ac76d19835bb4e004e852"; libraryHaskellDepends = [ aivika aivika-transformers base binary containers distributed-process exceptions mtl random stm time @@ -20963,8 +20957,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "4.6"; - sha256 = "7b4c8179260f865fb6e00005c679ee9894403f098ae462082891bd0f6bed59ef"; + version = "4.6.1"; + sha256 = "0177336d1d520bf303a3702a90dd33e31195d825f949872f3525fe940b7c01f8"; libraryHaskellDepends = [ aivika array base containers mtl random vector ]; @@ -33282,6 +33276,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-html_0_8_1_3" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring + , containers, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-html"; + version = "0.8.1.3"; + sha256 = "8c16e717d353f981e0cd67b50f89ef6f94ab9c56662b3e58bd8a6c552433d637"; + libraryHaskellDepends = [ + base blaze-builder blaze-markup bytestring text + ]; + testHaskellDepends = [ + base blaze-builder blaze-markup bytestring containers HUnit + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast HTML combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-html-contrib" = callPackage ({ mkDerivation, base, blaze-html, cgi, data-default, network, safe , text @@ -33370,6 +33387,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-markup_0_7_1_1" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.7.1.1"; + sha256 = "638da5984ecd5bcc87f5836786ff93352058a8856bea428d7ffd25bc26c54303"; + libraryHaskellDepends = [ base blaze-builder bytestring text ]; + testHaskellDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-shields" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }: mkDerivation { @@ -33717,14 +33754,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "blosum_0_1_1_3" = callPackage + "blosum_0_1_1_4" = callPackage ({ mkDerivation, base, containers, fasta, lens , optparse-applicative, pipes, pipes-text, split, text, text-show }: mkDerivation { pname = "blosum"; - version = "0.1.1.3"; - sha256 = "bff68ec89bf8f7c70b18a8d13df8b9e464eea6168ec3df935f7d3391e6196de1"; + version = "0.1.1.4"; + sha256 = "44b12d24d56bfadec7a53c1d620e1cc52f4126ba01ab541a135b187846c10380"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34135,6 +34172,8 @@ self: { pname = "boolsimplifier"; version = "0.1.8"; sha256 = "096fa9377241520ee114403fd53b51a7369187fb4dca65f19f85a727d689828f"; + revision = "1"; + editedCabalFile = "d05220c8f3aaeb0c5f6f92cd6c3d869b7f5253b66cdb6d5d392b9198ec061577"; libraryHaskellDepends = [ base containers ]; description = "Simplification tools for simple propositional formulas"; license = stdenv.lib.licenses.bsd3; @@ -34800,8 +34839,8 @@ self: { }: mkDerivation { pname = "buffer-builder"; - version = "0.2.4.3"; - sha256 = "8a3da08e222498a245405d77eed7da90a943e848396291e617ba0b6daf27ad6f"; + version = "0.2.4.4"; + sha256 = "01c0bafb776784a08c041abfc89c3eaee3236bf5555b98e9542676dc43db2dd8"; libraryHaskellDepends = [ base bytestring mtl text unordered-containers vector ]; @@ -35393,6 +35432,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytestring-handle_0_1_0_5" = callPackage + ({ mkDerivation, base, bytestring, HUnit, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "bytestring-handle"; + version = "0.1.0.5"; + sha256 = "a2c426f35ba32822e45bcc2e6d4945bbb2ee10b8540bb0965ab6f3304325bb83"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://hub.darcs.net/ganesh/bytestring-handle"; + description = "ByteString-backed Handles"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytestring-lexing" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -35914,8 +35972,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.35.3"; - sha256 = "09d5531215a3c963adc80bd40402d16c7a59698537ee4d21c7d3f9b7c486d56f"; + version = "4.35.5"; + sha256 = "7cd914109290b09c8269a42809cb0d0c29d5e9f9dec8226333d2e3179bb8c381"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35928,10 +35986,6 @@ self: { executableHaskellDepends = [ base Cabal debian lens mtl pretty Unixutils ]; - testHaskellDepends = [ - base Cabal containers debian Diff directory filepath hsemail HUnit - lens pretty process text - ]; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; @@ -36005,6 +36059,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-file-th_0_2_4" = callPackage + ({ mkDerivation, base, Cabal, directory, pretty, template-haskell + }: + mkDerivation { + pname = "cabal-file-th"; + version = "0.2.4"; + sha256 = "0b55d7ffacd0c6324fa7c8b8f148e788e6b899fb9bf8795285dea66575bed91c"; + libraryHaskellDepends = [ + base Cabal directory pretty template-haskell + ]; + testHaskellDepends = [ base Cabal ]; + homepage = "http://github.com/nkpart/cabal-file-th"; + description = "Template Haskell expressions for reading fields from a project's cabal file"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-ghc-dynflags" = callPackage ({ mkDerivation, base, Cabal, ghc, transformers }: mkDerivation { @@ -36358,6 +36429,25 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "cabal-rpm_0_10_1" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath, old-locale + , process, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "0.10.1"; + sha256 = "46aae9f3b5734ceb9c35d9a5dbe7603bd26235169f16a10035078de33140cde9"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal directory filepath old-locale process time unix + ]; + homepage = "https://github.com/juhp/cabal-rpm"; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -38399,6 +38489,29 @@ self: { pname = "cayley-client"; version = "0.2.1.0"; sha256 = "670264faf8ac3366ffe40d22fae24fde437d60fffbff6f1753a92aef798a1c19"; + revision = "1"; + editedCabalFile = "96e6564d03d1aa6a47aba589a085374b0c50a85af96ed56d1f884774905c0359"; + libraryHaskellDepends = [ + aeson attoparsec base binary bytestring exceptions http-client + http-conduit lens lens-aeson mtl text transformers + unordered-containers vector + ]; + testHaskellDepends = [ aeson base hspec unordered-containers ]; + homepage = "https://github.com/MichelBoucey/cayley-client"; + description = "A Haskell client for the Cayley graph database"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cayley-client_0_2_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring + , exceptions, hspec, http-client, http-conduit, lens, lens-aeson + , mtl, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "cayley-client"; + version = "0.2.1.1"; + sha256 = "04547226bf0e504d41527de6e2d81ba66d6c59d4460e2ce37f34a6d9aca747cf"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -39660,8 +39773,10 @@ self: { }: mkDerivation { pname = "chronos"; - version = "0.2.0"; - sha256 = "229742c16772aa4befe5b37c4f6862b128ef51fbdcef07ac856f3349d4b7dd70"; + version = "0.3"; + sha256 = "97e9bcdb2a65bb5034d2d6af2e0ac23dd91e797d7d4b914bad0110e9740486b5"; + revision = "1"; + editedCabalFile = "61e89d96d116d28efa59ca1583ce5e1a9dd6bbc8a644000f182233aa5fb480a0"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -39670,7 +39785,7 @@ self: { test-framework-hunit test-framework-quickcheck2 text ]; homepage = "https://github.com/andrewthad/chronos#readme"; - description = "A time library, encoding, decoding, and instances"; + description = "A performant time library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -40516,6 +40631,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "classy-prelude_1_0_2" = 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, say + , semigroups, stm, stm-chans, text, time, time-locale-compat + , transformers, transformers-base, unordered-containers, vector + , vector-instances + }: + mkDerivation { + pname = "classy-prelude"; + version = "1.0.2"; + sha256 = "4e5facf997758af2f15387349f373997abeee3edf3a3953e412490d4a9f5a467"; + 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 say semigroups stm stm-chans 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-conduit" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet @@ -40538,6 +40685,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "classy-prelude-conduit_1_0_2" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, conduit + , conduit-combinators, hspec, monad-control, QuickCheck, resourcet + , transformers, void + }: + mkDerivation { + pname = "classy-prelude-conduit"; + version = "1.0.2"; + sha256 = "ab8f17db80cf1058013e00a16078275681faa93f91894263cf6a608c03843f19"; + 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-yesod" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types @@ -40558,6 +40727,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "classy-prelude-yesod_1_0_2" = 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.2"; + sha256 = "3183921a292159e8deb0ed63130defa239510beb1692f505438edebd2ca19406"; + 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; + }) {}; + "classyplate" = callPackage ({ mkDerivation, base, template-haskell, type-list }: mkDerivation { @@ -42926,8 +43115,8 @@ self: { ({ mkDerivation, base, doctest, QuickCheck }: mkDerivation { pname = "composition-tree"; - version = "0.2.0.2"; - sha256 = "67d26787ad5e35d1840b5e1bd325bb12815bd151faa0f6e13aaeb55e63af9bd6"; + version = "0.2.0.3"; + sha256 = "40243191eb557a9a5d7a6986dee5aa56968a3f36901a2ca6035310cfc4b255cc"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck ]; homepage = "https://github.com/liamoc/composition-tree"; @@ -43627,6 +43816,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-combinators_1_0_8_3" = 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.3"; + sha256 = "3b81e379c4dcb1cb6212bcbad1d0714e46f400ebf9ae2abe23621db500406dbe"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-connection" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, HUnit , network, resourcet, test-framework, test-framework-hunit @@ -44220,6 +44438,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "console-style" = callPackage + ({ mkDerivation, base, mtl, semigroups, transformers }: + mkDerivation { + pname = "console-style"; + version = "0.0.2.0"; + sha256 = "5e6e372560a61bcd882af5f8255e6c3fbe4d28e8ad459e3dc9c28853ef809f5c"; + libraryHaskellDepends = [ base mtl semigroups transformers ]; + homepage = "https://github.com/minad/console-style#readme"; + description = "Styled console text output using ANSI escape sequences"; + license = stdenv.lib.licenses.mit; + }) {}; + "const-math-ghc-plugin" = callPackage ({ mkDerivation, base, containers, directory, ghc, process }: mkDerivation { @@ -46540,27 +46770,6 @@ self: { }) {}; "cron" = callPackage - ({ mkDerivation, attoparsec, base, derive, mtl, mtl-compat - , old-locale, quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers-compat - }: - mkDerivation { - pname = "cron"; - version = "0.4.1.2"; - sha256 = "554c0b971306e55815cce41e2b1c6cc14aaecd7728795310d13b114e5260daa5"; - libraryHaskellDepends = [ - attoparsec base mtl mtl-compat old-locale semigroups text time - ]; - testHaskellDepends = [ - attoparsec base derive 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; - }) {}; - - "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 @@ -46581,7 +46790,6 @@ self: { 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 @@ -47272,8 +47480,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.5.0"; - sha256 = "6eacf0967f30ae543f25e3a0982f015c10d7241dba680b5d889bfe5a4ad6d29e"; + version = "0.6.0"; + sha256 = "08d43d6d701b85ffa3617c8142e23a32daef3156a704b0d30d892e1beb875424"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -47291,8 +47499,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.0.1"; - sha256 = "ed771c3351358b67b25aecfaebdacdf38c5dffe2dddf306dc93466fd440c3978"; + version = "5.1.0"; + sha256 = "3d42e34bb20823342974362c08f6bc386656922119020b34dbf92c39e72c8885"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -47309,8 +47517,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.1.6"; - sha256 = "846b3c456ba92f538b101a682fe796e91352c680070344f6296db99b740a64a2"; + version = "0.2.0"; + sha256 = "901b7811a296ab59b2baecf161e69c478da2f4b9a1f8d24d5e0c7063704df475"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse hashable transformers wl-pprint @@ -47342,8 +47550,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.0.9.3"; - sha256 = "b63d2a0634f789a851b897755db0d0596c48ba4348bd224c60d450e7c8803a06"; + version = "0.1.0.0"; + sha256 = "ecff32336825df2197502e7b464c00b3fd1dc40eaab52f40cd9a585c4180e866"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic data-default deepseq ghc-prim hashable temporal-media transformers @@ -47358,8 +47566,8 @@ self: { ({ mkDerivation, base, csound-expression, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.6.5"; - sha256 = "f68d07f9099f4f89395fe60093164a4ac2bbe2bf6aa2aaa3d3eae0fb7b349058"; + version = "0.0.7.0"; + sha256 = "deb478e275edcf7dada65f57ace1989d3e9e8f1c2fe2ef81aa1c257f82236870"; libraryHaskellDepends = [ base csound-expression transformers ]; homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; @@ -47399,6 +47607,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cspretty" = callPackage + ({ mkDerivation, base, containers, pretty }: + mkDerivation { + pname = "cspretty"; + version = "1.0"; + sha256 = "29a77c88684614ca41e88d8ee83b51cbd62ab12f7770701cb6699bc38d0a3909"; + libraryHaskellDepends = [ base containers pretty ]; + description = "AST and pretty printer for CSPm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "css" = callPackage ({ mkDerivation, base, mtl, text }: mkDerivation { @@ -47726,8 +47945,8 @@ self: { ({ mkDerivation, array, base, c2hs, cudd, mtl, transformers }: mkDerivation { pname = "cudd"; - version = "0.1.0.3"; - sha256 = "8e0684c4e01f4d48140d3cedbe15548c747a389e4e32bbe388a1341350dd675d"; + version = "0.1.0.3.1"; + sha256 = "95c05f80bb0caad6bc372ab511a7a74c6cf1c025c54d15105a573b3fec64d730"; libraryHaskellDepends = [ array base mtl transformers ]; librarySystemDepends = [ cudd ]; libraryToolDepends = [ c2hs ]; @@ -50255,8 +50474,8 @@ self: { }: mkDerivation { pname = "datasets"; - version = "0.2.0.2"; - sha256 = "e79f13a2001031230b968d582bc5c3567568b673d4ea9cc3571451c2deaddae2"; + version = "0.2.1"; + sha256 = "af3d9e9093358b9b1a320645a0411c750e9b7ed723f3d29088b5addaeeeb1277"; libraryHaskellDepends = [ aeson base bytestring cassava directory file-embed filepath hashable HTTP stringsearch text time vector @@ -52050,12 +52269,14 @@ self: { ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "derive-storable"; - version = "0.1.0.3"; - sha256 = "64e1101e32e58421efc4eeaef4e1da4449b52e525793d6cde3da892c6662729e"; + version = "0.1.0.4"; + sha256 = "eb45d84603824334442b68ef07eb107d1b7ccd69e17161ef2a7fc5b5b4df339a"; + revision = "1"; + editedCabalFile = "7b6e8b2dc9d542e818d131d4f6e52a14fed5dce75c20855b7f2d21ab51b74608"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://www.github.com/mkloczko/derive-storable/"; - description = "Derive Storable instances with help of GHC.Generics."; + description = "Derive Storable instances with GHC.Generics."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -52435,8 +52656,8 @@ self: { }: mkDerivation { pname = "diagrams-builder"; - version = "0.8"; - sha256 = "28633d2a5374ba3c9e56ff798242889986b9a5958e0bd2b35df342b4ac4c5744"; + version = "0.8.0.1"; + sha256 = "6e9b0eba4c9aa698ffdd21d55492b4cfd867cd4107ed8ccc591888cba7fe5b1c"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -52685,8 +52906,8 @@ self: { }: mkDerivation { pname = "diagrams-haddock"; - version = "0.4"; - sha256 = "79dbb7fa0b28b04cf0804fb993e04b22f7e1261089c0aa4e7fe06894edcce0b9"; + version = "0.4.0.1"; + sha256 = "594ed547bbbdce511f48048bc3626c134bc468133e908fe3512d2fadeb7342f4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53416,8 +53637,8 @@ self: { }: mkDerivation { pname = "digestive-bootstrap"; - version = "0.1.0.1"; - sha256 = "eb7d7586903f07c4519c4ff862923344e912268f686394cb4f550bd9ef0418f7"; + version = "0.3.0.0"; + sha256 = "5898973e9887a18b7763d0412b3b3569426fae506e2033608a9ec4e0c1eeec03"; libraryHaskellDepends = [ base blaze-bootstrap blaze-html digestive-functors digestive-functors-blaze http-types text @@ -54811,10 +55032,8 @@ self: { }: mkDerivation { pname = "dixi"; - version = "0.6.9.1"; - sha256 = "938923def44d17f193907edc2e928fe63eeca685dd9f5527c791718e3e8e6c6a"; - revision = "1"; - editedCabalFile = "1165d61068ddfdb1f480130f9aefc110505e0514484014fe4f3b69ecdd8e1b61"; + version = "0.6.9.2"; + sha256 = "39190af5648c2f39f133d140856d62cceefbe96f02a570bba68d442908dcb6d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55010,29 +55229,6 @@ self: { }) {}; "dns" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring - , bytestring-builder, conduit, conduit-extra, containers, doctest - , hspec, iproute, mtl, network, random, resourcet, safe, word8 - }: - mkDerivation { - pname = "dns"; - version = "2.0.9"; - sha256 = "b0d6c335dd9fdfa85e8389c67fc4a132d47ecb871c32332cb7858ceaa045fb8c"; - libraryHaskellDepends = [ - attoparsec base binary bytestring bytestring-builder conduit - conduit-extra containers iproute mtl network random resourcet safe - ]; - testHaskellDepends = [ - attoparsec base binary bytestring bytestring-builder conduit - conduit-extra containers doctest hspec iproute mtl network random - resourcet safe word8 - ]; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dns_2_0_10" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-builder, conduit, conduit-extra, containers, doctest , hspec, iproute, mtl, network, random, resourcet, safe, word8 @@ -55053,7 +55249,6 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnscache" = callPackage @@ -56026,19 +56221,6 @@ self: { }) {}; "drawille" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck }: - mkDerivation { - pname = "drawille"; - version = "0.1.0.6"; - sha256 = "3282ca7d783580f95349ffd85b6f668f57a354aad74a84c37406fc8ef2636c09"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - homepage = "https://github.com/yamadapc/haskell-drawille"; - description = "A port of asciimoo's drawille to haskell"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "drawille_0_1_2_0" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck }: mkDerivation { pname = "drawille"; @@ -56049,26 +56231,25 @@ self: { 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 + , optparse-applicative, text, time, unordered-containers, vector }: mkDerivation { pname = "dresdner-verkehrsbetriebe"; - version = "0.1.1"; - sha256 = "380af7c7a9181b3d8b3a9e1bce271a71071781d3055a669b31492217f6c8babf"; + version = "1.0.0"; + sha256 = "8c23ab7f2f3b8c7c885eb5f6fd9aff7f644656a07ad2a4b0cd13437f9201b20a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring HTTP old-locale time unordered-containers - vector + aeson base bytestring HTTP old-locale text time + unordered-containers vector ]; executableHaskellDepends = [ - aeson base bytestring HTTP old-locale optparse-applicative time - unordered-containers vector + aeson base bytestring HTTP old-locale optparse-applicative text + time unordered-containers vector ]; description = "Library and program for querying DVB (Dresdner Verkehrsbetriebe AG)"; license = stdenv.lib.licenses.mit; @@ -57209,6 +57390,31 @@ self: { license = "unknown"; }) {}; + "ede_0_2_8_6" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors + , bytestring, comonad, directory, filepath, free, lens, mtl + , parsers, scientific, semigroups, tasty, tasty-golden, text + , text-format, text-manipulate, trifecta, unordered-containers + , vector + }: + mkDerivation { + pname = "ede"; + version = "0.2.8.6"; + sha256 = "6388ce61ebc6153fcae1aeabe426ef4eb07f2080fd5019bb4d441184570cf2a5"; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base bifunctors bytestring comonad directory + filepath free lens mtl parsers scientific semigroups text + text-format text-manipulate trifecta unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring directory tasty tasty-golden text + ]; + homepage = "http://github.com/brendanhay/ede"; + description = "Templating language with similar syntax and features to Liquid or Jinja2"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "edenmodules" = callPackage ({ mkDerivation, base, containers, deepseq, parallel }: mkDerivation { @@ -59577,6 +59783,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "errors_2_1_3" = callPackage + ({ mkDerivation, base, safe, transformers, transformers-compat + , unexceptionalio + }: + mkDerivation { + pname = "errors"; + version = "2.1.3"; + sha256 = "201a1d9d2fba16dff734eb79e07f138718ed62f5a0a846cf0cee743828844df1"; + libraryHaskellDepends = [ + base safe transformers transformers-compat unexceptionalio + ]; + description = "Simplified error-handling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ersaconcat" = callPackage ({ mkDerivation, base, directory, doctest, filepath, HTTP , network-uri, process, QuickCheck, tagsoup, template-haskell @@ -60160,19 +60382,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "eventstore_0_13_1_7" = callPackage + "eventstore_0_14_0_0" = callPackage ({ mkDerivation, aeson, array, base, cereal, classy-prelude - , connection, containers, dns, dotnet-timespan, http-client + , connection, containers, dns, dotnet-timespan, http-client, mtl , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time , unordered-containers, uuid }: mkDerivation { pname = "eventstore"; - version = "0.13.1.7"; - sha256 = "a0c6ea5e91f56dc8027bb34825c1382c31cd26ac291c5a7c988bec0681c5e8d8"; + version = "0.14.0.0"; + sha256 = "0855c29baa25f14da74804bd324a4e4fb4f51f7609df3d0c6fbb0ef09d81552d"; libraryHaskellDepends = [ aeson array base cereal classy-prelude connection containers dns - dotnet-timespan http-client protobuf random semigroups stm time + dotnet-timespan http-client mtl protobuf random semigroups stm time unordered-containers uuid ]; testHaskellDepends = [ @@ -61968,22 +62190,6 @@ self: { }) {}; "fclabels" = callPackage - ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers - }: - mkDerivation { - pname = "fclabels"; - version = "2.0.3.1"; - sha256 = "b993e35fd89945669c8b3cd95fa9dee618eb6a5256f8909ccbdc8ec713f75c8b"; - libraryHaskellDepends = [ base mtl template-haskell transformers ]; - testHaskellDepends = [ - base HUnit mtl template-haskell transformers - ]; - homepage = "https://github.com/sebastiaanvisser/fclabels"; - description = "First class accessor labels implemented as lenses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fclabels_2_0_3_2" = callPackage ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers }: mkDerivation { @@ -61997,7 +62203,6 @@ self: { homepage = "https://github.com/sebastiaanvisser/fclabels"; description = "First class accessor labels implemented as lenses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fclabels-monadlib" = callPackage @@ -63689,19 +63894,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "flat-mcmc_1_2_2" = callPackage + "flat-mcmc_1_4_0" = callPackage ({ mkDerivation, base, formatting, mcmc-types, monad-par , monad-par-extras, mwc-probability, pipes, primitive, text , transformers, vector }: mkDerivation { pname = "flat-mcmc"; - version = "1.2.2"; - sha256 = "c70914ac35058f847e5faf173076403b8feb7bb8c8c96c34ba728aca031f6937"; + version = "1.4.0"; + sha256 = "daf0ba3202b7c315e022db361eb01d399d6cec4c742a12d94aeb7a13e95f2b7b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base formatting mcmc-types monad-par monad-par-extras mwc-probability pipes primitive text transformers vector ]; + executableHaskellDepends = [ base vector ]; testHaskellDepends = [ base vector ]; homepage = "https://github.com/jtobin/flat-mcmc"; description = "Painless general-purpose sampling"; @@ -64271,6 +64479,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fmt" = callPackage + ({ mkDerivation, base, text, text-format }: + mkDerivation { + pname = "fmt"; + version = "0.0.0.1"; + sha256 = "e118bd72ec75ad1c749cf43492e85aeed5ee8a3cf616e2af4884f492123d8b30"; + libraryHaskellDepends = [ base text text-format ]; + homepage = "http://github.com/aelve/fmt"; + description = "Nice formatting library"; + license = stdenv.lib.licenses.mit; + }) {}; + "fn" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory , filepath, hspec, http-types, text, unordered-containers, wai @@ -64326,23 +64546,6 @@ self: { }) {}; "fold-debounce" = callPackage - ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay - , time - }: - mkDerivation { - pname = "fold-debounce"; - version = "0.2.0.3"; - sha256 = "ca5eaa3ea7eea742c961df63249920021824a949c879053ff34bdeef4fb7a7af"; - libraryHaskellDepends = [ - base data-default-class stm stm-delay time - ]; - testHaskellDepends = [ base hspec stm time ]; - homepage = "https://github.com/debug-ito/fold-debounce"; - description = "Fold multiple events that happen in a given period of time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fold-debounce_0_2_0_4" = callPackage ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay , time }: @@ -64357,7 +64560,6 @@ self: { homepage = "https://github.com/debug-ito/fold-debounce"; description = "Fold multiple events that happen in a given period of time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fold-debounce-conduit" = callPackage @@ -64836,21 +65038,6 @@ self: { }) {}; "formatting" = callPackage - ({ mkDerivation, base, clock, old-locale, scientific, text - , text-format, time - }: - mkDerivation { - pname = "formatting"; - version = "6.2.3"; - sha256 = "81eaab0d9a6a3a402344c1a97e54eccca2c4efd795e376e87de38f699d1c79bc"; - libraryHaskellDepends = [ - base clock old-locale scientific text text-format time - ]; - description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "formatting_6_2_4" = callPackage ({ mkDerivation, base, clock, old-locale, scientific, text , text-format, time }: @@ -64863,7 +65050,6 @@ self: { ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "forml" = callPackage @@ -65645,29 +65831,6 @@ self: { libfreenect = null;}; "freer" = callPackage - ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "freer"; - version = "0.2.3.0"; - sha256 = "e0ef288ad5c8fc5b1ab7a50413e435648251575bb6803d41374d702fc5ad44b8"; - revision = "2"; - editedCabalFile = "39d3fcc74267e006eae237770ac8d6b7c651a927913544fb74a260ac8307beca"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - homepage = "https://gitlab.com/queertypes/freer"; - description = "Implementation of the Freer Monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "freer_0_2_4_1" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit , tasty-quickcheck }: @@ -69101,8 +69264,8 @@ self: { ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.7.0.0"; - sha256 = "433c06b7c445fd9edfc081720ab51f9ced41994f481d66d4ce181df583efda38"; + version = "0.7.0.2"; + sha256 = "eccf3df2533b5ebcc619f79bb791b84e01765ce66f77b3039cbece34a0302de1"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; @@ -69131,8 +69294,8 @@ self: { ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.7.0.0"; - sha256 = "5359536c791cfaf24fb8a5884d30cc117ad869ab773b977293d6424b52520a2d"; + version = "0.7.0.1"; + sha256 = "3a4d95d81f32e46bbd0b50254d56b57315dbfd2cdd47845116095356f5122af4"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; @@ -69144,8 +69307,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.7.0.0"; - sha256 = "da1532bf854bc9d0ae311dd1b1f14900f1258e6e29884b8c35c9326c55811ed9"; + version = "0.7.0.2"; + sha256 = "7ff04a5bc39b2b84c98badd6f8f569ca9d97fec348c0734821801f7090a1efd6"; isLibrary = false; isExecutable = false; description = "DOM library using JSFFI and GHCJS"; @@ -70298,6 +70461,8 @@ self: { pname = "giphy-api"; version = "0.4.0.0"; sha256 = "bb2952f54232cead3e66350b514ca31aac511bf172be45115b98dd8777859876"; + revision = "2"; + editedCabalFile = "bf615e33d6be695e26434f8cb6747bb91be136093e0181eb85efe415c689d9f5"; libraryHaskellDepends = [ aeson base containers http-api-data http-client http-client-tls microlens microlens-th mtl network-uri servant servant-client text @@ -70313,7 +70478,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "giphy-api_0_5_0_0" = callPackage + "giphy-api_0_5_1_0" = callPackage ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers , directory, hspec, http-api-data, http-client, http-client-tls , lens, microlens, microlens-th, mtl, network-uri, servant @@ -70321,8 +70486,8 @@ self: { }: mkDerivation { pname = "giphy-api"; - version = "0.5.0.0"; - sha256 = "12ad1a1080348dfd4033d4c97e5b2a7c3d3da8d342c78c520a5d51396474b16e"; + version = "0.5.1.0"; + sha256 = "b4b33df49353f67621fba1655cf5938c5ca6f1e563e349a3f9a43edc6a98fa99"; libraryHaskellDepends = [ aeson base containers http-api-data http-client http-client-tls microlens microlens-th mtl network-uri servant servant-client text @@ -79181,8 +79346,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.9.1.0"; - sha256 = "47f5b2eb038be6cf8a2fbb0eb3fa012b687ed06104b59169c39bf4662c87bf84"; + version = "4.9.2.0"; + sha256 = "20f1e5be71290445626ccf716e6b312bf3f5ebf780ce9481d574a83681ef2e3f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79387,8 +79552,8 @@ self: { }: mkDerivation { pname = "hakyll-filestore"; - version = "0.1.4"; - sha256 = "4f4a4ff6312fd8a226357329c19b7da9ad0547b3683679ce033a1b82dd7d4bb9"; + version = "0.1.5"; + sha256 = "f013b519a8fd552f21ca5b487ea01436e3c649cdc34fe907035a46ff74e83e3a"; libraryHaskellDepends = [ base filestore hakyll time time-locale-compat ]; @@ -81043,20 +81208,22 @@ self: { "hascas" = callPackage ({ mkDerivation, base, binary, bytestring, containers - , data-binary-ieee754, hspec, mtl, network, stm, template-haskell - , uuid + , data-binary-ieee754, hspec, mtl, network, safe-exceptions, stm + , template-haskell, uuid }: mkDerivation { pname = "hascas"; - version = "0.1.0.0"; - sha256 = "25dc79e9e8798d35932b1f8729330a1863fe93278778e4a3265c9a0dba504ccd"; + version = "1.0.0"; + sha256 = "004dba51e8cfa2b2e41fd9b51d8bdfb877a4ce19c46b412862327d567c64ccea"; + revision = "1"; + editedCabalFile = "dd3a3609ef9afd3507fc7c0a425683e2900da0b70512a5ef4342f39548c8d1a2"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 mtl network - stm template-haskell uuid + safe-exceptions stm template-haskell uuid ]; testHaskellDepends = [ base binary bytestring containers data-binary-ieee754 hspec mtl - network stm template-haskell uuid + network safe-exceptions stm template-haskell uuid ]; homepage = "https://github.com/eklavya/hascas#readme"; description = "Cassandra driver for haskell"; @@ -81317,6 +81484,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashmap_1_3_2" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable }: + mkDerivation { + pname = "hashmap"; + version = "1.3.2"; + sha256 = "01409d423e27f529602b376cfb506afe7a47f73b2ca1e362638c4fccfbba5796"; + libraryHaskellDepends = [ base containers deepseq hashable ]; + homepage = "https://github.com/foxik/hashmap"; + description = "Persistent containers Map and Set based on hashing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashring" = callPackage ({ mkDerivation, base, containers, hashable, QuickCheck , test-framework, test-framework-quickcheck2 @@ -81617,8 +81797,10 @@ self: { ({ mkDerivation, base, containers, mtl, protolude, text }: mkDerivation { pname = "haskelisp"; - version = "0.1.0.5"; - sha256 = "bc35b968ed448582b13dad1b5364eecd2f2bae27c1c859ed14fa151a5c02b949"; + version = "0.1.1.0"; + sha256 = "1a5e1901451ecf5a3152a77686c7c625ea934f11f5cef22ffa38b5ae28ead372"; + revision = "1"; + editedCabalFile = "a1b283345ab2aa1553f6293a7b261e973bcb546a0eaecbfd76a9fd5978052041"; libraryHaskellDepends = [ base containers mtl protolude text ]; homepage = "http://github.com/githubuser/haskelisp#readme"; description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature"; @@ -88106,8 +88288,8 @@ self: { }: mkDerivation { pname = "hint-server"; - version = "1.4.2"; - sha256 = "c579a71d68272dc463ba9625027615bd323fdbbe8780bd462d05694c375866e7"; + version = "1.4.3"; + sha256 = "fecb7fd63ff216054ba1a6569b85757ae6227ce6aa2b0b55ea1c35a54a45ffdd"; libraryHaskellDepends = [ base eprocess exceptions hint monad-loops mtl ]; @@ -88116,6 +88298,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hinterface" = callPackage + ({ mkDerivation, array, async, base, binary, bytestring, containers + , cryptonite, exceptions, hspec, lifted-async, lifted-base, memory + , monad-control, monad-logger, mtl, network, QuickCheck, random + , resourcet, safe-exceptions, stm, text, transformers + , transformers-base, vector + }: + mkDerivation { + pname = "hinterface"; + version = "0.5.0.0"; + sha256 = "44520a3892dbefda790b3a44f2896a808db3a22751582ed41a0935f8b2b7544f"; + libraryHaskellDepends = [ + array async base binary bytestring containers cryptonite exceptions + lifted-async lifted-base memory monad-control monad-logger mtl + network QuickCheck random resourcet safe-exceptions stm text + transformers transformers-base vector + ]; + testHaskellDepends = [ + async base binary bytestring hspec monad-logger QuickCheck + transformers + ]; + homepage = "https://github.com/LTI2000/hinterface"; + description = "Haskell / Erlang interoperability library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hinvaders" = callPackage ({ mkDerivation, base, haskell98, random }: mkDerivation { @@ -88145,18 +88353,19 @@ self: { }) {}; "hip" = callPackage - ({ mkDerivation, base, bytestring, Chart, Chart-cairo, colour - , deepseq, filepath, JuicyPixels, netpbm, primitive, process, repa - , temporary, vector + ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour + , deepseq, directory, filepath, hspec, JuicyPixels, netpbm + , primitive, process, QuickCheck, repa, temporary, vector }: mkDerivation { pname = "hip"; - version = "1.0.1.2"; - sha256 = "3fff4507cf53a979630d8e94d3dec05b18139007bc7e24ec122ce35d38292484"; + version = "1.1.0.2"; + sha256 = "86ff4302827f4d320efd2b574dee5f6383e41b330a38b1f5dca2a717973659f5"; libraryHaskellDepends = [ - base bytestring Chart Chart-cairo colour deepseq filepath - JuicyPixels netpbm primitive process repa temporary vector + base bytestring Chart Chart-diagrams colour deepseq directory + filepath JuicyPixels netpbm primitive process repa temporary vector ]; + testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/lehins/hip"; description = "Haskell Image Processing (HIP) Library"; license = stdenv.lib.licenses.bsd3; @@ -90611,8 +90820,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.5"; - sha256 = "d5b6f897ddd63f037ae9ce09c4f671e95a7f4331add3c09bd2bbd29114a89bb1"; + version = "5.0.6"; + sha256 = "fd151310dcdb4fc8c317aabe0faf0b9563ccd59471de12ea3f10136c6f134712"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92422,7 +92631,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {mesos = null; inherit (pkgs) protobuf;}; + }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;}; "hs-nombre-generator" = callPackage ({ mkDerivation, base, HandsomeSoup, hxt, random }: @@ -94239,6 +94448,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsoz" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , base64-bytestring, byteable, bytestring, case-insensitive + , containers, cryptonite, data-default, either, errors, http-client + , http-conduit, http-types, HUnit, lens, lucid, memory, mtl + , network, QuickCheck, scientific, scotty, securemem, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, text, time + , transformers, uri-bytestring, vault, wai, warp, wreq + }: + mkDerivation { + pname = "hsoz"; + version = "0.0.0.3"; + sha256 = "5aa1d06f0fe3f2f38354d12af1f6205c15894d74e5a32ed743a4ce6602573781"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring base64-bytestring byteable + bytestring case-insensitive containers cryptonite data-default + either errors http-client http-types lens memory mtl network + scientific scotty securemem text time transformers uri-bytestring + vault wai warp + ]; + executableHaskellDepends = [ + aeson base bytestring case-insensitive containers cryptonite + data-default http-client http-conduit http-types lens lucid scotty + text transformers uri-bytestring wai warp wreq + ]; + testHaskellDepends = [ + aeson base bytestring data-default http-client http-types HUnit + QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck text + time wai + ]; + homepage = "https://github.com/rvl/hsoz"; + description = "Iron, Hawk, Oz: Web auth protocols"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsp" = callPackage ({ mkDerivation, base, mtl, text }: mkDerivation { @@ -96382,8 +96628,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.31.1"; - sha256 = "7032cd356bc5ddd5786b315271174ed510e1a190c4210bd65abe16201b86ce0c"; + version = "0.4.31.2"; + sha256 = "16410148a9705677cdd89510192caf1abd3460db2a17ce0c2fafd7bd0c15d88b"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -100787,6 +101033,8 @@ self: { pname = "imperative-edsl"; version = "0.7"; sha256 = "1a207736fb6b84e5316bbbe95593b464fe7f155db65e89fbac78b59d0e05f5f7"; + revision = "1"; + editedCabalFile = "c7ce36becbcecf66151a8b850abb7a19752aa0dfd68922198dd53ed95470b57c"; libraryHaskellDepends = [ array base BoundedChan containers data-default-class deepseq directory exception-transformers ghc-prim language-c-quote @@ -100822,27 +101070,34 @@ self: { "implicit" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, blaze-svg - , bytestring, containers, deepseq, directory, filepath, JuicyPixels - , mtl, NumInstances, optparse-applicative, parallel, parsec - , storable-endian, text, unordered-containers, vector-space + , bytestring, containers, criterion, deepseq, directory, download + , filepath, hspec, JuicyPixels, monads-tf, mtl, NumInstances + , optparse-applicative, parallel, parsec, silently, snap-core + , snap-server, storable-endian, text, transformers + , unordered-containers, vector-space }: mkDerivation { pname = "implicit"; - version = "0.0.5"; - sha256 = "aa5a5de53ad25517a9ce044c21572f42262e537c848a81fd2be5b32c88d2fc9e"; - revision = "1"; - editedCabalFile = "9f5c887aaa0c834171243bf2acdc5e6234e124c3ee3f55c8c10ce37a7690500a"; + version = "0.1.0"; + sha256 = "f3120deca5f140e91ebf1af9ff035ca0a469024bd4e8855132aa24781f65d09b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blaze-builder blaze-markup blaze-svg bytestring containers - deepseq directory filepath JuicyPixels mtl NumInstances - optparse-applicative parallel parsec storable-endian text - unordered-containers vector-space + criterion deepseq directory download filepath JuicyPixels monads-tf + NumInstances parallel parsec silently snap-core snap-server + storable-endian text transformers unordered-containers vector-space ]; - homepage = "https://github.com/colah/ImplicitCAD"; + executableHaskellDepends = [ + base blaze-builder blaze-markup blaze-svg bytestring containers + criterion deepseq directory filepath JuicyPixels monads-tf + optparse-applicative parallel parsec silently snap-core snap-server + storable-endian text transformers vector-space + ]; + testHaskellDepends = [ base containers hspec mtl parsec ]; + homepage = "http://kalli1.faikvm.com/ImplicitCAD/Stable"; description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export.."; - license = "GPL"; + license = stdenv.lib.licenses.agpl3; }) {}; "implicit-logging" = callPackage @@ -103450,6 +103705,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "itemfield" = callPackage + ({ mkDerivation, base, brick, data-default, HUnit, microlens + , microlens-th, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, vty + }: + mkDerivation { + pname = "itemfield"; + version = "1.2.0.0"; + sha256 = "a55b83a20a599c4acbba6aecc68db6d8de982f646c125f68bf0a48f6d4260716"; + revision = "1"; + editedCabalFile = "cefe94a562c871d018efedccd5246afd8a019463e4bb3e1e20d3b8d52939de17"; + libraryHaskellDepends = [ base brick microlens text vty ]; + testHaskellDepends = [ + base brick data-default HUnit microlens microlens-th QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + vty + ]; + description = "A brick Widget for selectable summary of many elements on a terminal"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "iter-stats" = callPackage ({ mkDerivation, base, heap, HUnit, iteratee, ListLike, mtl , statistics, test-framework, test-framework-hunit @@ -104177,6 +104453,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "java-adt" = callPackage + ({ mkDerivation, alex, array, base, happy, pretty }: + mkDerivation { + pname = "java-adt"; + version = "0.2016.11.28"; + sha256 = "874de697e2bee902ba89b4527459eabbd8b6f6b3d63df1946ea22dfdad2092dc"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ array base pretty ]; + executableToolDepends = [ alex happy ]; + homepage = "http://github.com/andreasabel/java-adt"; + description = "Create immutable algebraic data structures for Java"; + license = "unknown"; + }) {}; + "java-bridge" = callPackage ({ mkDerivation, base, bimap, containers, cpphs, directory , filepath, hinduce-missingh, hint, mtl, multimap, named-records @@ -104461,7 +104752,7 @@ self: { }) {}; "jni" = callPackage - ({ mkDerivation, base, bytestring, containers, inline-c, jvm + ({ mkDerivation, base, bytestring, containers, inline-c, jdk , singletons, thread-local-storage }: mkDerivation { @@ -104471,12 +104762,12 @@ self: { libraryHaskellDepends = [ base bytestring containers inline-c singletons thread-local-storage ]; - librarySystemDepends = [ jvm ]; + librarySystemDepends = [ jdk ]; homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme"; description = "Complete JNI raw bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {jvm = null;}; + }) {inherit (pkgs) jdk;}; "jobqueue" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring @@ -104724,8 +105015,8 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.7.0.0"; - sha256 = "0315258fbf5a1ce449de3df26d53de1d3e569ad4604bd17697983629fc183f82"; + version = "0.7.0.1"; + sha256 = "60581922dd1ccef07eb2319653d4b8448cbf65039c32680269277d731d0e95aa"; libraryHaskellDepends = [ base base-compat jsaddle lens text transformers ]; @@ -105845,6 +106136,122 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "kafka-device" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cereal, milena + , mtl + }: + mkDerivation { + pname = "kafka-device"; + version = "0.1.5.0"; + sha256 = "e43b2e3ed49285745bf3dde7b870f61b87dc4f5ef8fdc31bda56c5ee22c18004"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring cereal milena mtl + ]; + executableHaskellDepends = [ + aeson base binary bytestring cereal milena mtl + ]; + homepage = "https://bitbucket.org/functionally/kafka-device"; + description = "UI device events via a Kafka message broker"; + license = stdenv.lib.licenses.mit; + }) {}; + + "kafka-device-glut" = callPackage + ({ mkDerivation, base, GLUT, kafka-device, milena, OpenGL }: + mkDerivation { + pname = "kafka-device-glut"; + version = "0.1.3.0"; + sha256 = "c06c42b23f1fcec14fad72e690b2360942e56a6b5d3f7d7496c379dd22887f8f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base GLUT kafka-device milena OpenGL ]; + executableHaskellDepends = [ + base GLUT kafka-device milena OpenGL + ]; + homepage = "https://bitbucket.org/functionally/kafka-device-glut"; + description = "GLUT events via a Kafka message broker"; + license = stdenv.lib.licenses.mit; + }) {}; + + "kafka-device-joystick" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cereal + , kafka-device, milena + }: + mkDerivation { + pname = "kafka-device-joystick"; + version = "0.1.5.0"; + sha256 = "ec7cdb06a7ddc8aa54238cf3b762721ce81ff22021daa16f559abf75350798cd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring cereal kafka-device milena + ]; + executableHaskellDepends = [ + aeson base binary bytestring cereal kafka-device milena + ]; + homepage = "https://bitbucket.org/functionally/kafka-device-joystick"; + description = "Linux joystick events via a Kafka message broker"; + license = stdenv.lib.licenses.mit; + }) {}; + + "kafka-device-leap" = callPackage + ({ mkDerivation, aeson, base, hleap, kafka-device, milena + , websockets + }: + mkDerivation { + pname = "kafka-device-leap"; + version = "0.1.3.0"; + sha256 = "d9440f6991d230caed95c81940569c77d7911616c2d598a8cb5e770e41cada3a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base hleap kafka-device milena websockets + ]; + executableHaskellDepends = [ + aeson base hleap kafka-device milena websockets + ]; + homepage = "https://bitbucket.org/functionally/kafka-device-leap"; + description = "Leap Motion events via a Kafka message broker"; + license = stdenv.lib.licenses.mit; + }) {}; + + "kafka-device-spacenav" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cereal + , kafka-device, milena + }: + mkDerivation { + pname = "kafka-device-spacenav"; + version = "0.1.5.0"; + sha256 = "c501b38ef88ac3d8e870f6ce698a299508cbabb2088c472c8163bcca5d53cf7d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring cereal kafka-device milena + ]; + executableHaskellDepends = [ + aeson base binary bytestring cereal kafka-device milena + ]; + homepage = "https://bitbucket.org/functionally/kafka-device-spacenav"; + description = "Linux SpaceNavigator events via a Kafka message broker"; + license = stdenv.lib.licenses.mit; + }) {}; + + "kafka-device-vrpn" = callPackage + ({ mkDerivation, base, kafka-device, milena, vrpn }: + mkDerivation { + pname = "kafka-device-vrpn"; + version = "0.1.5.0"; + sha256 = "27df692620b7fbd293520108c236406cad95aed665c4807afc15d8efc9c006bb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base kafka-device milena vrpn ]; + executableHaskellDepends = [ base kafka-device milena vrpn ]; + homepage = "https://bitbucket.org/functionally/kafka-device-vrpn"; + description = "VRPN events via a Kafka message broker"; + license = stdenv.lib.licenses.mit; + }) {}; + "kaleidoscope" = callPackage ({ mkDerivation, base, containers, haskeline, llvm-general , llvm-general-pure, mtl, parsec, transformers @@ -106045,14 +106452,14 @@ self: { , directory, either, exceptions, hostname, microlens, microlens-th , monad-control, mtl, old-locale, quickcheck-instances, regex-tdfa , resourcet, semigroups, string-conv, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text - , time, time-locale-compat, transformers, transformers-base + , tasty-hunit, tasty-quickcheck, template-haskell, text, time + , time-locale-compat, transformers, transformers-base , transformers-compat, unix, unordered-containers }: mkDerivation { pname = "katip"; - version = "0.3.1.0"; - sha256 = "bd7ba7fcab3a6cd5ed9a1e38f750c06e7fed53d549c9fe974fb74b4a6446ced3"; + version = "0.3.1.2"; + sha256 = "d666b12f235c6eb5fa36fa1cfc5a48ec001996a4ad6e4abf5ff0601ee3d9cea5"; libraryHaskellDepends = [ aeson auto-update base bytestring containers either exceptions hostname microlens microlens-th monad-control mtl old-locale @@ -106063,8 +106470,7 @@ self: { testHaskellDepends = [ aeson base bytestring directory microlens quickcheck-instances regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck - template-haskell temporary text time time-locale-compat - unordered-containers + template-haskell text time time-locale-compat unordered-containers ]; homepage = "https://github.com/Soostone/katip"; description = "A structured logging framework"; @@ -106081,8 +106487,8 @@ self: { }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.3.0.0"; - sha256 = "93aec808795efb6add91cd294f6612db8d0207f6192d6a518932484dca8a9a45"; + version = "0.3.0.1"; + sha256 = "92ad73f911363b879e7d8ba4b4249469ca7b6807f0469ca5648e64e38d5720d6"; libraryHaskellDepends = [ aeson async base bloodhound enclosed-exceptions exceptions http-client http-types katip retry scientific stm stm-chans text @@ -108030,8 +108436,8 @@ self: { }: mkDerivation { pname = "lambdacube-compiler"; - version = "0.6.0.0"; - sha256 = "4fae3343d4bc733a759e97324d260a10f0b07d144664b29855c37f2ea1012423"; + version = "0.6.0.1"; + sha256 = "48e0869887cf6e01abe45e95f117c6bb2e50c4d1f0c23895a59438da19fad4e7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109344,8 +109750,8 @@ self: { }: mkDerivation { pname = "latex-formulae-image"; - version = "0.1.1.1"; - sha256 = "6c663420647282ec20c71421a2faf95629f2690283df4b9279ae53536cac3f61"; + version = "0.1.1.2"; + sha256 = "92f1fa3233eef7992a6fcae9fa240c6859e63ff09d7e89ca212017b974f29f0d"; libraryHaskellDepends = [ base directory errors filepath JuicyPixels process temporary transformers @@ -109362,8 +109768,8 @@ self: { }: mkDerivation { pname = "latex-formulae-pandoc"; - version = "0.2.0.3"; - sha256 = "289720149572814da30b9854b8a7b0798125c3fa3508b28ca53c9d382f65d12d"; + version = "0.2.0.4"; + sha256 = "76013ba9f4b9f1631ac347c026799b4a70bcb3b8a6e07038218befc5d0ec8332"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110129,6 +110535,8 @@ self: { pname = "lens"; version = "4.15.1"; sha256 = "5cfaa64cb1b9787193c2247a1ed1c248104ba5fadb91cec6432e648e41b1bea6"; + revision = "2"; + editedCabalFile = "012be5e38b4fa0f4cb98ad04d6eb82a48eea6d789213a058b08fdc2e64aa1327"; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim @@ -111733,8 +112141,8 @@ self: { }: mkDerivation { pname = "line"; - version = "1.0.0.1"; - sha256 = "f4cdfb7531f722143c20ee7a52655ec0a5c776777a45f9a9b653e2ff9910d9d6"; + version = "1.0.1.0"; + sha256 = "b356e813369b9ebf80ea71a79e658caabbc32645de8821eb878809afb0f1e1d5"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptohash-sha256 http-types lens text time transformers wai wreq @@ -114626,8 +115034,8 @@ self: { }: mkDerivation { pname = "lua-bc"; - version = "0.1.0.2"; - sha256 = "b507d95739cf149ea5fa321b53182c53cdf89d9726c494734092da19f7dfb515"; + version = "0.1.0.3"; + sha256 = "a441ce9aa5d7eb13f5ec7cd4254f1827b17f729c166ec4c2b4eb4475a2fee20f"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 pretty text vector @@ -115298,6 +115706,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mackerel-client" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, data-default + , directory, filepath, hspec, htoml, http-client, http-client-tls + , http-types, parsec, raw-strings-qq, split, text + , unordered-containers + }: + mkDerivation { + pname = "mackerel-client"; + version = "0.0.2"; + sha256 = "c0b9b1b074176b45771ae6b1bfb3bc41dacdb1c0ccfab675b06eceba037ddaf1"; + revision = "1"; + editedCabalFile = "e4fd64b142d46108e28cc52262779ae1096efefdb01ea6128f4a86161d880030"; + libraryHaskellDepends = [ + aeson base bytestring data-default directory filepath htoml + http-client http-client-tls http-types parsec split text + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base data-default hspec raw-strings-qq + unordered-containers + ]; + homepage = "https://github.com/itchyny/mackerel-client-hs"; + description = "An API client library for Mackerel"; + license = stdenv.lib.licenses.mit; + }) {}; + "maclight" = callPackage ({ mkDerivation, base, filemanip, filepath, HUnit , optparse-applicative, parsec, strict, test-framework @@ -116631,6 +117065,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "math-functions_0_2_1_0" = callPackage + ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector, vector-th-unbox + }: + mkDerivation { + pname = "math-functions"; + version = "0.2.1.0"; + sha256 = "f71b5598de453546396a3f5f7f6ce877fffcc996639b7569d8628cae97da65eb"; + libraryHaskellDepends = [ + base deepseq primitive vector vector-th-unbox + ]; + testHaskellDepends = [ + base deepseq erf HUnit primitive QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 vector + vector-th-unbox + ]; + homepage = "https://github.com/bos/math-functions"; + description = "Special functions and Chebyshev polynomials"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mathblog" = callPackage ({ mkDerivation, base, bytestring, ConfigFile, containers , data-default, deepseq, directory, either, filepath, fsnotify @@ -117105,15 +117562,13 @@ self: { }: mkDerivation { pname = "mdp"; - version = "0.1.0.0"; - sha256 = "816474886b59ab0f0cd5c4779f2702e9b7484fe94179a426894f561828f86711"; + version = "0.1.1.0"; + sha256 = "6e0e52f652dd969d5bfda6edf6519e6a0c38fa40994626820dc10c8a52aa4143"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers vector ]; - executableHaskellDepends = [ base containers vector ]; - testHaskellDepends = [ - base containers HTF HUnit QuickCheck vector - ]; + executableHaskellDepends = [ base vector ]; + testHaskellDepends = [ base HTF HUnit QuickCheck vector ]; description = "Tools for solving Markov Decision Processes"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -119958,6 +120413,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger-syslog_0_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, fast-logger, hsyslog + , monad-logger, text, transformers + }: + mkDerivation { + pname = "monad-logger-syslog"; + version = "0.1.3.0"; + sha256 = "b35098f5d3a7ea9bcdda886a60b19c404618f36410011d7beaef07ee353383e3"; + libraryHaskellDepends = [ + base bytestring fast-logger hsyslog monad-logger text transformers + ]; + homepage = "https://github.com/fpco/monad-logger-syslog"; + description = "syslog output for monad-logger"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-loops" = callPackage ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { @@ -122997,6 +123469,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mwc-random_0_13_5_0" = callPackage + ({ mkDerivation, base, primitive, time, vector }: + mkDerivation { + pname = "mwc-random"; + version = "0.13.5.0"; + sha256 = "28dd2d95d088438ab15e9dee45ddc500b6c4700a87539c70a48b1b7b4c8d1ca9"; + libraryHaskellDepends = [ base primitive time vector ]; + doCheck = false; + homepage = "https://github.com/bos/mwc-random"; + description = "Fast, high quality pseudo random number generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mwc-random-monad" = callPackage ({ mkDerivation, base, monad-primitive, mwc-random, primitive , transformers, vector @@ -123461,8 +123947,8 @@ self: { ({ mkDerivation, base, containers, monoid-extras }: mkDerivation { pname = "namespace"; - version = "0.1.2.2"; - sha256 = "78992bb0c7b3f03633884512417674fbd9400298cf869b05d2d7ef9c9cdfe2f1"; + version = "0.1.3.0"; + sha256 = "bfb9ce8386eb72cb1e00b06632140629fc587128c0729dd85f29a022b5c82a06"; libraryHaskellDepends = [ base containers monoid-extras ]; testHaskellDepends = [ base ]; homepage = "https://github.com/xu-hao/namespace"; @@ -124360,6 +124846,8 @@ self: { pname = "netpbm"; version = "1.0.2"; sha256 = "846a04bca94be31c779888febc390c64cfba93e40f3a7a2f80ff6a6e44fcc2d7"; + revision = "1"; + editedCabalFile = "a0d0ed6bfda0c77c9842b627403392757df62d29aa0994124db6bfc2ca961cee"; libraryHaskellDepends = [ attoparsec attoparsec-binary base bytestring storable-record unordered-containers vector vector-th-unbox @@ -126915,10 +127403,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "0.0.7"; - sha256 = "bbd20049812fd481b882443341b17ad4b6b4e4766e7767130beb4f005786dabf"; - revision = "1"; - editedCabalFile = "957ab623269032edade4d4ea8c62761e7f35564e6a35dbcb825cbb3d05224bfd"; + version = "0.1.0"; + sha256 = "69d20c6ea113d9a88e68256f7c4017886e88005fca32a3c0c2cba3749ea09bd0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126953,8 +127439,8 @@ self: { }: mkDerivation { pname = "nvim-hs-contrib"; - version = "0.0.6"; - sha256 = "0825e32af7a9ee26a1f3d8104b2864208ac8142ce10c3f79516897cb5d12682d"; + version = "0.1.0"; + sha256 = "f0de17887d394301ec1975ab768ad6a6131bd7e6580b11c8b9364980e3be6472"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring data-default directory exceptions messagepack mtl nvim-hs parsec process resourcet setenv stm text @@ -127385,22 +127871,6 @@ self: { }) {}; "oeis" = callPackage - ({ mkDerivation, base, HTTP, HUnit, network, network-uri - , test-framework, test-framework-hunit - }: - mkDerivation { - pname = "oeis"; - version = "0.3.7"; - sha256 = "5d898a04d6117eca1250083cb8783d159302e9b5eb084878f5771916204861cf"; - 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; - }) {}; - - "oeis_0_3_8" = callPackage ({ mkDerivation, base, HTTP, HUnit, network, network-uri , test-framework, test-framework-hunit }: @@ -127414,7 +127884,6 @@ self: { ]; description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "off-simple" = callPackage @@ -127857,32 +128326,6 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, case-insensitive, containers, contravariant, multiset - , postgresql-simple, pretty, product-profunctors, profunctors - , QuickCheck, semigroups, text, time, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.5.2.1"; - sha256 = "ef175620163b6aaa5dc7aff6a49347b698134fb924869a789c097406ad746152"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors semigroups text time time-locale-compat transformers - uuid void - ]; - testHaskellDepends = [ - aeson base containers contravariant multiset postgresql-simple - product-profunctors profunctors QuickCheck semigroups text time - ]; - homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye_0_5_2_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, case-insensitive, containers, contravariant, multiset , postgresql-simple, pretty, product-profunctors, profunctors @@ -127906,7 +128349,6 @@ self: { homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -128654,14 +129096,16 @@ self: { "opentype" = callPackage ({ mkDerivation, base, binary, bytestring, containers, ghc - , pretty-hex, time, vector + , microlens, microlens-th, mtl, pretty-hex, time + , unordered-containers, vector }: mkDerivation { pname = "opentype"; - version = "0.0.1"; - sha256 = "21c574b4af3c99607e1e647b52bd32a2ae644135ab55e3dc3041f6dd6f4f1340"; + version = "0.1.0"; + sha256 = "ff80076a81c6aec66347718f11fb7990a45c46e5719db185268007930ca46d6c"; libraryHaskellDepends = [ - base binary bytestring containers ghc pretty-hex time vector + base binary bytestring containers ghc microlens microlens-th mtl + pretty-hex time unordered-containers vector ]; description = "Opentype loading and writing"; license = stdenv.lib.licenses.bsd3; @@ -128706,6 +129150,8 @@ self: { pname = "operational-alacarte"; version = "0.3"; sha256 = "c9e6ebe251d0854ed71fcf10ea54af2489f6819e180c55d6f15cc1fe3cb5dfcc"; + revision = "1"; + editedCabalFile = "b8fa0a71719bbc82e750cab4dacede2ba752370169dd210f75c66e244ffb5ff8"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base ]; homepage = "https://github.com/emilaxelsson/operational-alacarte"; @@ -129999,7 +130445,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_1_18" = callPackage + "pandoc_1_19" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , cmark, containers, data-default, deepseq, Diff, directory @@ -130014,8 +130460,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "1.18"; - sha256 = "3ea4b977f31d71dedd99a4584a895659efbbab02b00fdc9daaf7781787ce4e92"; + version = "1.19"; + sha256 = "227a5a70c8510e95f7dcc4dc1af3ebd9fb3efd252e5cbbda38aa1b9eb178f638"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -130081,6 +130527,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_10_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hs-bibutils, mtl + , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , setenv, split, syb, tagsoup, temporary, text, time + , unordered-containers, vector, xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.10.3"; + sha256 = "2f6233ff91a9fb08edfb0ac2b4ec40729d87590a7c557d0452674dd3c7df4d58"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 + setenv split syb tagsoup text time unordered-containers vector + xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring filepath pandoc + pandoc-types syb text yaml + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath pandoc pandoc-types + process temporary text yaml + ]; + doCheck = false; + homepage = "https://github.com/jgm/pandoc-citeproc"; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -131412,8 +131892,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.4.0.0"; - sha256 = "1368b963c500cd2945ef7de890d337066ed99efab8565b1f8825febf4b5ee1b4"; + version = "0.4.2.0"; + sha256 = "bd2304d0f4dbc6e6533771c8a24e2103018ac7ea8d86de9bf45b503ca40aec97"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -131465,8 +131945,8 @@ self: { }: mkDerivation { pname = "patches-vector"; - version = "0.1.5.2"; - sha256 = "aa19e7edb991e383672d58536351f63733359b0260902170c61c48e7196fec85"; + version = "0.1.5.4"; + sha256 = "f4c938988ad98883b98db10a32d4d544c39f98fc77b4e2c8da393718ef30da54"; libraryHaskellDepends = [ base edit-distance-vector microlens vector ]; @@ -134467,8 +134947,8 @@ self: { }: mkDerivation { pname = "pipes-key-value-csv"; - version = "0.4.0.0"; - sha256 = "1792858c4359a6c0ed9c685d422005c285853ac8382cb14390c2d00829ec427e"; + version = "0.4.0.1"; + sha256 = "940f5961dba5bfcc50f8e54e3263156cd80d73ee34730961eaa81b0f36f77734"; libraryHaskellDepends = [ base bifunctors containers data-default-class lens mtl pipes pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text @@ -138030,6 +138510,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "printcess" = callPackage + ({ mkDerivation, base, containers, hspec, HUnit, lens, mtl + , QuickCheck, transformers + }: + mkDerivation { + pname = "printcess"; + version = "0.1.0.2"; + sha256 = "53907a189318381f5b6d77a15fa36eff274bc1f500f974dba060896d5d7e2418"; + libraryHaskellDepends = [ base containers lens mtl transformers ]; + testHaskellDepends = [ + base containers hspec HUnit lens mtl QuickCheck transformers + ]; + homepage = "https://github.com/m0rphism/printcess/"; + description = "Pretty printing with indentation, mixfix operators, and automatic line breaks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "printf-mauke" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , template-haskell @@ -139457,6 +139954,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "psqueues_0_2_2_3" = callPackage + ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit + , QuickCheck, tagged, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "psqueues"; + version = "0.2.2.3"; + sha256 = "6d757c30f6fdc8df7ed62601f2b2530e71192109ab94d06dec4176c9c3eea6b5"; + libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; + testHaskellDepends = [ + array base deepseq ghc-prim hashable HUnit QuickCheck tagged + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "Pure priority search queues"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pstemmer" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -139506,12 +140022,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "publicsuffix_0_20161116" = callPackage + "publicsuffix_0_20161129" = callPackage ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20161116"; - sha256 = "615ad3cb9a0489403595c79979c3cc9820d03e02fc2a9481d646188f16f64ce8"; + version = "0.20161129"; + sha256 = "419e1c5019b6c255087c88e27992d733a550442c40b8a58ee40e647cc76fb894"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -140338,6 +140854,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libdevil;}; + "pvss" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptonite + , cryptonite-openssl, deepseq, hourglass, integer-gmp, memory + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "pvss"; + version = "0.1"; + sha256 = "fa140bcc44158ae54a486668820c6b7c4b767ea702c5e687b064dcd386c0fc99"; + revision = "1"; + editedCabalFile = "2d6b823ed5c0e8852c2d91c248b09cabf83409fb71bd473ab15c44b30427dd0e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring cryptonite cryptonite-openssl deepseq + integer-gmp memory + ]; + executableHaskellDepends = [ + base cryptonite deepseq hourglass memory + ]; + testHaskellDepends = [ base cryptonite tasty tasty-quickcheck ]; + homepage = "https://github.com/input-output-hk/pvss-haskell#readme"; + description = "Public Verifiable Secret Sharing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pwstore-cli" = callPackage ({ mkDerivation, base, bytestring, cmdargs, HUnit, process , pwstore-fast, test-framework, test-framework-hunit, text @@ -142508,8 +143050,10 @@ self: { }: mkDerivation { pname = "raw-feldspar"; - version = "0.1"; - sha256 = "e1c3a65925f763519ef55d893b38c859db3a5386c6a8007e08dc941bc521f357"; + version = "0.2.1"; + sha256 = "7c188b8ffca38e8f63cfbff3555c8a8d29265262ada77c6e914c2e73859958fc"; + revision = "1"; + editedCabalFile = "193a7ca804a40c8b27c2962e39b914933ef7e69c6d1fb1aee7bbf954121df6f8"; libraryHaskellDepends = [ array base constraints containers data-default-class data-hash imperative-edsl language-c-quote mtl operational-alacarte @@ -143314,28 +143858,6 @@ self: { }) {}; "rebase" = callPackage - ({ mkDerivation, base, base-prelude, bifunctors, bytestring - , containers, contravariant, contravariant-extras, deepseq, dlist - , either, fail, hashable, mtl, profunctors, scientific - , semigroupoids, semigroups, stm, text, time, transformers - , unordered-containers, uuid, vector, void - }: - mkDerivation { - pname = "rebase"; - version = "1.0.3"; - sha256 = "366a0d4224d4f80da4e6bcd80ed0027a2895e0b4504e11448cad9e03c1a9f82d"; - libraryHaskellDepends = [ - base base-prelude bifunctors bytestring containers contravariant - contravariant-extras deepseq dlist either fail hashable mtl - profunctors scientific semigroupoids semigroups stm text time - transformers unordered-containers uuid vector void - ]; - homepage = "https://github.com/nikita-volkov/rebase"; - description = "A more progressive alternative to the \"base\" package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rebase_1_0_6" = callPackage ({ mkDerivation, base, base-prelude, bifunctors, bytestring , containers, contravariant, contravariant-extras, deepseq, dlist , either, fail, hashable, mtl, profunctors, scientific @@ -143355,7 +143877,6 @@ self: { homepage = "https://github.com/nikita-volkov/rebase"; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rebindable" = callPackage @@ -146003,8 +146524,8 @@ self: { ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.0.1"; - sha256 = "8cc418b668b575382ef5a977b06de3475c5ab92c3ed47174c94ef98bdbf13205"; + version = "1.0.1.1"; + sha256 = "44b023de5749713d04d43342dc94ca6562fc0e827e53ac3a8f1e62500b60463b"; libraryHaskellDepends = [ rebase ]; homepage = "https://github.com/nikita-volkov/rerebase"; description = "Reexports from \"base\" with a bunch of other standard libraries"; @@ -146628,26 +147149,6 @@ self: { }) {}; "retry" = callPackage - ({ mkDerivation, base, data-default-class, exceptions, ghc-prim - , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers - }: - mkDerivation { - pname = "retry"; - version = "0.7.4.1"; - sha256 = "d2791b0ea317655c3d5a5d9d1d443eeb66a31953e0a66ac7a510050c54d83fab"; - libraryHaskellDepends = [ - base data-default-class exceptions ghc-prim random transformers - ]; - testHaskellDepends = [ - base data-default-class exceptions ghc-prim hspec HUnit mtl - QuickCheck random stm time transformers - ]; - homepage = "http://github.com/Soostone/retry"; - description = "Retry combinators for monadic actions that may fail"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "retry_0_7_4_2" = callPackage ({ mkDerivation, base, data-default-class, exceptions, ghc-prim , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers }: @@ -146665,7 +147166,6 @@ self: { homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "retryer" = callPackage @@ -149392,8 +149892,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "2.0.0"; - sha256 = "7babbe1f9716ee17874f2c661285d5a384b8399e279288c6d1237b5f26d061b1"; + version = "2.1.0"; + sha256 = "4120efabc373ed18cf009ba8ca3961aca97b31bd0c347e748f2bfbf0e8d47519"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150243,6 +150743,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "scotty-format" = callPackage + ({ mkDerivation, aeson, base, http-media, http-types, scotty, text + }: + mkDerivation { + pname = "scotty-format"; + version = "0.1.0.2"; + sha256 = "848a326a18445c1c7f39a7aa5a46d3f042c2e9abfd1ef8f972751f51b4c00968"; + revision = "1"; + editedCabalFile = "64c796f66dd445224f06820feec9d91717a1de9d2d24d993d5db1d6021240d32"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base http-media http-types scotty text ]; + executableHaskellDepends = [ aeson base scotty text ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/potomak/scotty-format#readme"; + description = "Response format helper for the Scotty web framework"; + license = stdenv.lib.licenses.asl20; + }) {}; + "scotty-hastache" = callPackage ({ mkDerivation, base, containers, filepath, hastache, http-types , mtl, scotty, text, wai, warp @@ -151769,8 +152288,8 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.1.2.0"; - sha256 = "7dfa3165d4edb739c33e7d737b5655535ae28666f9d3886501ed623f28c6e15e"; + version = "0.1.2.1"; + sha256 = "585328969b7403c64b05eb05d908074d2742e40ce5d549d161c298d91a69f3db"; libraryHaskellDepends = [ acid-state aeson aeson-extra base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal @@ -151958,8 +152477,8 @@ self: { ({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, yaml }: mkDerivation { pname = "servant-auth"; - version = "0.2.0.0"; - sha256 = "5743a4ac6da19e77c13d0ce02e95eff196932f789ae1bf73a711a1b2f0ed545c"; + version = "0.2.1.0"; + sha256 = "31c963fa9dcc39431d45edb0f859771cba74f0dc6229258205fac99f0572fb4a"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck yaml ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; @@ -151976,8 +152495,8 @@ self: { }: mkDerivation { pname = "servant-auth-client"; - version = "0.2.0.0"; - sha256 = "276fe75aefe7686729883186125a7931ed07a8a593fb59aeea1a71b8461a46f2"; + version = "0.2.1.0"; + sha256 = "61afe42548bf696d2a2d2ad89b6284a40c192a30bc9201f0f49529cd90d556fe"; libraryHaskellDepends = [ base bytestring servant servant-auth servant-client text ]; @@ -152056,8 +152575,8 @@ self: { }: mkDerivation { pname = "servant-auth-docs"; - version = "0.2.0.0"; - sha256 = "8a4c47b9804b1d9d60304247d66315ae3d789597d979570e4783a161bc84ced9"; + version = "0.2.1.0"; + sha256 = "0bdce6889b1caf64e6b1ecbf565fb5201d32689c576bb3701cde671fbad8e3a1"; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text ]; @@ -152109,36 +152628,38 @@ self: { "servant-auth-server" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, case-insensitive, cookie, crypto-api - , data-default-class, entropy, hspec, http-api-data, http-client - , http-types, jose, lens, lens-aeson, markdown-unlit, monad-time - , mtl, QuickCheck, servant-auth, servant-server, text, time - , transformers, unordered-containers, wai, warp, wreq + , bytestring, bytestring-conversion, case-insensitive, cookie + , crypto-api, data-default-class, entropy, hspec, http-api-data + , http-client, http-types, jose, lens, lens-aeson, markdown-unlit + , monad-time, mtl, QuickCheck, servant-auth, servant-server, text + , time, transformers, unordered-containers, wai, warp, wreq }: mkDerivation { pname = "servant-auth-server"; - version = "0.2.0.0"; - sha256 = "e021d5fc4983eddd145fcb95e7f317534b7742fdf164b43d6735cbfe1412aa61"; + version = "0.2.1.0"; + sha256 = "0f9e848300a916de0892c55a8b530a02d3fc8bcbc7983012780355a88e266c84"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring - case-insensitive cookie crypto-api data-default-class entropy - http-api-data jose lens monad-time mtl servant-auth servant-server - text time unordered-containers wai + bytestring-conversion case-insensitive cookie crypto-api + data-default-class entropy http-api-data jose lens monad-time mtl + servant-auth servant-server text time unordered-containers wai ]; executableHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring - case-insensitive cookie crypto-api data-default-class entropy - http-api-data jose lens markdown-unlit monad-time mtl servant-auth - servant-server text time transformers unordered-containers wai warp + bytestring-conversion case-insensitive cookie crypto-api + data-default-class entropy http-api-data jose lens markdown-unlit + monad-time mtl servant-auth servant-server text time transformers + unordered-containers wai warp ]; testHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring - case-insensitive cookie crypto-api data-default-class entropy hspec - http-api-data http-client http-types jose lens lens-aeson - monad-time mtl QuickCheck servant-auth servant-server text time - unordered-containers wai warp wreq + bytestring-conversion case-insensitive cookie crypto-api + data-default-class entropy hspec http-api-data http-client + http-types jose lens lens-aeson monad-time mtl QuickCheck + servant-auth servant-server text time unordered-containers wai warp + wreq ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-server/servant-auth compatibility"; @@ -157072,16 +157593,15 @@ self: { "snap-cors" = callPackage ({ mkDerivation, attoparsec, base, bytestring, case-insensitive - , hashable, network, network-uri, snap, text, transformers - , unordered-containers + , hashable, network, network-uri, snap, text, unordered-containers }: mkDerivation { pname = "snap-cors"; - version = "1.2.10"; - sha256 = "57304a8fa66584fb0d7cd5d7b64feaa8c4a9d15e8f753ff80f1cd2d5e092b637"; + version = "1.2.11"; + sha256 = "81bd318b871c08a25bdcb05b286b43e99865b2ea21a4eb48b6e9839362acaf34"; libraryHaskellDepends = [ attoparsec base bytestring case-insensitive hashable network - network-uri snap text transformers unordered-containers + network-uri snap text unordered-containers ]; homepage = "http://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; @@ -158421,30 +158941,6 @@ self: { }) {}; "soap" = callPackage - ({ mkDerivation, base, bytestring, conduit, configurator - , data-default, exceptions, hspec, http-client, http-types, HUnit - , iconv, mtl, resourcet, text, unordered-containers, xml-conduit - , xml-conduit-writer, xml-types - }: - mkDerivation { - pname = "soap"; - version = "0.2.3.1"; - sha256 = "a9cad8d48dfe6674b836e017ba0d1cf80d78f55e543e0bf58d07e5656a6c1c39"; - libraryHaskellDepends = [ - base bytestring conduit configurator data-default exceptions - http-client http-types iconv mtl resourcet text - unordered-containers xml-conduit xml-conduit-writer xml-types - ]; - testHaskellDepends = [ - base bytestring hspec HUnit text unordered-containers xml-conduit - xml-conduit-writer - ]; - homepage = "https://bitbucket.org/dpwiz/haskell-soap"; - description = "SOAP client tools"; - license = stdenv.lib.licenses.mit; - }) {}; - - "soap_0_2_3_2" = callPackage ({ mkDerivation, base, bytestring, conduit, configurator , data-default, exceptions, hspec, http-client, http-types, HUnit , iconv, mtl, resourcet, text, unordered-containers, xml-conduit @@ -158466,7 +158962,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "SOAP client tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap-openssl" = callPackage @@ -159915,8 +160410,8 @@ self: { }: mkDerivation { pname = "sproxy2"; - version = "1.91.0"; - sha256 = "cfa966eddf2336a000d26cf6d4234529dddabeb8d87cadd51e7a5d2e5e794738"; + version = "1.92.0"; + sha256 = "8f93a7d03db1508a2a7e53998edef027a00f75d33a1532113e56a651dc6e3f9e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160110,6 +160605,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sqlite-simple_0_4_12_0" = 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.12.0"; + sha256 = "eb5732bea0fff46a1761c5aa635533c7200c748624825440276774ce4bf56093"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sqlite-simple-errors" = callPackage ({ mkDerivation, base, mtl, parsec, sqlite-simple, text }: mkDerivation { @@ -160806,6 +161323,52 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stackage-curator_0_14_3" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async + , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal + , classy-prelude-conduit, conduit, conduit-extra, containers + , cryptohash, cryptohash-conduit, data-default-class, directory + , exceptions, filepath, hashable, hspec, html-conduit, http-client + , http-client-tls, http-conduit, lucid, mime-types, monad-unlift + , monad-unlift-ref, mono-traversable, mtl, old-locale + , optparse-applicative, optparse-simple, process, QuickCheck + , resourcet, safe, semigroups, stm, store, streaming-commons, syb + , system-fileio, system-filepath, tar, temporary, text, time + , transformers, unix-compat, unordered-containers, utf8-string + , vector, xml-conduit, xml-types, yaml, zlib + }: + mkDerivation { + pname = "stackage-curator"; + version = "0.14.3"; + sha256 = "ce868f0bc6c385d23672421df9a8613c418e50e793a9ffbb16a2e0a4003ba8fa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 async base + base16-bytestring blaze-html byteable bytestring Cabal + classy-prelude-conduit conduit conduit-extra containers cryptohash + cryptohash-conduit data-default-class directory exceptions filepath + hashable html-conduit http-client http-client-tls http-conduit + lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl + old-locale process resourcet safe semigroups stm store + streaming-commons syb system-fileio system-filepath tar temporary + text time transformers unix-compat unordered-containers utf8-string + vector xml-conduit xml-types yaml zlib + ]; + executableHaskellDepends = [ + aeson base http-client http-client-tls optparse-applicative + optparse-simple system-filepath text + ]; + testHaskellDepends = [ + base Cabal classy-prelude-conduit containers directory hspec + http-client http-client-tls QuickCheck text yaml + ]; + homepage = "https://github.com/fpco/stackage-curator"; + description = "Tools for curating Stackage bundles"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stackage-install" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , cryptohash, directory, filepath, http-client, http-client-tls @@ -162006,14 +162569,14 @@ self: { "stompl" = callPackage ({ mkDerivation, attoparsec, base, bytestring, mime, split, text - , utf8-string + , utf8-string, word8 }: mkDerivation { pname = "stompl"; - version = "0.3.0"; - sha256 = "52897d2b5f0f100d76e1b8ae0d243102b712f6c760cda103146618e11007e5c6"; + version = "0.4.0"; + sha256 = "8766eec4d48e44d08fbcb009f9d3098ba1b10193caac14935b2c0c1889ae0d7d"; libraryHaskellDepends = [ - attoparsec base bytestring mime split text utf8-string + attoparsec base bytestring mime split text utf8-string word8 ]; homepage = "http://github.com/toschoo/mom"; description = "Stomp Parser and Utilities"; @@ -163386,15 +163949,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stylish-haskell_0_6_4_0" = callPackage + "stylish-haskell_0_6_5_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative , strict, syb, test-framework, test-framework-hunit, yaml }: mkDerivation { pname = "stylish-haskell"; - version = "0.6.4.0"; - sha256 = "7f8aba23c7409350c59fdc836eedc4ab71e179bd5eed7e1b828178ef89bc6676"; + version = "0.6.5.0"; + sha256 = "aeee182f8b6a9492eedd12a45cd9a4abb677e95e1789ddd8681e699f27a5ea78"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163734,8 +164297,8 @@ self: { }: mkDerivation { pname = "super-user-spark"; - version = "0.3.0.0"; - sha256 = "772a27569ab8d2bf00c67b2ab07581cd135ee2a5e129fbf9a46ff2e1a222269e"; + version = "0.3.1.0"; + sha256 = "9daf90541bbb17621d0a0c4993f9601bffcbb1452d862c990f5bf147afaab3ef"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163754,6 +164317,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "superbuffer" = callPackage + ({ mkDerivation, base, bytestring, HTF, QuickCheck }: + mkDerivation { + pname = "superbuffer"; + version = "0.1.0.0"; + sha256 = "85d6e38f100ec5847067f569f964e1bbf04df58b001275b70589d58191be2105"; + revision = "1"; + editedCabalFile = "162970f213762fe4be50f554d52e2500150fa400cff70e8069127a84c50dfb4a"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring HTF QuickCheck ]; + homepage = "https://github.com/agrafix/superbuffer#readme"; + description = "Efficiently build a bytestring from smaller chunks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "supercollider-ht" = callPackage ({ mkDerivation, base, hosc, hsc3, opensoundcontrol-ht, process , random, transformers @@ -164536,6 +165114,8 @@ self: { pname = "syntactic"; version = "3.6.2"; sha256 = "f110ce1a2d5029756c6388666a4d817c4c739665c1c2cea718858302b2f07a73"; + revision = "1"; + editedCabalFile = "48bee990f011eaa13392605459eb15eaa5d63d798cd8b50ec293a4430f4266d3"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view @@ -167605,6 +168185,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "test-fixture_0_5_0_0" = callPackage + ({ mkDerivation, base, data-default, haskell-src-exts + , haskell-src-meta, hspec, hspec-discover, mtl, template-haskell + , th-orphans, th-to-exp, transformers + }: + mkDerivation { + pname = "test-fixture"; + version = "0.5.0.0"; + sha256 = "084877f777878d2cabfb661e957dd8f5517000650c120308f8e2dbe7eda6772d"; + libraryHaskellDepends = [ + base data-default haskell-src-exts haskell-src-meta mtl + template-haskell th-orphans + ]; + testHaskellDepends = [ + base hspec hspec-discover mtl template-haskell th-to-exp + transformers + ]; + 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 ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers , hostname, old-locale, random, regex-posix, time, xml @@ -168141,6 +168744,28 @@ self: { license = "GPL"; }) {}; + "texmath_0_9" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, process, split, syb, temporary, text + , utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.9"; + sha256 = "6ee9cda09fd38b27309abf50216ae2081543c0edf939f71cc3856feca24c5f2c"; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + homepage = "http://github.com/jgm/texmath"; + description = "Conversion between formats used to represent mathematics"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -172063,30 +172688,6 @@ self: { }) {}; "transient-universe" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , directory, filepath, hashable, HTTP, iproute, mtl, network - , network-info, network-uri, process, random, stm, TCache, text - , time, transformers, transient, vector, websockets - }: - mkDerivation { - pname = "transient-universe"; - version = "0.3.5"; - sha256 = "0a990737a635cad37e7530eb1abe295df7b72b24a066fd2891d943bf4a92bbfb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring case-insensitive containers directory filepath - hashable HTTP iproute mtl network network-info network-uri process - random stm TCache text time transformers transient vector - websockets - ]; - executableHaskellDepends = [ base transformers transient ]; - homepage = "http://www.fpcomplete.com/user/agocorona"; - description = "Remote execution and map-reduce: distributed computing for Transient"; - license = stdenv.lib.licenses.mit; - }) {}; - - "transient-universe_0_3_5_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, filepath, hashable, HTTP, iproute, mtl, network , network-info, network-uri, process, random, stm, TCache, text @@ -172113,7 +172714,6 @@ self: { homepage = "http://www.fpcomplete.com/user/agocorona"; description = "Remote execution and map-reduce: distributed computing for Transient"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "translatable-intset" = callPackage @@ -172274,6 +172874,8 @@ self: { pname = "tree-view"; version = "0.5"; sha256 = "2d0046df6a78bfc57c7d11736d3baf6e1e427e8eb944f408b80a9195b062dcab"; + revision = "1"; + editedCabalFile = "85fbc67b53c1ef47f020a69051e6a29b27481698fe802cd2ed8ab0108aa69a38"; libraryHaskellDepends = [ base containers mtl ]; description = "Render trees as foldable HTML and Unicode art"; license = stdenv.lib.licenses.bsd3; @@ -172433,32 +173035,6 @@ self: { }) {}; "trifecta" = callPackage - ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base - , blaze-builder, blaze-html, blaze-markup, bytestring, charset - , comonad, containers, deepseq, directory, doctest, filepath - , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors - , QuickCheck, reducers, semigroups, transformers - , unordered-containers, utf8-string - }: - mkDerivation { - pname = "trifecta"; - version = "1.6"; - sha256 = "b302a69295fcb70f645e48b5005ded4f62a05ae11e4470f20ff4cc136ada7065"; - libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html - blaze-markup bytestring charset comonad containers deepseq - fingertree ghc-prim hashable lens mtl parsers profunctors reducers - semigroups transformers unordered-containers utf8-string - ]; - testHaskellDepends = [ - base directory doctest filepath parsers QuickCheck - ]; - homepage = "http://github.com/ekmett/trifecta/"; - description = "A modern parser combinator library with convenient diagnostics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "trifecta_1_6_1" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base , blaze-builder, blaze-html, blaze-markup, bytestring, charset , comonad, containers, deepseq, directory, doctest, filepath @@ -172482,7 +173058,6 @@ self: { homepage = "http://github.com/ekmett/trifecta/"; description = "A modern parser combinator library with convenient diagnostics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trimpolya" = callPackage @@ -173746,6 +174321,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-assertions" = callPackage + ({ mkDerivation, base, hspec, test-fixture }: + mkDerivation { + pname = "type-assertions"; + version = "0.1.0.0"; + sha256 = "aac74571c99fa0170970716385570cf0e0bbb18fc93f1d7ad372824fe7a679bb"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec test-fixture ]; + homepage = "https://github.com/lexi-lambda/type-assertions#readme"; + description = "Runtime type assertions for testing"; + license = stdenv.lib.licenses.isc; + }) {}; + "type-booleans" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -174625,26 +175213,6 @@ self: { }) {}; "ua-parser" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, derive - , file-embed, filepath, HUnit, pcre-light, tasty, tasty-hunit - , tasty-quickcheck, text, yaml - }: - mkDerivation { - pname = "ua-parser"; - version = "0.7.1"; - sha256 = "bfcfe7ea0cbeade0053dbdbbc8f4593283d17403058d754b00430edb1a0444b4"; - libraryHaskellDepends = [ - aeson base bytestring data-default file-embed pcre-light text yaml - ]; - testHaskellDepends = [ - aeson base bytestring data-default derive 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; - }) {}; - - "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 @@ -174662,7 +175230,6 @@ self: { ]; 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 @@ -176424,29 +176991,6 @@ self: { }) {}; "uri-bytestring" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , containers, derive, HUnit, lens-simple, QuickCheck - , quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "uri-bytestring"; - version = "0.2.2.0"; - sha256 = "d7ab6d08e4c0b0ef2ed6ae47ec839cbc39734ea31af3178ce66a0b6896d14f0d"; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring containers - ]; - testHaskellDepends = [ - attoparsec base blaze-builder bytestring containers derive HUnit - lens-simple QuickCheck quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck - ]; - homepage = "https://github.com/Soostone/uri-bytestring"; - description = "Haskell URI parsing as ByteStrings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "uri-bytestring_0_2_2_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , containers, generics-sop, HUnit, lens-simple, QuickCheck , quickcheck-instances, semigroups, tasty, tasty-hunit @@ -176467,7 +177011,6 @@ self: { homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-conduit" = callPackage @@ -177531,26 +178074,6 @@ self: { }) {}; "validation" = callPackage - ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , lens, mtl, QuickCheck, semigroupoids, semigroups - , template-haskell, transformers - }: - mkDerivation { - pname = "validation"; - version = "0.5.3"; - sha256 = "481e01f8213e09d8b4a45f27e58921fe7da40a2b6ce15f0220d4efe210118f13"; - libraryHaskellDepends = [ - base bifunctors lens mtl semigroupoids semigroups transformers - ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; - homepage = "https://github.com/NICTA/validation"; - description = "A data-type like Either but with an accumulating Applicative"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "validation_0_5_4" = callPackage ({ mkDerivation, base, bifunctors, directory, doctest, filepath , lens, mtl, QuickCheck, semigroupoids, semigroups , template-haskell, transformers @@ -177568,7 +178091,6 @@ self: { homepage = "https://github.com/NICTA/validation"; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validations" = callPackage @@ -181806,16 +182328,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets_0_10_0_0" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , blaze-builder, bytestring, case-insensitive, containers, entropy + , HUnit, network, QuickCheck, random, SHA, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "websockets"; + version = "0.10.0.0"; + sha256 = "3ee56fa6683912928a7d336d591c43e4948886037b5aa72cbab2f33fb43fa2eb"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers entropy network random SHA text + ]; + testHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers entropy HUnit network QuickCheck random + SHA test-framework test-framework-hunit test-framework-quickcheck2 + text + ]; + doCheck = false; + homepage = "http://jaspervdj.be/websockets"; + description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "websockets-snap" = callPackage - ({ mkDerivation, base, bytestring, io-streams, mtl, snap-core - , snap-server, websockets + ({ mkDerivation, base, bytestring, bytestring-builder, io-streams + , mtl, snap-core, snap-server, websockets }: mkDerivation { pname = "websockets-snap"; - version = "0.10.0.0"; - sha256 = "092328966679e2f2761acc06ab4236297e61eff8a2e8087470b6962238daf4fe"; + version = "0.10.2.0"; + sha256 = "294173c3dbc327ce3873ff310dcd14590d6a1ec05d54ea8d1a0cda0498dbe4a2"; libraryHaskellDepends = [ - base bytestring io-streams mtl snap-core snap-server websockets + base bytestring bytestring-builder io-streams mtl snap-core + snap-server websockets ]; description = "Snap integration for the websockets library"; license = stdenv.lib.licenses.bsd3; @@ -181939,6 +182489,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wembley" = callPackage + ({ mkDerivation, base, bytestring, filemanip, filepath + , optparse-applicative, split + }: + mkDerivation { + pname = "wembley"; + version = "0.1.0.0"; + sha256 = "608b999e650552af2f922611511d612da491c28d56900cf8a4a7e3458c49d510"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring filemanip filepath optparse-applicative split + ]; + homepage = "https://github.com/lovasko/wembley"; + description = "Pretty-printing of codebases"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "werewolf" = callPackage ({ mkDerivation, aeson, base, containers, directory, extra , filepath, interpolate, lens, MonadRandom, mtl @@ -182128,23 +182696,6 @@ self: { }) {}; "wikicfp-scraper" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec - , scalpel, text, time - }: - mkDerivation { - pname = "wikicfp-scraper"; - version = "0.1.0.5"; - sha256 = "0a34feeaf03f5f98ebb4c43c9d711323814c0148e062f2eebacb524f489769ee"; - libraryHaskellDepends = [ - attoparsec base bytestring scalpel text time - ]; - testHaskellDepends = [ base bytestring filepath hspec time ]; - homepage = "https://github.com/debug-ito/wikicfp-scraper"; - description = "Scrape WikiCFP web site"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wikicfp-scraper_0_1_0_6" = callPackage ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec , scalpel, text, time }: @@ -182159,7 +182710,6 @@ self: { homepage = "https://github.com/debug-ito/wikicfp-scraper"; description = "Scrape WikiCFP web site"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wikipedia4epub" = callPackage @@ -182487,6 +183037,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wl-pprint-annotated" = callPackage + ({ mkDerivation, base, containers, deepseq, HUnit, semigroups + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "wl-pprint-annotated"; + version = "0.0.1.2"; + sha256 = "7fa75ad09c60f72fa75430c862667847cd83fa4c9e912bf86b00f3eed6a4af33"; + libraryHaskellDepends = [ + base containers deepseq semigroups text + ]; + testHaskellDepends = [ + base containers deepseq HUnit semigroups test-framework + test-framework-hunit text + ]; + homepage = "https://github.com/minad/wl-pprint-annotated#readme"; + description = "Wadler/Leijen pretty printer with annotations and slightly modernized API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wl-pprint-ansiterm" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl , nats, semigroups, text, transformers, wl-pprint-extras @@ -182505,6 +183075,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wl-pprint-console" = callPackage + ({ mkDerivation, base, console-style, mtl, text + , wl-pprint-annotated + }: + mkDerivation { + pname = "wl-pprint-console"; + version = "0.0.1.2"; + sha256 = "dbef55503890a3d60c318084f2e857feba4529d458a17629f4ad00f13084ab3a"; + revision = "2"; + editedCabalFile = "560613daa268b1755476619a69dc7d343a52513b6bf2789ba25523afe9708917"; + libraryHaskellDepends = [ + base console-style mtl text wl-pprint-annotated + ]; + homepage = "https://github.com/minad/wl-pprint-console#readme"; + description = "Wadler/Leijen pretty printer supporting colorful console output"; + license = stdenv.lib.licenses.mit; + }) {}; + "wl-pprint-extras" = callPackage ({ mkDerivation, base, containers, HUnit, nats, semigroupoids , semigroups, test-framework, test-framework-hunit, text @@ -183119,23 +183707,6 @@ self: { }) {}; "writer-cps-mtl" = callPackage - ({ mkDerivation, base, mtl, transformers, writer-cps-transformers - }: - mkDerivation { - pname = "writer-cps-mtl"; - version = "0.1.0.2"; - sha256 = "b77e45607d7bfde15758ae5223f79d846dc6adc7ab73b0d0b0df422daa1c7fce"; - revision = "1"; - editedCabalFile = "6c3b908440ba1217cb4b9724d5f3835ee370578b491c58f219e31193f36f9422"; - libraryHaskellDepends = [ - base mtl transformers writer-cps-transformers - ]; - homepage = "https://github.com/minad/writer-cps-mtl#readme"; - description = "MonadWriter orphan instances for writer-cps-transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "writer-cps-mtl_0_1_1_0" = callPackage ({ mkDerivation, base, mtl, transformers, writer-cps-transformers }: mkDerivation { @@ -183148,24 +183719,9 @@ self: { homepage = "https://github.com/minad/writer-cps-mtl#readme"; description = "MonadWriter orphan instances for writer-cps-transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "writer-cps-transformers" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "writer-cps-transformers"; - version = "0.1.0.2"; - sha256 = "037e74cb6c2780f151d937e15560a26c59c824f14c2c8f169971c76fcbd1dd4d"; - revision = "1"; - editedCabalFile = "07137b0cb53028a4025ed02c85863c91a3e6256f0f506261ec129ac347d9c619"; - libraryHaskellDepends = [ base transformers ]; - homepage = "https://github.com/minad/writer-cps-transformers#readme"; - description = "WriteT and RWST monad transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "writer-cps-transformers_0_1_1_0" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "writer-cps-transformers"; @@ -183175,7 +183731,6 @@ self: { homepage = "https://github.com/minad/writer-cps-transformers#readme"; description = "WriteT and RWST monad transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wsdl" = callPackage @@ -183342,6 +183897,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wuss_1_1_3" = callPackage + ({ mkDerivation, base, bytestring, connection, network, websockets + }: + mkDerivation { + pname = "wuss"; + version = "1.1.3"; + sha256 = "691f03173df3b9af98760f27597318e3d028bef2d65ed58ea9e1fabf11bec8b0"; + libraryHaskellDepends = [ + base bytestring connection network websockets + ]; + homepage = "https://github.com/tfausak/wuss#readme"; + description = "Secure WebSocket (WSS) clients"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wx" = callPackage ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { @@ -185694,6 +186265,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libyaml;}; + "yaml_0_8_21_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat + , bytestring, conduit, containers, directory, enclosed-exceptions + , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific + , semigroups, template-haskell, temporary, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.8.21.1"; + sha256 = "f9f8e801a215c65cf5eff6e3aa384060e60232521630495d13573bf0677a0db2"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + enclosed-exceptions filepath resourcet scientific semigroups + template-haskell text transformers unordered-containers vector + ]; + libraryPkgconfigDepends = [ libyaml ]; + executableHaskellDepends = [ aeson base bytestring ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring conduit directory hspec + HUnit mockery resourcet temporary text transformers + unordered-containers vector + ]; + homepage = "http://github.com/snoyberg/yaml/"; + description = "Support for parsing and rendering YAML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libyaml;}; + "yaml-config" = callPackage ({ mkDerivation, base, deepseq, hashable, QuickCheck, tasty , tasty-quickcheck, text, unordered-containers, yaml @@ -186116,8 +186719,8 @@ self: { }: mkDerivation { pname = "yeshql"; - version = "0.3.0.3"; - sha256 = "b405093850400d551cc9d443cedcd28e7b0ff4b9e724ee00d4b21c4852d80f0b"; + version = "1.0.0.1"; + sha256 = "c535ab7797d2ad062a351f688d147908d79770c1e0881e4340c9d8ab25307bfc"; libraryHaskellDepends = [ base containers filepath HDBC parsec template-haskell ]; @@ -186219,6 +186822,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_4_14" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, conduit, conduit-extra + , containers, cryptohash, data-default, email-validate, file-embed + , http-client, http-conduit, http-types, lifted-base, mime-mail + , network-uri, nonce, persistent, persistent-template, random + , resourcet, safe, shakespeare, template-haskell, text, time + , transformers, unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.4.14"; + sha256 = "44f5c8c4f1c129fd8552d583679bb848b54ab3ed81e86e7038edaf8996a6ca85"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup byteable bytestring conduit + conduit-extra containers cryptohash data-default email-validate + file-embed http-client http-conduit http-types lifted-base + mime-mail network-uri nonce persistent persistent-template random + resourcet safe shakespeare template-haskell text time transformers + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -186593,6 +187226,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-bin_1_5_0_1" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, deepseq, directory, file-embed + , filepath, fsnotify, http-client, http-client-tls + , http-reverse-proxy, http-types, lifted-base, network + , optparse-applicative, parsec, process, project-template + , resourcet, safe-exceptions, say, shakespeare, split, stm + , streaming-commons, tar, template-haskell, text, time + , transformers, transformers-compat, typed-process, unix-compat + , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.5.0.1"; + sha256 = "5530506d1ddbe0b846f538b366645c416322046aa712d866c422e4778829d3e8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async attoparsec base base64-bytestring blaze-builder bytestring + Cabal conduit conduit-extra containers data-default-class deepseq + directory file-embed filepath fsnotify http-client http-client-tls + http-reverse-proxy http-types lifted-base network + optparse-applicative parsec process project-template resourcet + safe-exceptions say shakespeare split stm streaming-commons tar + template-haskell text time transformers transformers-compat + typed-process unix-compat unordered-containers wai wai-extra warp + warp-tls yaml zlib + ]; + homepage = "http://www.yesodweb.com/"; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, conduit , conduit-extra, containers, either, email-validate @@ -186730,6 +187398,47 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_4_28" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , blaze-html, blaze-markup, byteable, bytestring, case-insensitive + , cereal, clientsession, conduit, conduit-extra, containers, cookie + , data-default, deepseq, deepseq-generics, directory, exceptions + , fast-logger, hspec, hspec-expectations, http-types, HUnit + , lifted-base, monad-control, monad-logger, mtl, mwc-random + , network, old-locale, parsec, path-pieces, primitive, QuickCheck + , random, resourcet, safe, semigroups, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.4.28"; + sha256 = "f544294deb9f9ac499885b6978d64a9467213908d19b6af6a4c46846d1990186"; + libraryHaskellDepends = [ + aeson auto-update base blaze-builder blaze-html blaze-markup + byteable bytestring case-insensitive cereal clientsession conduit + conduit-extra containers cookie data-default deepseq + deepseq-generics directory exceptions fast-logger http-types + lifted-base monad-control monad-logger mtl mwc-random old-locale + parsec path-pieces primitive random resourcet safe semigroups + shakespeare template-haskell text time transformers + transformers-base unix-compat unordered-containers vector wai + wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base blaze-builder bytestring clientsession conduit + conduit-extra containers cookie hspec hspec-expectations http-types + HUnit lifted-base mwc-random network path-pieces QuickCheck random + resourcet shakespeare streaming-commons template-haskell text + transformers wai wai-extra + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -187763,6 +188472,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_5_4" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, containers, cookie + , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base + , monad-control, network, persistent, pretty-show, text, time + , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core + , yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.5.4"; + sha256 = "c8b69211a49939fa74e3d799626487dcc358213896eec6e887f3051843b7a17a"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + case-insensitive containers cookie hspec-core html-conduit + http-types HUnit monad-control network persistent pretty-show text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers hspec html-conduit http-types HUnit + lifted-base text wai xml-conduit yesod-core yesod-form + ]; + homepage = "http://www.yesodweb.com"; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -187880,6 +188617,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-websockets_0_2_4_1" = callPackage + ({ mkDerivation, async, base, conduit, enclosed-exceptions + , monad-control, transformers, wai, wai-websockets, websockets + , yesod-core + }: + mkDerivation { + pname = "yesod-websockets"; + version = "0.2.4.1"; + sha256 = "795b497217dece919d4034bc4dfa84632d900798d1be9a423ce57409378cbccf"; + libraryHaskellDepends = [ + async base conduit enclosed-exceptions monad-control transformers + wai wai-websockets websockets yesod-core + ]; + homepage = "https://github.com/yesodweb/yesod"; + description = "WebSockets support for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-websockets-extra" = callPackage ({ mkDerivation, base, enclosed-exceptions, transformers , websockets, yesod-websockets From 880ae3fd1ebbe3e0d629936449c82c5a55dd2346 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Tue, 29 Nov 2016 01:03:29 +0800 Subject: [PATCH 1053/1749] haskellPackages: fix brick and vty_5_13 brick 0.14 requires vty >= 5.12 --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4b3a16de26d9..22416389040c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -494,6 +494,7 @@ self: super: { # https://ghc.haskell.org/trac/ghc/ticket/9625 vty = dontCheck super.vty; + vty_5_13 = dontCheck super.vty_5_13; # https://github.com/vincenthz/hs-crypto-pubkey/issues/20 crypto-pubkey = dontCheck super.crypto-pubkey; @@ -1121,4 +1122,8 @@ self: super: { # https://github.com/philopon/barrier/issues/3 barrier = doJailbreak super.barrier; + + # requires vty 5.13 + brick = super.brick.overrideScope (self: super: { vty = self.vty_5_13; }); + } From a571edecd089758c365f49803f851e46d3dcefb0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Dec 2016 19:52:16 +0100 Subject: [PATCH 1054/1749] haskell-jni: fix path to missing libjvm libjvm.so is in a non-standard location and the build needs help finding it. Closes https://github.com/NixOS/nixpkgs/issues/20669. --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 22416389040c..766f7f793b5b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -76,6 +76,14 @@ self: super: { ''; }); + # jni needs help finding libjvm.so because it's in a weird location. + jni = overrideCabal super.jni (drv: { + preConfigure = '' + local libdir=( "${pkgs.jdk}/lib/openjdk/jre/lib/"*"/server" ) + configureFlags+=" --extra-lib-dir=''${libdir[0]}" + ''; + }); + # The package doesn't know about the AL include hierarchy. # https://github.com/phaazon/al/issues/1 al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"; From 297ea7550caa2f27dbdde17c526350e148c6be79 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Dec 2016 20:01:35 +0100 Subject: [PATCH 1055/1749] haskellPackages.ghc-core: Revert "0.5.6 -> 2012-12-15" This reverts commit c1b919ff5c13103017e750fb6a7a1dfdeaf23394. That kind of change is a maintenance nightmare because it unconditionally overrides the package's version specified in hackage-packages.nix with something else, i.e. no future update will ever have an effect. This is not the proper way to do it. The proper way is to add the relevant commit from Github as a patch. --- .../haskell-modules/configuration-common.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 766f7f793b5b..4f9c32a1414b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1113,17 +1113,6 @@ self: super: { socket_0_7_0_0 = super.socket_0_7_0_0.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_9_2; }); - # 0.5.6 invokes $PAGER in a way that crashes if there are args such as $PAGER="less -R" - ghc-core = overrideCabal super.ghc-core (drv: { - src = pkgs.fetchFromGitHub { - owner = "shachaf"; - repo = "ghc-core"; - rev = "630196adf0bebf073328325302453ef1c409fd9a"; - sha256 = "05jzpjy5zkri2faw5jnq5vh12mx58lrb0zfzz4h598miq2vc8848"; - }; - version = "2012-12-15"; - }); - # Encountered missing dependencies: hspec >=1.3 && <2.1 # https://github.com/rampion/ReadArgs/issues/8 ReadArgs = doJailbreak super.ReadArgs; From bfc2721ebf08a414f0268e9f4913a563a6b86999 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 1 Dec 2016 20:41:14 +0100 Subject: [PATCH 1056/1749] pythonPackages.docker: Fix build for python3 --- pkgs/top-level/python-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09f35be2798a..d2f63239eed3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6079,13 +6079,16 @@ in { docker = buildPythonPackage rec { name = "docker-py-${version}"; version = "1.10.6"; - disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/d/docker-py/${name}.tar.gz"; sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc"; }; + buildInputs = [ + pkgs.glibcLocales + ]; + propagatedBuildInputs = with self; [ six requests2 @@ -6098,6 +6101,8 @@ in { # Version conflict doCheck = false; + LC_ALL="en_US.UTF-8"; + meta = { description = "An API client for docker written in Python"; homepage = https://github.com/docker/docker-py; From d69a25dfdedef3a8001f286bd7b0cecebe7c68e6 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 1 Dec 2016 20:42:27 +0100 Subject: [PATCH 1057/1749] pythonPackages.docker: Add myself as a maintainer --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2f63239eed3..9044288bad64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6107,6 +6107,9 @@ in { description = "An API client for docker written in Python"; homepage = https://github.com/docker/docker-py; license = licenses.asl20; + maintainers = with maintainers; [ + jgeerds + ]; }; }; From 49a313c395006ede63850f42c3887d2e1446b43a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 12:32:39 +0100 Subject: [PATCH 1058/1749] pythonpackages.lti: rename to PyLTI and remove overriding - rename to PyLTI to follow upstream - remove overriding because it is not necessary; newer mock can be used, and modules python packages should be fixed to not propagate pytest (see separate commit). cc maintainer @layus --- pkgs/servers/inginious/default.nix | 2 +- pkgs/top-level/python-packages.nix | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix index c85d96100c3c..113b297787b3 100644 --- a/pkgs/servers/inginious/default.nix +++ b/pkgs/servers/inginious/default.nix @@ -38,7 +38,7 @@ in pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ requests2 - cgroup-utils docker_1_7_2 docutils lti mock pygments + cgroup-utils docker_1_7_2 docutils PyLTI mock pygments pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib websocket_client watchdog webpy-custom flup ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9044288bad64..201c34f3a9a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7981,26 +7981,21 @@ in { }; }; - lti = let - self' = (self.override {self = self';}) // {pytest = self.pytest_27;}; - mock_1_0_1 = self'.mock.overrideDerivation (_: rec { - name = "mock-1.0.1"; - propagatedBuildInputs = null; - src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/m/mock/${name}.tar.gz"; - sha256 = "0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq"; - }; - }); - in buildPythonPackage rec { + PyLTI = buildPythonPackage rec { version = "0.4.1"; name = "PyLTI-${version}"; disabled = !isPy27; + # There is no need to fix mock. https://github.com/mitodl/pylti/pull/48 + postPatch = '' + substituteInPlace setup.py --replace "mock==1.0.1" "mock" + ''; + propagatedBuildInputs = with self; [ httplib2 oauth oauth2 semantic-version ]; - buildInputs = with self'; [ + buildInputs = with self; [ flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore - pytestflakes pytestpep8 sphinx mock_1_0_1 + pytestflakes pytestpep8 sphinx mock ]; src = pkgs.fetchurl { From d3f3ad3b26d4c9737f8e4f9a4d251aa49023a17e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 12:34:57 +0100 Subject: [PATCH 1059/1749] pythonPackages.pyjwt: does not need pytest 2.7 --- pkgs/top-level/python-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 201c34f3a9a6..7c70d76b065b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20284,9 +20284,14 @@ in { sha256 = "06vg84aicwkv0kli8i4jhg0kc6298cmh38ib058q01yxzk6q17gn"; }; - buildInputs = with self; [ pytestrunner pytestcov pytest_27 coverage ]; + buildInputs = with self; [ pytestrunner pytestcov pytest coverage ]; propagatedBuildInputs = with self; [ pycrypto ecdsa ]; + # We don't need this specific version + postPatch = '' + substituteInPlace setup.py --replace "pytest==2.7.3" "pytest" + ''; + meta = { description = "JSON Web Token implementation in Python"; longDescription = "A Python implementation of JSON Web Token draft 01"; From a8379a19069d54253afe60dde8d47f71eff6557b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 12:35:41 +0100 Subject: [PATCH 1060/1749] pythonPackages.pytestcache: disable tests --- pkgs/top-level/python-packages.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c70d76b065b..9b65ab312e0d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4906,7 +4906,15 @@ in { sha256 = "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y"; }; - propagatedBuildInputs = with self ; [ pytest execnet ]; + buildInputs = with self; [ pytest]; + propagatedBuildInputs = with self ; [ execnet ]; + + checkPhase = '' + py.test + ''; + + # Too many failing tests. Are they maintained? + doCheck = false; meta = { license = licenses.mit; From be020a25826be05518214061fa5396ed101ceb94 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 12:37:15 +0100 Subject: [PATCH 1061/1749] pythonPackages: do not propagate pytest pytest plugins should not propagate pytest. Instead, packages depending on pytest and plugins, should explicitly depend on both the plugin(s) and pytest. This change will more easily allow packages to depend on another version of pytest when needed. --- pkgs/top-level/python-packages.nix | 51 +++++++++++++++++++----------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b65ab312e0d..bd6e74c6a64b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1541,6 +1541,7 @@ in { sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5"; url = "mirror://pypi/a/aws-shell/aws-shell-${version}.tar.gz"; }; + # Why does it propagate packages that are used for testing? propagatedBuildInputs = with self; [ configobj prompt_toolkit awscli boto3 pygments mock pytest pytestcov unittest2 tox @@ -4936,7 +4937,8 @@ in { # pytest's binaries pytest = self.pytest; - propagatedBuildInputs = with self; [ django pytest setuptools_scm_18 ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ django setuptools_scm_18 ]; meta = { description = "py.test plugin for testing of Django applications"; @@ -4955,7 +4957,8 @@ in { sha256 = "7d7cc1cb25f88a707f083b1dc2e3c2fdfc6f37709567a2587dd0cd0bcd70edb6"; }; - propagatedBuildInputs = with self; [ pytest coverage virtualenv pytestcov six ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ coverage virtualenv pytestcov six ]; checkPhase = '' py.test -k "not test_yield_requires_config_doesnt_skip and not test_yield_requires_config_skips" @@ -4980,7 +4983,7 @@ in { sha256 = "1zzxlswbny8dp3c1sbhpyms1xkknxb6qfji3y3azc7gc95324xsv"; }; - propagatedBuildInputs = with self; [ pytest ]; + buildInputs = with self; [ pytest ]; checkPhase = '' py.test @@ -5004,7 +5007,12 @@ in { sha256 = "9c2271654294020e134624020a2144cb93b7334809d70fb3f470cd31ec788a3a"; }; - propagatedBuildInputs = with self ; [ pytest pyflakes pytestcache ]; + buildInputs = with self; [ pytestpep8 pytest ]; + propagatedBuildInputs = with self; [ pyflakes pytestcache ]; + + checkPhase = '' + py.test test_flakes.py + ''; meta = { license = licenses.mit; @@ -5018,7 +5026,8 @@ in { pname = "pytest-mock"; version = "1.2"; - propagatedBuildInputs = with self; [ mock pytest ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ mock ]; meta = { description = "Thin-wrapper around the mock package for easier use with py.test."; @@ -5041,7 +5050,8 @@ in { sha256 = "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3"; }; - propagatedBuildInputs = with self ; [ pytest pytestcache pep8 ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ pytestcache pep8 ]; meta = { license = licenses.mit; @@ -5059,7 +5069,8 @@ in { sha256 = "003vdkxpx37n0kjqpwgj3314hwk2jfz3nz58db7xh68bf8xy75lk"; }; - propagatedBuildInputs = with self ; [ pytest pep257 ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self ; [ pep257 ]; meta = { homepage = https://github.com/anderslime/pytest-pep257; @@ -5121,7 +5132,8 @@ in { sha256 = "047w4zwdsnlzmsc5f3rapzbzd2frlvz9nnp8v4b48fjmqmxassh3"; }; - propagatedBuildInputs = with self ; [ pytest pytestflakes pytestpep8 tox ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ pytestflakes pytestpep8 tox ]; meta = { license = licenses.asl20; @@ -5135,6 +5147,7 @@ in { pname = "pytest-server-fixtures"; version = "1.1.0"; + buildInputs = with self; [ pytest ]; propagatedBuildInputs = with self; [ setuptools-git pytest-shutil pytest-fixture-config psutil requests2 ]; meta = { @@ -5161,8 +5174,8 @@ in { url = "mirror://pypi/p/pytest-shutil/${name}.tar.gz"; sha256 = "bb3c4fc2dddaf70b38bd9bb7a710d07728fa14f88fbc89c2a07979b383ade5d4"; }; - buildInputs = with self; [ cmdline ]; - propagatedBuildInputs = with self; [ pytest pytestcov coverage setuptools-git mock pathpy execnet contextlib2 ]; + buildInputs = with self; [ cmdline pytest ]; + propagatedBuildInputs = with self; [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 ]; meta = { description = "A goodie-bag of unix shell and environment tools for py.test"; homepage = https://github.com/manahl/pytest-plugins; @@ -5209,8 +5222,8 @@ in { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; sha256 = "093f5fa479ee6201e48db367c307531dc8b800609b0c3ddca9c01e0fd466a669"; }; - buildInputs = with self; [ pytestcov mock cmdline ]; - propagatedBuildInputs = with self; [ pytest-fixture-config pytest-shutil pytest ]; + buildInputs = with self; [ pytest pytestcov mock cmdline ]; + propagatedBuildInputs = with self; [ pytest-fixture-config pytest-shutil ]; checkPhase = '' py.test tests/unit ''; meta = { description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; @@ -5270,7 +5283,7 @@ in { sha256 = "15kzcr5pchf3id4ikdvlv752rc0j4d912n589l4rifp8qsj19l1x"; }; - propagatedBuildInputs = with self; [ pytest ]; + buildInputs = with self; [ pytest ]; # no upstream test doCheck = false; @@ -7676,8 +7689,8 @@ in { sed 's/==/>=/' -i setup.py ''; - propagatedBuildInputs = with self; [ six clint pyyaml docopt pytest - requests2 jsonpatch args ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ six clint pyyaml docopt requests2 jsonpatch args ]; meta = with stdenv.lib; { description = "A python wrapper for the various Internet Archive APIs"; @@ -8002,7 +8015,7 @@ in { propagatedBuildInputs = with self; [ httplib2 oauth oauth2 semantic-version ]; buildInputs = with self; [ - flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore + flask httpretty oauthlib pyflakes pytest_27 pytestcache pytestcov covCore pytestflakes pytestpep8 sphinx mock ]; @@ -10341,7 +10354,8 @@ in { sha256 = "10p9rb2m1zccszg7590fjd0in6rabzsh86f5m7qm369mapc3b6dc"; }; - propagatedBuildInputs = with self; [ django pytest ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ django ]; meta = { description = "Efficient tree implementations for Django 1.6+"; @@ -10996,8 +11010,7 @@ in { sha256 = "1x9ixika7wqjj52x8wnsh1vk7jadkdqpx01plj7mlh8slwyq4s41"; }; - propagatedBuildInputs = with self; [ pytest ]; - buildInputs = with self; [ mock ]; + buildInputs = with self; [ mock pytest ]; # waiting for feedback https://github.com/box/flaky/issues/97 doCheck = false; From 74276caf194ac9a1398cf164ec6604c3730f75a2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 16:36:38 +0100 Subject: [PATCH 1062/1749] koji -> pythonPackages.koji koji is both a library and an application. It is used in Nixpkgs primarily as a library and therefore I move it. --- .../python-modules}/koji/default.nix | 9 ++++----- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/python-packages.nix | 4 +++- 3 files changed, 7 insertions(+), 8 deletions(-) rename pkgs/{tools/package-management => development/python-modules}/koji/default.nix (72%) diff --git a/pkgs/tools/package-management/koji/default.nix b/pkgs/development/python-modules/koji/default.nix similarity index 72% rename from pkgs/tools/package-management/koji/default.nix rename to pkgs/development/python-modules/koji/default.nix index 7d2022ee91bb..262ea74d4a34 100644 --- a/pkgs/tools/package-management/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, python2 }: +{ stdenv, fetchurl, mkPythonDerivation, pycurl }: -let - pythonEnv = python2.withPackages(ps : [ps.pycurl]); -in stdenv.mkDerivation rec { +mkPythonDerivation rec { name = "koji-1.8"; src = fetchurl { @@ -10,11 +8,12 @@ in stdenv.mkDerivation rec { sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1"; }; - propagatedBuildInputs = [ pythonEnv ]; + propagatedBuildInputs = [ pycurl ]; makeFlags = "DESTDIR=$(out)"; postInstall = '' + mv $out/usr/* $out/ cp -R $out/nix/store/*/* $out/ rm -rf $out/nix ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cad0b6c80319..69790130efc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13575,8 +13575,6 @@ in stdenv = overrideCC stdenv gcc49; }; - koji = callPackage ../tools/package-management/koji { }; - konversation = qt5.callPackage ../applications/networking/irc/konversation/1.6.nix { }; krita = qt5.callPackage ../applications/graphics/krita { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd6e74c6a64b..8eaa75fb69d7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13338,7 +13338,9 @@ in { homepage = "https://github.com/twisted/klein"; license = licenses.mit; }; - }; + }; + + koji = callPackage ../development/python-modules/koji { }; kombu = buildPythonPackage rec { name = "kombu-${version}"; From 19ca20c91f56b47b194039781145f0cba9a2ddc3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 16:39:51 +0100 Subject: [PATCH 1063/1749] pythonPackages.rpm: rpm for specific python version rpm provides a Python module that is used by certain packages. We need to override pkgs.rpm to get a correct version. --- pkgs/tools/misc/diffoscope/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 4d5eabfebc90..c6eb7c8b0180 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils , acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc -, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz +, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, vim, xz , enableBloat ? false }: @@ -29,9 +29,9 @@ pythonPackages.buildPythonApplication rec { # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf # Also these libraries: python3-guestfs # FIXME: move xxd into a separate package so we don't have to pull in all of vim. - propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++ + propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh rpm ]) ++ map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext - gzip libcaca poppler_utils rpm sng sqlite squashfsTools unzip vim xz + gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]); doCheck = false; # Calls 'mknod' in squashfs tests, which needs root diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69790130efc4..564e52777f79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1430,7 +1430,6 @@ in diffoscope = callPackage ../tools/misc/diffoscope { jdk = jdk7; pythonPackages = python3Packages; - rpm = rpm.override { python = python3; }; }; diffstat = callPackage ../tools/text/diffstat { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8eaa75fb69d7..06bad487f8ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22454,6 +22454,8 @@ in { }); + rpm = (pkgs.rpm.override{inherit python;}); + rpy2 = buildPythonPackage rec { name = "rpy2-2.8.2"; disabled = isPyPy; From 13017d8ba6ac90837e4ec73c372f236a3b4d12fe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 16:40:34 +0100 Subject: [PATCH 1064/1749] pythonPackages.rpkg: use local rpm and koji --- 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 06bad487f8ec..b1c2bdd05210 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22439,7 +22439,7 @@ in { rpkg = buildPythonPackage (rec { name = "rpkg-1.14"; - disabled = !isPy27; + disabled = !isPy27; # error: invalid command 'bdist_wheel' meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { @@ -22449,8 +22449,8 @@ in { patches = [ ../development/python-modules/rpkg-buildfix.diff ]; - propagatedBuildInputs = with self; [ pycurl pkgs.koji GitPython pkgs.git - pkgs.rpm pyopenssl ]; + propagatedBuildInputs = with self; [ pycurl koji GitPython pkgs.git + rpm pyopenssl ]; }); From 8b5544bea26f320c13626a03893be0ed265a4305 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 17:06:19 +0100 Subject: [PATCH 1065/1749] pythonPackages.pynzb: disable tests --- pkgs/top-level/python-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1c2bdd05210..66dbdcd611dd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20746,6 +20746,12 @@ in { sha256 = "0735b3889a1174bbb65418ee503629d3f5e4a63f04b16f46ffba18253ec3ef17"; }; + # Can't get them working + doCheck = false; + checkPhase = '' + ${python.interpreter} -m unittest -s pynzb -t . + ''; + meta = { homepage = http://github.com/ericflo/pynzb; description = "Unified API for parsing NZB files"; From 2dba67fbb7da79905e7c865fe70d73a6e034e373 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 17:13:26 +0100 Subject: [PATCH 1066/1749] pythonPackages.webassets: disable tests Test invocation was broken. Now that is fixed, but getting the tests to pass requires more work. --- pkgs/top-level/python-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 66dbdcd611dd..1777dbad6367 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26043,8 +26043,15 @@ in { sha256 = "14m13xa5sc7iqq2j1wsd2klcwaihqlhz2l9lmn92dks2yc8hplcr"; }; + buildInputs = with self; [ nose jinja2 mock pytest ]; propagatedBuildInputs = with self; [ pyyaml ]; + doCheck = false; + + checkPhase = '' + py.test + ''; + meta = { description = "Media asset management for Python, with glue code for various web frameworks"; homepage = "http://github.com/miracle2k/webassets/"; From 7d2bc0c2d215bfb9ddd1652bc0e35ca7099833a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 21:04:31 +0100 Subject: [PATCH 1067/1749] pythonPackages.numtraits: needs six --- pkgs/top-level/python-packages.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1777dbad6367..3f730ebe77a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15899,16 +15899,21 @@ in { }; numtraits = buildPythonPackage rec { - name = "numtraits-${version}"; + pname = "numtraits"; version = "0.2"; + name = "${pname}-${version}"; src = pkgs.fetchurl { - url = "mirror://pypi/n/numtraits/${name}.tar.gz"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e"; }; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ numpy traitlets]; + propagatedBuildInputs = with self; [ six numpy traitlets]; + + checkPhase = '' + py.test + ''; meta = { description = "Numerical traits for Python objects"; From 9c87884fdf38fd517d10a632908434aa426645eb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 1 Dec 2016 20:06:57 +0000 Subject: [PATCH 1068/1749] merlin: 2.5.2 -> 2.5.3 --- pkgs/development/tools/ocaml/merlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 2aa2321ef6ac..7af1b5ccd7a3 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -8,10 +8,10 @@ let then "2.3.1" else - "2.5.2"; + "2.5.3"; hashes = { "2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn"; - "2.5.2" = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc"; + "2.5.3" = "0qljklgcrpqdxzvcqj7b4785zcz322pjvw9cddbmzla33hagglha"; }; in From 36f980b7ff98f0106a534166f28b9eabb4ec7e20 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 2 Dec 2016 05:50:50 +0900 Subject: [PATCH 1069/1749] firefox-esr: security 45.5.0 -> 45.5.1 (#20841) --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 3ab8ced9fc82..6000f2602312 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -153,8 +153,8 @@ in { firefox-esr-unwrapped = common { pname = "firefox-esr"; - version = "45.5.0esr"; - sha512 = "fadac65fcad4bd4701026c9f3d87ba7dec304205e3c375769db7f7de9e596877deed9b21d3e8c34c1ce8ae689dd2979b3627742dfbec9bc0cb16a5cb1ce7507d"; + version = "45.5.1esr"; + sha512 = "36c56e1486a6a35f71526bd81d01fb4fc2b9df852eb2feb39b77c902fcf90d713d8fcdcd6113978630345e1ed36fa5cf0df6da7b6bf7e85a84fe014cb11f9a03"; }; } From d4858edf57f1e3d89f136ea96436979a614aefdc Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Thu, 1 Dec 2016 22:29:44 +0100 Subject: [PATCH 1070/1749] ponyc: 0.6.0 -> 0.9.0 --- pkgs/development/compilers/ponyc/default.nix | 6 +++--- .../compilers/ponyc/disable-tests.patch | 18 +++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 122b9ff7ed1a..2bce01551ee5 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.6.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "10miwsyxl589b0n1h3dbbc2qckq8z8a58s0d53asq88w2gpc339q"; + sha256 = "1g2i3x9k36h5rx7ifx0i6hn78xlj42i86x8apwzvkh0y84y88adi"; }; buildInputs = [ llvm makeWrapper which ]; @@ -83,7 +83,7 @@ stdenv.mkDerivation ( rec { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; homepage = http://www.ponylang.org; license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.doublec ]; + maintainers = with stdenv.lib.maintainers; [ doublec kamilchm ]; platforms = stdenv.lib.platforms.unix; }; }) diff --git a/pkgs/development/compilers/ponyc/disable-tests.patch b/pkgs/development/compilers/ponyc/disable-tests.patch index 696dc005f0ab..38740cf963eb 100644 --- a/pkgs/development/compilers/ponyc/disable-tests.patch +++ b/pkgs/development/compilers/ponyc/disable-tests.patch @@ -1,15 +1,19 @@ -diff --git a/packages/net/_test.pony b/packages/net/_test.pony -index ce26bd7..9a98cc7 100644 ---- a/packages/net/_test.pony -+++ b/packages/net/_test.pony -@@ -5,9 +5,7 @@ actor Main is TestList +diff -Naur a/packages/net/_test.pony b/packages/net/_test.pony +--- a/packages/net/_test.pony 1970-01-01 01:00:01.000000000 +0100 ++++ b/packages/net/_test.pony 2016-12-01 22:25:59.102433053 +0100 +@@ -5,14 +5,7 @@ new make() => None - + fun tag tests(test: PonyTest) => - test(_TestBroadcast) - test(_TestTCPWritev) - test(_TestTCPExpect) +- test(_TestTCPMute) +- test(_TestTCPUnmute) +- ifdef not windows then +- test(_TestTCPThrottle) +- end + None - + class _TestPing is UDPNotify let _h: TestHelper From 5afc6b506cc6e96cd03008a6f014edfbf1cfa432 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 1 Dec 2016 20:34:02 -0500 Subject: [PATCH 1071/1749] linux: 4.1.35 -> 4.1.36 --- pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index 67d8d267b546..b7f988299313 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.35"; + version = "4.1.36"; extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jn09hs91d5fi6615v9fnbpggyh1x192q6faggpbb90q110g0jjl"; + sha256 = "140my5r39w795gsaglqxaw97hwpy8qf95c6hy2cr7a122bgnslp1"; }; kernelPatches = args.kernelPatches; From 4e2e2039c2f111924a3c733babdc988771c62ccf Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 2 Dec 2016 03:25:01 +0100 Subject: [PATCH 1072/1749] pythonPackages.acoustic: fix meta.license There is no licenses.bsd; the upstream license looks like 3-clause BSD. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f730ebe77a7..7ae28a275b39 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -60,7 +60,7 @@ in { meta = { description = "A package for acousticians"; maintainer = with maintainers; [ fridh ]; - license = with licenses; [ bsd ]; + license = with licenses; [ bsd3 ]; homepage = https://github.com/python-acoustics/python-acoustics; }; }; From 813e5284cf4621572aee6d53c1639573fdb7fc5e Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Fri, 2 Dec 2016 13:14:22 +0900 Subject: [PATCH 1073/1749] urlwatch: 2.2 -> 2.5 --- pkgs/tools/networking/urlwatch/default.nix | 27 ++++++-------- pkgs/tools/networking/urlwatch/setup.patch | 42 ---------------------- 2 files changed, 11 insertions(+), 58 deletions(-) delete mode 100644 pkgs/tools/networking/urlwatch/setup.patch diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 3634b852fadc..c1b19f745a3f 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchurl, python3Packages }: +{ stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - name = "urlwatch-2.2"; + name = "urlwatch-${version}"; + version = "2.5"; - src = fetchurl { - url = "http://thp.io/2008/urlwatch/${name}.tar.gz"; - sha256 = "0s9056mm1hkj5gpzsb5bz6fwxk0nm73i0dhnqwa1bfddjnvpl9d3"; + src = fetchFromGitHub { + owner = "thp"; + repo = "urlwatch"; + rev = version; + sha256 = "0irz54nvyq3cxa3fvjc5k2836a5nmly4wiiy4s5cwib1rnwg6r94"; }; - patches = [ - ./setup.patch - ]; - propagatedBuildInputs = with python3Packages; [ keyring minidb @@ -19,14 +18,10 @@ python3Packages.buildPythonApplication rec { requests2 ]; - postFixup = '' - wrapProgram "$out/bin/urlwatch" --prefix "PYTHONPATH" : "$PYTHONPATH" - ''; - - meta = { + meta = with stdenv.lib; { description = "A tool for monitoring webpages for updates"; homepage = https://thp.io/2008/urlwatch/; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.tv ]; + license = licenses.bsd3; + maintainers = with maintainers; [ tv ]; }; } diff --git a/pkgs/tools/networking/urlwatch/setup.patch b/pkgs/tools/networking/urlwatch/setup.patch deleted file mode 100644 index 66626dbf0259..000000000000 --- a/pkgs/tools/networking/urlwatch/setup.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ebe7b90100a3d960f53fdc9409d2d89eaa61bf11 Mon Sep 17 00:00:00 2001 -From: Thomas Perl -Date: Tue, 28 Jun 2016 18:15:51 +0200 -Subject: [PATCH] Check current directory and use os.path.relpath (Fixes #73) - ---- - setup.py | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index 947a7c8..45405cd 100644 ---- a/setup.py -+++ b/setup.py -@@ -7,10 +7,15 @@ - - import os - import re -+import sys - - PACKAGE_NAME = 'urlwatch' - DEPENDENCIES = ['minidb', 'PyYAML', 'requests'] --HERE = os.path.dirname(__file__) -+HERE = os.path.abspath(os.path.dirname(__file__)) -+ -+if os.path.normpath(os.getcwd()) != os.path.normpath(HERE): -+ print('You must run {} inside {} (cwd={})'.format(os.path.basename(__file__), HERE, os.getcwd())) -+ sys.exit(1) - - # Assumptions: - # 1. Package name equals main script file name (and only one script) -@@ -29,9 +34,9 @@ - - m['scripts'] = [os.path.join(HERE, PACKAGE_NAME)] - m['package_dir'] = {'': os.path.join(HERE, 'lib')} --m['packages'] = ['.'.join(dirname[len(HERE)+1:].split(os.sep)[1:]) -+m['packages'] = ['.'.join(os.path.relpath(dirname, HERE).split(os.sep)[1:]) - for dirname, _, files in os.walk(os.path.join(HERE, 'lib')) if '__init__.py' in files] --m['data_files'] = [(dirname[len(HERE)+1:], [os.path.join(dirname[len(HERE)+1:], fn) for fn in files]) -+m['data_files'] = [(os.path.relpath(dirname, HERE), [os.path.join(os.path.relpath(dirname, HERE), fn) for fn in files]) - for dirname, _, files in os.walk(os.path.join(HERE, 'share')) if files] - m['install_requires'] = DEPENDENCIES - From fe514b3053acf72e91eea725ffd74de2502ec7ed Mon Sep 17 00:00:00 2001 From: Sheena Artrip Date: Fri, 2 Dec 2016 02:52:11 -0500 Subject: [PATCH 1074/1749] spotify: 1.0.42.151 -> 1.0.43.125 --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index c9139a8c2276..0ff4e2c1cbc3 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux"; let # Please update the stable branch! - version = "1.0.42.151.g19de0aa6-74"; + version = "1.0.43.125.g376063c5-91"; deps = [ alsaLib @@ -51,7 +51,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "905c0c87091855c9d5d354ebeca9fb3951ff60c08f0dfc1c1898bf66cc8acd15"; + sha256 = "1qkyfqi6dy8sggq8kakl6y03l6w2fcxb22ya3kxb4d468bifss3v"; }; buildInputs = [ dpkg makeWrapper ]; From da3d8d077d3533a493fd2ae6554a7962a3d831b4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 2 Dec 2016 10:35:17 +0100 Subject: [PATCH 1075/1749] pythonPackages.django_guardian: add missing pytest --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ae28a275b39..e990295f1e02 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10085,7 +10085,7 @@ in { sha256 = "1m7y3brk3697hr2cvkzl8dry4pp7wkmhvxmf8db1ardz1r9d8895"; }; - buildInputs = with self ; [ pytestrunner pytestdjango django_environ mock ]; + buildInputs = with self ; [ pytest pytestrunner pytestdjango django_environ mock ]; propagatedBuildInputs = with self ; [ django six ]; checkPhase = '' From 538ec0cc929684058a0dda7587446afd2ab351dc Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Fri, 2 Dec 2016 03:31:01 -0700 Subject: [PATCH 1076/1749] teensyduino: init at 1.31 (#20807) --- .../arduino/arduino-core/default.nix | 110 +++++++++++++++++- pkgs/top-level/all-packages.nix | 2 + 2 files changed, 108 insertions(+), 4 deletions(-) diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index ccf6dac895c9..fbc139c314fd 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -1,10 +1,21 @@ { stdenv, lib, fetchFromGitHub, fetchurl, jdk, ant , libusb, libusb1, unzip, zlib, ncurses, readline -, withGui ? false, gtk2 ? null +, withGui ? false, gtk2 ? null, withTeensyduino ? false + /* Packages needed for Teensyduino */ +, upx, fontconfig, xorg, gcc, xdotool, xvfb_run +, atk, glib, pango, gdk_pixbuf, libpng12, expat, freetype }: assert withGui -> gtk2 != null; +assert withTeensyduino -> withGui; +# TODO: Teensyduino is disabled for i686-linux due to an indefinite hang in the +# xdotool script; the cause of this hang is not yet known. +# TODO: There is a fair chance that Teensyduino works with arm-linux, but it +# has not yet been tested. +if withTeensyduino && (stdenv.system != "x86_64-linux") then throw + "Teensyduino is only supported on x86_64-linux at this time (patches welcome)." +else let externalDownloads = import ./downloads.nix {inherit fetchurl; inherit (lib) optionalAttrs; inherit (stdenv) system;}; # Some .so-files are later copied from .jar-s to $HOME, so patch them beforehand @@ -14,10 +25,37 @@ let ; # abiVersion 6 is default, but we need 5 for `avrdude_bin` executable ncurses5 = ncurses.override { abiVersion = "5"; }; + + teensy_libpath = stdenv.lib.makeLibraryPath [ + atk + expat + fontconfig + freetype + gcc.cc.lib + gdk_pixbuf + glib + gtk2 + libpng12 + libusb + pango + xorg.libSM + xorg.libX11 + xorg.libXext + xorg.libXft + xorg.libXinerama + zlib + ]; + teensy_architecture = + lib.optionalString (stdenv.system == "x86_64-linux") "linux64" + + lib.optionalString (stdenv.system == "i686-linux") "linux32" + + lib.optionalString (stdenv.system == "arm-linux") "linuxarm"; + + flavor = (if withTeensyduino then "teensyduino" else "arduino") + + stdenv.lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { version = "1.6.12"; - name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}-${version}"; + name = "${flavor}-${version}"; src = fetchFromGitHub { owner = "arduino"; @@ -26,7 +64,19 @@ stdenv.mkDerivation rec { sha256 = "0rz8dv1mncwx2wkafakxqdi2y0rq3f72fr57cg0z5hgdgdm89lkh"; }; - buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline ]; + teensyduino_src = fetchurl { + url = "http://www.pjrc.com/teensy/td_131/TeensyduinoInstall.${teensy_architecture}"; + sha256 = + lib.optionalString ("${teensy_architecture}" == "linux64") + "1q4wv6s0900hyv9z1mjq33fr2isscps4q3bsy0h12wi3l7ir94g9" + + lib.optionalString ("${teensy_architecture}" == "linux32") + "06fl951f44avqyqim5qmy73siylbqcnsmz55zmj2dzhgf4sflkvc" + + lib.optionalString ("${teensy_architecture}" == "linuxarm") + "0ldf33w8wkqwklcj8fn4p22f23ibpwpf7873dc6i2jfmmbx0yvxn"; + }; + + buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline + ] ++ stdenv.lib.optionals withTeensyduino [ upx xvfb_run xdotool ]; downloadSrcList = builtins.attrValues externalDownloads; downloadDstList = builtins.attrNames externalDownloads; @@ -75,6 +125,50 @@ stdenv.mkDerivation rec { --replace '' "$out/bin/arduino" \ --replace '' "$out/share/arduino/icons/128x128/apps/arduino.png" ''} + + ${stdenv.lib.optionalString withTeensyduino '' + # Extract and patch the Teensyduino installer + cp ${teensyduino_src} ./TeensyduinoInstall.${teensy_architecture} + chmod +w ./TeensyduinoInstall.${teensy_architecture} + upx -d ./TeensyduinoInstall.${teensy_architecture} + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "${teensy_libpath}" \ + ./TeensyduinoInstall.${teensy_architecture} + chmod +x ./TeensyduinoInstall.${teensy_architecture} + + # Run the GUI-only installer in a virtual X server + # Script thanks to AUR package. See: + # + echo "Running Teensyduino installer..." + # Trick the GUI into using HOME as the install directory. + export HOME=$out/share/arduino + # Run the installer in a virtual X server in memory. + xvfb-run -n 99 ./TeensyduinoInstall.${teensy_architecture} & + sleep 4 + echo "Waiting for Teensyduino to install (about 1 minute)..." + # Control the installer GUI with xdotool. + DISPLAY=:99 xdotool search --class "teensyduino" \ + windowfocus \ + key space sleep 1 \ + key Tab sleep 0.4 \ + key Tab sleep 0.4 \ + key Tab sleep 0.4 \ + key Tab sleep 0.4 \ + key space sleep 1 \ + key Tab sleep 0.4 \ + key Tab sleep 0.4 \ + key Tab sleep 0.4 \ + key Tab sleep 0.4 \ + key space sleep 1 \ + key Tab sleep 0.4 \ + key space sleep 35 \ + key space sleep 2 & + # Wait for xdotool to terminate and swallow the inevitable XIO error + wait $! || true + + # Check for successful installation + [ -d $out/share/arduino/hardware/teensy ] || exit 1 + ''} ''; # So we don't accidentally mess with firmware files @@ -101,6 +195,14 @@ stdenv.mkDerivation rec { # avrdude_bin is linked against libtinfo.so.5 mkdir $out/lib/ ln -s ${lib.makeLibraryPath [ncurses5]}/libncursesw.so.5 $out/lib/libtinfo.so.5 + + ${stdenv.lib.optionalString withTeensyduino '' + # Patch the Teensy loader binary + patchelf --debug \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "${teensy_libpath}" \ + $out/share/arduino/hardware/tools/teensy + ''} ''; meta = with stdenv.lib; { @@ -108,6 +210,6 @@ stdenv.mkDerivation rec { homepage = http://arduino.cc/; license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ antono robberer bjornfor ]; + maintainers = with maintainers; [ antono auntie robberer bjornfor ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84923c566426..01d8593a676d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6502,6 +6502,8 @@ in tcptrack = callPackage ../development/tools/misc/tcptrack { }; + teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; }; + teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; From d78b890178ce5c497c396ce181c1a055b2fda515 Mon Sep 17 00:00:00 2001 From: Dejan Lukan Date: Fri, 2 Dec 2016 11:47:35 +0100 Subject: [PATCH 1077/1749] mail-notification: init at 5.4 --- lib/maintainers.nix | 1 + .../desktop/mail-notification/default.nix | 87 + ...ation-5.4-remove-ubuntu-special-case.patch | 33 + .../patches/mail-notification-aarch64.patch | 1629 +++++++++++++++++ ...ication-dont-link-against-bsd-compat.patch | 10 + .../mail-notification-jb-gcc-format.patch | 15 + pkgs/top-level/all-packages.nix | 2 + 7 files changed, 1777 insertions(+) create mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/default.nix create mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch create mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch create mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch create mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 2a3b10905539..b56dce798201 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -141,6 +141,7 @@ ehmry = "Emery Hemingway "; eikek = "Eike Kettner "; elasticdog = "Aaron Bull Schaefer "; + eleanor = "Dejan Lukan "; elitak = "Eric Litak "; ellis = "Ellis Whitehead "; epitrochoid = "Mabry Cervin "; diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix new file mode 100644 index 000000000000..e8abc47c2d0e --- /dev/null +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -0,0 +1,87 @@ +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus_glib, gmime, libnotify, libgnome_keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor_icon_theme, tango-icon-theme }: + +stdenv.mkDerivation rec { + rev = "9ae8768"; + version = "5.4"; + name = "mail-notification-${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "epienbroek"; + repo = "mail-notification"; + sha256 = "1slb7gajn30vdaq0hf5rikwdly1npmg1cf83hpjs82xd98knl13d"; + }; + + buildInputs = [ pkgconfig glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ]; + + prePatch = '' + sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c || die + + # Ensure we never append -Werror + sed -i -e 's/ -Werror//' jb jbsrc/jb.c || die + ''; + + patches = [ + ./patches/mail-notification-5.4-remove-ubuntu-special-case.patch + # ./patches/mail-notification-aarch64.patch + ./patches/mail-notification-dont-link-against-bsd-compat.patch + # ./patches/mail-notification-jb-gcc-format.patch + ]; + + patchFlags = "-p0"; + + configurePhase = '' + ./jb configure + runHook postConfigure + ''; + + postConfigure = '' + sed -i -e "/^prefix/c prefix|string|1|$out" \ + -e 's/^pkgdatadir.*/pkgdatadir|string|0|$datadir/g' \ + build/config + + # currently disable the check for missing sheme until a better solution + # is found; needed, because otherwise the application doesn't even start + # and fails saying it unable to find gconf scheme values. + sed -i -e 's/(schema_missing)/(!schema_missing)/g' src/mn-conf.c + ''; + + + buildPhase = '' + ./jb build + ''; + + # the "./jb install" tries to install directly to nix store, which is not + # writable, so we have to copy the files ourselves + installPhase = '' + #GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install + + # create directories + mkdir -p $out/{bin,lib,libexec,share,etc,var} + + # copy executable + cp ./build/src/mail-notification $out/bin/ + + # copy icons + #mkdir -p $out/share/icons/hicolor + cp -r art/* $out/share/ + + # copy schemas + mkdir -p $out/etc/gconf/schemas/ + #GCONF_CONFIG_SOURCE="xml:merged:${gnome2.GConf}/etc/gconf/gconf.xml.defaults" ${gnome2.GConf}/bin/gconftool-2 --makefile-install-rule data/mail-notification.schemas.in.in + cp data/mail-notification.schemas.in.in $out/etc/gconf/schemas/ + + # copy properties dialogs + cp ui/* $out/share/ + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Tray status icon, which notifies us when new email arrives"; + homepage = "http://www.nongnu.org/mailnotify/"; + license = "GPL-3"; + platforms = platforms.unix; + maintainers = [ maintainers.eleanor ]; + }; +} diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch new file mode 100644 index 000000000000..4516f32c6f52 --- /dev/null +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch @@ -0,0 +1,33 @@ +--- jbsrc/lib/src/core/jb-feature.c.~1~ 2008-04-27 16:47:27.000000000 +0200 ++++ jbsrc/lib/src/core/jb-feature.c 2008-07-22 11:40:50.856886210 +0200 +@@ -164,8 +164,6 @@ + static void + gconf_configure (void) + { +- JBVariable *variable; +- + jb_require_program("gconftool-2"); + + if (! strcmp(jb_variable_get_string("gconf-config-source"), "autodetect")) +@@ -178,21 +176,6 @@ + jb_variable_set_string("gconf-config-source", config_source); + g_free(config_source); + } +- +- /* fix the default schemas dir on Ubuntu */ +- variable = jb_variable_get_variable_or_error("gconf-schemas-dir"); +- if (! variable->user_set) +- { +- static const char *ubuntu_dir = "$datadir/gconf/schemas"; +- char *expanded; +- +- expanded = jb_variable_expand(ubuntu_dir, NULL); +- +- if (g_file_test(expanded, G_FILE_TEST_IS_DIR)) +- jb_variable_set_string("gconf-schemas-dir", ubuntu_dir); +- +- g_free(expanded); +- } + } + + static void diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch new file mode 100644 index 000000000000..e0957715b4b2 --- /dev/null +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch @@ -0,0 +1,1629 @@ +diff -urN epienbroek-mail-notification-eab5c13/jbsrc/tools/config.guess epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.guess +--- epienbroek-mail-notification-eab5c13/jbsrc/tools/config.guess 2012-11-21 12:57:35.000000000 -0600 ++++ epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.guess 2013-03-08 02:14:30.621645440 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +-# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2007-07-22' ++timestamp='2012-09-25' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,9 +17,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -27,16 +25,16 @@ + # the same distribution terms that you use for the rest of that program. + + +-# Originally written by Per Bothner . +-# Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -56,7 +54,8 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO +@@ -144,7 +143,7 @@ + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -170,7 +169,7 @@ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -180,7 +179,7 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -201,6 +200,10 @@ + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +@@ -223,7 +226,7 @@ + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -269,7 +272,10 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -295,12 +301,12 @@ + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -324,14 +330,33 @@ + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize +@@ -375,23 +400,23 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; +@@ -461,8 +486,8 @@ + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -475,7 +500,7 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; +@@ -532,7 +557,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[45]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -575,52 +600,52 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c + +- #define _HPUX_SOURCE +- #include +- #include +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -640,7 +665,7 @@ + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | +- grep __LP64__ >/dev/null ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else +@@ -711,22 +736,22 @@ + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; +@@ -750,14 +775,14 @@ + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +@@ -769,40 +794,51 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- case ${UNAME_MACHINE} in +- pc98) +- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) +- # uname -m includes "-pc" on this system. +- echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- *:Interix*:[3456]*) +- case ${UNAME_MACHINE} in ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +- EM64T | authenticamd) ++ authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we +@@ -832,20 +868,68 @@ + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; +- arm*:Linux:*:*) ++ aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; ++ arm*:Linux:*:*) ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi ++ fi ++ exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -856,74 +940,33 @@ + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- mips:Linux:*:*) ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips +- #undef mipsel ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } +- ;; +- mips64:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips64 +- #undef mips64el +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 +- #else +- CPU= +- #endif +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu +- exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu + exit ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level +@@ -933,14 +976,17 @@ + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -948,78 +994,18 @@ + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- xtensa:Linux:*:*) +- echo xtensa-unknown-linux-gnu ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^LIBC/{ +- s: ::g +- p +- }'`" +- test x"${LIBC}" != x && { +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" +- exit +- } +- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } +- ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both +@@ -1027,11 +1013,11 @@ + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) +@@ -1048,7 +1034,7 @@ + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) +@@ -1063,7 +1049,7 @@ + fi + exit ;; + i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; +@@ -1091,10 +1077,13 @@ + exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp +- exit ;; ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; +@@ -1129,8 +1118,18 @@ + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; +@@ -1143,7 +1142,7 @@ + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) +@@ -1163,10 +1162,10 @@ + echo ns32k-sni-sysv + fi + exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm +@@ -1192,11 +1191,11 @@ + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; +@@ -1206,6 +1205,12 @@ + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1233,6 +1238,16 @@ + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +@@ -1248,7 +1263,10 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1293,13 +1311,13 @@ + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; +@@ -1314,11 +1332,14 @@ + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c < + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + +@@ -1474,9 +1495,9 @@ + the operating system you are using. It is advised that you + download the most up to date version of the config scripts from + +- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + and +- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + + If the version you run ($0) is already up to date, please + send the following data and any information you think might be +diff -urN epienbroek-mail-notification-eab5c13/jbsrc/tools/config.sub epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.sub +--- epienbroek-mail-notification-eab5c13/jbsrc/tools/config.sub 2012-11-21 12:57:35.000000000 -0600 ++++ epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.sub 2013-03-08 02:14:30.629644517 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +-# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2007-06-28' ++timestamp='2012-10-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,9 +21,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -32,13 +30,16 @@ + + + # Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -72,7 +73,8 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO +@@ -120,12 +122,18 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ +- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -148,10 +156,13 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 +@@ -166,10 +177,10 @@ + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; +@@ -214,6 +225,12 @@ + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -238,24 +255,32 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | be32 | be64 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | le32 | le64 \ ++ | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore | mep \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +- | mips64vr | mips64vrel \ ++ | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ +@@ -268,29 +293,42 @@ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ + | mt \ + | msp430 \ ++ | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ ++ | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ ++ | rl78 | rx \ + | score \ +- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +- | spu | strongarm \ +- | tahoe | thumb | tic4x | tic80 | tron \ +- | v850 | v850e \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | ubicom32 \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ +- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ +- | z8k) ++ | x86 | xc16x | xstormy16 | xtensa \ ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12) +- # Motorola 68HC11/12. ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -300,6 +338,21 @@ + basic_machine=mt-unknown + ;; + ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +@@ -314,29 +367,37 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ ++ | be32-* | be64-* \ + | bfin-* | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ ++ | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +- | mips64vr-* | mips64vrel-* \ ++ | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ +@@ -351,27 +412,36 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* \ +- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ +- | tahoe-* | thumb-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile*-* \ + | tron-* \ +- | v850-* | v850e-* | vax-* \ ++ | ubicom32-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ +- | xstormy16-* | xtensa-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ ++ | xstormy16-* | xtensa*-* \ + | ymp-* \ +- | z8k-*) ++ | z8k-* | z80-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. +@@ -389,7 +459,7 @@ + basic_machine=a29k-amd + os=-udi + ;; +- abacus) ++ abacus) + basic_machine=abacus-unknown + ;; + adobe68k) +@@ -435,6 +505,10 @@ + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -443,10 +517,35 @@ + basic_machine=ns32k-sequent + os=-dynix + ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd +@@ -475,7 +574,7 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16) ++ cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; +@@ -514,6 +613,10 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp +@@ -629,7 +732,6 @@ + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -668,6 +770,14 @@ + basic_machine=m68k-isi + os=-sysv + ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + m88k-omron*) + basic_machine=m88k-omron + ;; +@@ -679,6 +789,13 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze*) ++ basic_machine=microblaze-xilinx ++ ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -715,10 +832,18 @@ + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -783,6 +908,12 @@ + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -813,6 +944,14 @@ + basic_machine=i860-intel + os=-osf + ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + pbd) + basic_machine=sparc-tti + ;; +@@ -857,9 +996,10 @@ + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown ++ ppc | ppcbe) basic_machine=powerpc-unknown + ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +@@ -953,6 +1093,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -1009,17 +1152,9 @@ + basic_machine=t90-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff +- ;; +- tic55x | c55x*) +- basic_machine=tic55x-unknown +- os=-coff +- ;; +- tic6x | c6x*) +- basic_machine=tic6x-unknown +- os=-coff ++ tile*) ++ basic_machine=$basic_machine-unknown ++ os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown +@@ -1088,6 +1223,9 @@ + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; + ymp) + basic_machine=ymp-cray + os=-unicos +@@ -1096,6 +1234,10 @@ + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -1134,7 +1276,7 @@ + we32k) + basic_machine=we32k-att + ;; +- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) +@@ -1181,9 +1323,12 @@ + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; +@@ -1204,21 +1349,23 @@ + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +- | -openbsd* | -solidbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ +- | -chorusos* | -chorusrdb* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +@@ -1226,7 +1373,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1265,7 +1412,7 @@ + -opened*) + os=-openedition + ;; +- -os400*) ++ -os400*) + os=-os400 + ;; + -wince*) +@@ -1314,7 +1461,7 @@ + -sinix*) + os=-sysv4 + ;; +- -tpf*) ++ -tpf*) + os=-tpf + ;; + -triton*) +@@ -1356,6 +1503,11 @@ + -zvmoe) + os=-zvmoe + ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) ++ ;; + -none) + ;; + *) +@@ -1378,10 +1530,10 @@ + # system, and we'll never get to this point. + + case $basic_machine in +- score-*) ++ score-*) + os=-elf + ;; +- spu-*) ++ spu-*) + os=-elf + ;; + *-acorn) +@@ -1393,8 +1545,20 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ hexagon-*) ++ os=-elf ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) +@@ -1414,14 +1578,11 @@ + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; +- mep-*) ++ mep-*) + os=-elf + ;; + mips*-cisco) +@@ -1448,7 +1609,7 @@ + *-ibm) + os=-aix + ;; +- *-knuth) ++ *-knuth) + os=-mmixware + ;; + *-wec) +@@ -1553,7 +1714,7 @@ + -sunos*) + vendor=sun + ;; +- -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch new file mode 100644 index 000000000000..e246a8cc9389 --- /dev/null +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch @@ -0,0 +1,10 @@ +--- jbsrc/jb.c.orig 2014-01-19 20:06:48.525462981 +0100 ++++ jbsrc/jb.c 2014-01-19 20:07:36.087934897 +0100 +@@ -425,7 +425,6 @@ + */ + jb_compile_options_add_cflags(object->compile_options, "-std=c99"); + jb_compile_options_add_cppflags(object->compile_options, "-D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L"); +- jb_compile_options_add_libs(object->compile_options, "-lbsd-compat"); + } + + jb_compile_options_add_string_defines(object->compile_options, diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch new file mode 100644 index 000000000000..c99b01eda48f --- /dev/null +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch @@ -0,0 +1,15 @@ +Index: epienbroek-mail-notification-eab5c13/jbsrc/lib/src/core/jb-util.c +=================================================================== +--- epienbroek-mail-notification-eab5c13.orig/jbsrc/lib/src/core/jb-util.c ++++ epienbroek-mail-notification-eab5c13/jbsrc/lib/src/core/jb-util.c +@@ -208,6 +208,10 @@ jb_message_result_string_format (const c + g_free(message); + } + ++#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) ++static void print_warning_or_error (const char *prefix, const char *format, va_list args) __attribute__ ((format(printf, 1, 0))); ++#endif ++ + static void + print_warning_or_error (const char *prefix, const char *format, va_list args) + { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84923c566426..329924c515a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13732,6 +13732,8 @@ in lyx = callPackage ../applications/misc/lyx { }; + mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; + magnetophonDSP = { CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { }; CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { }; From 19fd547a7fee2665ba562933cc385a5fbe0f63a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 2 Dec 2016 13:03:24 +0100 Subject: [PATCH 1078/1749] Fixing the patch for icu for ARM. The source file changed paths. --- .../libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch index 2968d571bb3e..72d3f67d3bcc 100644 --- a/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch +++ b/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch @@ -10,10 +10,10 @@ Signed-off-by: Khem Raj source/config/mh-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/config/mh-linux b/config/mh-linux +diff --git a/source/config/mh-linux b/source/config/mh-linux index 366f0cc..2689aab 100644 ---- a/config/mh-linux -+++ b/config/mh-linux +--- a/source/config/mh-linux ++++ b/source/config/mh-linux @@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN LD_RPATH_PRE = -Wl,-rpath, From f0974e1e586699365eb4dd44b842f4711b552db7 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 2 Dec 2016 14:28:59 +0200 Subject: [PATCH 1079/1749] qt5: more reproducible builds Avoid mktemp -d in sources, where pathnames can affect result. --- pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh | 2 +- pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh | 2 +- pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index 304919831140..47d196cec26b 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -91,7 +91,7 @@ _qtSetQmakePath() { if [ -z "$NIX_QT5_TMP" ]; then if [ -z "$NIX_QT_SUBMODULE" ]; then - NIX_QT5_TMP=$(mktemp -d) + NIX_QT5_TMP=$(pwd)/__nix_qt5__ else NIX_QT5_TMP=$out fi diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh index 304919831140..47d196cec26b 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh @@ -91,7 +91,7 @@ _qtSetQmakePath() { if [ -z "$NIX_QT5_TMP" ]; then if [ -z "$NIX_QT_SUBMODULE" ]; then - NIX_QT5_TMP=$(mktemp -d) + NIX_QT5_TMP=$(pwd)/__nix_qt5__ else NIX_QT5_TMP=$out fi diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh index 304919831140..47d196cec26b 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh @@ -91,7 +91,7 @@ _qtSetQmakePath() { if [ -z "$NIX_QT5_TMP" ]; then if [ -z "$NIX_QT_SUBMODULE" ]; then - NIX_QT5_TMP=$(mktemp -d) + NIX_QT5_TMP=$(pwd)/__nix_qt5__ else NIX_QT5_TMP=$out fi From 8c9582ca673f581dcb3e564f58c4c0a71d0b4e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 2 Dec 2016 07:43:24 +0100 Subject: [PATCH 1080/1749] gajim: add enableOmemoPluginDependencies option --- .../networking/instant-messengers/gajim/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index e03b99aa1718..11e2b13653d8 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -7,6 +7,7 @@ , enableRST ? true , enableSpelling ? true, gtkspell2 ? null , enableNotifications ? false +, enableOmemoPluginDependencies ? false , extraPythonPackages ? pkgs: [] }: @@ -68,7 +69,9 @@ stdenv.mkDerivation rec { ] ++ optional enableE2E pythonPackages.pycrypto ++ optional enableRST pythonPackages.docutils ++ optional enableNotifications pythonPackages.notify - ++ extraPythonPackages pythonPackages; + ++ optionals enableOmemoPluginDependencies (with pythonPackages; [ + cryptography python-axolotl python-axolotl-curve25519 qrcode + ]) ++ extraPythonPackages pythonPackages; postFixup = '' install -m 644 -t "$out/share/gajim/icons/hicolor" \ From af609b02546d5361a8200a024df2c689dbba9d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 21 Nov 2016 13:11:40 +0000 Subject: [PATCH 1081/1749] lxcfs: init at 2.0.4 --- pkgs/os-specific/linux/lxcfs/default.nix | 36 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 37 insertions(+) create mode 100644 pkgs/os-specific/linux/lxcfs/default.nix diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix new file mode 100644 index 000000000000..ceaed205db96 --- /dev/null +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, help2man, fuse, pam }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "lxcfs-${version}"; + version = "2.0.4"; + + src = fetchurl { + url = "https://linuxcontainers.org/downloads/lxcfs/lxcfs-${version}.tar.gz"; + sha256 = "0pfrsn7hqccpcnwg4xk8ds0avb2yc9gyvj7bk2bl90vpwsm35j7y"; + }; + + nativeBuildInputs = [ pkgconfig help2man ]; + buildInputs = [ fuse pam ]; + + configureFlags = [ + "--with-init-script=systemd" + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + installFlags = [ "SYSTEMD_UNIT_DIR=\${out}/lib/systemd" ]; + + postFixup = '' + # liblxcfs.so is reloaded with dlopen() + patchelf --set-rpath "$(patchelf --print-rpath "$out/bin/lxcfs"):$out/lib" "$out/bin/lxcfs" + ''; + + meta = { + homepage = https://linuxcontainers.org/lxcfs; + description = "FUSE filesystem for LXC"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d9a1f1eb12e..cefa0f6be664 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2637,6 +2637,7 @@ in lshw = callPackage ../tools/system/lshw { }; lxc = callPackage ../os-specific/linux/lxc { }; + lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd { }; lzfse = callPackage ../tools/compression/lzfse { }; From aa854f192e34f3bce5f0d9bac42daecbaec16372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 2 Dec 2016 12:38:41 +0000 Subject: [PATCH 1082/1749] cgmanager: add module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/system/cgmanager.nix | 27 +++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 nixos/modules/services/system/cgmanager.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5ae69ffd2230..bf7a68c6cea9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -483,6 +483,7 @@ ./services/security/torify.nix ./services/security/tor.nix ./services/security/torsocks.nix + ./services/system/cgmanager.nix ./services/system/cloud-init.nix ./services/system/dbus.nix ./services/system/kerberos.nix diff --git a/nixos/modules/services/system/cgmanager.nix b/nixos/modules/services/system/cgmanager.nix new file mode 100644 index 000000000000..59d3deced867 --- /dev/null +++ b/nixos/modules/services/system/cgmanager.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.cgmanager; +in { + meta.maintainers = [ maintainers.mic92 ]; + + ###### interface + options.services.cgmanager.enable = mkEnableOption "cgmanager"; + + ###### implementation + config = mkIf cfg.enable { + systemd.services.cgmanager = { + wantedBy = [ "multi-user.target" ]; + after = [ "local-fs.target" ]; + description = "Cgroup management daemon"; + restartIfChanged = false; + serviceConfig = { + ExecStart = "${pkgs.cgmanager}/bin/cgmanager -m name=systemd"; + KillMode = "process"; + Restart = "on-failure"; + }; + }; + }; +} From d331e538c2d18cc4718c823a091837e1ffa47373 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Fri, 2 Dec 2016 16:12:14 +0100 Subject: [PATCH 1083/1749] erlang_basho_R16: B03-1 -> B02-8 --- .../{R16B03-1-basho.nix => R16B02-8-basho.nix} | 15 ++++++++------- pkgs/top-level/all-packages.nix | 8 ++++---- 2 files changed, 12 insertions(+), 11 deletions(-) rename pkgs/development/interpreters/erlang/{R16B03-1-basho.nix => R16B02-8-basho.nix} (88%) diff --git a/pkgs/development/interpreters/erlang/R16B03-1-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix similarity index 88% rename from pkgs/development/interpreters/erlang/R16B03-1-basho.nix rename to pkgs/development/interpreters/erlang/R16B02-8-basho.nix index cbb5f0789fa2..a4afd1e9b40c 100644 --- a/pkgs/development/interpreters/erlang/R16B03-1-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, perl, gnum4, ncurses, openssl, autoconf264, gcc, erlang +{ stdenv, fetchurl, fetchFromGitHub, perl, gnum4, ncurses, openssl, autoconf264, gcc, erlang , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null , wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null @@ -12,12 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-basho-" + version + "${optionalString odbcSupport "-odbc"}"; - version = "16B03-1"; + version = "16B02"; - src = fetchgit { - url = "https://github.com/basho/otp"; - rev = "cb3a485894e493ad172db2749129e613fe52713a"; - sha256 = "0xn28cxlq0ya1aww9q14rg8jf3x2flwxrz6wdnpb0l2h2dasr655"; + src = fetchFromGitHub { + owner = "basho"; + repo = "otp"; + rev = "OTP_R16B02_basho8"; + sha256 = "1w0hbm0axxxa45v3kl6bywc9ayir5vwqxjpnjlzc616ldszb2m0x"; }; debugInfo = enableDebugInfo; @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { postInstall = let manpages = fetchurl { url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; - sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g"; + sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p"; }; in '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01d8593a676d..3c40896dd6c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5400,10 +5400,10 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; odbcSupport = true; }; - erlang_basho_R16B03 = callPackage ../development/interpreters/erlang/R16B03-1-basho.nix { + erlang_basho_R16B02 = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - erlang_basho_R16B03_odbc = callPackage ../development/interpreters/erlang/R16B03-1-basho.nix { + erlang_basho_R16B02_odbc = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; odbcSupport = true; }; @@ -10277,11 +10277,11 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { - erlang = erlang_basho_R16B03; + erlang = erlang_basho_R16B02; }; stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { - erlang = erlang_basho_R16B03; + erlang = erlang_basho_R16B02; }; influxdb = callPackage ../servers/nosql/influxdb { }; From 654f5df5dcac1aa326cc9abeca236710d9001941 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 2 Dec 2016 14:28:26 -0500 Subject: [PATCH 1084/1749] linux: 4.4.35 -> 4.4.36 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 8e92afca6e44..6d9fc79cd9f2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.35"; + version = "4.4.36"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1spqkh0bsd2s4qjlaa5q0cr2qdlw0bflxinr451dbhwrzdwfnaz9"; + sha256 = "1gh3i7ss0wnh3irpff3j079jwyccslbzkw9zxjjp600lcc5hva9h"; }; kernelPatches = args.kernelPatches; From 853b6493c87155388fd4a22f46c637a076e929a7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 2 Dec 2016 14:29:00 -0500 Subject: [PATCH 1085/1749] linux: 4.8.11 -> 4.8.12 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index 4937c2271c7a..715af76267ca 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.11"; + version = "4.8.12"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03w90vfjfcya38mcp1njasa5c67za203sgp9n3w52gms13s443yc"; + sha256 = "03i5q36aqlxir3dy213civkaz1lnwzzv6s3vaafgkdj7fzvqcx44"; }; kernelPatches = args.kernelPatches; From 895d3c890848aeed689aa29708430969ef3f35c6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 27 Nov 2016 10:13:13 +0100 Subject: [PATCH 1086/1749] omake: 0.9.8.5 -> 0.10.1 --- .../development/tools/ocaml/omake/default.nix | 42 +++++++------------ .../ocaml/omake/omake-build-0.9.8.5.diff | 11 ----- .../ocaml/omake/omake-lm_printf-gcc44.diff | 22 ---------- pkgs/top-level/all-packages.nix | 6 ++- pkgs/top-level/ocaml-packages.nix | 1 - 5 files changed, 19 insertions(+), 63 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff delete mode 100644 pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 451d025aa3c0..53152898fd6f 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -1,38 +1,24 @@ -{stdenv, fetchurl, makeWrapper, ocaml, ncurses}: -let - pname = "omake"; - version = "0.9.8.5-3"; - webpage = "http://omake.metaprl.org"; -in -stdenv.mkDerivation { +{ stdenv, fetchurl, ocaml, ncurses }: - name = "${pname}-${version}"; +stdenv.mkDerivation rec { + + name = "omake-${version}"; + version = "0.10.1"; src = fetchurl { - url = "mirror://debian/pool/main/o/omake/omake_${version}.orig.tar.gz"; - sha256 = "1bfxbsimfivq0ar2g5fkzvr5ql97n5dg562pfyd29y4zyh4mwrsv"; + url = "http://download.camlcity.org/download/${name}.tar.gz"; + sha256 = "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj"; }; - patchFlags = "-p0"; - patches = [ ./omake-build-0.9.8.5.diff ./omake-lm_printf-gcc44.diff ]; - buildInputs = [ ocaml makeWrapper ncurses ]; - - phases = "unpackPhase patchPhase buildPhase"; - buildPhase = '' - make bootstrap - make PREFIX=$out all - make PREFIX=$out install - ''; -# prefixKey = "-prefix "; -# -# configureFlags = if transitional then "--transitional" else "--strict"; -# -# buildFlags = "world.opt"; + buildInputs = [ ocaml ncurses ]; meta = { description = "A build system designed for scalability and portability"; - homepage = "${webpage}"; - license = "GPL"; - broken = true; + homepage = http://projects.camlcity.org/projects/omake.html; + license = with stdenv.lib.licenses; [ + mit /* scripts */ + gpl2 /* program */ + ]; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff b/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff deleted file mode 100644 index b0a091e341cd..000000000000 --- a/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/exec/omake_exec.ml 2006-12-08 23:52:01.000000000 +0100 -+++ src/exec/omake_exec.ml 2009-04-15 22:19:07.000000000 +0200 -@@ -46,7 +46,7 @@ - open Omake_options - open Omake_command_type - --external sync : unit -> unit = "caml_sync" -+(*external sync : unit -> unit = "caml_sync"*) - - module Exec = - struct diff --git a/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff b/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff deleted file mode 100644 index 03665340f5f9..000000000000 --- a/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- src/libmojave-external/cutil/lm_printf.c.orig 2007-07-15 19:55:23.000000000 +0200 -+++ src/libmojave-external/cutil/lm_printf.c 2009-06-21 19:20:40.000000000 +0200 -@@ -144,3 +144,3 @@ - if(bufp != buffer) -- free(buffer); -+ free(bufp); - failwith("ml_print_string"); -@@ -149,3 +149,3 @@ - if(bufp != buffer) -- free(buffer); -+ free(bufp); - return v_result; -@@ -192,3 +192,3 @@ - if(bufp != buffer) -- free(buffer); -+ free(bufp); - failwith("ml_print_string"); -@@ -197,3 +197,3 @@ - if(bufp != buffer) -- free(buffer); -+ free(bufp); - return v_result; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01d8593a676d..5eb3006d9352 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6337,7 +6337,11 @@ in noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; - inherit (ocamlPackages) omake omake_rc1; + omake = callPackage ../development/tools/ocaml/omake { + inherit (ocamlPackages_4_02) ocaml; + }; + + inherit (ocamlPackages) omake_rc1; omniorb = callPackage ../development/tools/omniorb { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 46f1ce4b023f..6e3f98c7ba2e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -649,7 +649,6 @@ let trv = callPackage ../development/tools/misc/trv { }; - omake = callPackage ../development/tools/ocaml/omake { }; omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; verasco = callPackage ../development/tools/analysis/verasco ( From 7f501d7f02ed614f2159ae8b0855f33d796d6819 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 2 Dec 2016 19:35:11 +0000 Subject: [PATCH 1087/1749] teyjus: 2.0b2 -> 2.1 --- pkgs/development/compilers/teyjus/default.nix | 10 ++++----- .../compilers/teyjus/fix-lex-to-flex.patch | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index 301915b7a26b..fafc58371ef9 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, omake, ocaml, flex, bison }: +{ stdenv, fetchzip, omake, ocaml, flex, bison }: stdenv.mkDerivation { - name = "teyjus-2.0b2"; + name = "teyjus-2.1"; - src = fetchurl { - url = "https://teyjus.googlecode.com/files/teyjus-source-2.0-b2.tar.gz"; - sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052"; + src = fetchzip { + url = https://github.com/teyjus/teyjus/archive/v2.1.tar.gz; + sha256 = "064jqf68zpmvndgyhilmxfhnvx1bzm8avhgw82csj5wxw5ky6glz"; }; patches = [ ./fix-lex-to-flex.patch ]; diff --git a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch index d2da1d3facca..52d259bb64de 100644 --- a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch +++ b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch @@ -1,23 +1,23 @@ -diff --git a/source/OMakefile b/source/OMakefile -index 6b19d84..095b8b6 100644 ---- a/source/OMakefile -+++ b/source/OMakefile -@@ -164,12 +164,17 @@ LNK_MAIN = $(FNT)/linkerfront +--- a/source/OMakefile 1970-01-01 00:00:01.000000000 +0000 ++++ b/source/OMakefile 2016-12-02 08:48:42.000000000 +0000 +@@ -183,18 +183,18 @@ DEP_MAIN = $(FNT)/dependfront + PAR_MAIN = $(FNT)/parsefront - ############################################################ -+# Nixpkgs specific changes -+# -+ +LEX = flex + -+############################################################ + ############################################################ # Platform specific changes # + if $(mem $(SYSNAME), Linux) + YACC = bison -by +- LEX = flex + export + if $(mem $(OSTYPE), Cygwin Win32) YACC = bison -by - LEX = flex - CFLAGS += -mno-cygwin + CC = i686-pc-mingw32-gcc INC_C[] += $(INC)/byteswap $(INC)/search export diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5eb3006d9352..a554f353d1eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5295,9 +5295,7 @@ in lua = lua5_1; }; - teyjus = callPackage ../development/compilers/teyjus { - omake = omake_rc1; - }; + teyjus = callPackage ../development/compilers/teyjus { }; thrust = callPackage ../development/tools/thrust { gconf = pkgs.gnome2.GConf; From 3d804da98322c4f7daf77bdab78b8a972ee8258f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 2 Dec 2016 19:36:07 +0000 Subject: [PATCH 1088/1749] camlimages: use omake rather than omake_rc1 --- pkgs/development/ocaml-modules/camlimages/4.0.nix | 4 ++-- pkgs/development/ocaml-modules/camlimages/4.1.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/camlimages/4.0.nix b/pkgs/development/ocaml-modules/camlimages/4.0.nix index 4f47680dcec9..0ec3a26d0511 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.0.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.0.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: +{ stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: let pname = "camlimages"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; }; - buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; + buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ]; propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; diff --git a/pkgs/development/ocaml-modules/camlimages/4.1.nix b/pkgs/development/ocaml-modules/camlimages/4.1.nix index f98d149c4829..77a252de52fd 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.1.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: +{stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1ppddhfknpirj1vilm5dxgyp82kf7ahpvjmh7z75a1fnaqv3kpki"; }; - buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; + buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ]; propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; From e672fbc6f0e0dd503f78e0c23e6de1795bf81b8f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 2 Dec 2016 19:45:09 +0000 Subject: [PATCH 1089/1749] omake: remove 0.9.8.6-rc1 --- .../tools/ocaml/omake/0.9.8.6-rc1.nix | 38 ------------------- pkgs/development/tools/ocaml/omake/warn.patch | 10 ----- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/ocaml-packages.nix | 2 - 4 files changed, 52 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix delete mode 100644 pkgs/development/tools/ocaml/omake/warn.patch diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix deleted file mode 100644 index 9f318afc67d7..000000000000 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ /dev/null @@ -1,38 +0,0 @@ -{stdenv, fetchurl, makeWrapper, ocaml, ncurses}: -let - pname = "omake"; - version = "0.9.8.6-0.rc1"; - webpage = "http://omake.metaprl.org"; -in -stdenv.mkDerivation { - - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; - sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13"; - }; - patchFlags = "-p0"; - patches = [ ./warn.patch ]; - - buildInputs = [ ocaml makeWrapper ncurses ]; - - phases = "unpackPhase patchPhase buildPhase"; - buildPhase = '' - make bootstrap - make PREFIX=$out all - make PREFIX=$out install - ''; -# prefixKey = "-prefix "; -# -# configureFlags = if transitional then "--transitional" else "--strict"; -# -# buildFlags = "world.opt"; - - meta = { - description = "Omake build system"; - homepage = "${webpage}"; - license = "GPL"; - platforms = ocaml.meta.platforms or []; - }; -} diff --git a/pkgs/development/tools/ocaml/omake/warn.patch b/pkgs/development/tools/ocaml/omake/warn.patch deleted file mode 100644 index 4459e89d7f9c..000000000000 --- a/pkgs/development/tools/ocaml/omake/warn.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -p1 -aur ../omake-0.9.8.6.ori/lib/build/OCaml.om ./lib/build/OCaml.om ---- ../omake-0.9.8.6.ori/lib/build/OCaml.om 2008-03-05 01:07:25.000000000 +0000 -+++ ./lib/build/OCaml.om 2013-06-01 15:52:37.000000000 +0000 -@@ -178,3 +178,3 @@ declare OCAMLDEPFLAGS - public.OCAMLPPFLAGS = --public.OCAMLFLAGS = -warn-error A -+public.OCAMLFLAGS = - public.OCAMLCFLAGS = -g -Seulement dans ./lib/build: OCaml.om~ -Seulement dans .: warn.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a554f353d1eb..8f512db38958 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6339,8 +6339,6 @@ in inherit (ocamlPackages_4_02) ocaml; }; - inherit (ocamlPackages) omake_rc1; - omniorb = callPackage ../development/tools/omniorb { }; opengrok = callPackage ../development/tools/misc/opengrok { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6e3f98c7ba2e..dc497b125e61 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -649,8 +649,6 @@ let trv = callPackage ../development/tools/misc/trv { }; - omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; - verasco = callPackage ../development/tools/analysis/verasco ( if system == "x86_64-linux" then { tools = pkgs.pkgsi686Linux.stdenv.cc; } From ae1fa72a48566e086efc6e9c7e565ea4ae647bc1 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 2 Dec 2016 20:55:34 -0200 Subject: [PATCH 1090/1749] mkvtoolnix: 9.5.0 -> 9.6.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 0af19aeca950..9c987534065e 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "9.5.0"; + version = "9.6.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "1v6rqlb5srhwzad45b50pvfbi1c9n719ihi54hzbkzklj7h4s70h"; + sha256 = "14v6iclzkqxibzcdxr65bb5frmnsjyyly0d3lwv1gg7g1mkcw3jd"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ]; From 31702666574390d442a4dc36568208c261678976 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 2 Dec 2016 22:26:27 -0200 Subject: [PATCH 1091/1749] adapta-gtk-theme: 3.21.3.68 -> 3.89.1.66 --- pkgs/misc/themes/adapta/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 7fe968a582ba..8dc913601177 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, sass, inkscape, glib, which, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, autoreconfHook, parallel, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.21.3.68"; + version = "3.89.1.66"; meta = with stdenv.lib; { description = "An adaptive GTK+ theme based on Material Design"; @@ -16,14 +16,16 @@ stdenv.mkDerivation rec { owner = "tista500"; repo = "Adapta"; rev = version; - sha256 = "0wwsmsyxfdgsc7fj1kn4r9zsgs09prizwkjljmirwrfdm6j3387p"; + sha256 = "08g941xgxg7i8g1srn3zdxz1nxm24bkrg5cx9ipjqk5cwsck7470"; }; preferLocalBuild = true; - buildInputs = [ gtk-engine-murrine ]; - nativeBuildInputs = [ autoreconfHook sass inkscape glib.dev which ]; + + nativeBuildInputs = [ autoreconfHook parallel sassc inkscape libxml2 glib.dev ]; + + buildInputs = [ gdk_pixbuf librsvg gtk-engine-murrine ]; postPatch = "patchShebangs ."; - configureFlags = "--enable-chrome --disable-unity"; + configureFlags = "--disable-unity"; } From d5cb4d8734abad70d31e4ccc839d20db7bb362a5 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 1 Dec 2016 09:04:35 -0500 Subject: [PATCH 1092/1749] ecryptfs test: use TTY output to stabilize test --- nixos/tests/ecryptfs.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/nixos/tests/ecryptfs.nix b/nixos/tests/ecryptfs.nix index db800c7bb2c2..041be0f5a624 100644 --- a/nixos/tests/ecryptfs.nix +++ b/nixos/tests/ecryptfs.nix @@ -21,13 +21,13 @@ import ./make-test.nix ({ pkgs, ... }: $machine->log("ecryptfs-migrate-home said: $out"); # Log alice in (ecryptfs passwhrase is wrapped during first login) - $machine->sleep(2); # urgh: wait for username prompt + $machine->waitUntilTTYMatches(1, "login: "); $machine->sendChars("alice\n"); - $machine->sleep(1); + $machine->waitUntilTTYMatches(1, "Password: "); $machine->sendChars("foobar\n"); - $machine->sleep(2); + $machine->waitUntilTTYMatches(1, "alice\@machine"); $machine->sendChars("logout\n"); - $machine->sleep(2); + $machine->waitUntilTTYMatches(1, "login: "); # Why do I need to do this?? $machine->succeed("su alice -c ecryptfs-umount-private || true"); @@ -39,10 +39,11 @@ import ./make-test.nix ({ pkgs, ... }: $machine->log("keyctl unlink said: " . $out); # Log alice again + $machine->waitUntilTTYMatches(1, "login: "); $machine->sendChars("alice\n"); - $machine->sleep(1); + $machine->waitUntilTTYMatches(1, "Password: "); $machine->sendChars("foobar\n"); - $machine->sleep(2); + $machine->waitUntilTTYMatches(1, "alice\@machine"); # Create some files in encrypted home $machine->succeed("su alice -c 'touch ~alice/a'"); @@ -50,7 +51,7 @@ import ./make-test.nix ({ pkgs, ... }: # Logout $machine->sendChars("logout\n"); - $machine->sleep(2); + $machine->waitUntilTTYMatches(1, "login: "); # Why do I need to do this?? $machine->succeed("su alice -c ecryptfs-umount-private || true"); @@ -62,10 +63,11 @@ import ./make-test.nix ({ pkgs, ... }: $machine->succeed("su alice -c 'test \! -f ~alice/b'"); # Log alice once more + $machine->waitUntilTTYMatches(1, "login: "); $machine->sendChars("alice\n"); - $machine->sleep(1); + $machine->waitUntilTTYMatches(1, "Password: "); $machine->sendChars("foobar\n"); - $machine->sleep(2); + $machine->waitUntilTTYMatches(1, "alice\@machine"); # Check that the files are there $machine->sleep(1); @@ -77,5 +79,6 @@ import ./make-test.nix ({ pkgs, ... }: $machine->succeed("su alice -c 'ls -lh ~alice/'"); $machine->sendChars("logout\n"); + $machine->waitUntilTTYMatches(1, "login: "); ''; }) From 629b979227b627293b839eebc9cafe31b682cee3 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 2 Dec 2016 22:59:33 -0200 Subject: [PATCH 1093/1749] adapta-backgrounds: init at 0.4.0.6 --- pkgs/data/misc/adapta-backgrounds/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/data/misc/adapta-backgrounds/default.nix diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix new file mode 100644 index 000000000000..72ee323030a9 --- /dev/null +++ b/pkgs/data/misc/adapta-backgrounds/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "adapta-backgrounds-${version}"; + version = "0.4.0.6"; + + src = fetchFromGitHub { + owner = "adapta-project"; + repo = "adapta-backgrounds"; + rev = version; + sha256 = "1yqxrwhjl6g92wm52kalbns41i2l5g45qbd4185b22crhbrn5x79"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "A wallpaper collection for adapta-project"; + homepage = https://github.com/adapta-project/adapta-backgrounds; + license = with licenses; [ gpl2 cc-by-sa-30 ]; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01d8593a676d..68faacc1ee88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11690,6 +11690,8 @@ in ### DATA + adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { }; + andagii = callPackage ../data/fonts/andagii { }; android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { }; From 6343fef5469863d99208a336048cc2a8cba9dd52 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 3 Dec 2016 01:09:16 +0100 Subject: [PATCH 1094/1749] python/pillow: Only disable failing tests There's no reason to disable ALL tests just because only one particular test module is failing. Tested on i686-linux and x86_64-linux against these Python versions: Python 2.6: The interpreter itself doesn't build Python 2.7: Successful for both architectures Python 3.3: Successful for both architectures Python 3.4: Successful for both architectures Python 3.5: Successful for both architectures Python 3.6: One of the dependencies of pillow doesn't build (pytest) Tests for PyPy still fail, which is why the doCheck attribute is only set to false if we're building for PyPy. Signed-off-by: aszlig Cc: @desiderius, @goibhniu, @prikhi --- pkgs/top-level/python-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e990295f1e02..31724a1597d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18689,9 +18689,13 @@ in { sha256 = "0ee9975c05602e755ff5000232e0335ba30d507f6261922a658ee11b1cec36d1"; }; - # Check is disabled because of assertion errors, see + doCheck = !isPyPy; + + # Disable imagefont tests, because they don't work well with infinality: # https://github.com/python-pillow/Pillow/issues/1259 - doCheck = false; + postPatch = '' + rm Tests/test_imagefont.py + ''; buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl nose pkgs.lcms2 ] From a76f5241c565afce7ca7843f5eaee40d87021451 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 3 Dec 2016 02:27:51 +0100 Subject: [PATCH 1095/1749] vimiv: init at 0.7.2 Packaging itself is pretty much straightforward, the tests however revealed a few issues, which I have fixed with a small patch that has been upstreamed at https://github.com/karlch/vimiv/pull/32. The other sed-based patches in postPatch are mostly NixOS-specific. Signed-off-by: aszlig --- pkgs/applications/graphics/vimiv/default.nix | 74 +++++++++++ pkgs/applications/graphics/vimiv/fixes.patch | 128 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 206 insertions(+) create mode 100644 pkgs/applications/graphics/vimiv/default.nix create mode 100644 pkgs/applications/graphics/vimiv/fixes.patch diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix new file mode 100644 index 000000000000..bb8437153cad --- /dev/null +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -0,0 +1,74 @@ +{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead +, hicolor_icon_theme, defaultIconTheme + +# Test requirements +, dbus, xvfb_run, xdotool +}: + +python3Packages.buildPythonApplication rec { + name = "vimiv"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "karlch"; + repo = "vimiv"; + rev = "v${version}"; + sha256 = "1g97ms84xk4ci4crq9wdc3744jnrqkq2qz9sg69lhm9sr5f68bw4"; + }; + + testimages = fetchFromGitHub { + owner = "karlch"; + repo = "vimiv"; + rev = "6f4d1372b27f2065c56eafdb521d230d9bb8f4e2"; + sha256 = "0a3aybzpms0381dz9japhm4c7j5klhmw91prcac6zaww6x34nmxb"; + }; + + patches = [ ./fixes.patch ]; + + postPatch = '' + patchShebangs scripts/install_icons.sh + sed -i -e 's,/usr,,g' -e '/setup\.py/d' Makefile scripts/install_icons.sh + + sed -i \ + -e 's,/etc/vimiv/\(vimivrc\|keys\.conf\),'"$out"'&,g' \ + man/* vimiv/parser.py + + sed -i \ + -e 's!"mogrify"!"${imagemagick}/bin/mogrify"!g' \ + -e '/cmd *=/s!"jhead"!"${jhead}/bin/jhead"!g' \ + vimiv/imageactions.py + ''; + + checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; + buildInputs = [ hicolor_icon_theme defaultIconTheme librsvg ]; + propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; + + makeWrapperArgs = [ + "--prefix GI_TYPELIB_PATH : \"$GI_TYPELIB_PATH\"" + "--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$out/share\"" + "--set GDK_PIXBUF_MODULE_FILE \"$GDK_PIXBUF_MODULE_FILE\"" + ]; + + postCheck = '' + # Some tests assume that the directory only contains one vimiv directory + rm -rf vimiv.egg-info vimiv.desktop + + # Re-use the wrapper args from the main program + makeWrapper "$SHELL" run-tests $makeWrapperArgs + + cp -Rd --no-preserve=mode "$testimages/testimages" vimiv/testimages + HOME="$(mktemp -d)" PATH="$out/bin:$PATH" \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + ./run-tests -c 'python tests/main_test.py && nosetests -vx' + ''; + + postInstall = "make DESTDIR=\"$out\" install"; + + meta = { + homepage = "https://github.com/karlch/vimiv"; + description = "An image viewer with Vim-like keybindings"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/vimiv/fixes.patch b/pkgs/applications/graphics/vimiv/fixes.patch new file mode 100644 index 000000000000..09c06e43058a --- /dev/null +++ b/pkgs/applications/graphics/vimiv/fixes.patch @@ -0,0 +1,128 @@ +Patch submitted upstream at https://github.com/karlch/vimiv/pull/32 + +diff --git a/tests/main_test.py b/tests/main_test.py +index a1870e7..2edc86d 100644 +--- a/tests/main_test.py ++++ b/tests/main_test.py +@@ -15,7 +15,7 @@ class MainTest(TestCase): + + def test_main_until_quit(self): + """Run through vimiv main once.""" +- v_main.main(True) ++ v_main.main([], True) + + + if __name__ == '__main__': +diff --git a/vimiv/helpers.py b/vimiv/helpers.py +index 22f0115..bfaf016 100644 +--- a/vimiv/helpers.py ++++ b/vimiv/helpers.py +@@ -3,7 +3,6 @@ + """Wrappers around standard library functions used in vimiv.""" + + import os +-from subprocess import Popen, PIPE + from gi import require_version + require_version('Gtk', '3.0') + from gi.repository import Gtk +@@ -20,17 +19,17 @@ scrolltypes["K"] = (Gtk.ScrollType.START, False) + scrolltypes["L"] = (Gtk.ScrollType.END, True) + + # A list of all external commands +-external_commands = [] +-try: +- p = Popen('echo $PATH | tr \':\' \'\n\' | xargs -n 1 ls -1', +- stdout=PIPE, stderr=PIPE, shell=True) +- out, err = p.communicate() +- out = out.decode('utf-8').split() +- for cmd in sorted(list(set(out))): +- external_commands.append("!" + cmd) +-except: +- external_commands = [] +-external_commands = tuple(external_commands) ++pathenv = os.environ.get('PATH') ++if pathenv is not None: ++ executables = set() ++ for path in pathenv.split(':'): ++ try: ++ executables |= set(["!" + e for e in os.listdir(path)]) ++ except OSError: ++ continue ++ external_commands = tuple(sorted(list(executables))) ++else: ++ external_commands = () + + + def listdir_wrapper(path, show_hidden=False): +diff --git a/vimiv/imageactions.py b/vimiv/imageactions.py +index d92eb73..b9bc986 100644 +--- a/vimiv/imageactions.py ++++ b/vimiv/imageactions.py +@@ -157,8 +157,8 @@ class Thumbnails: + # Correct name + thumb_ext = ".thumbnail_%dx%d" % (self.thumbsize[0], + self.thumbsize[1]) +- outfile_ext = infile.split(".")[0] + thumb_ext + ".png" +- outfile_base = os.path.basename(outfile_ext) ++ infile_base = os.path.basename(infile) ++ outfile_base = infile_base.split(".")[0] + thumb_ext + ".png" + outfile = os.path.join(self.directory, outfile_base) + # Only if they aren't cached already + if outfile_base not in self.thumbnails: +diff --git a/vimiv/main.py b/vimiv/main.py +index a0e38cf..39f7407 100644 +--- a/vimiv/main.py ++++ b/vimiv/main.py +@@ -27,7 +27,7 @@ from vimiv.mark import Mark + from vimiv.information import Information + + +-def main(running_tests=False): ++def main(arguments, running_tests=False): + """Starting point for vimiv. + + Args: +@@ -36,7 +36,7 @@ def main(running_tests=False): + parser = get_args() + parse_dirs() + settings = parse_config() +- settings = parse_args(parser, settings) ++ settings = parse_args(parser, settings, arguments) + + args = settings["GENERAL"]["paths"] + +diff --git a/vimiv/parser.py b/vimiv/parser.py +index 874a538..9d5afce 100644 +--- a/vimiv/parser.py ++++ b/vimiv/parser.py +@@ -56,7 +56,7 @@ def get_args(): + return parser + + +-def parse_args(parser, settings, arguments=None): ++def parse_args(parser, settings, arguments): + """Parse the arguments and return the modified settings. + + Args: +@@ -66,10 +66,7 @@ def parse_args(parser, settings, arguments=None): + + Return: Modified settings after parsing the arguments. + """ +- if arguments: +- args = parser.parse_args(arguments) +- else: +- args = parser.parse_args() ++ args = parser.parse_args(arguments) + if args.show_version: + information = Information() + print(information.get_version()) +diff --git a/vimiv/vimiv b/vimiv/vimiv +index 5497e08..57f34f1 100755 +--- a/vimiv/vimiv ++++ b/vimiv/vimiv +@@ -5,4 +5,4 @@ import sys + import vimiv + + if __name__ == '__main__': +- sys.exit(vimiv.main.main()) ++ sys.exit(vimiv.main.main(sys.argv)) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01d8593a676d..8fb9771d6fc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14992,6 +14992,10 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; + vimiv = callPackage ../applications/graphics/vimiv { + inherit (gnome3) defaultIconTheme; + }; + macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; ruby = ruby_2_2; }; vimHugeX = vim_configurable; From 1f9cbcd21de891540139bbb86faa4b14ce23bd15 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 3 Dec 2016 05:21:00 +0100 Subject: [PATCH 1096/1749] beets: Set Python version via top-level attribute This largely reverts commit 599312739e3a338f923e6c22ab183178ca49c7b6. The main reason is that it breaks the plugins, because the mentioned commit didn't change the attributes for the plugins as well. But instead of just fixing the attributes when we import the plugin packages, let's just override pythonPackages in all-packages.nix. Right now, Beets is in transition to Python 3, so we don't need to wait that long until we can remove the dependency on Python 2: https://github.com/beetbox/beets/releases/tag/v1.4.1 Once Python 3 support is no longer beta, we can just change this by changing one line only instead of several. Tested this by building beets with both external plugins. Signed-off-by: aszlig Cc: @FRidh --- pkgs/tools/audio/beets/default.nix | 54 +++++++++++++++--------------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 8adb68078a21..0c6dc9219c47 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, writeScript, glibcLocales -, python2Packages, imagemagick +, pythonPackages, imagemagick , enableAcousticbrainz ? true , enableAcoustid ? true @@ -22,17 +22,17 @@ , bashInteractive, bash-completion }: -assert enableAcoustid -> python2Packages.pyacoustid != null; +assert enableAcoustid -> pythonPackages.pyacoustid != null; assert enableBadfiles -> flac != null && mp3val != null; assert enableConvert -> ffmpeg != null; -assert enableDiscogs -> python2Packages.discogs_client != null; -assert enableFetchart -> python2Packages.responses != null; +assert enableDiscogs -> pythonPackages.discogs_client != null; +assert enableFetchart -> pythonPackages.responses != null; assert enableKeyfinder -> keyfinder-cli != null; -assert enableLastfm -> python2Packages.pylast != null; -assert enableMpd -> python2Packages.mpd != null; +assert enableLastfm -> pythonPackages.pylast != null; +assert enableMpd -> pythonPackages.mpd != null; assert enableReplaygain -> bs1770gain != null; -assert enableThumbnails -> python2Packages.pyxdg != null; -assert enableWeb -> python2Packages.flask != null; +assert enableThumbnails -> pythonPackages.pyxdg != null; +assert enableWeb -> pythonPackages.flask != null; with stdenv.lib; @@ -72,7 +72,7 @@ let testShell = "${bashInteractive}/bin/bash --norc"; completion = "${bash-completion}/share/bash-completion/bash_completion"; -in python2Packages.buildPythonApplication rec { +in pythonPackages.buildPythonApplication rec { name = "beets-${version}"; version = "1.4.1"; @@ -84,34 +84,34 @@ in python2Packages.buildPythonApplication rec { }; propagatedBuildInputs = [ - python2Packages.enum34 - python2Packages.jellyfish - python2Packages.munkres - python2Packages.musicbrainzngs - python2Packages.mutagen - python2Packages.pathlib - python2Packages.pyyaml - python2Packages.unidecode - ] ++ optional enableAcoustid python2Packages.pyacoustid + pythonPackages.enum34 + pythonPackages.jellyfish + pythonPackages.munkres + pythonPackages.musicbrainzngs + pythonPackages.mutagen + pythonPackages.pathlib + pythonPackages.pyyaml + pythonPackages.unidecode + ] ++ optional enableAcoustid pythonPackages.pyacoustid ++ optional (enableFetchart || enableEmbyupdate || enableAcousticbrainz) - python2Packages.requests2 + pythonPackages.requests2 ++ optional enableConvert ffmpeg - ++ optional enableDiscogs python2Packages.discogs_client + ++ optional enableDiscogs pythonPackages.discogs_client ++ optional enableKeyfinder keyfinder-cli - ++ optional enableLastfm python2Packages.pylast - ++ optional enableMpd python2Packages.mpd - ++ optional enableThumbnails python2Packages.pyxdg - ++ optional enableWeb python2Packages.flask + ++ optional enableLastfm pythonPackages.pylast + ++ optional enableMpd pythonPackages.mpd + ++ optional enableThumbnails pythonPackages.pyxdg + ++ optional enableWeb pythonPackages.flask ++ optional enableAlternatives (import ./alternatives-plugin.nix { - inherit stdenv python2Packages fetchFromGitHub; + inherit stdenv pythonPackages fetchFromGitHub; }) ++ optional enableCopyArtifacts (import ./copyartifacts-plugin.nix { - inherit stdenv python2Packages fetchFromGitHub; + inherit stdenv pythonPackages fetchFromGitHub; }); - buildInputs = with python2Packages; [ + buildInputs = with pythonPackages; [ beautifulsoup4 imagemagick mock diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fb9771d6fc4..7588e7ba7e6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1018,7 +1018,9 @@ in beanstalkd = callPackage ../servers/beanstalkd { }; - beets = callPackage ../tools/audio/beets { }; + beets = callPackage ../tools/audio/beets { + pythonPackages = python2Packages; + }; bgs = callPackage ../tools/X11/bgs { }; From ffdf7ec2341726eedd19333c7a8a8b4bd8a16f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Wed, 9 Nov 2016 14:09:27 +0100 Subject: [PATCH 1097/1749] cpp-ipfs-api: init at 2016-11-09 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- .../libraries/cpp-ipfs-api/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/cpp-ipfs-api/default.nix diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix new file mode 100644 index 000000000000..2c9d36154a2b --- /dev/null +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: + +stdenv.mkDerivation rec { + name = "cpp-ipfs-api-${version}"; + version = "2016-11-09"; + + src = fetchFromGitHub { + owner = "vasild"; + repo = "cpp-ipfs-api"; + rev = "46e473e49ede4fd829235f1d4930754d5356a747"; + sha256 = "10c5hmg9857zb0fp262ca4a42gq9iqdyqz7f975cp3qs70x12q08"; + }; + + buildInputs = [ cmake curl ]; + propagatedBuildInputs = [ nlohmann_json ]; + + meta = with stdenv.lib; { + description = "IPFS C++ API client library"; + homepage = https://github.com/vasild/cpp-ipfs-api; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7588e7ba7e6f..70a1e950e24a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6805,6 +6805,8 @@ in cpp-hocon = callPackage ../development/libraries/cpp-hocon { }; + cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { }; + cpp-netlib = callPackage ../development/libraries/cpp-netlib { }; uri = callPackage ../development/libraries/uri { }; From 88fa365cf2c52a3fa15ec12b75952c2d5a368cc0 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Sat, 3 Dec 2016 07:02:31 +0100 Subject: [PATCH 1098/1749] marathon: 1.1.2 -> 1.3.6 --- pkgs/applications/networking/cluster/marathon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index f339657b7fe2..fa19c562e8cc 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marathon-${version}"; - version = "1.1.2"; + version = "1.3.6"; src = fetchurl { url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz"; - sha256 = "1c1ml3blhhc10mky5pqxhpndbz6nk7qgcfbzwdqj9kqfzmwlsfbb"; + sha256 = "12a6ah6qsx1ap6y7sps4vwkq8lyc08k1qnak2mnsa04ifrx9z0dy"; }; buildInputs = [ makeWrapper jdk mesos ]; From d06bf820ea50c72854395231fa64fab99e91f9c2 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 3 Dec 2016 03:12:56 +0100 Subject: [PATCH 1099/1749] tor: 0.2.8.9 -> 0.2.8.10 Per upstream, this contains primarily stability & performance fixes. Notably, the relase fixes a bug that would sometimes make clients unusable after leaving standby mode, as well as plugging a memory leak. --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 8fbf35caf1d2..46b85aefca5f 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.2.8.9"; + name = "tor-0.2.8.10"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "3f5c273bb887be4aff11f4d99b9e2e52d293b81ff4f6302b730161ff16dc5316"; + sha256 = "0kcw9hq4xz8p91xwyhjfry5p1dmn7vvnhpfz66vl9gsfndbqr2y8"; }; nativeBuildInputs = [ pkgconfig ]; From 1960fb527500405fcf9da4a18014757efbacd3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 11:07:49 +0100 Subject: [PATCH 1100/1749] pciutils: 3.5.1 -> 3.5.2 --- pkgs/tools/system/pciutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 6530abd23626..dd1070495786 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, kmod, which }: stdenv.mkDerivation rec { - name = "pciutils-3.5.1"; # with database from 2016-05 + name = "pciutils-3.5.2"; # with database from 2016-10 src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; - sha256 = "0byl2f897w5lhs4bvr6p7qwcz9bllj2zyfv7nywbcbsnb9ha9wrb"; + sha256 = "1z2y4f3cyvm7a0dyan0n6jpb3p9pvh35lrim0058slj0kwd1969s"; }; patches = [ ./module-dir.diff ]; From 650501f5b1a7f8dbf8c40180f1b14e8b885e363e Mon Sep 17 00:00:00 2001 From: romildo Date: Sat, 3 Dec 2016 08:20:33 -0200 Subject: [PATCH 1101/1749] e17gtk: init at 3.22.0 --- pkgs/misc/themes/e17gtk/default.nix | 30 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/misc/themes/e17gtk/default.nix diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix new file mode 100644 index 000000000000..a5495d5120cd --- /dev/null +++ b/pkgs/misc/themes/e17gtk/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, gnome3 }: + +stdenv.mkDerivation rec { + name = "e17gtk-${version}"; + version = "${gnome3.version}.0"; + + src = fetchFromGitHub { + owner = "tsujan"; + repo = "E17gtk"; + rev = "V${version}"; + sha256 = { + "3.20" = "1dbhwsqqk12rff1971q2snvg38dx2y33dxr2l9yvwrhrhsgmc2v7"; + "3.22" = "17ir1f7ka765m57bdx3knq4k1837p118a384qnmsj83bz15k39i3"; + }."${gnome3.version}"; + }; + + installPhase = '' + mkdir -p $out/share/{doc,themes}/E17gtk + cp -a index.theme gtk-2.0 gtk-3.0 metacity-1 $out/share/themes/E17gtk/ + cp -a README.md WORKAROUNDS screenshot.jpg $out/share/doc/E17gtk/ + ''; + + meta = { + description = "An Enlightenment-like GTK+ theme with sharp corners"; + homepage = https://github.com/tsujan/E17gtk; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7588e7ba7e6f..c5538f605c6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17034,6 +17034,8 @@ in crashplan = callPackage ../applications/backup/crashplan { }; + e17gtk = callPackage ../misc/themes/e17gtk { }; + epson-escpr = callPackage ../misc/drivers/epson-escpr { }; epson_201207w = callPackage ../misc/drivers/epson_201207w { }; From b87cf7539f8b5b5be33a03ae5cdaaf833f516916 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 3 Dec 2016 11:33:01 +0100 Subject: [PATCH 1102/1749] libunistring: 0.9.6 -> 0.9.7 See http://lists.gnu.org/archive/html/info-gnu/2016-12/msg00002.html for announcement --- pkgs/development/libraries/libunistring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 7f32f37a704d..1318f4a509e5 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libiconv }: stdenv.mkDerivation rec { - name = "libunistring-0.9.6"; + name = "libunistring-0.9.7"; src = fetchurl { url = "mirror://gnu/libunistring/${name}.tar.gz"; - sha256 = "0ixxmgpgh2v8ifm6hbwsjxl023myk3dfnj7wnvmqjivza31fw9cn"; + sha256 = "1ra1baz2187kbw9im47g6kqb5mx9plq703mkjxaval8rxv5q3q4w"; }; patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ]; From 8f89fe65a2d65a215d51c9fbe2b906fd675bb7e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 12:12:18 +0100 Subject: [PATCH 1103/1749] harfbuzz: 1.3.2 -> 1.3.3 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 14fd7cd07f0b..9ff735ec1c0a 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.3.2"; + version = "1.3.3"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "09z0ki9w76v0bh4rdkds7zsb7vf721iaiyidcdy9ii885wvschw5"; + sha256 = "2620987115a4122b47321610dccbcc18f7f121115fd7b88dc8a695c8b66cb3c9"; }; outputs = [ "out" "dev" ]; From 386188692c9c3ee3a4fe1cfb47258c072093c6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 12:12:48 +0100 Subject: [PATCH 1104/1749] libjpeg(-turbo): 1.5.0 -> 1.5.1 --- pkgs/development/libraries/libjpeg-turbo/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 0bbdcae3af10..a59a1702e173 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, nasm }: stdenv.mkDerivation rec { - name = "libjpeg-turbo-1.5.0"; + name = "libjpeg-turbo-${version}"; + version = "1.5.1"; src = fetchurl { url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; - sha256 = "0pq3lav976d6a1d16yyqrj1b4gmhk1ca4zar6zp00avxlqqpqfcz"; - }; + sha256 = "0v365hm6z6lddcqagjj15wflk66rqyw75m73cqzl65rh4lyrshj1"; + }; # github releases still need autotools, surprisingly patches = stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt") From 34e2d681a0cc9f6a282e60479cdc3b7405a1830a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 12:20:02 +0100 Subject: [PATCH 1105/1749] pango: 1.40.2 -> 1.40.3 --- pkgs/development/libraries/pango/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index b2915d1c2407..f39fc2afe7da 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -6,14 +6,14 @@ with stdenv.lib; let ver_maj = "1.40"; - ver_min = "2"; + ver_min = "3"; in stdenv.mkDerivation rec { name = "pango-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; - sha256 = "90582a02bc89318d205814fc097f2e9dd164d26da5f27c53ea42d583b34c3cd1"; + sha256 = "abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3"; }; outputs = [ "bin" "dev" "out" "devdoc" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = false; # test-layout fails on 1.38.0 + doCheck = false; # test-layout fails on 1.40.3 (fails to find font config) # jww (2014-05-05): The tests currently fail on Darwin: # # ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0) From 63a502d9dfa09286582d1366c74431d10f7a4c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 12:26:07 +0100 Subject: [PATCH 1106/1749] dbus-glib: 0.106 -> 0.108 --- pkgs/development/libraries/dbus-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index c3386d3e1a60..df983ff3471c 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { - name = "dbus-glib-0.106"; + name = "dbus-glib-0.108"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "0in0i6v68ixcy0ip28i84hdczf10ykq9x682qgcvls6gdmq552dk"; + sha256 = "0b307hw9j41npzr6niw1bs6ryp87m5yafg492gqwvsaj4dz0qd4z"; }; outputs = [ "out" "dev" "devdoc" ]; From d8e2eba8283edbaa26e464c8ce638f5e058e9830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 3 Dec 2016 12:31:30 +0100 Subject: [PATCH 1107/1749] haskellPackages.turtle: enable tests again (they pass) --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4f9c32a1414b..af433eb7382f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -507,9 +507,6 @@ self: super: { # https://github.com/vincenthz/hs-crypto-pubkey/issues/20 crypto-pubkey = dontCheck super.crypto-pubkey; - # https://github.com/Gabriel439/Haskell-Turtle-Library/issues/1 - turtle = dontCheck super.turtle; - # https://github.com/Philonous/xml-picklers/issues/5 xml-picklers = dontCheck super.xml-picklers; From ea42d6fe62e5e21c4d191505019931d02182ea25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 12:32:11 +0100 Subject: [PATCH 1108/1749] dbus: 1.10.12 -> 1.10.14 --- pkgs/development/libraries/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index a2586b011de2..509e7dd00c81 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.10.12"; - sha256 = "0pa71vf5c0d7k3gni06iascmplj0j5g70wbc833ayvi71d1pj2i1"; + version = "1.10.14"; + sha256 = "10x0wvv2ly4lyyfd42k4xw0ar5qdbi9cksw3l5fcwf1y6mq8y8r3"; self = stdenv.mkDerivation { name = "dbus-${version}"; From b78ea7f6e0f86f31dd00bd7f146dcc28d5f24fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 12:32:50 +0100 Subject: [PATCH 1109/1749] glib: maintenance 2.50.1 -> 2.50.2 --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 710b65509959..87c511f00ddf 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -43,7 +43,7 @@ let ''; ver_maj = "2.50"; - ver_min = "1"; + ver_min = "2"; in stdenv.mkDerivation rec { @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "2ef87a78f37c1eb5b95f4cc95efd5b66f69afad9c9c0899918d04659cf6df7dd"; + sha256 = "be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; From cf205e463044a599e1f2397e731deb487a620108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 12:38:01 +0100 Subject: [PATCH 1110/1749] atk: 2.20.0 -> 2.22.0 That's the gnome-3.22 version. --- pkgs/development/libraries/atk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 34d6f23699f7..e44ad424e0cf 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }: let - ver_maj = "2.20"; + ver_maj = "2.22"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz"; - sha256 = "493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0"; + sha256 = "d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6"; }; enableParallelBuilding = true; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gobjectIntrospection /*ToDo: why propagate*/ ]; - #doCheck = true; # no checks in there (2.10.0) + #doCheck = true; # no checks in there (2.22.0) meta = { description = "Accessibility toolkit"; From da97018f48dbf2923c94e38c8ca510afa361ea2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 12:51:39 +0100 Subject: [PATCH 1111/1749] libdrm: 2.4.73 -> 2.4.74 --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index a0923a15d4ad..38d072bc4503 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }: stdenv.mkDerivation rec { - name = "libdrm-2.4.73"; + name = "libdrm-2.4.74"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "0kayvwqqrjm45y6dk9q2b4gmjdasci0y28jzv4bq05py8a9d7gwn"; + sha256 = "d80dd5a76c401f4c8756dcccd999c63d7e0a3bad258d96a829055cfd86ef840b"; }; outputs = [ "out" "dev" ]; From d652b2cbeeb7120a51c98f5eb0e481e605d7e97a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 13:29:09 +0100 Subject: [PATCH 1112/1749] cairomm: maintenance 1.12.0 -> 1.12.2 1.13.x and 1.15.x are not stable ones (cairo uses the even-odd rule). --- pkgs/development/libraries/cairomm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 017516f6b490..87af7bb1dcc1 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, pkgconfig, darwin, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: let ver_maj = "1.12"; - ver_min = "0"; + ver_min = "2"; in stdenv.mkDerivation rec { name = "cairomm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; - sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6"; + sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; }; outputs = [ "out" "dev" ]; From c9668e40fe785edb8b54d7cb1107396f27d2bcf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 13:52:36 +0100 Subject: [PATCH 1113/1749] xorg.libXfont: 1.5.1 -> 1.5.2 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2c27d6483bed..d972e32c8c50 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -790,11 +790,11 @@ let }) // {inherit fixesproto libX11 xextproto xproto ;}; libXfont = (mkDerivation "libXfont" { - name = "libXfont-1.5.1"; + name = "libXfont-1.5.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2; - sha256 = "1630v3sfvwwlimb2ja10c84ql6v1mw9bdfhvan7pbybkgi99h25p"; + url = mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2; + sha256 = "0w8d07bkmjiarkx09579bl8zsq903mn8javc7qpi0ix4ink5x502"; }; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 161d7bda85e9..6fa22e3e0ab7 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2 -mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2 +mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2 From 75816008089ae73b85866707f7240c7f23db7236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 13:54:31 +0100 Subject: [PATCH 1114/1749] xkeyboard_config: 2.18 -> 2.19 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d972e32c8c50..099f7224c8b4 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2243,11 +2243,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.18"; + name = "xkeyboard-config-2.19"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.bz2; - sha256 = "1l6x2w357ja8vm94ns79s7yj9a5dlr01r9dxrjvzwncadiyr27f4"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.19.tar.bz2; + sha256 = "09sqyi430bbg13pp8j0j60p9p9xn2lpqx38xw1lyv77bp63d3pw3"; }; buildInputs = [pkgconfig libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 6fa22e3e0ab7..3a4f560d1986 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -175,7 +175,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.19.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 From b9f511d279ffcf3de4240c477a585e1898109a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 13:55:23 +0100 Subject: [PATCH 1115/1749] xorg.xproto: 7.0.29 -> 7.0.31 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 099f7224c8b4..50fc546f3228 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2397,11 +2397,11 @@ let }) // {inherit libX11 xproto ;}; xproto = (mkDerivation "xproto" { - name = "xproto-7.0.29"; + name = "xproto-7.0.31"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xproto-7.0.29.tar.bz2; - sha256 = "12lzpa9mrzkyrhrphzpi1014np3328qg7mdq08wj6wyaj9q4f6kc"; + url = mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2; + sha256 = "0ivpxz0rx2a7nahkpkhfgymz7j0pwzaqvyqpdgw9afmxl1yp9yf6"; }; buildInputs = [pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 3a4f560d1986..d9205128a79d 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -187,7 +187,7 @@ mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 -mirror://xorg/individual/proto/xproto-7.0.29.tar.bz2 +mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 From 3e48bb2444a8fe6203f5cec5a3fc64e73311492c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 14:13:57 +0100 Subject: [PATCH 1116/1749] cairomm: use a mirror that actually contains the file --- pkgs/development/libraries/cairomm/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 87af7bb1dcc1..9573d1f2e638 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -7,7 +7,9 @@ stdenv.mkDerivation rec { name = "cairomm-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; + url = "http://www.cairographics.org/releases/${name}.tar.gz"; + # gnome doesn't have the latest version ATM + #url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; }; From 1191dac0f90d755cc57ef48ba1b413ff7f53ab17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 14:14:41 +0100 Subject: [PATCH 1117/1749] poppler: 0.47.0 -> 0.49.0 --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index fd3c063ed904..edcbc18fa130 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -8,8 +8,8 @@ }: let # beware: updates often break cups-filters build - version = "0.47.0"; # even major numbers are stable - sha256 = "0hnjkcqqk87dw3hlda4gh4l7brkslniax9a79g772jn3iwiffwmq"; + version = "0.49.0"; + sha256 = "17x7nc6c0bk4s95nzq4i1qzbl419p76c40pwkksdvp233q75yj0l"; in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; From b5286f3747ad8776b2b3631d091abe0ef0579947 Mon Sep 17 00:00:00 2001 From: Igor Sharonov Date: Sat, 3 Dec 2016 16:16:45 +0300 Subject: [PATCH 1118/1749] neovim-qt: 0.2.3 -> 0.2.4 --- pkgs/applications/editors/neovim/qt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index df98264d9690..07660eaddf6c 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -3,7 +3,7 @@ }: let # not very usable ATM - version = "0.2.3"; + version = "0.2.4"; in stdenv.mkDerivation { name = "neovim-qt-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "0ichqph7nfw3934jf0sp81bqd376xna3f899cc2xg88alb4f16dv"; + sha256 = "0yf9wwkl0lbbj3vyf8hxnlsk7jhk5ggivszyqxply69dbar9ww59"; }; # It tries to download libmsgpack; let's use ours. From 41626234606f3e5f65fd5fd6861ee0ba4771e1c9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Dec 2016 09:59:42 +0100 Subject: [PATCH 1119/1749] pythonPackages.cython: 0.24.1 -> 0.25.1 --- pkgs/development/python-modules/cython_test.patch | 15 --------------- pkgs/top-level/python-packages.nix | 10 ++++------ 2 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/python-modules/cython_test.patch diff --git a/pkgs/development/python-modules/cython_test.patch b/pkgs/development/python-modules/cython_test.patch deleted file mode 100644 index 5b1cece3aa50..000000000000 --- a/pkgs/development/python-modules/cython_test.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/tests/run/numpy_math.pyx b/tests/run/numpy_math.pyx -index eafd23a..4a15522 100644 ---- a/tests/run/numpy_math.pyx -+++ b/tests/run/numpy_math.pyx -@@ -37,8 +37,8 @@ def test_fp_classif(): - assert not npmath.isnan(d_zero) - assert not npmath.isnan(f_zero) - -- assert npmath.isinf(npmath.INFINITY) == 1 -- assert npmath.isinf(-npmath.INFINITY) == -1 -+ assert npmath.isinf(npmath.INFINITY) != 0 -+ assert npmath.isinf(-npmath.INFINITY) != 0 - assert npmath.isnan(npmath.NAN) - - assert npmath.signbit(npmath.copysign(1., -1.)) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 31724a1597d4..7e8ce52c66bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4233,20 +4233,18 @@ in { cython = buildPythonPackage rec { name = "Cython-${version}"; - version = "0.24.1"; + version = "0.25.1"; src = pkgs.fetchurl { url = "mirror://pypi/C/Cython/${name}.tar.gz"; - sha256 = "84808fda00508757928e1feadcf41c9f78e9a9b7167b6649ab0933b76f75e7b9"; + sha256 = "e0941455769335ec5afb17dee36dc3833b7edc2ae20a8ed5806c58215e4b6669"; }; - buildInputs = with self; [ pkgs.pkgconfig pkgs.gdb ]; + buildInputs = with self; [ pkgs.glibcLocales pkgs.pkgconfig pkgs.gdb ]; # For testing nativeBuildInputs = with self; [ numpy pkgs.ncurses ]; - # cython's testsuite requires npy_isinf to return sign of the infinity, but - # a C99 conformant is only required to return a non zero value - patches = [ ../development/python-modules/cython_test.patch ]; + LC_ALL = "en_US.UTF-8"; # cython's testsuite is not working very well with libc++ # We are however optimistic about things outside of testsuite still working From 851b5944bb797394728eb368c3cddf51534c73e4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 3 Dec 2016 09:51:31 -0600 Subject: [PATCH 1120/1749] qt5: factor out common setup hook for qtbase --- .../libraries/qt-5/5.5/qtbase/default.nix | 2 +- .../libraries/qt-5/5.6/qtbase/default.nix | 2 +- .../libraries/qt-5/5.6/qtbase/setup-hook.sh | 166 ------------------ .../libraries/qt-5/5.7/qtbase/default.nix | 2 +- .../libraries/qt-5/5.7/qtbase/setup-hook.sh | 166 ------------------ .../setup-hook.sh => qtbase-setup-hook.sh} | 0 6 files changed, 3 insertions(+), 335 deletions(-) delete mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh rename pkgs/development/libraries/qt-5/{5.5/qtbase/setup-hook.sh => qtbase-setup-hook.sh} (100%) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index 04d06b0fcd44..5a44ca89902d 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -272,7 +272,7 @@ stdenv.mkDerivation { ''; inherit lndir; - setupHook = ./setup-hook.sh; + setupHook = ../../qtbase-setup-hook.sh; enableParallelBuilding = true; 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 cb63f0b50f53..b34540d87a5c 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -228,7 +228,7 @@ stdenv.mkDerivation { ''; inherit lndir; - setupHook = ./setup-hook.sh; + setupHook = ../../qtbase-setup-hook.sh; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh deleted file mode 100644 index 47d196cec26b..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh +++ /dev/null @@ -1,166 +0,0 @@ -addToSearchPathOnceWithCustomDelimiter() { - local delim="$1" - local search="$2" - local target="$3" - local dirs - local exported - IFS="$delim" read -a dirs <<< "${!search}" - local canonical - if canonical=$(readlink -e "$target"); then - for dir in ${dirs[@]}; do - if [ "z$dir" == "z$canonical" ]; then exported=1; fi - done - if [ -z $exported ]; then - eval "export ${search}=\"${!search}${!search:+$delim}$canonical\"" - fi - fi -} - -addToSearchPathOnce() { - addToSearchPathOnceWithCustomDelimiter ':' "$@" -} - -propagateOnce() { - addToSearchPathOnceWithCustomDelimiter ' ' "$@" -} - -_qtPropagate() { - for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do - if [ -d "$1/$dir" ]; then - propagateOnce propagatedBuildInputs "$1" - break - fi - done - addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" - addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" - addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" -} - -crossEnvHooks+=(_qtPropagate) - -_qtPropagateNative() { - for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do - if [ -d "$1/$dir" ]; then - propagateOnce propagatedNativeBuildInputs "$1" - break - fi - done - if [ -z "$crossConfig" ]; then - addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" - addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" - addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" - fi -} - -envHooks+=(_qtPropagateNative) - -_qtMultioutDevs() { - # This is necessary whether the package is a Qt module or not - moveToOutput "mkspecs" "${!outputDev}" -} - -preFixupHooks+=(_qtMultioutDevs) - -_qtSetCMakePrefix() { - export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}" -} - -_qtRmTmp() { - if [ -z "$NIX_QT_SUBMODULE" ]; then - rm -fr "$NIX_QT5_TMP" - else - cat "$NIX_QT5_TMP/nix-support/qt-inputs" | while read file; do - if [ ! -d "$NIX_QT5_TMP/$file" ]; then - rm -f "$NIX_QT5_TMP/$file" - fi - done - - cat "$NIX_QT5_TMP/nix-support/qt-inputs" | while read dir; do - if [ -d "$NIX_QT5_TMP/$dir" ]; then - rmdir --ignore-fail-on-non-empty -p "$NIX_QT5_TMP/$dir" - fi - done - - rm "$NIX_QT5_TMP/nix-support/qt-inputs" - fi -} - -_qtSetQmakePath() { - export PATH="$NIX_QT5_TMP/bin${PATH:+:}$PATH" -} - -if [ -z "$NIX_QT5_TMP" ]; then - if [ -z "$NIX_QT_SUBMODULE" ]; then - NIX_QT5_TMP=$(pwd)/__nix_qt5__ - else - NIX_QT5_TMP=$out - fi - postInstallHooks+=(_qtRmTmp) - - mkdir -p "$NIX_QT5_TMP/nix-support" - for subdir in bin include lib mkspecs share; do - mkdir "$NIX_QT5_TMP/$subdir" - echo "$subdir/" >> "$NIX_QT5_TMP/nix-support/qt-inputs" - done - - postHooks+=(_qtSetCMakePrefix) - - cp "@dev@/bin/qmake" "$NIX_QT5_TMP/bin" - echo "bin/qmake" >> "$NIX_QT5_TMP/nix-support/qt-inputs" - - cat >"$NIX_QT5_TMP/bin/qt.conf" <> "$NIX_QT5_TMP/nix-support/qt-inputs" - - export QMAKE="$NIX_QT5_TMP/bin/qmake" - - # Set PATH to find qmake first in a preConfigure hook - # It must run after all the envHooks! - preConfigureHooks+=(_qtSetQmakePath) -fi - -qt5LinkModuleDir() { - if [ -d "$1/$2" ]; then - @lndir@/bin/lndir -silent "$1/$2" "$NIX_QT5_TMP/$2" - find "$1/$2" -printf "$2/%P\n" >> "$NIX_QT5_TMP/nix-support/qt-inputs" - fi -} - -NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@" -NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@" - -_qtLinkAllModules() { - IFS=: read -a modules <<< $NIX_QT5_MODULES - for module in ${modules[@]}; do - qt5LinkModuleDir "$module" "lib" - done - - IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV - for module in ${modules[@]}; do - qt5LinkModuleDir "$module" "bin" - qt5LinkModuleDir "$module" "include" - qt5LinkModuleDir "$module" "lib" - qt5LinkModuleDir "$module" "mkspecs" - qt5LinkModuleDir "$module" "share" - done -} - -preConfigureHooks+=(_qtLinkAllModules) - -_qtFixCMakePaths() { - find "${!outputLib}" -name "*.cmake" | while read file; do - substituteInPlace "$file" \ - --subst-var-by NIX_OUT "${!outputLib}" \ - --subst-var-by NIX_DEV "${!outputDev}" - done -} - -if [ -n "$NIX_QT_SUBMODULE" ]; then - postInstallHooks+=(_qtFixCMakePaths) -fi diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix index 16cc09f9c038..06bec5a0faf1 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -232,7 +232,7 @@ stdenv.mkDerivation { ''; inherit lndir; - setupHook = ./setup-hook.sh; + setupHook = ../../qtbase-setup-hook.sh; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh deleted file mode 100644 index 47d196cec26b..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh +++ /dev/null @@ -1,166 +0,0 @@ -addToSearchPathOnceWithCustomDelimiter() { - local delim="$1" - local search="$2" - local target="$3" - local dirs - local exported - IFS="$delim" read -a dirs <<< "${!search}" - local canonical - if canonical=$(readlink -e "$target"); then - for dir in ${dirs[@]}; do - if [ "z$dir" == "z$canonical" ]; then exported=1; fi - done - if [ -z $exported ]; then - eval "export ${search}=\"${!search}${!search:+$delim}$canonical\"" - fi - fi -} - -addToSearchPathOnce() { - addToSearchPathOnceWithCustomDelimiter ':' "$@" -} - -propagateOnce() { - addToSearchPathOnceWithCustomDelimiter ' ' "$@" -} - -_qtPropagate() { - for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do - if [ -d "$1/$dir" ]; then - propagateOnce propagatedBuildInputs "$1" - break - fi - done - addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" - addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" - addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" -} - -crossEnvHooks+=(_qtPropagate) - -_qtPropagateNative() { - for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do - if [ -d "$1/$dir" ]; then - propagateOnce propagatedNativeBuildInputs "$1" - break - fi - done - if [ -z "$crossConfig" ]; then - addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" - addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" - addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" - fi -} - -envHooks+=(_qtPropagateNative) - -_qtMultioutDevs() { - # This is necessary whether the package is a Qt module or not - moveToOutput "mkspecs" "${!outputDev}" -} - -preFixupHooks+=(_qtMultioutDevs) - -_qtSetCMakePrefix() { - export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}" -} - -_qtRmTmp() { - if [ -z "$NIX_QT_SUBMODULE" ]; then - rm -fr "$NIX_QT5_TMP" - else - cat "$NIX_QT5_TMP/nix-support/qt-inputs" | while read file; do - if [ ! -d "$NIX_QT5_TMP/$file" ]; then - rm -f "$NIX_QT5_TMP/$file" - fi - done - - cat "$NIX_QT5_TMP/nix-support/qt-inputs" | while read dir; do - if [ -d "$NIX_QT5_TMP/$dir" ]; then - rmdir --ignore-fail-on-non-empty -p "$NIX_QT5_TMP/$dir" - fi - done - - rm "$NIX_QT5_TMP/nix-support/qt-inputs" - fi -} - -_qtSetQmakePath() { - export PATH="$NIX_QT5_TMP/bin${PATH:+:}$PATH" -} - -if [ -z "$NIX_QT5_TMP" ]; then - if [ -z "$NIX_QT_SUBMODULE" ]; then - NIX_QT5_TMP=$(pwd)/__nix_qt5__ - else - NIX_QT5_TMP=$out - fi - postInstallHooks+=(_qtRmTmp) - - mkdir -p "$NIX_QT5_TMP/nix-support" - for subdir in bin include lib mkspecs share; do - mkdir "$NIX_QT5_TMP/$subdir" - echo "$subdir/" >> "$NIX_QT5_TMP/nix-support/qt-inputs" - done - - postHooks+=(_qtSetCMakePrefix) - - cp "@dev@/bin/qmake" "$NIX_QT5_TMP/bin" - echo "bin/qmake" >> "$NIX_QT5_TMP/nix-support/qt-inputs" - - cat >"$NIX_QT5_TMP/bin/qt.conf" <> "$NIX_QT5_TMP/nix-support/qt-inputs" - - export QMAKE="$NIX_QT5_TMP/bin/qmake" - - # Set PATH to find qmake first in a preConfigure hook - # It must run after all the envHooks! - preConfigureHooks+=(_qtSetQmakePath) -fi - -qt5LinkModuleDir() { - if [ -d "$1/$2" ]; then - @lndir@/bin/lndir -silent "$1/$2" "$NIX_QT5_TMP/$2" - find "$1/$2" -printf "$2/%P\n" >> "$NIX_QT5_TMP/nix-support/qt-inputs" - fi -} - -NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@" -NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@" - -_qtLinkAllModules() { - IFS=: read -a modules <<< $NIX_QT5_MODULES - for module in ${modules[@]}; do - qt5LinkModuleDir "$module" "lib" - done - - IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV - for module in ${modules[@]}; do - qt5LinkModuleDir "$module" "bin" - qt5LinkModuleDir "$module" "include" - qt5LinkModuleDir "$module" "lib" - qt5LinkModuleDir "$module" "mkspecs" - qt5LinkModuleDir "$module" "share" - done -} - -preConfigureHooks+=(_qtLinkAllModules) - -_qtFixCMakePaths() { - find "${!outputLib}" -name "*.cmake" | while read file; do - substituteInPlace "$file" \ - --subst-var-by NIX_OUT "${!outputLib}" \ - --subst-var-by NIX_DEV "${!outputDev}" - done -} - -if [ -n "$NIX_QT_SUBMODULE" ]; then - postInstallHooks+=(_qtFixCMakePaths) -fi diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh similarity index 100% rename from pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh rename to pkgs/development/libraries/qt-5/qtbase-setup-hook.sh From 53a694e0968430483b27509e7a80aeb8d5b78b87 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 3 Dec 2016 09:53:18 -0600 Subject: [PATCH 1121/1749] qt5: factor out common qtSubmodule setup hook --- pkgs/development/libraries/qt-5/5.5/default.nix | 2 +- pkgs/development/libraries/qt-5/5.6/default.nix | 2 +- pkgs/development/libraries/qt-5/5.6/setup-hook.sh | 2 -- pkgs/development/libraries/qt-5/5.7/default.nix | 2 +- pkgs/development/libraries/qt-5/5.7/setup-hook.sh | 2 -- .../qt-5/{5.5/setup-hook.sh => qtsubmodule-setup-hook.sh} | 0 6 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 pkgs/development/libraries/qt-5/5.6/setup-hook.sh delete mode 100644 pkgs/development/libraries/qt-5/5.7/setup-hook.sh rename pkgs/development/libraries/qt-5/{5.5/setup-hook.sh => qtsubmodule-setup-hook.sh} (100%) diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index fdeb4f7e6c94..92e71aab0912 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -49,7 +49,7 @@ let outputs = args.outputs or [ "out" "dev" ]; setOutputFlags = args.setOutputFlags or false; - setupHook = ./setup-hook.sh; + setupHook = ../qtsubmodule-setup-hook.sh; enableParallelBuilding = args.enableParallelBuilding or true; diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 8b4e924a7339..68def625cb2e 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -50,7 +50,7 @@ let outputs = args.outputs or [ "out" "dev" ]; setOutputFlags = args.setOutputFlags or false; - setupHook = ./setup-hook.sh; + setupHook = ../qtsubmodule-setup-hook.sh; enableParallelBuilding = args.enableParallelBuilding or true; diff --git a/pkgs/development/libraries/qt-5/5.6/setup-hook.sh b/pkgs/development/libraries/qt-5/5.6/setup-hook.sh deleted file mode 100644 index e41433c11386..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/setup-hook.sh +++ /dev/null @@ -1,2 +0,0 @@ -NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@" -NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@" diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix index c5d32b8ce0a2..93a3fdf72b0f 100644 --- a/pkgs/development/libraries/qt-5/5.7/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/default.nix @@ -50,7 +50,7 @@ let outputs = args.outputs or [ "out" "dev" ]; setOutputFlags = args.setOutputFlags or false; - setupHook = ./setup-hook.sh; + setupHook = ../qtsubmodule-setup-hook.sh; enableParallelBuilding = args.enableParallelBuilding or true; diff --git a/pkgs/development/libraries/qt-5/5.7/setup-hook.sh b/pkgs/development/libraries/qt-5/5.7/setup-hook.sh deleted file mode 100644 index e41433c11386..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/setup-hook.sh +++ /dev/null @@ -1,2 +0,0 @@ -NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@" -NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@" diff --git a/pkgs/development/libraries/qt-5/5.5/setup-hook.sh b/pkgs/development/libraries/qt-5/qtsubmodule-setup-hook.sh similarity index 100% rename from pkgs/development/libraries/qt-5/5.5/setup-hook.sh rename to pkgs/development/libraries/qt-5/qtsubmodule-setup-hook.sh From 2c4995c013fa093ccbf469ca279f543739529d8b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 3 Dec 2016 09:55:39 -0600 Subject: [PATCH 1122/1749] qt5: factor out common qmake setup hook --- .../libraries/qt-5/5.5/default.nix | 5 ++- .../libraries/qt-5/5.6/default.nix | 5 ++- .../libraries/qt-5/5.6/qmake-hook.sh | 42 ------------------- .../libraries/qt-5/5.7/default.nix | 2 +- .../libraries/qt-5/5.7/qmake-hook.sh | 42 ------------------- .../libraries/qt-5/{5.5 => }/qmake-hook.sh | 0 6 files changed, 9 insertions(+), 87 deletions(-) delete mode 100644 pkgs/development/libraries/qt-5/5.6/qmake-hook.sh delete mode 100644 pkgs/development/libraries/qt-5/5.7/qmake-hook.sh rename pkgs/development/libraries/qt-5/{5.5 => }/qmake-hook.sh (100%) diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 92e71aab0912..e7d35dcb84b2 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -113,7 +113,10 @@ let ]; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; - qmakeHook = makeSetupHook { substitutions = { qt_dev = qtbase.dev; lndir = pkgs.xorg.lndir; }; } ./qmake-hook.sh; + qmakeHook = + makeSetupHook + { deps = [ self.qtbase.dev ]; } + ../qmake-hook.sh; }; diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 68def625cb2e..5c58b85639ba 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -110,7 +110,10 @@ let ]; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; - qmakeHook = makeSetupHook { deps = [ self.qtbase.dev ]; } ./qmake-hook.sh; + qmakeHook = + makeSetupHook + { deps = [ self.qtbase.dev ]; } + ../qmake-hook.sh; }; diff --git a/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh deleted file mode 100644 index 696b4ea8dad3..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh +++ /dev/null @@ -1,42 +0,0 @@ -qmakeConfigurePhase() { - runHook preConfigure - - qmake PREFIX=$out $qmakeFlags - - runHook postConfigure -} - -if [ -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then - configurePhase=qmakeConfigurePhase -fi - -_qtModuleMultioutDevsPre() { - # We cannot simply set these paths in configureFlags because libQtCore retains - # references to the paths it was built with. - moveToOutput "bin" "${!outputDev}" - moveToOutput "include" "${!outputDev}" - - # The destination directory must exist or moveToOutput will do nothing - mkdir -p "${!outputDev}/share" - moveToOutput "share/doc" "${!outputDev}" -} - -_qtModuleMultioutDevsPost() { - # Move libtool archives and qmake project files to $dev/lib - if [ "z${!outputLib}" != "z${!outputDev}" ]; then - pushd "${!outputLib}" - if [ -d "lib" ]; then - find lib \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | \ - while read -r -d $'\0' file; do - mkdir -p "${!outputDev}/$(dirname "$file")" - mv "${!outputLib}/$file" "${!outputDev}/$file" - done - fi - popd - fi -} - -if [ -n "$NIX_QT_SUBMODULE" ]; then - preFixupHooks+=(_qtModuleMultioutDevsPre) - postFixupHooks+=(_qtModuleMultioutDevsPost) -fi diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix index 93a3fdf72b0f..dbb66b6510a1 100644 --- a/pkgs/development/libraries/qt-5/5.7/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/default.nix @@ -112,7 +112,7 @@ let qmakeHook = makeSetupHook { deps = [ self.qtbase.dev ]; } - ./qmake-hook.sh; + ../qmake-hook.sh; }; diff --git a/pkgs/development/libraries/qt-5/5.7/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.7/qmake-hook.sh deleted file mode 100644 index 696b4ea8dad3..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qmake-hook.sh +++ /dev/null @@ -1,42 +0,0 @@ -qmakeConfigurePhase() { - runHook preConfigure - - qmake PREFIX=$out $qmakeFlags - - runHook postConfigure -} - -if [ -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then - configurePhase=qmakeConfigurePhase -fi - -_qtModuleMultioutDevsPre() { - # We cannot simply set these paths in configureFlags because libQtCore retains - # references to the paths it was built with. - moveToOutput "bin" "${!outputDev}" - moveToOutput "include" "${!outputDev}" - - # The destination directory must exist or moveToOutput will do nothing - mkdir -p "${!outputDev}/share" - moveToOutput "share/doc" "${!outputDev}" -} - -_qtModuleMultioutDevsPost() { - # Move libtool archives and qmake project files to $dev/lib - if [ "z${!outputLib}" != "z${!outputDev}" ]; then - pushd "${!outputLib}" - if [ -d "lib" ]; then - find lib \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | \ - while read -r -d $'\0' file; do - mkdir -p "${!outputDev}/$(dirname "$file")" - mv "${!outputLib}/$file" "${!outputDev}/$file" - done - fi - popd - fi -} - -if [ -n "$NIX_QT_SUBMODULE" ]; then - preFixupHooks+=(_qtModuleMultioutDevsPre) - postFixupHooks+=(_qtModuleMultioutDevsPost) -fi diff --git a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh b/pkgs/development/libraries/qt-5/qmake-hook.sh similarity index 100% rename from pkgs/development/libraries/qt-5/5.5/qmake-hook.sh rename to pkgs/development/libraries/qt-5/qmake-hook.sh From 7b05efb90dc8f12a01dbf2e6adf4f9f59f94d956 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 3 Dec 2016 09:57:17 -0600 Subject: [PATCH 1123/1749] qt5: factor out common makeQtWrapper setup hook --- .../libraries/qt-5/5.5/default.nix | 6 +++- .../libraries/qt-5/5.6/default.nix | 6 +++- .../libraries/qt-5/5.6/make-qt-wrapper.sh | 36 ------------------- .../libraries/qt-5/5.7/default.nix | 2 +- .../libraries/qt-5/5.7/make-qt-wrapper.sh | 36 ------------------- .../qt-5/{5.5 => }/make-qt-wrapper.sh | 0 6 files changed, 11 insertions(+), 75 deletions(-) delete mode 100644 pkgs/development/libraries/qt-5/5.6/make-qt-wrapper.sh delete mode 100644 pkgs/development/libraries/qt-5/5.7/make-qt-wrapper.sh rename pkgs/development/libraries/qt-5/{5.5 => }/make-qt-wrapper.sh (100%) diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index e7d35dcb84b2..6d27ed5a0d32 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -112,7 +112,11 @@ let qtxmlpatterns ]; - makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; + makeQtWrapper = + makeSetupHook + { deps = [ makeWrapper ]; } + ../make-qt-wrapper.sh; + qmakeHook = makeSetupHook { deps = [ self.qtbase.dev ]; } diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 5c58b85639ba..560e0ac021d9 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -109,7 +109,11 @@ let qtwebchannel qtwebengine qtwebsockets qtx11extras qtxmlpatterns ]; - makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; + makeQtWrapper = + makeSetupHook + { deps = [ makeWrapper ]; } + ../make-qt-wrapper.sh; + qmakeHook = makeSetupHook { deps = [ self.qtbase.dev ]; } diff --git a/pkgs/development/libraries/qt-5/5.6/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.6/make-qt-wrapper.sh deleted file mode 100644 index b0d0bec9e3f6..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/make-qt-wrapper.sh +++ /dev/null @@ -1,36 +0,0 @@ -wrapQtProgram() { - local prog="$1" - shift - wrapProgram "$prog" \ - --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ - --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ - --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ - --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \ - --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \ - "$@" -} - -makeQtWrapper() { - local old="$1" - local new="$2" - shift - shift - makeWrapper "$old" "$new" \ - --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ - --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ - --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ - --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \ - --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \ - "$@" -} - -_makeQtWrapperSetup() { - # cannot use addToSearchPath because these directories may not exist yet - export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins" - export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports" - export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml" - export RUNTIME_XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputBin}/share" - export RUNTIME_XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg" -} - -prePhases+=(_makeQtWrapperSetup) diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix index dbb66b6510a1..b3a8b4d05ebd 100644 --- a/pkgs/development/libraries/qt-5/5.7/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/default.nix @@ -107,7 +107,7 @@ let makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } - ./make-qt-wrapper.sh; + ../make-qt-wrapper.sh; qmakeHook = makeSetupHook diff --git a/pkgs/development/libraries/qt-5/5.7/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.7/make-qt-wrapper.sh deleted file mode 100644 index b0d0bec9e3f6..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/make-qt-wrapper.sh +++ /dev/null @@ -1,36 +0,0 @@ -wrapQtProgram() { - local prog="$1" - shift - wrapProgram "$prog" \ - --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ - --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ - --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ - --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \ - --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \ - "$@" -} - -makeQtWrapper() { - local old="$1" - local new="$2" - shift - shift - makeWrapper "$old" "$new" \ - --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ - --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ - --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ - --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \ - --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \ - "$@" -} - -_makeQtWrapperSetup() { - # cannot use addToSearchPath because these directories may not exist yet - export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins" - export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports" - export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml" - export RUNTIME_XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputBin}/share" - export RUNTIME_XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg" -} - -prePhases+=(_makeQtWrapperSetup) diff --git a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh similarity index 100% rename from pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh rename to pkgs/development/libraries/qt-5/make-qt-wrapper.sh From 475224968c4b902bc798c374449dbf7ce0b9ef6f Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 3 Dec 2016 20:15:31 +0100 Subject: [PATCH 1124/1749] rust-packages: update 2016-11-15 -> 2016-12-03 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index bea2cb41a69f..ef6dee3e3f7d 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-11-15"; - rev = "4ed749b5a45d596e59c454e6ffc27177bd93a221"; - sha256 = "09vw8lbwm34qp9amxzb4a2nvxzz0aaw4sas0qkay7gh4ryy5wflk"; + version = "2016-12-03"; + rev = "94e482dd6667aa239e5b3b8590fc9bfa0c1fd376"; + sha256 = "0k300vhc0m8a0165pikl6rvyz0w20dnlacpb9b4jjl7gfixynlmz"; src = fetchFromGitHub { inherit rev; From e3dcf5da1d28b37308dea2e23613f8f8a4ee8c81 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 3 Dec 2016 23:36:48 +0100 Subject: [PATCH 1125/1749] rq: init at 0.9.2 (broken because our v8 is too old, and I'm too weak to update v8) --- pkgs/build-support/rust/default.nix | 3 ++ pkgs/development/tools/rq/default.nix | 76 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 83 insertions(+) create mode 100644 pkgs/development/tools/rq/default.nix diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index bbea045f6371..a69ef5c6b07f 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -6,6 +6,7 @@ , logLevel ? "" , buildInputs ? [] , cargoUpdateHook ? "" +, cargoDepsHook ? "" , ... } @ args: let @@ -28,6 +29,8 @@ in stdenv.mkDerivation (args // { configurePhase = args.configurePhase or "true"; postUnpack = '' + eval "$cargoDepsHook" + echo "Using cargo deps from $cargoDeps" cp -r "$cargoDeps" deps diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix new file mode 100644 index 000000000000..b383812d321d --- /dev/null +++ b/pkgs/development/tools/rq/default.nix @@ -0,0 +1,76 @@ +{ stdenv, fetchFromGitHub, rustPlatform, llvmPackages, v8 }: + +with rustPlatform; + +buildRustPackage rec { + name = "rq-${version}"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "dflemstr"; + repo = "rq"; + rev = "v${version}"; + sha256 = "051k7ls2mbjf584crayd654wm8m7gk3b7s73j97f9l8sbppdhpcq"; + }; + + serde_json = fetchFromGitHub { + owner = "serde-rs"; + repo = "json"; + rev = "0c05059e4533368020bd356bd708c38286810a7d"; + sha256 = "0924ngqbsif2vmmpgn8l2gg4bzms0z0i7yng0zx6sdv0x836lw43"; + }; + + v8_rs = fetchFromGitHub { + owner = "dflemstr"; + repo = "v8-rs"; + rev = "0772be5b2e84842a2d434963702bc2995aeda90b"; + sha256 = "0h2n431rp6nqpip7dy7xpckkvcr19aq7l1f3x3wlrj02xi4c8mad"; + }; + + cargoDepsHook = '' + # use non-git dependencies + (cd $sourceRoot && patch -p1 < Date: Sun, 4 Dec 2016 01:39:03 +0100 Subject: [PATCH 1126/1749] lib: fix typo --- lib/attrsets.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 1f381c5e7213..c1bd764c70dc 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -391,7 +391,7 @@ rec { ); in f [] [rhs lhs]; - /* A recursive variant of the update operator ‘//’. The recusion + /* A recursive variant of the update operator ‘//’. The recursion stops when one of the attribute values is not an attribute set, in which case the right hand side value takes precedence over the left hand side value. From e3d54be3873c8d954e3fb04cdeeb9694da214349 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 2 Dec 2016 12:51:58 +0100 Subject: [PATCH 1127/1749] dhcpcd: 6.11.3 -> 6.11.5 --- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 766e7505f273..beffb0c05e82 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.11.3"; + name = "dhcpcd-6.11.5"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "01lv4a7ls55iv9f9gkh6vswqmbpqkdzj4d8ayq4dcir9vz215gas"; + sha256 = "17nnhxmbdcc7k2mh6sgvxisqcqbic5540xbig363ds97gvf795kg"; }; buildInputs = [ pkgconfig udev ]; From 2401f06801cd08ee06feffc42ad3ee568d354fb5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 2 Dec 2016 12:51:00 +0100 Subject: [PATCH 1128/1749] containers: disable dhcpcd on veth bridge interfaces --- nixos/modules/virtualisation/containers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index cfc1065b7294..a532696d03ae 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -667,7 +667,7 @@ in ${cfg.localAddress} ${name}.containers '') config.containers); - networking.dhcpcd.denyInterfaces = [ "ve-*" ]; + networking.dhcpcd.denyInterfaces = [ "ve-*" "vb-*" ]; environment.systemPackages = [ pkgs.nixos-container ]; }); From 5c6234a7d3f0b430d7dc941dc1ab059c42729611 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 3 Dec 2016 17:21:07 -0800 Subject: [PATCH 1129/1749] top-level: Allow manually specifying a stdenv, and fix stdenv tests - The darwin test can now force the use of the freshly-booted darwin stdenv - The linux test now passes enough dummy arguments This may make debugging harder, if so, check out #20889 --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 8 ++++---- pkgs/stdenv/linux/make-bootstrap-tools.nix | 7 +++++++ pkgs/top-level/default.nix | 6 +++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 10d2b4decddd..bd581f71a436 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -332,10 +332,10 @@ in rec { }; # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it - test-pkgs = let - stdenv = import (test-pkgspath + "/pkgs/stdenv/darwin") { inherit system bootstrapFiles; }; - in import test-pkgspath { + test-pkgs = import test-pkgspath { inherit system; - bootStdenv = stdenv.stdenvDarwin; + stdenv = args: let + args' = args // { inherit bootstrapFiles; }; + in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stdenvDarwin; }; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 1ecb222af3ec..7063d7bfcb6a 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -175,6 +175,13 @@ rec { bootstrapTools = (import ./default.nix { inherit system bootstrapFiles; + + lib = assert false; null; + allPackages = assert false; null; + + platform = assert false; null; + crossSystem = assert false; null; + config = assert false; null; }).bootstrapTools; test = derivation { diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index a1f3a1c38c5c..31c51215676b 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -23,6 +23,10 @@ , # Allow a configuration attribute set to be passed in as an argument. config ? {} +, # The standard environment for building packages, or rather a function + # providing it. See below for the arguments given to that function. + stdenv ? assert false; null + , crossSystem ? null , platform ? assert false; null } @ args: @@ -72,7 +76,7 @@ in let inherit lib nixpkgsFun; } // newArgs); - stdenv = import ../stdenv { + stdenv = (args.stdenv or (import ../stdenv)) { inherit lib allPackages system platform crossSystem config; }; From 64aabae8e24ba6278b28aef3587dc12b1805f42b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 4 Dec 2016 09:09:49 +0100 Subject: [PATCH 1130/1749] perl-CryptX: 0.041 -> 0.044 --- 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 efc4faa4786a..288d47a17df3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2760,10 +2760,10 @@ let self = _self // overrides; _self = with self; { }; CryptX = buildPerlPackage rec { - name = "CryptX-0.041"; + name = "CryptX-0.044"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "481f8c9285d6ce3cf330e1fa52c835a202debdac5d81e1acd20bd1d93b99790e"; + sha256 = "15e5e6bd7b90af24c7e730751fec7b10d8e22ef4380d527bda242dee7dd20443"; }; propagatedBuildInputs = [ JSONMaybeXS ]; meta = { From 0dc4e70fc99defb4c7ea1d4ed0d0690c9752b22e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 4 Dec 2016 09:10:08 +0100 Subject: [PATCH 1131/1749] perl-Math-BigInt: 1.999801 -> 1.999802 --- 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 288d47a17df3..740292886dd1 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.999801"; + name = "Math-BigInt-1.999802"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "41deb23d453f5a376759fff155e4947988a6b6713a4164f21aedac8238089e57"; + sha256 = "a44ceb255a76b7f455ef41f4f12e8923fe3662255853c4d0f3ad1f77b9eaa491"; }; meta = { description = "Arbitrary size integer/float math package"; From 7cdf160f34f249477e1ce9102052c84872e34228 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 4 Dec 2016 09:10:26 +0100 Subject: [PATCH 1132/1749] perl-Test2-Suite: 0.000052 -> 0.000061 --- 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 740292886dd1..ef8984230f42 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12256,10 +12256,10 @@ let self = _self // overrides; _self = with self; { }; Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000052"; + name = "Test2-Suite-0.000061"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "0f571c8d8939eb90d06dd1da0681ca6af3bd1012a6c03e7bfb924dab675a6fa4"; + sha256 = "b2ef2a59c8864c79f6c6a64c65e12c93f881361e4d9eb54419fcb4785c08ea75"; }; propagatedBuildInputs = [ Importer TestSimple13 ]; meta = { From 64291e4fa289e10c63eb54e1cdc00a447271d593 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 4 Dec 2016 09:10:44 +0100 Subject: [PATCH 1133/1749] pythonPackages.slob: 2016-03-04 -> 2016-11-03 --- 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 7e8ce52c66bc..fc5972bfbf0f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23151,15 +23151,15 @@ in { }; slob = buildPythonPackage rec { - name = "slob-unstable-2016-03-04"; + name = "slob-unstable-2016-11-03"; disabled = !isPy3k; src = pkgs.fetchFromGitHub { owner = "itkach"; repo = "slob"; - rev = "31ad0e769360a5b10a4893f686587bb8e48c3895"; - sha256 = "06yn510178awhjsvy88cpjz7rlmyviqd5g58gc8gf4ivyqdlqbsl"; + rev = "d1ed71e4778729ecdfc2fe27ed783689a220a6cd"; + sha256 = "1r510s4r124s121wwdm9qgap6zivlqqxrhxljz8nx0kv0cdyypi5"; }; propagatedBuildInputs = [ self.PyICU ]; From 33abc705b31a294d9e788bda5b0b1708c8eed92d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Dec 2016 18:07:04 +0100 Subject: [PATCH 1134/1749] xorg-server variants: eradicate symlink to /var/tmp - Fixes #19673; it caused problems in combination with buildEnv. - As noted, X falls back to /tmp: https://github.com/NixOS/nixpkgs/issues/19673#issuecomment-258871876 - Removing the directory is still required, as X would attempt to write into it if allowed - and probably succeed in case the user set nix.readOnlyStore = false; (X runs as root). - Archeology link: 9d1569316. --- pkgs/servers/x11/xorg/overrides.nix | 4 +--- pkgs/servers/x11/xorg/xwayland.nix | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c87acfee43a8..8d6817441315 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -459,8 +459,7 @@ in "--enable-glamor" ]; postInstall = '' - rm -fr $out/share/X11/xkb/compiled - ln -s /var/tmp $out/share/X11/xkb/compiled + rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it wrapProgram $out/bin/Xephyr \ --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" wrapProgram $out/bin/Xvfb \ @@ -510,7 +509,6 @@ in ''; postInstall = '' rm -fr $out/share/X11/xkb/compiled - ln -s /var/tmp $out/share/X11/xkb/compiled cp -rT ${darwinOtherX}/bin $out/bin rm -f $out/bin/X diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 729fcc2e3447..ee4b5695c7cd 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -25,7 +25,6 @@ overrideDerivation xorgserver (oldAttrs: { postInstall = '' rm -fr $out/share/X11/xkb/compiled - ln -s /var/tmp $out/share/X11/xkb/compiled ''; }) // { From 84d737cfe92967b9759f191d1b7c90ff87bea02b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 09:58:18 +0100 Subject: [PATCH 1135/1749] clisp: remove Darwin from meta.platforms for now It's problematic. See #20062. --- pkgs/development/interpreters/clisp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 1a05f19bd82f..2386cc271550 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -26,7 +26,7 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null stdenv.mkDerivation rec { v = "2.49"; name = "clisp-${v}"; - + src = fetchurl { url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2"; sha256 = "8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890"; @@ -92,6 +92,7 @@ stdenv.mkDerivation rec { description = "ANSI Common Lisp Implementation"; homepage = http://clisp.cons.org; maintainers = with stdenv.lib.maintainers; [raskin tohl]; - platforms = stdenv.lib.platforms.unix; + # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 + platforms = stdenv.lib.platforms.linux; }; } From 61aa9cb9b213248978277de8531438c9d5852414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 10:11:16 +0100 Subject: [PATCH 1136/1749] guile: doCheck = false, as it causes problems sometimes ... and I don't feel like digging into the exact cause. It's made worse by the fact that guile is quite a mass rebuild. --- pkgs/development/interpreters/guile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index b0b4e26fffb8..41ce9c659aa2 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -61,8 +61,8 @@ ''; # make check doesn't work on darwin - # On i686-linux we got some error that doesn't always appear. - doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux"); + # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper. + doCheck = false; setupHook = ./setup-hook-2.0.sh; From 374ac13a6ee283fe45c489d642ea39a6199a5c48 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 4 Dec 2016 10:16:14 +0100 Subject: [PATCH 1137/1749] Docs: fix Python docs --- doc/languages-frameworks/python.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index df60cc1e5738..121e123c8cfa 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -409,10 +409,10 @@ and in this case the `python35` interpreter is automatically used. ### Interpreters -Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are as respectively +Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available as respectively `python26`, `python27`, `python33`, `python34` and `python35`. The PyPy interpreter is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and -`python35`. The default interpreter, `python`, maps to `python3`. +`python35`. The default interpreter, `python`, maps to `python2`. The Nix expressions for the interpreters can be found in `pkgs/development/interpreters/python`. @@ -437,14 +437,16 @@ Each interpreter has the following attributes: ### Building packages and applications -Python packages (libraries) and applications that use `setuptools` or -`distutils` are typically built with respectively the `buildPythonPackage` and -`buildPythonApplication` functions. +Python libraries and applications that use `setuptools` or +`distutils` are typically build with respectively the `buildPythonPackage` and +`buildPythonApplication` functions. These two functions also support installing a `wheel`. All Python packages reside in `pkgs/top-level/python-packages.nix` and all -applications elsewhere. Some packages are also defined in +applications elsewhere. In case a package is used as both a library and an application, +then the package should be in `pkgs/top-level/python-packages.nix` since only those packages are made +available for all interpreter versions. The preferred location for library expressions is in `pkgs/development/python-modules`. It is important that these packages are -called in `pkgs/top-level/python-packages.nix` and not elsewhere, to guarantee +called from `pkgs/top-level/python-packages.nix` and not elsewhere, to guarantee the right version of the package is built. Based on the packages defined in `pkgs/top-level/python-packages.nix` an @@ -462,14 +464,14 @@ and the aliases * `pkgs.python2Packages` pointing to `pkgs.python27Packages` * `pkgs.python3Packages` pointing to `pkgs.python35Packages` -* `pkgs.pythonPackages` pointing to `pkgs.python3Packages` +* `pkgs.pythonPackages` pointing to `pkgs.python2Packages` #### `buildPythonPackage` function The `buildPythonPackage` function is implemented in `pkgs/development/interpreters/python/build-python-package.nix` -and can be used as: +The following is an example: twisted = buildPythonPackage { name = "twisted-8.1.0"; From d34ccd1db4607fedc2ec700193edb4204dee54f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 10:40:35 +0100 Subject: [PATCH 1138/1749] xf86-input-synaptics: 1.8.3 -> 1.9.0 I'm getting new error in X.0.log: "Synaptics driver unable to detect protocol" but the touchpad still works fine. It seems the driver is trying to additionally apply to my regular (wireless) mouse which fails. I hope this is just harmless. --- pkgs/servers/x11/xorg/default.nix | 52 ++++++++++++------------- pkgs/servers/x11/xorg/tarballs-7.7.list | 16 ++++---- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2c27d6483bed..399ca7734e71 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1593,55 +1593,55 @@ let }) // {inherit inputproto udev xorgserver xproto ;}; xf86inputjoystick = (mkDerivation "xf86inputjoystick" { - name = "xf86-input-joystick-1.6.2"; + name = "xf86-input-joystick-1.6.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2; - sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf"; + url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2; + sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto kbproto xorgserver xproto ;}; xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" { - name = "xf86-input-keyboard-1.8.1"; + name = "xf86-input-keyboard-1.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2; - sha256 = "04d27kwqq03fc26an6051hs3i0bff8albhnngzyd59wxpwwzzj0s"; + url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2; + sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.19.1"; + name = "xf86-input-libinput-0.22.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2; - sha256 = "0381rnahg8mbzcisify092jyjycxzswpqg7dnqldrwjadx0ckwf7"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.22.0.tar.bz2; + sha256 = "1qpaffl21xxjqcn4cqdfnd1gvxwdxizvvkimkypf4j6l5q3v8qn7"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; xf86inputmouse = (mkDerivation "xf86inputmouse" { - name = "xf86-input-mouse-1.9.1"; + name = "xf86-input-mouse-1.9.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2; - sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l"; + url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2; + sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" { - name = "xf86-input-synaptics-1.8.3"; + name = "xf86-input-synaptics-1.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2; - sha256 = "009zx199pilcvlaqm6fx4mg94q81d6vvl5rznmw3frzkfh6117yk"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2; + sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1681,11 +1681,11 @@ let }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.1.2"; + name = "xf86-video-amdgpu-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2; - sha256 = "0y87d4rhm5r71qpzcmmz4q37f3d3461jzh3sr99j7lbhdpnpzs3f"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2; + sha256 = "13vcwxswhzq611ly890fcl11vkpai7gs303l7nx5azqjbyn1lnr7"; }; buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1714,11 +1714,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.7.1"; + name = "xf86-video-ati-7.8.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2; - sha256 = "1387cn4b2wwawvzqmy17hrg9d394pl5r5if5jn831vk2vf48b980"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2; + sha256 = "1ynnm4v4261xmg94b7jam9hjyym4n2nqba23rv23v3wjfbkms7s0"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2067,15 +2067,15 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (mkDerivation "xf86videovmware" { - name = "xf86-video-vmware-13.1.0"; + name = "xf86-video-vmware-13.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2; - sha256 = "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w"; + url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2; + sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; + buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; + }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; xf86videovoodoo = (mkDerivation "xf86videovoodoo" { name = "xf86-video-voodoo-1.2.5"; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 161d7bda85e9..eece5ff3ed81 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -120,17 +120,17 @@ mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2 -mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.22.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 @@ -162,7 +162,7 @@ mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 From bf220b1b4aa8e5e2939d29cdd2fe9f566ccc25c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 10:49:49 +0100 Subject: [PATCH 1139/1749] Revert "xf86-input-synaptics: 1.8.3 -> 1.9.0" This reverts commit d34ccd1db4607fedc2ec700193edb4204dee54f4. By a mistake, it included much more than intended at this point. --- pkgs/servers/x11/xorg/default.nix | 52 ++++++++++++------------- pkgs/servers/x11/xorg/tarballs-7.7.list | 16 ++++---- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 399ca7734e71..2c27d6483bed 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1593,55 +1593,55 @@ let }) // {inherit inputproto udev xorgserver xproto ;}; xf86inputjoystick = (mkDerivation "xf86inputjoystick" { - name = "xf86-input-joystick-1.6.3"; + name = "xf86-input-joystick-1.6.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2; - sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; + url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2; + sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf"; }; buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto kbproto xorgserver xproto ;}; xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" { - name = "xf86-input-keyboard-1.9.0"; + name = "xf86-input-keyboard-1.8.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2; - sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; + url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2; + sha256 = "04d27kwqq03fc26an6051hs3i0bff8albhnngzyd59wxpwwzzj0s"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.22.0"; + name = "xf86-input-libinput-0.19.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.22.0.tar.bz2; - sha256 = "1qpaffl21xxjqcn4cqdfnd1gvxwdxizvvkimkypf4j6l5q3v8qn7"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2; + sha256 = "0381rnahg8mbzcisify092jyjycxzswpqg7dnqldrwjadx0ckwf7"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; xf86inputmouse = (mkDerivation "xf86inputmouse" { - name = "xf86-input-mouse-1.9.2"; + name = "xf86-input-mouse-1.9.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2; - sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl"; + url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2; + sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" { - name = "xf86-input-synaptics-1.9.0"; + name = "xf86-input-synaptics-1.8.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2; - sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2; + sha256 = "009zx199pilcvlaqm6fx4mg94q81d6vvl5rznmw3frzkfh6117yk"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1681,11 +1681,11 @@ let }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.2.0"; + name = "xf86-video-amdgpu-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2; - sha256 = "13vcwxswhzq611ly890fcl11vkpai7gs303l7nx5azqjbyn1lnr7"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2; + sha256 = "0y87d4rhm5r71qpzcmmz4q37f3d3461jzh3sr99j7lbhdpnpzs3f"; }; buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1714,11 +1714,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.8.0"; + name = "xf86-video-ati-7.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2; - sha256 = "1ynnm4v4261xmg94b7jam9hjyym4n2nqba23rv23v3wjfbkms7s0"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2; + sha256 = "1387cn4b2wwawvzqmy17hrg9d394pl5r5if5jn831vk2vf48b980"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2067,15 +2067,15 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (mkDerivation "xf86videovmware" { - name = "xf86-video-vmware-13.2.1"; + name = "xf86-video-vmware-13.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2; - sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2"; + url = mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2; + sha256 = "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w"; }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; + }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; xf86videovoodoo = (mkDerivation "xf86videovoodoo" { name = "xf86-video-voodoo-1.2.5"; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index eece5ff3ed81..161d7bda85e9 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -120,17 +120,17 @@ mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2 -mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 -mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.22.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 @@ -162,7 +162,7 @@ mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 From 3b3daf4104beb382f15079fbef385e8234ad8a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 10:52:53 +0100 Subject: [PATCH 1140/1749] xf86-input-synaptics: 1.8.3 -> 1.9.0 I'm getting new error in X.0.log: "Synaptics driver unable to detect protocol" but the touchpad still works fine. It seems the driver is trying to additionally apply to my regular (wireless) mouse which fails. I hope this is just harmless. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2c27d6483bed..5a8ba2c9ba04 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1637,11 +1637,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" { - name = "xf86-input-synaptics-1.8.3"; + name = "xf86-input-synaptics-1.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2; - sha256 = "009zx199pilcvlaqm6fx4mg94q81d6vvl5rznmw3frzkfh6117yk"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2; + sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 161d7bda85e9..263ac53a29ab 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -124,7 +124,7 @@ mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2 From 1b158bd1c816f3dafec27ade3961c2dc1b3425f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 10:57:26 +0100 Subject: [PATCH 1141/1749] xf86-input-*: update drivers not in common use --- pkgs/servers/x11/xorg/default.nix | 18 +++++++++--------- pkgs/servers/x11/xorg/tarballs-7.7.list | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5a8ba2c9ba04..5b1dfb4c3ec1 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1593,22 +1593,22 @@ let }) // {inherit inputproto udev xorgserver xproto ;}; xf86inputjoystick = (mkDerivation "xf86inputjoystick" { - name = "xf86-input-joystick-1.6.2"; + name = "xf86-input-joystick-1.6.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2; - sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf"; + url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2; + sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto kbproto xorgserver xproto ;}; xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" { - name = "xf86-input-keyboard-1.8.1"; + name = "xf86-input-keyboard-1.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2; - sha256 = "04d27kwqq03fc26an6051hs3i0bff8albhnngzyd59wxpwwzzj0s"; + url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2; + sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1626,11 +1626,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputmouse = (mkDerivation "xf86inputmouse" { - name = "xf86-input-mouse-1.9.1"; + name = "xf86-input-mouse-1.9.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2; - sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l"; + url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2; + sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 263ac53a29ab..1dcde0cc4bb2 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -120,10 +120,10 @@ mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2 -mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 From 7c7dc15cbfc8c513173ec461e901bf5271e4b47c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 2 Dec 2016 12:39:04 +0000 Subject: [PATCH 1142/1749] lxcfs: add module --- nixos/modules/module-list.nix | 1 + nixos/modules/virtualisation/lxcfs.nix | 49 ++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 nixos/modules/virtualisation/lxcfs.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bf7a68c6cea9..155d7a5ef923 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -618,6 +618,7 @@ ./virtualisation/docker.nix ./virtualisation/libvirtd.nix ./virtualisation/lxc.nix + ./virtualisation/lxcfs.nix ./virtualisation/lxd.nix ./virtualisation/amazon-options.nix ./virtualisation/openvswitch.nix diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix new file mode 100644 index 000000000000..48462dc66da8 --- /dev/null +++ b/nixos/modules/virtualisation/lxcfs.nix @@ -0,0 +1,49 @@ +# LXC Configuration + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.virtualisation.lxc.lxcfs; +in { + meta.maintainers = [ maintainers.mic92 ]; + + ###### interface + options.virtualisation.lxc.lxcfs = { + enable = + mkOption { + type = types.bool; + default = false; + description = '' + This enables LXCFS, a FUSE filesystem for LXC. + To use lxcfs in include the following configuration in your + container configuration: + + virtualisation.lxc.defaultConfig = "lxc.include = ''${pkgs.lxcfs}/share/lxc/config/common.conf.d/00-lxcfs.conf"; + + ''; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + services.cgmanager.enable = true; + + systemd.services.lxcfs = { + description = "FUSE filesystem for LXC"; + wantedBy = [ "multi-user.target" ]; + requires = [ "cgmanager.service" ]; + after = [ "cgmanager.service" ]; + before = [ "lxc.service" ]; + restartIfChanged = false; + serviceConfig = { + ExecStartPre="${pkgs.coreutils}/bin/mkdir -p /var/lib/lxcfs"; + ExecStart="${pkgs.lxcfs}/bin/lxcfs /var/lib/lxcfs"; + ExecStopPost="-${pkgs.fuse}/bin/fusermount -u /var/lib/lxcfs"; + KillMode="process"; + Restart="on-failure"; + }; + }; + }; +} From cb2c5f4a4384e944299b70eacd638a0cd7e8d071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 11:31:38 +0100 Subject: [PATCH 1143/1749] xf86-video-ati: 7.7.1 -> 7.8.0 I runs fine for me. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5b1dfb4c3ec1..fc064e6218f1 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1714,11 +1714,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.7.1"; + name = "xf86-video-ati-7.8.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2; - sha256 = "1387cn4b2wwawvzqmy17hrg9d394pl5r5if5jn831vk2vf48b980"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2; + sha256 = "1ynnm4v4261xmg94b7jam9hjyym4n2nqba23rv23v3wjfbkms7s0"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 1dcde0cc4bb2..0476fcdc2b89 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -130,7 +130,7 @@ mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 From 8e8742eac0e8b1e8af23a0ef678d39bdc94b0527 Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Sun, 4 Dec 2016 05:33:43 +0000 Subject: [PATCH 1144/1749] perlPackages.ModuleBuildPluggable: init at 0.10 Add the Perl module `Module::Build::Pluggable`, version 0.10, generated by `nix-generate-from-cpan`. I have tested this change per nixpkgs manual section 11.1 ("Making patches"). --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ef8984230f42..e316fd0ee044 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8097,6 +8097,20 @@ let self = _self // overrides; _self = with self; { }; }; + ModuleBuildPluggable = buildPerlModule rec { + name = "Module-Build-Pluggable-0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; + sha256 = "e5bb2acb117792c984628812acb0fec376cb970caee8ede57535e04d762b0e40"; + }; + propagatedBuildInputs = [ ClassAccessorLite ClassMethodModifiers DataOptList ModuleBuild TestSharedFork ]; + meta = { + homepage = https://github.com/tokuhirom/Module-Build-Pluggable; + description = "Module::Build meets plugins"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ModuleBuildTiny = buildPerlModule { name = "Module-Build-Tiny-0.039"; src = fetchurl { From e12b2b8119084d9ba30534aeb8de987113783d8e Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Sun, 4 Dec 2016 05:40:54 +0000 Subject: [PATCH 1145/1749] perlPackages.ModuleBuildPluggablePPPort: init at 0.04 Add the Perl module `Module::Build::Pluggable::PPPort`, version 0.04, generated by `nix-generate-from-cpan`. I have tested this change per nixpkgs manual section 11.1 ("Making patches"). --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e316fd0ee044..c3cd7b88203a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8111,6 +8111,20 @@ let self = _self // overrides; _self = with self; { }; }; + ModuleBuildPluggablePPPort = buildPerlModule rec { + name = "Module-Build-Pluggable-PPPort-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; + sha256 = "44084ba3d8815f343bd391585ac5d8339a4807ce5c0dd84c98db8f310b64c0ea"; + }; + buildInputs = [ ModuleBuild TestRequires ]; + propagatedBuildInputs = [ ClassAccessorLite ModuleBuildPluggable ]; + meta = { + description = "Generate ppport.h"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ModuleBuildTiny = buildPerlModule { name = "Module-Build-Tiny-0.039"; src = fetchurl { From 524f7c02dcd43a8807426874db0560d8e4ceb900 Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Sun, 4 Dec 2016 05:45:12 +0000 Subject: [PATCH 1146/1749] perlPackages.HTMLEscape: init at 1.10 Add the Perl module `HTML::Escape`, version 1.10, generated by `nix-generate-from-cpan`. I have tested this change per nixpkgs manual section 11.1 ("Making patches"). --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c3cd7b88203a..a906bcce7cbf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5976,6 +5976,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLTree ]; }; + HTMLEscape = buildPerlModule rec { + name = "HTML-Escape-1.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; + sha256 = "b1cbac4157ad8dedac6914e1628855e05b8dc885a4007d2e4df8177c6a9b70fb"; + }; + buildInputs = [ ModuleBuild ModuleBuildPluggablePPPort TestRequires ]; + meta = { + homepage = https://github.com/tokuhirom/HTML-Escape; + description = "Extremely fast HTML escaping"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTMLFromANSI = buildPerlPackage { name = "HTML-FromANSI-2.03"; src = fetchurl { From 7f5af41140ff9443779fcf3ce78e59304af7d6d3 Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Sun, 4 Dec 2016 05:48:54 +0000 Subject: [PATCH 1147/1749] perlPackages.Swim: init at 0.1.44 Add the Perl module `Swim`, version 0.1.44, generated by `nix-generate-from-cpan`. This Perl module is the reference implementation for the lightweight markup language [Swim]. I have tested this change per nixpkgs manual section 11.1 ("Making patches"). [Swim]: --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a906bcce7cbf..03c166b65fd4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11854,6 +11854,21 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ pkgs.subversionClient ]; }; + Swim = buildPerlPackage rec { + name = "Swim-0.1.44"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; + sha256 = "06aac148d7b1778028ffae657fdf79b1093b52035661fd8b9bdad729dc8741aa"; + }; + buildInputs = [ FileShareDirInstall ]; + propagatedBuildInputs = [ HTMLEscape HashMerge IPCRun Pegex TextAutoformat YAMLLibYAML ]; + meta = { + homepage = https://github.com/ingydotnet/swim-pm; + description = "See What I Mean?!"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Switch = buildPerlPackage rec { name = "Switch-2.17"; src = fetchurl { From 16a0657c9b7558129d277c7d67b8430b6115e4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 13:34:16 +0100 Subject: [PATCH 1148/1749] xf86-video-amdgpu: 1.1.2 -> 1.2.0 I only tested building, as I've got no compatible GPU. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index fc064e6218f1..08072b2e753c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1681,11 +1681,11 @@ let }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.1.2"; + name = "xf86-video-amdgpu-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2; - sha256 = "0y87d4rhm5r71qpzcmmz4q37f3d3461jzh3sr99j7lbhdpnpzs3f"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2; + sha256 = "13vcwxswhzq611ly890fcl11vkpai7gs303l7nx5azqjbyn1lnr7"; }; buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 0476fcdc2b89..cf72e2fcf333 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -127,7 +127,7 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 From 8d86d16db3c8a17ffa60c69b745eae4aece627f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 13:36:21 +0100 Subject: [PATCH 1149/1749] xf86-video-vmware: 13.1.0 -> 13.2.1 I only tested building. --- pkgs/servers/x11/xorg/default.nix | 10 +++++----- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 08072b2e753c..bb7675ff50a6 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2067,15 +2067,15 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (mkDerivation "xf86videovmware" { - name = "xf86-video-vmware-13.1.0"; + name = "xf86-video-vmware-13.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2; - sha256 = "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w"; + url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2; + sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; + buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; + }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; xf86videovoodoo = (mkDerivation "xf86videovoodoo" { name = "xf86-video-voodoo-1.2.5"; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index cf72e2fcf333..d501907650fa 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -162,7 +162,7 @@ mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 From d281a939602688577e0103ea3fad906abd7a12f5 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Wed, 30 Nov 2016 07:52:34 +0100 Subject: [PATCH 1150/1749] sbcl: 1.3.10 -> 1.3.11 --- pkgs/development/compilers/sbcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 788160b5888b..cc44c13940e6 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.10"; + version = "1.3.11"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0xspp04y0l0yxfi1zyv0qsj9b6px5i88xpannwpc45mkj6nplmja"; + sha256 = "0hkn760d4dhw1md0zqldbpc94nwp25d73sjdrdmhfqjcz6c2syh7"; }; patchPhase = '' From 13f82b04456ae56e0069c313c112aa7e7ce00677 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Wed, 30 Nov 2016 07:53:26 +0100 Subject: [PATCH 1151/1749] picolisp: 15.11 -> 16.6 --- pkgs/development/interpreters/picolisp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 9c669ceed68b..04aca84f902f 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -3,10 +3,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "picoLisp-${version}"; - version = "15.11"; + version = "16.6"; src = fetchurl { url = "http://www.software-lab.de/${name}.tgz"; - sha256 = "0gi1n7gl786wbz6sn0f0002h49f0zvfrzxlhabkghwlbva1rwp58"; + sha256 = "0y9b4wqpgx0j0igbp4h7k0bw3hvp7dnrhl3fsaagjpp305b003z3"; }; buildInputs = optional stdenv.is64bit jdk; patchPhase = optionalString stdenv.isArm '' From 194a2ae86aaac2840bd349448ef5858ce868cddc Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Wed, 30 Nov 2016 07:55:32 +0100 Subject: [PATCH 1152/1749] sbcl: fix disabling threadSupport --- pkgs/development/compilers/sbcl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index cc44c13940e6..0198dac1c444 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { (disable (x) (setf features (remove x features)))) '' - + stdenv.lib.optionalString threadSupport "(enable :sb-thread)" + + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)") + stdenv.lib.optionalString stdenv.isArm "(enable :arm)" + '' )) " > customize-target-features.lisp From c410dc75f26e9dab5c06804e769733a125385d23 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Wed, 30 Nov 2016 07:59:49 +0100 Subject: [PATCH 1153/1749] sbcl: avoid using wrong options --- pkgs/development/compilers/sbcl/bootstrap.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index f8352f0a362e..200293c6f519 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -23,7 +23,6 @@ let sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5"; }; armv6l-linux = armv7l-linux; - x86_64-solaris = x86_64-linux; x86_64-freebsd = rec { version = "1.2.7"; system = "x86-64-freebsd"; @@ -32,6 +31,7 @@ let }; cfg = options.${stdenv.system}; in +assert builtins.hasAttr stdenv.system options; stdenv.mkDerivation rec { name = "sbcl-bootstrap-${version}"; version = cfg.version; From 18eb185591185a2d82c73a5584bac2d22dbeaaa0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 4 Dec 2016 14:26:16 +0100 Subject: [PATCH 1154/1749] sbclBootstrap: list something for Solaris --- pkgs/development/compilers/sbcl/bootstrap.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 200293c6f519..8f442bd890b3 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -28,6 +28,11 @@ let system = "x86-64-freebsd"; sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6"; }; + x86_64-solaris = rec { + version = "1.2.7"; + system = "x86-64-solaris"; + sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0"; + }; }; cfg = options.${stdenv.system}; in From fd6dbd9d177b9a213cd2830873a6ddd311f743eb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 4 Dec 2016 14:21:13 +0100 Subject: [PATCH 1155/1749] blueman: add missing pycairo --- pkgs/tools/bluetooth/blueman/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 2efd4660bbcc..7af5f941b28b 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py ''; - pythonPath = with pythonPackages; [ dbus-python pygobject3 ]; + pythonPath = with pythonPackages; [ dbus-python pygobject3 pythonPackages.pycairo ]; propagatedUserEnvPkgs = [ obex_data_server dconf ]; From 9471411a3cde9d15adc55c69b0c75bbcb44bd2fa Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 4 Dec 2016 21:45:42 +0800 Subject: [PATCH 1156/1749] wp-cli: 0.24.1 -> 1.0.0 --- pkgs/development/tools/wp-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index a116e8b73e22..30d509a5e5eb 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, writeText, writeScript, fetchurl, php }: let - version = "0.24.1"; + version = "1.0.0"; name = "wp-cli-${version}"; phpIni = writeText "wp-cli-php.ini" '' @@ -18,12 +18,12 @@ let src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "027nclp8qbfr624ja6aixzcwnvb55d7dskk9l1i042bc86hmphfd"; + sha256 = "06a80fz9na9arjdpmnislwr0121kkg11kxfqmac0axa9vkv9fjcp"; }; in stdenv.mkDerivation rec { - inherit name; + inherit name src; buildCommand = '' mkdir -p $out/bin From a1ae6273626b467906ae964eca4b16b04e9f8953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 14:48:47 +0100 Subject: [PATCH 1157/1749] nixos GDM: fix #19896 - As noted on github, GDM needs different parameters for X. - Making xserverArgs a true list instead of concat-string helps to filter it and it feels more correct anyway. - Tested: gdm+gnome, lightdm+gnome. There seems to be no logout option in gnome, and gdm doesn't offer other sessions, but maybe these are normal. --- nixos/modules/services/x11/display-managers/default.nix | 1 - nixos/modules/services/x11/display-managers/gdm.nix | 7 ++++++- nixos/modules/services/x11/display-managers/kdm.nix | 2 +- nixos/modules/services/x11/display-managers/lightdm.nix | 2 +- nixos/modules/services/x11/display-managers/sddm.nix | 2 +- nixos/modules/services/x11/display-managers/slim.nix | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index c8a1a2361f7f..c0daf30d04eb 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -187,7 +187,6 @@ in default = []; example = [ "-ac" "-logverbose" "-verbose" "-nolisten tcp" ]; description = "List of arguments for the X server."; - apply = toString; }; sessionCommands = mkOption { diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index d3aa63fd4284..6c63fede857f 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -92,10 +92,15 @@ in users.extraGroups.gdm.gid = config.ids.gids.gdm; + # GDM needs different xserverArgs, presumable because using wayland by default. + services.xserver.tty = null; + services.xserver.display = null; + services.xserver.displayManager.job = { environment = { - GDM_X_SERVER_EXTRA_ARGS = "${cfg.xserverArgs}"; + GDM_X_SERVER_EXTRA_ARGS = toString + (filter (arg: arg != "-terminate") cfg.xserverArgs); GDM_SESSIONS_DIR = "${cfg.session.desktops}"; # Find the mouse XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons"; diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix index 8b51c621e112..04701a1640cc 100644 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ b/nixos/modules/services/x11/display-managers/kdm.nix @@ -25,7 +25,7 @@ let FailsafeClient=${pkgs.xterm}/bin/xterm [X-:*-Core] - ServerCmd=${dmcfg.xserverBin} ${dmcfg.xserverArgs} + ServerCmd=${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} # KDM calls `rm' somewhere to clean up some temporary directory. SystemPath=${pkgs.coreutils}/bin # The default timeout (15) is too short in a heavily loaded boot process. diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 1d309aa34292..4afef32aaa47 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -23,7 +23,7 @@ let else additionalArgs="-logfile /var/log/X.$display.log" fi - exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} $additionalArgs "$@" + exec ${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} $additionalArgs "$@" ''; usersConf = writeText "users.conf" diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index dda8d0f7629e..6630b8257e4e 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -14,7 +14,7 @@ let xserverWrapper = pkgs.writeScript "xserver-wrapper" '' #!/bin/sh ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} - exec systemd-cat ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@" + exec systemd-cat ${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} "$@" ''; Xsetup = pkgs.writeScript "Xsetup" '' diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index ca2ae1a47726..68acde85b5dc 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -12,7 +12,7 @@ let '' xauth_path ${dmcfg.xauthBin} default_xserver ${dmcfg.xserverBin} - xserver_arguments ${dmcfg.xserverArgs} + xserver_arguments ${toString dmcfg.xserverArgs} sessiondir ${dmcfg.session.desktops} login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session" halt_cmd ${config.systemd.package}/sbin/shutdown -h now From bb84c688f61753a1f1fa1a35b808f1497d0852e2 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Sun, 4 Dec 2016 13:26:58 +0100 Subject: [PATCH 1158/1749] rustfmt: 0.6.2 -> 0.6.3 --- pkgs/development/tools/rust/rustfmt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 335c469e0c1d..9372b448cc71 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "rustfmt-${version}"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustfmt"; - rev = "4418fab4f24e6497aa2a1f71bb4cf963c2971a28"; - sha256 = "0x2kg2sqpj4lsqqskcy5p0w3264f0by1irkjj369ch89xax7l52l"; + rev = "61ab06a92eae355ed6447d85d3c416fb65e96bdb"; + sha256 = "0fa16ycbvhyxs1b278q8jizrx9z0gis0ysjwk8fjws0282xsyvbk"; }; - depsSha256 = "022mwggmy6p9n8dh22y6m3sadrwvwlbpj9w9ki9avmgsm3cj2mhs"; + depsSha256 = "1qg04nzba30fqswjf97wf0slai6lhrsy0bfv648sqnrf50virx5h"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; From 63a5dd7e25c41a4b7074cbc9f93fe8b170f48200 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Dec 2016 14:17:12 +0100 Subject: [PATCH 1159/1749] firefox-bin-beta: 49.0b1 -> 51.0b6 --- .../browsers/firefox-bin/beta_sources.nix | 368 +++++++++--------- 1 file changed, 185 insertions(+), 183 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index ce49d92e3350..bf45e30eb455 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -4,189 +4,191 @@ # ruby generate_sources.rb 46.0.1 > sources.nix { - version = "49.0b1"; + version = "51.0b6"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ach/firefox-49.0b1.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "98736e1a7503e6550491147b418815abc1cc59e58172ca45933f24f8a3df1d2e2d614d059d1159fefd727e771489c488a369e0b1f9bb7a25c8eb75cfb4c3e2b0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ach/firefox-49.0b1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "e8186d58d6c3847b475ac3c55f97476f393bb2ef210a4b7ec95d174d160011e0b4d0798de8bd33ebd30c342506f713a71509eba06fab03dc6b0fee7524f19dcc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/af/firefox-49.0b1.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "0732de2c643ec1ac17bfb3b7629207cfde48f4a135b7dafd6a5efbac3231382fdc5f19048cb76f3da3bca255bf9816956e301e26cf28390ea9cccada67d920cc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/af/firefox-49.0b1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "ea5c72eb31b41714d57385040cd2d80f273b4177a576685ee752b2e92f90f8d9b5439e1f52dfc9941143bf91248be72aa670d134ba523cca856d175960bb3f40"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/an/firefox-49.0b1.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "36e3b5c374522efe6dfbb3b072ed2a75b3bcda8934c4763468643999fd14bcf043a2e4a0a5c62ada2f2d903a1f593e06976354a620733523ff806f6b8fecf1ce"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/an/firefox-49.0b1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "398134c3133b75f027743ded416f3063d74ef777cc854992cd39aabb6397b00fff8dcf5116dabdfccee6ab1335bc296ccd991b3a4d72707735880d94b8f81af7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ar/firefox-49.0b1.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "395b9abf6a6f01f448d7671908c2d7903604592490109793f3e36ba83375685aa43007bec07d3f28997416d8aa02df2597ce3392b7c1e83e1af4911203e2baaf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ar/firefox-49.0b1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "731d61dbc03548c77aade87c413f91d727cc8a87e15c202b73dece2a17c2bab887eb3912077aea670d9a928e930c4550ef2150442be8894e59b082c6f3d4b479"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/as/firefox-49.0b1.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "7f2d08dbeae79e7f903ed182c9eeb436f227ed9ff9db17d93f2c34efc3353788a0b499e23f2fb3eb892c9ee1592493cd8f960a6092f83b19de9419c7bd4ec3e1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/as/firefox-49.0b1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "311e413592438b610b8402eb00ed19b87caaa02522e8c40fff454d6d3fd8e0b7d5cf9223a6fc52d7c5f0be23baebb87639c2c64630e5a1a966d341b679bc1d03"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ast/firefox-49.0b1.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "a782df4a337fe18a7bb85c2a252444154100a597253d98d25c268c69a430045e4722a888f3d5fa51926de3571dd1941c117cd34537ff866c5d34279f3861e0e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ast/firefox-49.0b1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "87a7759ecd002f994ebf7334b9c8c4c042ed6b84bc33485c791c5ba49bb7477ec801531a0723820aa181770c3d404eb7a0f7fb91818c38044ca9e3a130962899"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/az/firefox-49.0b1.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "d3822be0aebbbaf200e243c3e0ed0564cf6b5a9f14825f477767f98b796afedde9c6018f3b34c0263553fe190516ff0020e591ddc8ed688cab9454b7760cf131"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/az/firefox-49.0b1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "2a70bffe3da3d3a9a61e649badc3a64f3110950cfc0b3cbb42c6f799465d928ec12c9efd1e7ee6ea978c865e2d3fe05d732a870654bf629f083f15357b360ccd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/be/firefox-49.0b1.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "edc39ed32b7d990074ae3a5099cc4a0caf23190364eb87d1218a61a25b66777fa02b5df6f20c96c5ea67798a999f0cba6873d5d23b583bcd3d6ee90a7c978847"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/be/firefox-49.0b1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "d0558a2e751d561e2f316a7bd57c3a8d92e8d5cb56e5eb28d44b5d40303550afef2bb9b69dfb0b80d1ef706a33717017eb077d3b2bca9277294cc76656a6131b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bg/firefox-49.0b1.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "3524f48e8fb8b0c98c8df55d3e2934240eb414160d0e17d6f9beccb6b0540b9c9b554757e99dc99b16e685779c5d3395ff9bdb5c3a6c9faa2e88e099986aa4df"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bg/firefox-49.0b1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "f44089b4c10a0791d98e75580c1316f400c7fadd48050d9f3a352064005b3b4205db7ef54bb1ab7bf6518f7bdb3be5f853f490cc0247f3f7a4ee7d6c50cbd20b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bn-BD/firefox-49.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "39b42d189a8ba7508e98045e1d94a1c79f8544cf4b2e2cc5187356d7f9ab6deef012c6e5d2220b2ce2b5a58f565289c5aeaee6ddcf0ab7b0cfcf18a902b95715"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bn-BD/firefox-49.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "210c40e18347440077ddd0ffd25426fe583547a2a9bfbecf3e8ba3d0159d7f7317c06f893731512cc0666af488f32ed5808c8e2aabc921367f538695ba49fde9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bn-IN/firefox-49.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "dadbab0c70f22ec20a253d73081d3ccecbe148c6b0e854b85e7c079f4979f746c79fd5febd916c167cedd78ef04f5e0b2d2c925999424bb77118d251287311a6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bn-IN/firefox-49.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "8a2b9fe150579e487063f68373157ba087c571f53a98dbc9251deee92ebc58d587e38be2bc0412ed02cd8ccd485d91bc2fe5d70c223e7fe6edd996d9bfb89bfe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/br/firefox-49.0b1.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "7a3a3c5015f407a1b7ecbf35763ea091cdcd3652c7916fe81d39336521fd6ab908a549bec8d39e089d0161fb6b37894b893058b523f78bb76e75dff21852fd13"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/br/firefox-49.0b1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "9a7b5efd1f8d35f8cacaeefcb446028745bd999765fb04e60403b710cc9e5be14d172b6f0c2b08f1093083b6c4d94f22117f2b717473f5cd2bdc43ecaaec50a4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bs/firefox-49.0b1.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "4671c1ed650df67ecdf152ae1503979f52b001660e167ea4ca1c47e1152e1450e2a5eac306b302c55b28e686c8535f6d612faa4c53b81cc5297e765c1bdd0afc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bs/firefox-49.0b1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "a2e4417c3987c8ab15ef8afd4fa130f6c45550c57a4605ffa301dc7d4ff49620c768d83e9de00f509dbb0cfd94530f4cb102cdb1f2a01eba091982fbfcd82d36"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ca/firefox-49.0b1.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "076f1deebdec83f76b44c41820253a7659b6702a1b1ef7139419a50411f2f752e764f96f84be24d84be388a3a3083656f967ee53ae1c640651dcac46b6dcd089"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ca/firefox-49.0b1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "6a34ba7edb264cf974fa23650c73bcdca3e9344dfa82f3adf56c04a73439af5a093789e38406e2ec94c97635883eda2a232fe33a1746d08ff148022a1bb61fd1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cak/firefox-49.0b1.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "0657e07ceb245e435dcb3c2e36e71054bf369c088e42ad0b7448c05c5d6a666ba5505da01d2e232388794ce5ae3be8dd1ce30ab0926dc9948d2a1291948f9b5f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cak/firefox-49.0b1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "4e95bff1e40614451baad90fb3ef76e27f2ee5d1d2ede400c091f46421b6b17a0c91bad04a45208219ef7513046749b9a42a147cdf7ba52a88dd515f5dc27cec"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cs/firefox-49.0b1.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "73264dd3b43e4ea4028bf622a2062797e4a28118ba597df19affa7fe38e630aac4a960fde8eb6be4a1e64d91b3b01e986d93684819c54e66c506153b19a06550"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cs/firefox-49.0b1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "a94a811ede59154c98e87c47bedf4a5faae44cbf2c87bd7346476c92977abcdb96b79cfe379a04a459daa576170849a5c2c779a14948e51e046fc6fcf0ba4571"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cy/firefox-49.0b1.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "cc45c49758e3542ce704f941fda143ec531c9c0b9b0b28eade737e792afe7bad0db708a61510fadcede7af64622b7a97cb1f2c8eae7385ab447dc4a4198c07d4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cy/firefox-49.0b1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "07999f0049f305e75ec3fd1102673576e685e42b894db7ac8eef4d4dd1b4d2599a47b8f1ac034c728a5f3bb433ed96550907dd2f9e63a3fbd0aa43b65f2ca744"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/da/firefox-49.0b1.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "115840053470a057de9afeecc8a74113ff97c06293ce52995ef2bb473217d7b057329a4bb239bd21799d894e6a11081e7afe5191cc1ffb8887481fd08911f333"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/da/firefox-49.0b1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "358f79e56cab4260557fdd999a70d025c6b2f8e7ea01a5767500e4b1906a57994592c633b7e10b9aa54a7a2dfd98f86bb3a8f8b09c364d8675bad5d74cedfd2c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/de/firefox-49.0b1.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "5f80f4e32a71560188a21bb6b457b66a692f5eb32c5b45e04c40770b83689ead6bc07ec4a110f3855f5fe0e034f7b64ef8b5fe80526c708077664b179def71f6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/de/firefox-49.0b1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "01c71572560665dafa87ae8b327ee356b18b5ef08df093792c07b3858c42f2f9f3a89a2752fee35503785cf10130ca22fb21db83ce48fb902876eb9780b959cf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/dsb/firefox-49.0b1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "11385bdd26fd0eb9eb505141af2033a9e3b85f0d748959938eb51b9d7bb9e4c801ecf19e351957b9f8549d487086968b1f86e19534b09997b04642ced3f708d5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/dsb/firefox-49.0b1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "4daa34474c395c52c42c12f03125db8266e83ac1d8e5b098f0371cab7445b767abfb965668eafff466857ac99b6f4c00f4238d00b2f3915f228a25277b54fc2d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/el/firefox-49.0b1.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f77b62b8acabbd5afca19572be983c2f81200ff2bccabfe45b6c3d41c32de90cb4fac56db7be01fcf6a8dd69a72056e903f62d2af08b7ef0a06d18588c685b8e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/el/firefox-49.0b1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "9a3852f3dec48d5c40c09d6c961f87fb34f7fd6423ac86c4f4fe293560769c1e5a40f0d3e307fe65cdf614fe6b7fa7b1279c59b8a514e83e121b58ca90b46d31"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-GB/firefox-49.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "3197dddc1f6aa65cc7bef6217175d308c29f1bc87014e651af76b490601cc202e9609d2728ba2c05203cfb93735094dc7efc2ee9f02b8544776ead8e788ac7b2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-GB/firefox-49.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "c1dcd26ed3b07c555793304c15644033105a72390c1307921fb215a06ddde547a34e1d027966e524878adf26a8fd3323d3d59c2914bfd20b6e7b7b4e59f54eb3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-US/firefox-49.0b1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "27d8f7ca57bd1fad729e73c0fce7f33da77249f1668c4d2b546db8b0edbddff4795537250c190d59cebd83dd91a06baad9b791c7c7ffec2f4d82cfdf15bb58f8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-US/firefox-49.0b1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "1e267127d21a6f7c64acd7e1a991a70b51742bdc2ae83f669a25203f710483a35b3bc7a9f226ad2efed77ef88161d345d312efba32e9b38d60d2144a1ff1810d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-ZA/firefox-49.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "37fc1a82999c427496fb50ab6ce47d719add8f2e00d47269d266418dc1c1cb4191675a0cef398098fa17e9ec510a40250628eb5290b270c502316b3694361f6c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-ZA/firefox-49.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "5ce15a1e1d9a5d3c26a2e1b2705c11fcd42acbd296231f2d25d7b130185b09ab25d0332c199d0f8e4994b30c97ea8d80e1f1ceaab8c8d8ffeaa2a2da91b32875"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/eo/firefox-49.0b1.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "bb5e5f0b07054f2cfaa047e8df129c0fede79f6e5d736014cea52bc59b8b4c5276bf3c4217b818adf2ddf11c054c8a5ddc782a9c0b529b7164bd6f1e7edb6ca4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/eo/firefox-49.0b1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "01d363154887ebf4c008646c4d749c89f8d748d9b0f76e19de37dc097517aa67485830679406b57348a670568f9406fe14fd22e01410f3a00e102b5436779193"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-AR/firefox-49.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "8fa22a6ac6e2f9553bfc6fd7b0326ce327e4352b83e45d89ea0f79267073e03bba7dd1f2c2c2de40e3533cb0af97673aaa758eb0914c090078306f4b2902e361"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-AR/firefox-49.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "da2b44fc3bd5c7536744b1355ee9640b2d430c32c3127ce1f8eea09cf88016c0e2bd9768925abf19b49ba62c55d90c029465b03c307fbc361ad95f4c28acb419"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-CL/firefox-49.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "2cbc20485b5faf26a7f8978b63b8c135582569bc5d68c96b2dcd3d66864b2158479b7c5db0521ccb9c2de4eda6b4ffdea04ea480ac9b3e4609fade7f17806a6f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-CL/firefox-49.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "ea8bfed6bb886d23f8755b8187495ead5aa955c9fa45db1249a2f23477bf01dae4959cd4eeacffb6c3a6402d47da458c9d9fdb43243d64e19e3d66e3e1b85114"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-ES/firefox-49.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "ffb37896e2f7de03c26b6e182416c399b9776bb14828fd54ebb34406f25ef77bc9eb975a13b7c9c9b02bf78b496928abc059283322fb1422d63d506f40b533a5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-ES/firefox-49.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "635e7f1e0fe96d6e074bb1f2a4e92d98e0fb4049f7bf34f5e5547fadd00691e27efbd5acf6b79ea9e3bbb8d7b72a50f7beb64bbabfc55601645292a83384a2a2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-MX/firefox-49.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "f67781fcf3ff9e4dfc1ed042bbc6c8aede1a06a6f9b4f9f4c969a9df769114febcdb4bae191ccc9ac10cebe727f495307e497af721c326ad7d2bb6894fd93944"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-MX/firefox-49.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "42236f745af27e5ffbd1370b9d5136793d1c0ffcd1a1f8299f3a3d439e2671175524416bba6e1ecd162d9f986f89da0d3d1ffc760f2d48c5d28a99d74c467bbb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/et/firefox-49.0b1.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "d2823810c39808332c46cc39d50c552efb61d74dbc7fb59dfd5b76d1efae544b52de89cac42be4944d831691971d4d8c880ed1cffd9448b05872acf7da39b698"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/et/firefox-49.0b1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "61fb55d812c8b487ddad136f9c908396aa02e3ec4eee3f2f3fefd883c5aaf24a0c138366326bfbebe59b7065cc6f8f99550823e46bad876db8d930251f6a4492"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/eu/firefox-49.0b1.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "5086ad7828197b129d8cd25fbbe7bf0e152b3476ea886ed8cc02290d4ab4912cd02ccdee0c02f08c73dffe6a0b34c11dceeba73cd948c03b26fea8c3bb2a84bc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/eu/firefox-49.0b1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "b701decbbb6374ebb39522b068a36fb7c3bedff9f2b76cb655cd56addd592bf7d118c828283f52686545a6d9f603b674d8d80b35db217b5637fe2b29864e35b1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fa/firefox-49.0b1.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "e14d7a15eb97c7b35bcdca156a86514ad8ca91d9af8978d9e9c1afeef6e71fd3f990daabd65efe424c6275944ea1922c3a313d562e710ee747b4e63d950c6578"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fa/firefox-49.0b1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "4a0cd3b22daae4cba54473e4b144062e93dcc995a00e4f94fb66349e52274a5504b8e91e681305999fbd0acc3691fb011cc4db5485d59a9de79f542c3fd4dc64"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ff/firefox-49.0b1.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "d199ced706d4dd7f1b21999c335c500cacb8c1e4ece153f2f169711b4b381c316d5c2654608bb6f9a035f8c318c6ec96afe217ee6480451002e8f3269b4f0a82"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ff/firefox-49.0b1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "58bb1595a4eb0dc651ad4778674103b42621375f8f7d138ac658915a974be52c35fd3944c099ee7ff791d7441cd818b09cddfb2a1498274aaecbaba8cbbd8ba7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fi/firefox-49.0b1.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "4796471c2c42d9f5f278615b4a29edd80df8c113f42929a97c211bd63fe905bb7861a4c42474c6f19847308c2444e5549b7844824d99e6f236bcd0e2ab44e906"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fi/firefox-49.0b1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "5d61a0ce98ffb8b9b3a8942b756ecaccaed33fe02513607aacf5338141beefcdcc547815d0f522da57ea1ba81dfcfb0c0e3ca6a0df237ce12501c41a157cfb51"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fr/firefox-49.0b1.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "6d69faed2f0c72d47311b2a756cd08c1f0b3c142129fd062bce661ec90a888e1ab246a04fd10dc2ba987ee2602f43b794a1507a7f23a5c65e909c0378e2bdea6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fr/firefox-49.0b1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "c92b0a2d591037bfda7831767d3c3f3d324190cfb26100bfb26cb12d9281a1b3a487141e4db5112cf122cb4e236ffded74d751aef2590fe703201128a1c453ff"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fy-NL/firefox-49.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "25cddb8ea11d5422f966c1467d225743aa5807df9131563ed272953b4fa5004c331de87629e2eb6ba1903ad9abf8f0745be966f2e29c82fa74f620f08473f638"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fy-NL/firefox-49.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "6ea3b911dcbf66fa365b2ce6a6722ce3e412e61e9779d647fdc42d6e9571d60b3908af034658cfa42bc22432ab0a360f9eca676ef3f22b36f05008a33760b1db"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ga-IE/firefox-49.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "7d594f87fc45fd1ef00f2d62dc1c0a382eabd02745cee1901d133f853cc937a4c8915615c189ee6c5378d161fc75230a1c250c789a8c734aca7eb23bb44d45cd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ga-IE/firefox-49.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "af5a12a3cf90eeaea1f028d4c9a6985d9d8c994947b7976b1a3e8e0ec1af18bab4f8d7b5b86105eb119b1928c23abb4cb7fde737662eb06e0b8394b19573daef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gd/firefox-49.0b1.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "8f0e9fa58b929fe1d5640a373ec0b9a93eac336989b1cf10e1577ef8b3b57786f51a40fb0b6a2401faf192e54f7793f04ac3ebccef5dec56a48ded34cbd5cbb7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gd/firefox-49.0b1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "8719d4655bf8ac157a6d144ff9acbcdcc138094a3d589a4078d9786acd036adfae6216846681a8feb33f9e020129acff3756074bfe18289cca126f140c4be1a5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gl/firefox-49.0b1.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "e198a3becf663600184ee46f5d7043d5349abf10e2e951abfef7782449c142755fa0a37defaadecd674fb92589c24c3d49b45fadcd75ccfb81dea5ddd42b766e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gl/firefox-49.0b1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "e37ed350a7cdd5801631ddc934874016b38e4596b1d397d28a9735a977ceee80a70f0b382c186a88bef39c3c747f9825805a2c8143e0fb7b7be574c07301b77d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gn/firefox-49.0b1.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "24b41e132f5aac62884d6b5703a8c3be679d6f8201a3abd3ed966cfe349055102bf099cec81f01cd86b40499c597adfbcbae2ca17bc6767c18aa9c0f1c317fb5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gn/firefox-49.0b1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "27c62ad953946a1c40b7b7393cc249a9fc2047c6a251c4d27c5a1a9ae8e8361a14c3fa934f6669f0e7a99b27573fac6c5e151ae9c590bb58327ab503f4482ba5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gu-IN/firefox-49.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "aea376e23c7522fdd3c0c82f39455b8bbe67ce7008e1e1d9de575f98776fdf3bfa06bab3ba0da81862c0a7242ab9cd2ab1f873a34df084a88ec82ec45c088611"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gu-IN/firefox-49.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "4dbb401a0f92e02ee8822379a6313a9e7822d1155d064199272dd2be921d9dc7849439b04be3f25043fe37f43a3dee3e7b21831eabd1c555d5292694975987ae"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/he/firefox-49.0b1.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "97888c66cec9bfd111e76fc22440dda604c643396679abad421223b10688763a5d0e64fec46dd94084f30d819a5a12df4fd78434c4b03290fa745b60281b39eb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/he/firefox-49.0b1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "d46a2aec65b32e9b92a11230465ee6e2f83cef5a5b95057710f0ebdb3581810a1cbff09563f9ad3503a2c7217947369fdd80e0217318a40feed7bfd01fdbbcff"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hi-IN/firefox-49.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "48c3142a39ed9d9173d1c25337d65367f1430804b13d0c9595ac2546c7c22a177a4d528f37d773ddff3379bc7bdba5e69002f2a37c837aa95a29d4e52774e65b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hi-IN/firefox-49.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "cc3c1520f6ec453bd7e347791f8ab3da06a3aeaccb44cfe5491a4fcfdf69ed7baef66c2d31a9ebad9d2538b6ff8f1dd27b20a8f42665a1c6ee57c5f60094ef71"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hr/firefox-49.0b1.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "86dce4d32a3f01493ce83379cb20bb2e267dbeb770b9631914d3b9e722cdb9ae5a0a974b323ee2ed17fb97bd232baaaea1e53ea6f29b11253046656f98219cde"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hr/firefox-49.0b1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "446c11ab6645e17465e24fe1d4dbf27175b27e4808bc66084bcf8a1760883f6a36a5992be18ab26115f75bf0dce780c42fcabb1af3d2009f4ff7015bbe0612fd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hsb/firefox-49.0b1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "8eae4fae6e4a7d5acb9ad2b83c4f7b4d2c7edd75a4d320b6665d803d44fc448214ac71b2c86c9b16e6450f7b5238db8633a917f201b5d45f2cc03a31df2ac9d7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hsb/firefox-49.0b1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "c937552d45b948fde0854ab6ec27f77aebf7fa13eb6ff5fbcc74e86309581fe6ec799580fca7e131c940d218d09f70e4e49dc5348ec99e4d5ae6a0c63c9a6f06"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hu/firefox-49.0b1.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "4c38f40861411365e4a67bef548252328024438fc3a39260708a505a625ae9fc2912bd537a83bbe4125a027b50916daceae369a68d0ea7ba309b8595f8864fd8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hu/firefox-49.0b1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "fa298f7b4cd8fa50767f8b9a2bea0bd10e898a9e3042a0e09785ac74559b05877dbbc663ddb185146062fb1b3018a06f7e948fc33711726e43d5f33df1b3aef4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hy-AM/firefox-49.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "9e2838645094c6f8703857b674916517a47328aedead3e10dd3801abfe94971a648d792cbc1abfcfc7e39629aa7936d74cb711b53daf9f7198594e7b82c063ec"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hy-AM/firefox-49.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "a84c9f9f20e19d3820b632f3ba4c9c479066459d293a57b5ff8fd4dae1d1451f812b0a6a71e72559d3ae0596a4ccb5fd09c0056a2726ac3a0c1cf083595adceb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/id/firefox-49.0b1.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "dc84f03e90ca309805c85f45f8e3a54c92e80237980b488abcac0eee1083237a51f30847b84adc3b6051b6d9c9075799c295996d5a912b7ebfb290911006b8c7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/id/firefox-49.0b1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "e3d9e20347ffdce67d5bf5c720c93330b6a19e9733eab79f07820b50cc4ccd39a7f0736b0355f15e5bd59a8de24a0e9105bedb9d8da1cef125ea88cd1e6865c0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/is/firefox-49.0b1.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "5b4966046dae0bb27a9fde5850fe291820b19c5e41fef4f010faa4d2d040ffcccb487d7f7647d0286e8e4e7fd27b50a12047d6fc95dc70dc34e7e1da4bce6b37"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/is/firefox-49.0b1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "7b30d841c840af2c9b55173ac31ce5880a8b01daefd7871a4519107d276660af072c097479ae92b5b83379cd36a7c68ecf2d781d16b75d5eb38648aef6d89288"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/it/firefox-49.0b1.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "920e34f7db5452fad20303296b49f7d3dc7bc780735ef881c4c2cb42f2393d3be319adacbda74cfa965283681a01260dbe2298244fba5e541b807f7faffdf285"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/it/firefox-49.0b1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "3af89ab3f92d771fa82c58fc5ebdaa9ad11d7f89b57357e98ecadcd57bcadfe66101d09b187daec1c64dff808172eac5a608239be6c991e2a725ea9421e4b8e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ja/firefox-49.0b1.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "e0239291135a98bce718d86831a0aaf3486c0e1ff54c98e65e970d1824786624e76ae73572b85f009b413bbe8c61aff41972629819812eb36918d4f2e864a274"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ja/firefox-49.0b1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "998635a41eb45b8329f70837d0096cc69c6c7983ec48a208185fb0f3ee56c607c68178ac6f8c02de34c62e5c7ab38c1829b445dfed80f7794b7ef4fcd9ddc4aa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/kk/firefox-49.0b1.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "aee3c991acefbf1e257882bbd34eaee45415eecfb3fee2fa47a1d70cc5b6780b0894165a4c25609d595e4759d56ff0767b42f5b1d9174b4c1daa3e967871b66d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/kk/firefox-49.0b1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "e2170378be3b442bd97066d740d458e82d282cbcdcac555d425d16082ca22c766832a8602071135cf9802eb97b0c6f7f414fe076ddb976d84a4ddb1f1ea23bcc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/km/firefox-49.0b1.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "71e8ebcec8758c4fcd6056530b26c2fed1512f36746d431660eb603838c22e7c9c86a560ba36bd18e3df783531e608c67daceb50ea1758671c489ce91e214690"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/km/firefox-49.0b1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "ed54aa4da9b6b2692c7d275d11ea53a85bd4ad131ecd644ec37acd3efbd51a25358c6b5720227e5cffb291d018c0890d46d09b61d3782e8000012893da10d144"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/kn/firefox-49.0b1.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "678f4cfff160cfc6fd4f8e478f64ace3658c84672153c501f817a1456d7f7721d891d0186dfffa32e12bbbb46421e08e46753dc01021d3361b2e863176b32288"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/kn/firefox-49.0b1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "ec945284725364eff8e57d2f2e8bee7d35d8c217423b21d97328c8c5c2d43575c2af30fc93c8e128131c72ca7b2ea7420b88b21ded184a6b5e242fc76731e25a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ko/firefox-49.0b1.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "07839edad66284da56ec54366fef1ef0d1a55b6e7f7d215d9f52827e080d070c07be4948df13d3b082bb5962e00d503b4916937bcf5045d9e3f9896e7c8698d1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ko/firefox-49.0b1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "6183cd77dfef7ed41e2049f3b423942eedcc2d5a49f820226c1fa366cbb75f63954b26c7797da42a11ec63f19bfc5bf19ebe605ac0d501391f64f5f168e157a5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lij/firefox-49.0b1.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "3e78f5ada0a37d181e4a7b5ef90ad39fcc0216783e6ef26de826c642f1aaea59cb968636b0249af9ff92b0ef32fdde051c2d6a71d4aa2e6ac35aecc062f8e222"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lij/firefox-49.0b1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "b8e8f635e927beaa0a12e92e025deaa2e98cf2d19dacca5ae91c21fe6c41177c8670b46b1a896f1b8b80fc60d806f1642bf787c44058077c4225a6de8902e664"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lt/firefox-49.0b1.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "e71759b4088ab845c193271e0c48c319401362c8d2f0def8342807a972f70db6963ea405c93fb8832cae1f930503a3a54458de230d17d53cc376946782cb6e3f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lt/firefox-49.0b1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "616a104d2ef421c162e6688d4128995faddac35f95327fccb313e20e56c410558f39869041900ac246d2cdbf510552bdc8a006623d8c6bbbf5350b6d7bd94899"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lv/firefox-49.0b1.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "2c413f2194c147fa4c3e21a9bdf67157fa7ea51dc7129dd8cb34e3b645600561ad9e9ebf3608cd75fc17e7d7b95cec49bb746d48c0b55fb4ea7b9ba7a359cfee"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lv/firefox-49.0b1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "2743486ad0860c500a6a9146a49ec6190867706a74350310ed2987b71c5503886ba2931ba066f373fd05342198f6e8bf2a491cbb4a85c0763f1a68c1a124f796"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mai/firefox-49.0b1.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "7e5bbede973200faf58753d0de6041298f8d31937e19b9353bb83043229c8634cafc2e79129e9a8b34d1b4be451b6d3ad77e3ceb21ce8bf1a35f386ecdd64d09"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mai/firefox-49.0b1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "8e51758b070bbde4d7bb4cd8aee148c1e8fef2d5bf236a4801b58e8acdfa567b6df5d32c3d46ddf965a599ba79c95b0884210bc3166fb8e9408e5255fcfaf5c7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mk/firefox-49.0b1.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "3d945094b78f360045cfe6e1ffd53ac15a070b61adafec3063a88dd7f6ad4972fa5d4cc0398aa9bf30494be4326b63c8d8340ebd25d15c231c39d9a8b9c18da4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mk/firefox-49.0b1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "d2e8537a64747c06b2fe05b080c0eb0af82e1f4427a396c90006d012b663c1d34273307af4995b6ff8e75de4e3727cc3f736c7a9a78e0042f2f8d018ce525582"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ml/firefox-49.0b1.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "561b7a1d3f308552ba8b2084c86d6318b901fe8a7fff3254b65b790e4909dffb355eaaa898ee352310b8633fc695c6d7feb1d13ab60bf491a0668dbb05297b7a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ml/firefox-49.0b1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "6970448bfda2c54605d052570fa3ac81cfd554611c994125247ff4927807938a80fa65405ddc14a295a38bae9a1d9fcf460b32e5ba0cdff5cc690b57cb4a8d87"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mr/firefox-49.0b1.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "43b9022cd14ca829cc1f8546a9e13767e6f32daa3b008b6864a8cae3a8e6f99e70df0a05fdaa724e92fad38aabc5ffdbc9685795a0cbf1c914fbe3b515e80c99"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mr/firefox-49.0b1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "16e029ba38ba9a88d57a72d7bb3ac843916f2e15b4a288815f59109cad9bb1c70beb0716360df4977231fe91f18ba3490168a857ce94c04d85a1aa5927372571"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ms/firefox-49.0b1.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "f418c661961f6c2e6fae0a1cd5329c35b331fa64bf9aa6d186f59d7b778d5b3fd7d6d548f69ba86f5b031bade68ec118aecc4aefc9a90ebc219945ce907f31be"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ms/firefox-49.0b1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "05630d2f74ea7f70e9dd97284b41c4d4da2d325884696f58b1f88b3e29c4d5bcfa1ba7cc5f3aa412c852ac61f406fec29e0d3fea7820759d87f022811e6c5b0f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nb-NO/firefox-49.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "81127ce66c7f7da82e6059abaf002b79225bea3e69558636d5aaccba0c9df97adcc8c041b9239ec8763e28040807151b2ea01c795f4df088b896b774ea2e6162"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nb-NO/firefox-49.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "e6c13dcdef6935921f74beaad25ceb8394a1256bc3ac6a1d76f3957f067d0bf1572d1a7b8ea2da6ffeb0eff8a4b2a1d80215f5169dce3c701fcc40dece34bd3e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nl/firefox-49.0b1.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "b97db2d48eb98be9228358a0a068ea93d21ce4a5f6d138d079461c0a7f93d3a726d141adb43f41a56e658f629366eebb7ed4a0a1594a9d265ef121faabb14d52"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nl/firefox-49.0b1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "acd10d50291fd833a574d049d99a567383dbb4483ecc45583dd977c3c67fabb9d450c802b8e2eb3d4eabc719f68f0db4e2a102bd716a4bf50aa02724da382f58"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nn-NO/firefox-49.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "a07fb8c7ee065b0b7a4a3fa33e8dad026b65e42920398e6fdbf186985e46c6c55b72ecff087aace1559df286b7832a6de8215b713274234242531d7807d90180"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nn-NO/firefox-49.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "37d17e905e92aa51d82f13e33415738cf8a5952617bec6a6e095147efca81b7196f997b47167abdd7a8d041c3308307c587a29ca3ec9f2e65e71d15b68b8bbda"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/or/firefox-49.0b1.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "85ec647821f82cc3ad99142e8e4425a00b6e0b273f137cdbff10c4e91afbdf4eb9feb7d4a2c9f80191cec918180aab0a84f96b7de1efda1fe0cdf9e1c44446eb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/or/firefox-49.0b1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "8819b00e2fdc06fb17873c769f7c8461fa131bcb12f0fd191a08a3a6526571fe40caa7cd8f7ef8e0d8722bae84699a479105cf518897c76aee674ea8a2dddc2f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pa-IN/firefox-49.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "70f7cdc912a6d1c5360b58ce522386ed9562aee8dffbf4a1f653871114359880df3f98629a2d4fe5556a1ba89fc5ec90a2c3da2d56ccf419f3956dfad157a3f9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pa-IN/firefox-49.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "9b60f41e9fd92c1d22dbfa1d287081d9514e081940dd9cbe1c9b4467926d83cec9ff43caf854710ec59d805293a83ea5defab887be5a93c8eedfa959b74ba783"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pl/firefox-49.0b1.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "80372feb8348b48627a93c5f2a5486933fe731a3fdfa2da6d71a7c75b35f585cd5b2cfa0760bb17de8fb98be1ef3dd90339a635ce25749bd27d147b316847084"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pl/firefox-49.0b1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "445b104cd539f088a5cecbad4a1a861096542d1a4f2c95696ec51d43d08f10fc71513cceb5a68fa179fd988abaedb20829742f108f529face6e8e442576abb54"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pt-BR/firefox-49.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "0788d7f599c3f46dfe485ed1ded013a7d87db6aec63193887f5e6b8c3636e0b117f4b854c5b0f60ee8b9683e6d46390f365a19e499fabc2a78ac29380dd26b35"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pt-BR/firefox-49.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "ced012e0d447aae654edde3b26422f895440d8aa0822f3a14450142f6d97c20e74d1ec068bf2cde4a81270a77ef01a23646532e55ada6dc41603b013945986cf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pt-PT/firefox-49.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "d27ad4e240ee032cf16ecdc5588d3bdfcc81d338ef357c96194bc33d5d0d571c3826d298215b9cf058dec1cdb86d2bb41d5739ee4f49292bcc290ea4d50d2ca7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pt-PT/firefox-49.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "e80d1df4ea210d5a3731803026c3fca5143ade3e7f994a7a7bd673a6ba8b7df8eff9784e9bfe6d3360caf5c50609835ffaab631ecb5aafe71dde8adafa91db04"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/rm/firefox-49.0b1.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "75f10944c6ab83ca1ca49d2bc05e8923830b1fa236620ceba9cbe2f874713cd49a6f0ea4968ce3ad08a5196746dbe3c48a3b51eb0f6d8d310715c6636d17d1f1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/rm/firefox-49.0b1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "35df8ad315c60342119605cbad7fc1614002750ba6745d35d25653eaad6eedd7b039271b2900f712ec5a1c03425a902f5009e76b8c42bb074d5f64d6f6ea7477"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ro/firefox-49.0b1.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "8c31aa2df6cf1e1006691152e74aaf4b580a3b15d141444eab1cd4f3adc1066e7ac9c8196c8cd87902d590cf605bdf449d71fcb34b132a9221b101e0c16efe8d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ro/firefox-49.0b1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "ff6d5a5bc127841a1e92eb6bc22d157a57d7f48e4bc95b68907fee50683b20a0dcfd9e5a567f013a6c72311b9441231e986c7659fa60b894ea34d265786a857e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ru/firefox-49.0b1.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "e8e7a794a3dde3b9fbe82c367d44134979cc45ad115fbc82bc8b9c8c438a857abe2e4962f50fa69ac7c22772ba3eb21c464bb800bef9eee9f2b33636f43261d2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ru/firefox-49.0b1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "c653182b26d643d32e0983cf546fe8f0e5a96b7f174c52e8a9025fc56f17ce6ae12b1362abe9b408cb9970b15fcacad1747b41be86bd2475a3e3c45665f88355"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/si/firefox-49.0b1.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "4e4ab25fc8048b4bd9129a554b465ced3ff773d9a7eed9715c71ab92852573712c58667971a1dec556917603c493872577b003168821350ceaa3dc3dd9e2211c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/si/firefox-49.0b1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "a8a9dad2f7563b686012a002b8fedac3b0a68f73986db717b901e832c57d1e4b2304b47aabcc17f5e453de3467caf8aabf9635e6db7772ef340fa38fed29eb0d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sk/firefox-49.0b1.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "2e2f936448e58f8b3b46119e06b2ab5f1c181536939127de0a76931ac992f28ea307227d5c61aa8b440907aefaeb95cdf81f9d0184c78234f82f6d965c045c98"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sk/firefox-49.0b1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "14d5960a06fb7135bbe78ea7123a7c151c4494898ad6ea1a5386f0532f0a5ec35ef58e3fcb82381afdf47ca1c0e6954d0903232d1ee06d9c2a606e706d22e82e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sl/firefox-49.0b1.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "04f2f408835a9bdddd4a4c256d9a0040171760f5bce1b7d5e9c3a4ce2c74682c4016ee93f8da193280c7fd3d47ef839d67e0c480d5abd8c2235e61b9c039453d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sl/firefox-49.0b1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "631c9305f259aab364c71550ad14a0cfc6edc24a43eac08345e4331cfd4192faf710f077f5b2a5fad169b15098725c996587b96261dc18b96bc18f2a63c62e34"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/son/firefox-49.0b1.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "b8605cc6851440a615cb8a29d6baadb90fc783270253c25992299b1ced630094c891d41a49a9802e47aa2f9e1656875825dabb31450d7765658e5fd4f3815b10"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/son/firefox-49.0b1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "c17946e4d664eefbeed3a3e3430b4c5b9ffcb69628344568b354092fb72142e7da107b1a88d1af89caa7ae63a0cb76814662fdffc9e179213df4e10a3290596b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sq/firefox-49.0b1.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "ecab80a09b8c2eb75f38c14c169ee88f78266973d21da9295d5cdbeb329a43e3978feca7bada4ee049b24cb914dcd2a4ebaa95f42ed6966cf614c55a229862a2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sq/firefox-49.0b1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "5931bc9ddb86a39fd0edda4cbedfa6838549201efb882eb9a3c25ea88031fe4aed971ef327d6c356c99a0610a19e99a6ec49e755888b00882c6039f2c0e4cfc5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sr/firefox-49.0b1.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "57895b4d8a0319d25288661b145d0aa59afbbd36edd8fbdf777d95f48fffa53d3dea546f465ce2070b801bcf751b03182711e5f74ca01f72258427fd37b2f038"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sr/firefox-49.0b1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "67d96d069f43312a4c5870c2a9715e9aa5e7592b12302a773c8d6fd9f9979e63a5053d54f326d66374f216d1e69203fafef436be6b015269513f8f4a289aa796"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sv-SE/firefox-49.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "f7b1ddace365492563a3eb985067e0c19270725a8db571b626000593b7e89130345b61199d50d41daadd499ecc6858fcb46115dac455cc62ed21460b916eaf41"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sv-SE/firefox-49.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "7ac9fbd7b3175d82e73fe176481c3611eaf313fd006cf1191b79860f215af8847af88299fcf673d9e9a52db4a68a4ea4e95b632729c7b221f38e35926d60bc93"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ta/firefox-49.0b1.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "05a83591aaf1d5fc15b9a0445e2d5a20798329b3842992ccd82d22e4c788bbd34cdb46b09b48cf044369742f2b6244857e7d00b68160d094fe01465b746e0493"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ta/firefox-49.0b1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "ec3cc0ae6d3765e9942436fadcb6208672a745df670a9e5881d243812b86023e8181f5b1b6d3ad3a2dbf8b93e80e3c8b2eee4622b511566b3ca7902b454d698c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/te/firefox-49.0b1.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "ab9a5d17a70bd8685370898ad86ca867bb9a919169ef4c8ee6dae07836f4dfa58d3dead4565462b6f12d3c39c16b50ef99919f850928de0527c55563edac66ed"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/te/firefox-49.0b1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "e3d216ee3ab627f7f86ef192f63a63f1e20bbc22df4947f53e3d9f8902e3871b7fb797eb409f0cf966be4da5b1ae05461c0b0dab7788a6c87069f940e1cc5498"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/th/firefox-49.0b1.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "4df9b93ba7bb70fa0c7c3c4e9a88cbfd8197c6bf628d2107a2a57105307a50cb08d8fc114e456b125164668c6f48aef1f0e4b71b52eb045e6b8be792e8b8e38b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/th/firefox-49.0b1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "51ed80166e1224db790dbdffc60d0eda618eaf67f473fb60ff0bb6a6f15d45fa8d44a31c6d4bc747752dac8fc3075371b4798040afaa594b713c331a91633724"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/tr/firefox-49.0b1.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "7db1ec390a2d4f120eff21fbaee7700d106c4fd5c1ee1216bba0c7f896e6708bbc1da4c0f1f3ef1dd6f830ed58256fce36616950df9eae3307d2bffba6c3147f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/tr/firefox-49.0b1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "7f1295dbb8c66e22dd818e9fcc910957328dee42ffed8ad3f987b1959bf6f1c01f8f94657dcf0c2593ff747308c6fccf14fa3716fb4b189fb03b77332300823a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/uk/firefox-49.0b1.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "81b1d6cd6e5666307ea592992084f7289a5eed5a732070fd65532722f6a345cb78de868e15f3e74dc15d97cfb57f346b7e36559c5f40769391f6616c897b218c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/uk/firefox-49.0b1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "752a9aaafe23559f2cb15e6652012803eeca5e3b584dd5515fc496d62671090272b7154f1e5f701a2cc6f848b5d2a1050966c1b9cccfab7cd16fe88d66a101c9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/uz/firefox-49.0b1.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "44b6ea23bd56ad74892f00f1abd3aaf1d0e8d748814b509f791dc0ac4d303c61cb3f5d9988c07028e9dfe88ef8130fb300c131b96fa1f1b5fb4693c8a2dc0c4f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/uz/firefox-49.0b1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "94a7da589c758fc5766ade665f15af4704aae4e0729fe0a92235804c42a280bdedc3b0d2d23f153243765fb803d05023c1f4900367fcbf1b60ec5a9449f99226"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/vi/firefox-49.0b1.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "e1674665330ce86c9ce6379e81f71ce7e1dd58f1dcf7ce4141a681e1135262565021c0885e884065b5f3637884ef25f7611c7ababa614e0f3e561051925fb168"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/vi/firefox-49.0b1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "74da3a781ceb5937e42f3aa8b6f2aa3481d439e67ab16e1745a9248efe96129c6962583276e06e417b7930ac65d4681f6362eef4cb916a5943f50b7ef98aa4a3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/xh/firefox-49.0b1.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "052c729f9a90bb02e60dc5d0639fb9639669aba511fbfb5cb727500892e58519f3b6231144741a163622a5bcbe855d38b530780350c5caf33d43d297769b0aa0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/xh/firefox-49.0b1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "b0c436603ed7ab7004e84f2e0654f04c5e5f3fb7866faa7548e675e8246adb2a60528d476292be99206a3e1b6342ced48d80031c8caba11f01a1534ae17901fa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/zh-CN/firefox-49.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "c591789133b5c73026d1f5131581f91c21d8c6ea402dfcfb80ff1dd5e07f7985274ef8682fc7a576421b05721df9533a14bb34ba95193178e62b6e195fae0ae6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/zh-CN/firefox-49.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "762eec0143e00d41d909f865dfef006a460a5b046b75f1132b63d76dff6380d40284a04b07415785f0bbadc457cf66f3aed1bf47e34cf5d5909fb6f8fddf58ec"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/zh-TW/firefox-49.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "b7eacd7854170626e9135d2bd5360b9d2073afc64ecc9f963de8b03ea550a0f6d2c4bae48268d2f9d0c09e7747dcbf8d06eaff4951cbf5953c237a8461b163df"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/zh-TW/firefox-49.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "78968866d80798b3360d3860db039b4f5ab4d62618be681188799efa675ed83b84b4b266dee84ff26d27afdbb8a08f3a3bf73f3bc85289473e7e7836e4a92cab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ach/firefox-51.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "9922d61aca30e0b95209010be736dd144c3c65986c08852798997cf3cf8e4969f815565bcdf1f0d82a81bbaecf3f4cf478cda66a2cd757f36043717ddce3385d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ach/firefox-51.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "de99e6e07ea084406927551ccbb549bfe583e21e16873707124d897c38dc04b183476eb620f5d457e19375df51a19d3b57bc3afe344efa07d7832ac973ea30eb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/af/firefox-51.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "cbd0e1e659c0568ee66004664cb5277b1df291747fa22d5dd2b0c68edc59ee9efd3bdb14c6ad60509dc613e80e955314c50b589a5aa9ab52dcfb7efeb8a0772b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/af/firefox-51.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "e4a653eec075b975f3a3d6f73874909f61a82bfded01935ea152d56b7249e726099ae873a347adff4d6fa82f73a267415711483a56845980d199fbebe57a9c23"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/an/firefox-51.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "c6705fbd66a251d3427da98d1efa67d7a3f8683f166b7daab8902480c009b4ab183ff1d4f2242628ce3c11a828b74c605d5c17322234cb7972930174a070bd41"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/an/firefox-51.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "cf5df1e60d2ee8387c173e5ea73699b29ba80251d2497b4e3cb25cfb37fe2bf8967f8d39be091ae5adea2d30cb8c911124bd4272c92e9d0ee811f36d13c62efe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ar/firefox-51.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "d6c91653320898857096b209f2572454351edd4aa4778e8bc91a6628870ca476f80ed48bd17b651e4dcbdd75013dac2b325cfe4e9aab6e62fbeec16f7013e8c8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ar/firefox-51.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "0e128e4c2edde6b9090e1278b5da9bfcf6fc6cd57c739fdad86084bc0e64637b6d9ce1fd31b1da53b85f460f26d9a02b7c95bd427de08dc46415e35dfa381b1c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/as/firefox-51.0b6.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "1fcd00eaf90603969e1e57ab486c088d7ca769c67382398caf1d0217134d6a814200f4c64a6ef8a5a58647e3cb0d45cacb6cf2cf64d7139443077905e4ceca72"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/as/firefox-51.0b6.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "fa223a00223abe964d6515e195dc4bef25a420ffbdc3131d13210ff70c584707757dfd44e53d2a3ca062cbe860ff3df590cf423fad5dff5dfdb1721f321a5b98"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ast/firefox-51.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "0314d493a15bd8069a6fcd4c86036e300ca7391f9b881d355065ebc248f9a4242787cfed6f5d13c7de828340c9013a325f011995b9544610aa93ade607334e99"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ast/firefox-51.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "835c02a80228fc317d8bc81429fa6331a5381e5ce26b7cf315c30d05e7bf8a29197d4105335bf8b32b0a9e2b65acd8c9c617afee5af3339777a0e23558dd92c9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/az/firefox-51.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "a63c05959fc74bca79f6760a31ce0be0ab19ebf372a83fcfb5b2e1807e025462f4fd6236f8848bc2f6066048862cdf6b68fa66de0aa3a0b0d7c65ccca097d9d6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/az/firefox-51.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "dbf48a762de944e8ffd39d65d4b94f67e4b2d3bf91ed0763e44f32343af0dc1183087421d0c6f737c6826e94fb205772cd6d484bfb45b19755948d602d02ae91"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/bg/firefox-51.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "a514ee7d9acdb0dcb95a5c02c8d786481b1d66b8d7de2c8c05793a330d711dc5b0136a822dacc6cf81e338a9e3eca93ff9a25fef457739c5767bd01ec10458f2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/bg/firefox-51.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "6bac773ce99d25062f188a01c3006689ff7441af29a80da323e7ebe09c678a426cc3938f0a1a83051bb0efe791e4779a92b6cd09a23c676ee3629ca2d8a43da7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/bn-BD/firefox-51.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "2738e2e97d52003b4f9b55e8912bceecc86a23c4e1db432db9e9d552e91c33bf0e523a924fc1011e45887b9432af801fab93574d808cfa1dbe77a0ae6056a2cc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/bn-BD/firefox-51.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "2648c10bddde134ee699c0b26be5520a8a47d2cd0ebe99fa114b2ed7f19ba7fddd0696585732d154db67099795e6aec922d49f9871a24eda571bd6e0c24dea35"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/bn-IN/firefox-51.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "c88648df222958a1c3c9ac71e54f2b248625a6637e46c2f39419ca3c57215f5af8ce16f4662326d24712f4cdf0b5f533e48a4bfd903e5cba66b579384d3bc7c0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/bn-IN/firefox-51.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "b97ba8c5bf7f282a323ad3a4e423e85cb9122b470a94eeca91df3c00c6ab3331e02bf36ad7e87684ae3f73770c213ba19ae7179117228ac7808ad2fbe5d99145"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/br/firefox-51.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "a5b160f8776b396dd837cc574cb4ae625e58afa0443ae12ccf857d52b5d5e16d21bea6dcfe7a77e52db6c038541f01efc78d4da0de74625992e3d833f84f0b94"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/br/firefox-51.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "a03eb659b54067721861a89d578b3fca086b02c8013e7e05b724caaa020f301a4015d81e4d9f2dcd69223930c94b4e0e7f12d4e0de4b2fe271bf903b75ba9ca2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/bs/firefox-51.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "18cb9436347d690aa1c7900f8eeaaccfcdc585c3ffe921cd77860596cb8cde01174d709d03489483b5867fb9d647baa9885673b983037656f020d245f4159da2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/bs/firefox-51.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "c64e5146ea1bdcd65b46dca33c8ac772d4c82ad49dc01fb4f1e51a56595e68167f7e4c8ecbe0fa3df258eb6f1ad6c2d9d0eb281e5c7b92831a03f7fbf8e2ddd0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ca/firefox-51.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "db8c8aaebf6679bd28d615e1e2304285ed0848906f93425a255171f48d6c75aa40fb2d88f71cf85eff3410d199032ff152585e277efe78c69440778705ef3b26"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ca/firefox-51.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "8c27b06059b07d2c915fa11ec7d57c7519093a9480dac97cd6c4a024777a79d64687cd3d0c48d0c723aa10ee533164c4f67be9ad6d1379bffac98755a4a3a980"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/cak/firefox-51.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "47cbf1f054fa5820ce1f8f769ce90ac26758f99ad300069e3a6c029e01115c3b12b08c812ebe1309667c17c1640d6cb2e7174fc6e050db8f013003436b7845aa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/cak/firefox-51.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "94ffb85f667d4a39c0de3d4b0853e72e9ad2d60822e7224110aefb187aea5ece6c0be0e82ec4d4f686c6ad710b73c54c70cae10282ec0b48ca6623d3d7558444"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/cs/firefox-51.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "8c5f82a831e31c42629f5e6c6406d5a1ecee37506b89cad845abb110b0f2b5a809ce3e81e8a70915f993fa96891fca4a5e36ff778bd45d23d2671ab55da9f874"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/cs/firefox-51.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "2523492cbcd990a0204dca79f393b7e034d1337e9ff81398de78575d2a98c806680cc363f7339514d9f57308bfe4cd863c8710f6bb6373487b584aa1e8de4077"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/cy/firefox-51.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "77080af629015197663e1e3de1feb76da0ccba3ce1341cf7592ef8d6d0b477f1349d944762d1e810d1cc3c8a0eb23bf44f73e7c00d07d1e9c2a0bc2e2c1692eb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/cy/firefox-51.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "3c4f972e53540ba28be94bdc1e0b67b6c744a20f0ce2c6bfa7a1a92ab20ba806a73f39c5c0afb0e83ed5c822dfb42ea7c0c2806b91cd889070e148de8e5d47a0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/da/firefox-51.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "d082549257e17392f75485548b1ed8062e155687c3d2f0a3287ec5139e6ad1db9cb4a8a449ed2ce18650e07719b03a3dbe1ac25589102c322727767a6d663dd9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/da/firefox-51.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "8b268c1d9e35a91e2a71623404fead75966d39d893944c311ceb572e02673a06c61ef0e08b9c0ba246e6fcd23772e94e7531be535b69c27840478ee1ce3cbe6f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/de/firefox-51.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "0b58e025fc3490c6b94df2f60c722edf909bccec3264bb9f618e54391cfbee8800a6ae1a2c625f68b975daae73596464bb53ffebbedd545bd4a79e77c1d9ca33"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/de/firefox-51.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "c2fb608c2c71412f192b1b910ffc7b270fb8d02b52c76af26fafe362c0cdb282086e902fe1e9eb3bc9d2d022e474816c45092480d199fe3b039083f0de94a3e0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/dsb/firefox-51.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "4f0633677c15ce3b9a4d3bade50c5d4e18c76b898cf82a6169213674220d4b82132912947aefdc2ff90e6e639224d76f3508242d664d051475366efeb4adf84d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/dsb/firefox-51.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "d7d7ec0004bf4712082c57f30e069cbcde9c70cd10d412979228f18fe2056cbab9c741cfda76c8cf5ffaa3086320dd4fede0e140fcc88fe200944e2f407f7606"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/el/firefox-51.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "089054405ee749b30895a8c6cd83a630399ef9cc493dd4f50d0654241ab35ee63c989ce03996f0921820ae701e90bd7af7b6a0058ecba25aa5272ba151da9f02"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/el/firefox-51.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "2fc754b1d951b4d008d9d7a0cfd2555e394e09f8a28adf00334fa780532d8694a78c19831500fda3aa1e85bbc649b7156400d659de45ac4d4ecc3dac3c642124"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/en-GB/firefox-51.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "4c4ec11a0642efe15b82991e8e3d614a239dab86866773b2ad966c45d928a0b6cba73c65bddbd0233cce0bcec7489ee2899115a8e38f02db1490a5a9814a5c30"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/en-GB/firefox-51.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "6dcc54ba099ea5c6845b109eb98cee58dff6bf2dbf442723a3369bd673d43ffa01c7656011d6280f5588e4ee49e8214de327ac3d7fd92ea0cf10fc9a00a3ccd6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/en-US/firefox-51.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "7c53368377d6b4258ba5a64fe16af394b514abcf516d04551c7fb22ff09ccd4fa37b0e16a21af179329f78c8970179b4d66b2882ede54960e9a7524403f7e7ab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/en-US/firefox-51.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "d3c8f949401e6b9ade7e620e0c0f9324d1440a313521d385d7ed038d16628c70762a90a46c45eb74c6880ff35c3ac856e3a083317c016ece2d4bc8e740fd6aec"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/en-ZA/firefox-51.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "f774c2c8803789dfd335dd6bdcab442eaffb2b7bdc1a3a59509060af8e1baf57e56bbca17224038fbadef1168ae20063cae8e6f98912ee35f031870ab65155b8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/en-ZA/firefox-51.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "802e89998c068af3712daebe727d7e865446189b436823175dceb325ea4c3aad8a0b4786961cd28013fa892d9b94d3bafd967bc8d3ebb40bd7d97a76a7c5bcef"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/eo/firefox-51.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "103dc2a263d1eeb0bea61e3ddff6d16e399501c59a61045b5821654af7804bac571ce6fceb1e6616da44384d910005cacf44e515028e5da8ad58f1804298c0be"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/eo/firefox-51.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "0204acc897416b13938127b4fcf57eae2abd50f4cead0124f3422efd4e9122c8d3861be6fc5da0d996260205b938e36cbd064d4f2fde48b1e6afcb2dc3f92f1e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/es-AR/firefox-51.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "dc3f7f830ede78340d323f5062edc564fec3bca2eee32bd88d729227e8b7cda4739e56dca54fd7d8a7856778843012b3c52acf4d773ab53249ea8c186896b7ab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/es-AR/firefox-51.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "1a35ab3546f2358d8c3dcfe85528bb42142fa44a565b0d6dedbbff95d230e25ee5627753de50d7868617de5086e8ff0d668626b17cf8f47c320865e1c5a4a3f2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/es-CL/firefox-51.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "ae16ef4d94c2b75bf57f425aa670ab71525655a1a092d7151a513c783c7b4967f5b7e0726e4aad676615165d84551f8ec59b7cc8ad18570834e9abb1089fca6a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/es-CL/firefox-51.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "9f389f9e5bbc30be888942f62dc35360d01d195cba416066321c5f2153f9aa8c7d02f52452ecf1f5d0d290c246066b9fb19f93141ffa0dbced4624495ac3c515"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/es-ES/firefox-51.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "cebede3a4d5750f5b7160dfb8609faf7c73892689da08c7b93b87b6cf159184e04016b3ae92a49bfb8d40c50ac45a8806ac45c30b436a466875cedf4a0270994"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/es-ES/firefox-51.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "b58dc439dc2186bb23e5e401db162717fa0adb90517660516cda553f00100120da2db07e5de8aefea2159537408217825efe1e8d843b75175848f1cfc88f6151"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/es-MX/firefox-51.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "3a263de75799e50ec08961b0f25c3e5366129aff7e466f9dcd8820f1f455cf1ec959ac9a4388ae8edd92f3f5a1647068cd699b809f1e4de9ea9f3dd25b4a4e4c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/es-MX/firefox-51.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "1d466f5c2c2f557fee8b9997fb9f17bedcdc3287a3cf972cb963e47cbf6cd3a440296ffe60d93a45394f83603445a31338f055835f965a09fe4f32839b628ada"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/et/firefox-51.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "70f2d3009b715e27b350bcedd6503a311db8a2c6c75fa29eacdf13a8ea7fcc674680f59dfd18bc2b0440dd528d8e63bd885ee5ff3dfc88361efd3fb137ff3903"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/et/firefox-51.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "c9c51ca82cfc0062576a230a0f78900a62a188724f7eecd3786e78e37c4ba410dcef2953cbb5ffb4eb4c9f750bfc70ea0aeafdd75378b51bdaa825521db0f862"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/eu/firefox-51.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "8cfcd9b768bb83978697db322ead6afe39b6dfee7c05b1b4291f2acc9f84e450c79f419b3a158e3e9757c36d739ecb4325ac51d129015309999b5b0cf8f53df0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/eu/firefox-51.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "cda51c8a34b72ee822542da864f9de3d43a7448d5db77ca775eb7cdbbbc99c432918bd397f53a284cc30257793f1cf50d80de4621e53af99f61b2e6542a27751"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/fa/firefox-51.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "470b4d9545479ed1f97059d4af318c7f38aca6bd80754c0e56c78912164244b4ebcb9aa697a653d608bd26919f76fe0a12dcd02423315570d91aa4b822ef2e76"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/fa/firefox-51.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "dbe302146776542e63f0b98149ad72f514195f7c3f7589a14d9bd96b36d60710bfb2df8a8a931122e58ff75909832a6d26366b171bcb2c78c08c17073726d8fe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ff/firefox-51.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "725c8f4e6ee92877635993bdc83b5d6098531274239e74399cf94c156dd0193b900564a6a1c99b2b57c896f43b9769ccac1d6f280f5338e407a07a740ee4ed2e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ff/firefox-51.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "7e5c390195258b50f5e9a43def66550b11c1f410b21e69e141bc5903ff0cd6b9329a5927249078d64de31edfc8f711f6616f8d9e2432e5e1a03d4472ead43bc6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/fi/firefox-51.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "8ce26856aafb9b496b703c5446a9aced0edafd21c321496021da83efb57514c38ec4065e0f3bbc79342eaab524a4592fe7d5757867bc7af778717857d1701b45"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/fi/firefox-51.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "152c5c7721c373a1d618adb8b89e47365a5e45d621c1dde7070c57ba34091a31c712920d465dbfe3b4fa4c92547249ea4cd296b1524e774d151d512b8931ccbb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/fr/firefox-51.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "3b5a92eb7c1871551b16a4374713df0db4d9af2d288e4a1b4851ad805076c7f4359d164ea1079ea6a48dd42f6496bab748037c7fa2f3be338823279552726f87"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/fr/firefox-51.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "cad55002d699a0791496f4b839899d1c3ed312765e62f4c02fd9886b349f7b2bc9a531003c97be3ff75838d011cef2b82b7ff3a2d41f84a2189d098a8557577e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/fy-NL/firefox-51.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "807180c0e71c13ed5e9081c135b9de19b0f9ce60998b43d6c22364a6f07d9b8e835993e5a12d8c81f3090d48e53bdf84d43f0a1c5829e0e88b273e4e1eb92f1c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/fy-NL/firefox-51.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "6e6e2efa9b4a5b9ddb745a2a037ac83838a6038f4f97a4784cdc9421cf8b673b51d1c814ab0b5e6114b27bb19ac3b32a42f15e9b0db052025246de53268b40b1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ga-IE/firefox-51.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "a7e2fa69e0a9eddb019874c450a9874c9b302084872c536f04012990898e7a9fabe0eeaa1052a1888dc21bff54bb0872c3bce9c4df6c0026caaf93e1ee8fa533"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ga-IE/firefox-51.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "da861b0bbfabc6dfaf46f9b45038794da940023d0428b97957f220f8287d081972e2e97383c7e3d31e4af53ad769ef23490f451929c9ab2bb58f3eddd1f02c5f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/gd/firefox-51.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "9d61356a39ca08c751668969268fd219ee35428d9353f2cb8862d9552403dbe8c05ef961e0694eadaa82de9207e90fe5b349dc27a4d50981c6eb83f59617af85"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/gd/firefox-51.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "54c1e3c396859376c7d95808f39b564380a875abda74ca7eed9ee96947f4afff3088b30d6b7c70de830bca81a8abca9c0379733130be4617e6e44218a96ea3e7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/gl/firefox-51.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "d72a791e014c7c5a6f6304f35c74f572de4ab68f514598fe076d6218b152bd12f2a764262888faeac397f802849920adfe5e97a3b7d4331e43e4ce2de75aa31f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/gl/firefox-51.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "38981f59e6499e1f0d7cfb88a0a62ea0b3874a5b956442da0c9a2852a8c35e6885ba467084c74b482b1bec80513c37835a9dbc5372898ec4500f4de9afb5a71b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/gn/firefox-51.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "c44d87a70e45d31412f38d0ba0a25a1b58d661d91c7a9b6deae19ec40c88da4a480933ba257cb83fea4120d31c3f959ce9c5ad0da4c10247b5fa2c68fdee6aca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/gn/firefox-51.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "fcc6c0432e61b90c7cf8983846d89fcd89c7b9a87eae2c6421194a8c26a4210e2dd7ec87be25e3ee291163fc70ea7703f26adc73137d4adc7ec09b09c152b071"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/gu-IN/firefox-51.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "a782a9bc8a2008a37feb74b4acbbb679eb406fa04745d38196f16304275727cf2215e301f3f25df443430684dffe800534e6f7bd7d35effb2f051895b8426825"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/gu-IN/firefox-51.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "eb59334967705f215d5ab445e829ed1d1c53859589b08610d349cf2bdf28a36bc1ebb1bb18afcb8279790ebcbc6dab032bbc0389020959709d46e3e23eae08c2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/he/firefox-51.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "e0cbf0607d45cf2f079ca2d138d26866bc2d0a65be9e64514417f77ecb89a0228ae228b876af56fce712d9e47aaa41f93c3c908ded27e2a8a1224b2100919f92"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/he/firefox-51.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "1202568d873164c3bd104ccccdde7e201a7e15b88aed1ea6f1fc76099df98fb074a99f3f3fddcbd46992c603a7009ce6dc769641737cac82755c0d2e5c410a38"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hi-IN/firefox-51.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "9d05eff13dfecee6f488d7748c3d109ae6d441760a5fe385011fe1a9d7cea2e4c1a8e3fad8fa8216a45af2d8f99ec8467d588f8fae410eb52f71d408dbbd03b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hi-IN/firefox-51.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "a35c3679d390ee6bc1ace19a07dd3e96b4bac7147d698ebec42f1fb800c9f9f259c194140ff821a8fd84c0ba8171c5aea01257987b051a07a705c82b60ac1f34"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hr/firefox-51.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "fe1a5472ce390b5f6825a40176e3e3e13d79931cf44447da06bf08fa8c483368f95877b848302e7e9cb0c4a8b7e13db03fb7bf895c78b8b5ac6e707dc2ac5979"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hr/firefox-51.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "f3ee08747a0b209681d53fcb82b139bc75797f0c7b60bf35e55c2b702213fc99e99133d9be0df74a4b925d706583f545bd33d99b96ad5eba2e7d7308c4bec318"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hsb/firefox-51.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "a2d170a74de204d24a883cb0be93f9c55eaec4d8872a85e59be3005df7b6f78f02d95bcc0cf24e9b9ee6f6b9e301acec7e692d259b98718b4088b84c56ae0347"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hsb/firefox-51.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "22ae95d23ac80add17200e042e03830cd1e9e709d34e5906217abacdd626533e1e1c359e1312b2dcf44d0dc184e0d9c523dc870c04a759c7c8d7f42abc05391b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hu/firefox-51.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "dede1498aae89a5cf2e78ce927efd801d058fa0a7cfcda6d2aca816b913206e39b78581f48100b2ecde4d9408be30f221e66cdb7d1d1b4e9a86d5a8beed372b5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hu/firefox-51.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "552c6398313ac5e8d49373ac8959b3e39281a067ecceceef8d3d26c53ec276a8fcde181dc96072cd82aac8e952f81a821f87349a58a9f43c4ee41410bfc955c8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hy-AM/firefox-51.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "2d3b69d793ae4483dd73bd205f6692f86254735a885609033994e697b6df0b843612a10df0c227af280b94d1435555b3caebaa7ce0d229e3960f1d219d1ba180"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hy-AM/firefox-51.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "760b31298a9f7ee58035089581742e3a855aeffa4ba7a2b34d927e52834a684329f8849201f348395f3224e60aed6540cdb76ca3c5a8fcb0d34c343317423917"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/id/firefox-51.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "be01e48d71ffcfd99973e1d34d3c8779cd79c13a16f325f9e760ca282d7ccf1582e3ee33eecec2f4146ad4001ecf9d8c91a6dd433918c4993e5920fd743ad50f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/id/firefox-51.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "98bda73d7c1cbcccd64b186747e5cbd9a798704c731bf76f05710be945be08a0f6538d1cbf9a839d939371e57428a3be66feabf06cc6166aba27541599748dcc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/is/firefox-51.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "45c337a8c734778f20ed5199911c24b92dcd24d27d4213b9932be675b215fcca39953e914c0ad4ffd35b4401f8debc89cd0d28e5c3b980c94e9f6d1d59f8b105"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/is/firefox-51.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "f28cc5822333bd4497a7d5f5e494e551baba9b7c73f7eb303bc7fc3b907333ebf759ad7e05c0e1b85eec178795ecad4803d0dd872470ac6a55ec4f3856e6596e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/it/firefox-51.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "62e5bc1312904866c09a82ac1a237e0c6b58ddb43f5ba154162ba5d4f51b0df5c54b92f4d6cb0be76f6d5aa5308ad2cca079bdfdcf1893d03f470898d4524015"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/it/firefox-51.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "fa7c0cee7be57b9dbc48785a9320597d03a68508578be7dc0e0d465d30c0d6fc54f330b2f65bf21be0c99c9355daf93f53a7a3b0dc25eda2dd109ef7fd04368e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ja/firefox-51.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "14d190cd8b483af4d9d7c97441e9fb198c1f675e4cc8878e692d940366ad83a48a279957270a4022ca056e0bc28b0c8de625bc81025bef4db1d5e39942376747"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ja/firefox-51.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "d62906737f20a0e886800f883fb671ac798b3cfa04303d364ce513040be3decac3da828578c8fb971908e14cfe07b82021d33f9c24216dc2869524fa2923955b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ka/firefox-51.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; sha512 = "417ae8fca27325c1a1f20b3ee88845db8f03350287869986c6665bd64970bb3f828ebbb516d36c5b9048d848c65f767c539198ee5aa29047cf145851b3a1148c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ka/firefox-51.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; sha512 = "c4d445c52a0579bb6e38e1919a47e7cb26667a1e9b7c54a3d581d56cb55e810fc44cfaba17a89e65aff214d1ad22bb43141a2a776f86a9e068ccc0743c9dc202"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/kab/firefox-51.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; sha512 = "64b677faaf6550dedc968116a86342facc92d7b2aaff8e2f47256a9151bb834e79fc08597808f37541b303eda283d9b8138972547db614a07ab87ea339f44df7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/kab/firefox-51.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; sha512 = "51971dab1d818c0360e351738f96083ebfc493397eb48e39ea2ff129c155bbabe50b591180f32ff6464c66fecaa8fd8b872e206846450ae8e6c76da21c538f8e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/kk/firefox-51.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "3674f209fd4b80daf47319a5ae6014490a9cfc3a64c548d84439dfdb14a3f2053c94cc5e47285924e21409fbaae03cd1f2fbcec02bf5fadf1567379d172cae2c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/kk/firefox-51.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "a7621c7f77f3315bbfac9c3587f05f726a65ba8711071f4f48bdb0e7cfa866f08f7c8bdc71b02a35ef47ed6572d899ad8c5a81977361c9e3845c4ccb84fe4f89"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/km/firefox-51.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "e9358288bd40d66ed2f27676cf92974e1c54f098f8a7978bc8d914a5e045bf94c68efa25674e42f4d976dfbdc1ad23b44d1174f0310e798f1cb1c7c8c1b93349"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/km/firefox-51.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "f5748497701c5c66fcf9fd508664c6846eda0c353782a259c58ddb0852f49dee6bf1b067ea87be53047d31debcc3cd242692bfc831a8b30b6aa01303d9b0a243"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/kn/firefox-51.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "e8f8331ff3d638955d087d2b75ffe7fa04426b6f72a35e1b0e194c92948793fc25e25ae927f03f119dac01a6cbd30f944f5022c32ff933b15a8dbe67245f310c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/kn/firefox-51.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "bc82153cc0a490be1c0e8197c3bb5d69bfb3799cabf4ef55650ea9164ce68c94e846b129fe8988c5cfc9699141b6313add4caff4bba2dff48dc17af2e173cedc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ko/firefox-51.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "58437f794e59333093bbd5a4d673d1a3149ca3468ef9a31bb0fdb4c40773faa6ed688b7636191223021e9bc7bfc09726dc45ad627e4f731f19ee78cd782ecc08"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ko/firefox-51.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "e3528d611eaab0313edd3def0753ddad32a624136c32ea181807b0efd63f5205002a689d5b9ebadc4dfca8059dc4ecb236709b9c64d4743989c9a590a326698b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/lij/firefox-51.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "80c30dc8064a0a075613c6720b976379b3a9fc4ca05db2c727a4bf1e4abbd4f6f44b45eba42bc3633c164cc3c15ef756b85d638d3ab857bd0e6d21d9e6f640fd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/lij/firefox-51.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "22daba4493e91d7ee15e7f9a0849f73dcde985ad909d3a8502b30a6e350cf04dc98fe2728068d2f3d8b7b5106d57caaaadb2fae70d49d50d893854b99a926485"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/lt/firefox-51.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "fd4ce4207ea3eebda966881ab9f113688122322d16a2c9a205b17d7c73ae0de4fd5a48789e01c96392ac5c84a59a790269329ddd9686b9cfa64c787a817101bd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/lt/firefox-51.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "8dc6e28946a238db81695080f73b3502e0f88bdb2d835c88574f79ab25896162c84b9184a37142c8ca1fe3b28f42d87be9e88b59233dde36287d5b05371824eb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/lv/firefox-51.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "57877344c135ad47073e992a06e5568a4564209f2a79c2b1851d69b2fff6c9c32d96cf3278e1bba4d91fc001765f4d65d6d4b730603ac0a5cc28d2520fac2d60"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/lv/firefox-51.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "f289cda83f46ae3d2343f66bcd007d99862768ee48220a92e79f2b7941a2b2a56ea000cfa1986283e2fc9ceac749f264f122503f1bf71676888473bac9841d47"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/mai/firefox-51.0b6.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "07a87e16e68b9089c7aa58048ae4b41e15bc267d9810a218c9473f0d1082ac935fa5adb759a9ac43c0bf2a6e79e830c6344943cb7b61b73746911dbd66a7fdaf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/mai/firefox-51.0b6.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "34aec0414161df6ab435b7518f1d522c4bce6eff415f3ff103d31e9ae6099ff6b3be03099a0f5a21754daebdfff852193e2bb93ee52d622d26644aea94d72aee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/mk/firefox-51.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "8e4a61d4f20c17f1dc2748568d731f8e9f9050741896f98ec761d551a0c9bf0836731ba9049684819d71f6eabae7f2d1e93e0add593661d882d619783fb996ce"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/mk/firefox-51.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "10696ef0643af2ed0a7681f6679c6eaef375ef1e193b0b0e315d0ff4aeedb373235ec4e8d26fc562887361ce659a85163c276ed1fd4d4563dc945c7281786298"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ml/firefox-51.0b6.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "f2300cfbce84cf49b434f56b262c34e734eb2ed47abd5b318b9ac9197252869c80b77a7e0617a61f8a1d06a7e6c083479833865b5f1a0e3172102c07d8b9d878"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ml/firefox-51.0b6.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "ac0a334c3beb163351b4fc7eb42ea8363ba9667a52cb14c59f32c404bc362da957f22a44d49f09299c73971a737685d8a93c1fe4eb456489fcab2eab1be1b6b8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/mr/firefox-51.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "e8536f0786bf5a49536f7703ac50fbaf31db932c1c855988c192d495365e677f674f1d84bdd5b5d07ae0b04c6498262a29d11949f4ee172d1ed97c3708e2e0e9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/mr/firefox-51.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "b7d89ca6b79661098ee64cbf945a7080b76a8557f9a2b33fb18b8166bd9cab9cf4c775e3460bb4637121c6ae2159786e185c33cd8eb819410edf71d8d962ae6b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ms/firefox-51.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "c3d6c1772f2d53e6e3928d9c680e737a03cba9fb22fcfe051c49afe147502c6b458832c735ecefd29a06a22fd91ec13f98f0590f386c5331d6faefb83afc64a7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ms/firefox-51.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "8f44e7510675d691a4735d13169c529414942b8a18c8106dc220b53f4d85f9c1284314279ef5cd1d59543baa60803f117796f2fd2d55ecc01a6b67314b1e23a9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/nb-NO/firefox-51.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "2d42ede2a1232c48068bbde4c9401e495b82ebc356cee2490e8282e7a50e7ebdaf235e5d109a6ad1e30bb4773b81a75dd8d8f338738db499a8bc910a435fcde9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/nb-NO/firefox-51.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "05ff88244ec7c715e642c62a2f71980e94346624db05b35fe35a605f8c9bf0fb661cd0aad8ffc7a290a3507711053f7d31573d4e7e82482de63db3492197a7b1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/nl/firefox-51.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "3f7d57fd1a64f4c99a573c6c2272999bb9bed78648a1476ae3d1d843ae7407612a750b07b6730c0c326b57e16c87df374049c49f8e9e2fe9ca7d14860af983a3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/nl/firefox-51.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "26ba18dee36247d64447b7aaed71795e582e86e333e0feb95f1085b26508299044a970fd535bf57f38e0caedd116e10a3eceba05c5f1cf92649553d6ad95d1d5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/nn-NO/firefox-51.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "649a79569ca51e418101d013061bb7ae977d80e0ca4854c03e256e214e4a0c2373caf994fb1d41db6beb4816524e4ba76d434b7a2942b20cd628b42f409792b2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/nn-NO/firefox-51.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "61a99b54b807e518e62813e76606111737904c20afb73c12e5ae866476f829a177365a4c8c9d36bd5fa2a355f512f556fbc9bbc7d1fdb962535dbd6340907b04"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/or/firefox-51.0b6.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "68a761c18b24f5ab5ee511f635653d1c3e798239f82a120c2bce73d5f0e706b5b8dad2540ece11361c0652f34b00f767c6be2c700c69a0d0eb08c35bfec29fcc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/or/firefox-51.0b6.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "4640280e8645f2ac9ec96a5b02a2705bcc96f2bd3d25c6456a5d4b0a45100f264afbf618dcd8e5b211b2c8186a2ed8bd0e306d95b118e52bd6548caf5f32d58d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/pa-IN/firefox-51.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "2d57687e8fbf53cf2bd8b0bc6780dffdfe1284b47fbef20ab9fa591e2eefec00e097bdd24159a28700d47f02273395f32fcabb401d0f5f3e13cce75481b9cd7c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/pa-IN/firefox-51.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "0898c9577c92d92e51026948fdd1b201e989ca1b0ef0515f3a22a9ab2fc0932b99d859c90ca0137a8bbd913c2d5f873a77b75fdbf01c330064ed2f854fc58dcb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/pl/firefox-51.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "afaef3a9d125774454adf37f83447600536db9abd7bf388a2a9e9024ee46f67269f122c39041b5537be23b19af39e8efc27cf142064fdfcb5cd3f404792b1383"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/pl/firefox-51.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "350c67a48d318bb19cf4885718d336f3242a648b40e0f79096214f4fd6254882ff1af2a50111424a00d2396fd1c481a9ba1125f098794296899cf306269993cd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/pt-BR/firefox-51.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "c3a34e85cde018ef1323786e373e8842cb6c590cc8db64441e99d5a092d87ca7cd935dd238b30a2752393515fd5455100e97a98e08b395b4082d09e800e25846"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/pt-BR/firefox-51.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "3d986e9e932156db8db994484f19519dd5dad00e4edd04d5d2510e1aa1c9360e0cb01f9369705861e806796cbe246c1c79882320caf91a59fd400b439bb4db8a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/pt-PT/firefox-51.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "2aa6b07f64b83287aeee048edf436632737da32188ce650ea2e323fa5587457cbceb05356b3917b75bcd1927bb9cf1da89e23fdebc3db2096bd4598ce8cc714d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/pt-PT/firefox-51.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "87614bfa16f6bc89180775331a52054a597ab54232a92af0062ea47b8a1c348d9f20b5802e2cb74f1619120eed56ed02bdc705e81f5944798ea2261384764d1c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/rm/firefox-51.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "1e774ec46f28bc561bc5dbc9af3c0c5a198485f5da7a7fc7d5d1ef920b54227ddc9b0168b7cce30cc30cd606513aaec317369335deb945bcf94fb49bf29367dd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/rm/firefox-51.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "24239e55efc9ec3979a0ae64cc977ebf853817b358c39266099bf892fc6cff7bc4e3adbc927684a95b4abb9ffd08877c5f25b2e579884ca93e0dad8a717a79d8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ro/firefox-51.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "3d449880c97442f60aee98be29abd097330b95acd9f121a57744d5694f5471afffc337239b2d3e527b2dc709daf0607b73ba664ddd466eab6236f3d842ee93f2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ro/firefox-51.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "90c0cdc6d9fae3620770455b80db01920685abe7514b2b112af32ee7554d0896e4877f2f9ad38f827ad8cea9fc8f9f0c6b97c049d7e98cdf20612a50018bbcc8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ru/firefox-51.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "42d9d4e4f2fe48e1c7db8395eb22737bd42b7a771bf8bb0f69b210fc4a2fafed421e22f498d68d1ab3e1661a3e828c1e21e096d655f47d6c6216c6c8bf4a38e8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ru/firefox-51.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "8456ce7fe9ec9ae2c8e4ee74ceaa75417d33559e84277350ae058a109f3b8cb7bcc52e35684bb343f8cd3f020df31c26ff15d4e6bfbe4d89733bbd4cefb307ab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/si/firefox-51.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "4d0132f95f13076df9cc4fc6e6fe6912d16aa3c71fd18a6dc81f4ba9dc53842b7cb4a3fb4da62436fe6d9e4061e90b8c02ec686644020437b7da78ea5ab09479"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/si/firefox-51.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "5947c45892fcb7f1d0beb429ef12448242631c14e568495d6c3a1e21d01cc44e316ada5c9d9099e8835e2abfd286589622b25eb8730ef2fce9ac18c6b854dd01"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sk/firefox-51.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "93eabc3dfdff6089ba9ca7ec7210ebf174fd548d4c5e3076551470a27b0b7f19ab8d4b6813aeaf7206ea8bde863cccc2e34f447e4f09a3b0b0f632dfe5c1bf05"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sk/firefox-51.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "8b4a24c9eecfc02ef1dd297e98590471ec3a9ee37abc248f06ee69e0b822537765fa1d6dc255c9424e996af27f1cf6f45f50728d2c2be52b8e58ed3e8c1cef7d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sl/firefox-51.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "ee064cabe643fce46242fed3292e3067159ce0dc57f08d8af67658f37b7cefe80082609be57e024b939054cda80f7573ca6715bdd4f084bb847e32776267394f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sl/firefox-51.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "a8207ba7d7606e93f6f39ca9e05320181353d8bd05f519196a20cbe335aba825edaa1403488c539ae9c622949d6b9c81bf5a711cc1118963e8a66a12e2bc5133"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/son/firefox-51.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "3a5c3ac7b1482fac457a5e537d743f14eb99b6d139ed840cc5c1fa4020e7c4950957b9cafc19dda8ec21741b48698a91dbe3dd455c9b002af407eb68a29cc8e6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/son/firefox-51.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "c3b34c6e958344acb66101712d4ddddf4041e060e45037aed5e35b8006d37bc92d88c9478538a2e3ba0dd14f78ef0027a3a4f569038ba3fd06ce3c2438c48a34"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sq/firefox-51.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "00782a5b28cc04a1fe58309503bb984b29c6842e4ebd9c8e43d8965d9041b3a676208134307d3b8f04637458e052dce8c3d5fcb593d48ef93a71fe3bccffb684"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sq/firefox-51.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "27ea36701359e9baf447434d34cd4e4615f4e4d1d1a82cf93e79390320b0f76ced36784d66fda6354fe5bd5eed8bb6c74306c922880b8d42097abbb34bb0b6f2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sr/firefox-51.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "b32b88641024c0f263bf8e190ab0bd8e3d2d6091aa38733971cb8f00ad1c776859d5b037ef6f2b6d220f93629b39c8730f99bba654bc3791e767b3f7182ca758"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sr/firefox-51.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "06b188b1dd9113a51d2cd369721919ff6132cceb108304b485c9d42898cc7b20d821ac201102af4652f157ea56cd7e17b5bd09ec645243df7ef8e2030b003d2a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sv-SE/firefox-51.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "08a713dda121e0df1131dfb50c5196c2b2e4ca58823a56453c23955d94f53b877f737c5f5d805f1203a4c9361f25d0f8e8327cfbefe9fdc32d2ddd5dda359e14"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sv-SE/firefox-51.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "b1d35953186b4fe3a1a823cec5a399f81ffcbbb2379e488805de10751614300994e4ae6f5e68396d2d45b72ba2cde0874690a8c7d47ab224d1e653a3ff380294"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ta/firefox-51.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "b8986fe3919db0386ed411c1269aba0f38fa6c01a36b24544e91e382e3f22a72b5cccebcbd59e21a1573910b9f4b838cd482e588a92153b3932835bbb87b8061"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ta/firefox-51.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "a98aa3c2ef28ece7ef2866af5f0044f195ddf56152131d608320dc211f5eb4d5f5be0a95e138598e32d4160baf29281219e6bbc38349ca374289144dbfbf94a5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/te/firefox-51.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "4f040903bf00eb129adb0aa431921bd39754815b8a789b9e8118ecd87bd6923ae02faff7791f17e326dfb844745b1b12ecdf8978c814be0964825dbdacad146f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/te/firefox-51.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "b2e54cb4ff6421923e20be26db7ef302715a29f49c4c0723191096aad9a910e3f68291d932bee6f5a26fb3f85252a2cb89434dbf8acc2ff19860123bb00ee18b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/th/firefox-51.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "b2868ea454d231e87e1389005d5ed7863865e708ac2b99075f08644875323427e4dc92a245be4de90f4d5e3791b352a27e26e3ab2c08e6f3dd8377225af70a00"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/th/firefox-51.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "e3682094081d4131e68a9fb4bab81a5430fe4bd8cc1903f24c48e110313d3489e338d58dcd6719a28d5363bb35c734144a695c3e81d1a805a0f20679a52ff645"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/tr/firefox-51.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "dfa63ee5ba94400175f1252c06bbc1070579a3fc9395f55528cfe6a0a99bc6a654708ffb930efa4153322c76532d201863206b14f07973bf6713c90b297898b8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/tr/firefox-51.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "29c9efc3253770b953634e6f2d09cf82245c9b580a43103a28a14adc795ae307644edf3dee65ad4d7248efde6562485750f1d976eebd413f339044774b9660fc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/uk/firefox-51.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "43157bfb4bca885e830035e525ef2642795e9f22e582c486f28a99acf462dcb09142b9e1fc35f014f800e5f30365d6bc76b0c4b7caeebbd9e2e3fb4bfeb780c7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/uk/firefox-51.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "33790606f02644a0b99b43a3e7d9df77dfbea8404d8ea2ad34ab81090fba6fe4553fdce83425e27a5816f8af0725f598efa0cefba755af537f1d0a953eafe8af"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/uz/firefox-51.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "0ce3bcd1bd6c7aa9d363ca869d9f1638f930b5df7a7e22b88b12300dba8cc0ebb9e7e1b61318b49e9452f21f1855dd3e0b38448f4067d2a0683b6aaae39e90ae"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/uz/firefox-51.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "24ad9eb31144e51e69653c50501ad2c8e8a5c40d13464da3ab8af464cbeda9fc37a47401987f48157603f679ff281728ebb10e686659f1cce8db764a4c0b3216"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/vi/firefox-51.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "c68aae839b6438ef934953c419d99921378bd81aa08da9653299a3410d2e102ad9890870e99ff9541477a0dcf779d8e80905b6741b8f40faf4fa9b7fa8fcf86c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/vi/firefox-51.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "1b5263078040636fa3dda434ab9433c96e7ba4d10460174de5d5abc1f05de8faa930ee1fe24dd9f8dc05bc20d6087d7657bef390725d446a4ad292e2cd06ab7a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/xh/firefox-51.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "c4422a3f38d47cf9caea2ea93f5eb4c402461a76fbd8285f8894bbf3d4ae0bb484be20f0761425ac9139facb1fca12ca4122efef47391b988d4dc4118482d660"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/xh/firefox-51.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "97ecde3e48e7f3cabe8b80db7c74b34946407831aebecc87fe5913a8622b866914d2a6bcba8166c4d8e85b35eec43eec337a2389a9856d9ca48f4694d61838e3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/zh-CN/firefox-51.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "5cefa5a67a1d468c017294884b04d3ae412f1f3bce56fb96e72919266ba697b46430460334d3593608d08238921517b9972435bd76fdf012ff3fec51bc64de82"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/zh-CN/firefox-51.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "e37d07897665c195648c7b96ad47487bbe1671f9aedb06e9e5ca415dfc0484b7a13171b217866af1ab29b2e3376c45bf382e9d9bd804d57030ab401eb083560d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/zh-TW/firefox-51.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "485a9f5184722c59a4a60a8f02c0c10d4f8fed359083a70701462a311caf652170625f06eabd5baa9f8b5312ca978c48c4da01a4de49c35f52a8c8c6a2d738bd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/zh-TW/firefox-51.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "5c1a87b1a96149f67c3213315c13524cda3d29b47ae078e22c04685de4f961c3a9bfd77a79c48e3ae619cf2bee7f035c725e480337d7e3491d48abab1bff1aaf"; } ]; } From c09e043d531ba693b881598e37621a06d592767a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Dec 2016 14:16:40 +0100 Subject: [PATCH 1160/1749] calibre: 2.70.0 -> 2.73.0 Fixes #20896. --- pkgs/applications/misc/calibre/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 4fcb3a085bd0..b98d327d3b8a 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.70.0"; + version = "2.73.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "18iv1c2nx93gkfqa3k2m42dk4p59b9zp08fggb6imc1xqh2icfch"; + sha256 = "17qs7dakzd25wbshsny2x82ppdqa6kwwfbp2vp1i8qmfc1nq61gc"; }; patches = [ @@ -46,15 +46,11 @@ stdenv.mkDerivation rec { ''; dontUseQmakeConfigure = true; - # hack around a build problem - preBuild = '' - mkdir -p ../tmp.*/lib - ''; nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ]; buildInputs = [ - poppler_utils libpng imagemagick libjpeg + poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils ] ++ (with python2Packages; [ apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow From 09fac98bf0cadc2ae81d4366b8680645dda450e1 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sun, 4 Dec 2016 15:14:06 +0100 Subject: [PATCH 1161/1749] blueman: use "with" expression for variable --- pkgs/tools/bluetooth/blueman/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 7af5f941b28b..1c1085ff8146 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py ''; - pythonPath = with pythonPackages; [ dbus-python pygobject3 pythonPackages.pycairo ]; + pythonPath = with pythonPackages; [ dbus-python pygobject3 pycairo ]; propagatedUserEnvPkgs = [ obex_data_server dconf ]; From 605f923e92b7e16ce008b0611bbd34fbc9e5cbfc Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Sun, 4 Dec 2016 06:42:42 -0800 Subject: [PATCH 1162/1749] libxslt: fixed crossDrv, where no python is available --- pkgs/development/libraries/libxslt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index df0543194791..ebad3fd3eb16 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs -, pythonSupport ? true, python2 +, python2, pythonSupport ? (! stdenv ? cross) }: assert pythonSupport -> python2 != null; From 63a1edb58fd4d567a0c39dbf66b7014c99d9e14d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 4 Dec 2016 16:16:42 +0100 Subject: [PATCH 1163/1749] ion3: requires lua 5.1 See e.g., https://hydra.nixos.org/build/44338071/nixlog/1/raw --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81c23ad15ae9..887a2018e910 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13479,7 +13479,7 @@ in inspectrum = callPackage ../applications/misc/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 { - lua = lua5; + lua = lua5_1; }; ipe = qt5.callPackage ../applications/graphics/ipe { From dc451ad3ea367c4f1ba66d539ac2ce732968f42f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 16:59:13 +0100 Subject: [PATCH 1164/1749] i3-gaps: enableParallelBuilding = false; http://hydra.nixos.org/build/44530327 --- pkgs/applications/window-managers/i3/gaps.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 3d8067f18825..f3472be7a72f 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -17,6 +17,8 @@ i3.overrideDerivation (super : rec { echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION ''; + # fatal error: GENERATED_config_enums.h: No such file or directory + enableParallelBuilding = false; }) // { meta = with stdenv.lib; { From 9ccc14b1bc1d7714e908d79f37785c5b80f045dc Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 4 Dec 2016 18:18:06 +0200 Subject: [PATCH 1165/1749] linux_rpi: Add some feature flags Copied from linux_4_4 (except for the EFI stub thing). Otherwise the firewall module fails to evaluate: Failed assertions: - This kernel does not support rpfilter --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 3d046ee8f59a..f41c53da5a68 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -16,6 +16,9 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { }; features.iwlwifi = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; extraMeta.hydraPlatforms = []; })) (oldAttrs: { From 659f75bfcdc8c623b1eabdf55fa2a01cc3f0d79f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 2 Dec 2016 00:24:15 +0200 Subject: [PATCH 1166/1749] coreutils-prefixed: Fix build since the single-binary changes With the symlinked build it's only renaming 'coreutils' to 'gcoreutils' and leaving all the actual command symlinks alone. Instead of custom renaming scripts, let's use --program-prefix from the autotools kitchen sink. This has the nice(?) bonus that the manpages also get prefixed with 'g' now. The build system refuses to enable both single-binary build and --program-prefix - but the symlink-based single-binary build couldn't possibly work either (as it will be looking at "$0" for which command to execute). --- pkgs/tools/misc/coreutils/default.nix | 12 +++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index e1d9bb921fd9..8f09a677b8e9 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -39,7 +39,8 @@ let configureFlags = optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") - ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no"; + ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no" + ++ optional withPrefix "--program-prefix=g"; buildInputs = [ gmp ] ++ optional aclSupport acl @@ -89,14 +90,7 @@ let makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; - # e.g. ls -> gls; grep -> ggrep - postFixup = optionalString withPrefix - '' - ( - cd "$out/bin" - find * -type f -executable -exec mv {} g{} \; - ) - ''; + postFixup = ""; # FIXME: remove on next mass rebuild meta = { homepage = http://www.gnu.org/software/coreutils/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 887a2018e910..78a8c9ac6579 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1286,7 +1286,7 @@ in aclSupport = stdenv.isLinux; }; - coreutils-prefixed = coreutils.override { withPrefix = true; }; + coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; }; corkscrew = callPackage ../tools/networking/corkscrew { }; From 4c9bebf8c21789d9f29ecae418407087ddb33a11 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sun, 4 Dec 2016 09:46:38 +0100 Subject: [PATCH 1167/1749] kdevelop: 5.0.2 -> 5.0.3 --- pkgs/applications/editors/kdevelop5/kdevelop.nix | 10 +++++----- pkgs/applications/editors/kdevelop5/kdevplatform.nix | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index cf1d70350ba7..19ffb2c4959b 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -4,13 +4,13 @@ , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee , plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info -, libksysguard, llvmPackages, makeWrapper +, libksysguard, konsole, llvmPackages, makeWrapper }: let pname = "kdevelop"; - version = "5.0.2"; - dirVersion = "5.0.2"; + version = "5.0.3"; + dirVersion = "5.0.3"; in stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz"; - sha256 = "9b017901167723230dee8b565cdc7b0e61762415ffcc0a32708f04f7ab668666"; + sha256 = "17a58dfc38b853c6c5987084e8973b4f7f5015a6c2c20f94c2a9f96b0c13f601"; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner - kdevplatform kdevelop-pg-qt shared_mime_info libksysguard + kdevplatform kdevelop-pg-qt shared_mime_info libksysguard konsole.unwrapped llvmPackages.llvm llvmPackages.clang-unwrapped ]; diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix index d8a7e7f2b9e0..93c3eac9c343 100644 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix @@ -6,8 +6,8 @@ let pname = "kdevplatform"; - version = "5.0.2"; - dirVersion = "5.0.2"; + version = "5.0.3"; + dirVersion = "5.0.3"; in stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz"; - sha256 = "a7f311198bb72f5fee064d99055e8df39ecf4e9066fe5c0ff901ee8c24d960ec"; + sha256 = "643d1145e1948af221f9ae148d0a10809f3d89af4b97ff0d6c4d571004f46bd4"; }; nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ]; From 6e91b7483937bc2a8b4d56695b0f33d24099b15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 19:20:47 +0100 Subject: [PATCH 1168/1749] Revert "cairomm: maintenance 1.12.0 -> 1.12.2" This reverts commit d652b2cbeeb7120a51c98f5eb0e481e605d7e97a. Some packages got broken by this (rawtherapee*, ardour*). --- pkgs/development/libraries/cairomm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 9573d1f2e638..47f0668e5c76 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, darwin, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: let ver_maj = "1.12"; - ver_min = "2"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "cairomm-${ver_maj}.${ver_min}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { url = "http://www.cairographics.org/releases/${name}.tar.gz"; # gnome doesn't have the latest version ATM #url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; - sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; + sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6"; }; outputs = [ "out" "dev" ]; From ae0bfae8102196fed738a0140ae14f3a41f836f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 20:21:25 +0100 Subject: [PATCH 1169/1749] cairomm: fixup url I've got no idea why there are two tarballs with same name but different hash. --- pkgs/development/libraries/cairomm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 47f0668e5c76..b1ee0b8d2736 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation rec { name = "cairomm-${ver_maj}.${ver_min}"; src = fetchurl { - url = "http://www.cairographics.org/releases/${name}.tar.gz"; - # gnome doesn't have the latest version ATM - #url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; + #url = "http://www.cairographics.org/releases/${name}.tar.gz"; + # gnome doesn't have the latest version ATM; beware: same name but different hash + url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6"; }; From 0fd5a0c8a3401d89ffd7e651e0d258f24a613ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Dec 2016 21:11:28 +0100 Subject: [PATCH 1170/1749] lyx: 2.1.5 -> 2.2.2 ... and use Qt5 now! --- pkgs/applications/misc/lyx/default.nix | 26 ++++++++++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 58d95d3b3fa2..0da6e8eb34ae 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,29 +1,35 @@ { fetchurl, stdenv, pkgconfig, python, file, bc -, qt4, hunspell, makeWrapper #, mythes, boost +, qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost }: stdenv.mkDerivation rec { - version = "2.1.5"; + version = "2.2.2"; name = "lyx-${version}"; src = fetchurl { - url = "ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${name}.tar.xz"; - sha256 = "1wrcxsvr5kx8cfdabshzmcjrb3rmy5bh74njnzpq9m5xms8parrf"; + url = "ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${name}.tar.xz"; + sha256 = "0s2mma8fkj5mi8qzc0j67589mbj854bypx2s3y59y1n429s3sp58"; }; + # LaTeX is used from $PATH, as people often want to have it with extra pkgs + buildInputs = [ + pkgconfig qtbase qtsvg python file/*for libmagic*/ bc + hunspell makeWrapper # enchant + ]; + + # bogus configure script tests + preConfigure = '' + NIX_CFLAGS_COMPILE+=" $(pkg-config --cflags Qt5Core)" + ''; + configureFlags = [ + "--enable-qt5" #"--without-included-boost" /* Boost is a huge dependency from which 1.4 MB of libs would be used. Using internal boost stuff only increases executable by around 0.2 MB. */ #"--without-included-mythes" # such a small library isn't worth a separate package ]; - # LaTeX is used from $PATH, as people often want to have it with extra pkgs - buildInputs = [ - pkgconfig qt4 python file/*for libmagic*/ bc - hunspell makeWrapper # enchant - ]; - enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78a8c9ac6579..50200dc3c69f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13743,7 +13743,7 @@ in lynx = callPackage ../applications/networking/browsers/lynx { }; - lyx = callPackage ../applications/misc/lyx { }; + lyx = qt5.callPackage ../applications/misc/lyx { }; magnetophonDSP = { CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { }; From 2f861e6ba652eb580babd179a632a1413caae061 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 4 Dec 2016 22:07:11 +0100 Subject: [PATCH 1171/1749] chkrootkit: 0.50 -> 0.51, fix build --- pkgs/tools/security/chkrootkit/default.nix | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index 2dad4b3e43aa..54aeb32cabd6 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -1,15 +1,25 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -stdenv.mkDerivation { - name = "chkrootkit-0.50"; +stdenv.mkDerivation rec { + name = "chkrootkit-0.51"; src = fetchurl { - url = ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-0.50.tar.gz; - sha256 = "1ivclp7ixndacjmf7xgj8lfa6h7ihx44mzzsapqdvf0c5f9gqj4m"; + url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${name}.tar.gz"; + sha256 = "0y0kbhy8156y8zli0wcqbakb9rprzl1w7jn0kw3xjfgzrgsncqgn"; }; - installPhase = " + # TODO: a lazy work-around for linux build failure ... + makeFlags = [ "STATIC=" ]; + + installPhase = '' mkdir -p $out/sbin cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin - "; + ''; + + meta = with stdenv.lib; { + description = "Locally checks for signs of a rootkit"; + homepage = http://www.chkrootkit.org/; + license = licenses.bsd2; + platforms = with platforms; linux; + }; } From ea412cd5a1b3ca93d86f7a43dcdecb5784155dae Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 4 Dec 2016 22:11:24 +0100 Subject: [PATCH 1172/1749] lib/generators: add toKeyValue & mkKeyValueLine (#20903) generators for the common use case of simple config files which hold keys and values. Used in the implementation for toINI. --- lib/generators.nix | 29 +++++++++++++++++++++++++---- lib/tests.nix | 16 ++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index 27d4142e8d9a..2c0cf5775f47 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -17,7 +17,29 @@ in rec { - /* Generates an INI-style config file from an + /* Generate a line of key k and value v, separated by + * character sep. If sep appears in k, it is escaped. + * Helper for synaxes with different separators. + * + * mkKeyValueLine ":" "f:oo" "bar" + * > "f\:oo:bar" + */ + mkKeyValueLine = sep: k: v: + "${libStr.escape [sep] k}${sep}${toString v}"; + + + /* Generate a key-value-style config file from an attrset. + * + * mkKeyValue is the same as in toINI. + */ + toKeyValue = { + mkKeyValue ? mkKeyValueLine "=" + }: attrs: + let mkLine = k: v: mkKeyValue k v + "\n"; + in libStr.concatStrings (libAttr.mapAttrsToList mkLine attrs); + + + /* Generate an INI-style config file from an * attrset of sections to an attrset of key-value pairs. * * generators.toINI {} { @@ -41,17 +63,16 @@ rec { # apply transformations (e.g. escapes) to section names mkSectionName ? (name: libStr.escape [ "[" "]" ] name), # format a setting line from key and value - mkKeyValue ? (k: v: "${libStr.escape ["="] k}=${toString v}") + mkKeyValue ? mkKeyValueLine "=" }: attrsOfAttrs: let # map function to string for each key val mapAttrsToStringsSep = sep: mapFn: attrs: libStr.concatStringsSep sep (libAttr.mapAttrsToList mapFn attrs); - mkLine = k: v: mkKeyValue k v + "\n"; mkSection = sectName: sectValues: '' [${mkSectionName sectName}] - '' + libStr.concatStrings (libAttr.mapAttrsToList mkLine sectValues); + '' + toKeyValue { inherit mkKeyValue; } sectValues; in # map input to ini sections mapAttrsToStringsSep "\n" mkSection attrsOfAttrs; diff --git a/lib/tests.nix b/lib/tests.nix index d59814987ed6..afbaf11a7f7b 100644 --- a/lib/tests.nix +++ b/lib/tests.nix @@ -135,6 +135,22 @@ runTests { # these tests assume attributes are converted to lists # in alphabetical order + testMkKeyValueLine = { + expr = generators.mkKeyValueLine ":" "f:oo" "bar"; + expected = ''f\:oo:bar''; + }; + + testToKeyValue = { + expr = generators.toKeyValue {} { + key = "value"; + "other=key" = "baz"; + }; + expected = '' + key=value + other\=key=baz + ''; + }; + testToINIEmpty = { expr = generators.toINI {} {}; expected = ""; From 6295d387d09b71d9ecf00c2a3ff1c1821f7522ff Mon Sep 17 00:00:00 2001 From: Dejan Lukan Date: Sun, 4 Dec 2016 22:25:09 +0100 Subject: [PATCH 1173/1749] mail-notification: remove unneeded patches, fix die, fix license --- .../desktop/mail-notification/default.nix | 66 +- ...ation-5.4-remove-ubuntu-special-case.patch | 33 - .../patches/mail-notification-aarch64.patch | 1629 ----------------- .../mail-notification-jb-gcc-format.patch | 15 - 4 files changed, 16 insertions(+), 1727 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch delete mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch delete mode 100644 pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index e8abc47c2d0e..36608f4294bd 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -15,30 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ]; prePatch = '' - sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c || die - - # Ensure we never append -Werror - sed -i -e 's/ -Werror//' jb jbsrc/jb.c || die - ''; - - patches = [ - ./patches/mail-notification-5.4-remove-ubuntu-special-case.patch - # ./patches/mail-notification-aarch64.patch - ./patches/mail-notification-dont-link-against-bsd-compat.patch - # ./patches/mail-notification-jb-gcc-format.patch - ]; - - patchFlags = "-p0"; - - configurePhase = '' - ./jb configure - runHook postConfigure - ''; - - postConfigure = '' - sed -i -e "/^prefix/c prefix|string|1|$out" \ - -e 's/^pkgdatadir.*/pkgdatadir|string|0|$datadir/g' \ - build/config + sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c # currently disable the check for missing sheme until a better solution # is found; needed, because otherwise the application doesn't even start @@ -46,41 +23,30 @@ stdenv.mkDerivation rec { sed -i -e 's/(schema_missing)/(!schema_missing)/g' src/mn-conf.c ''; + patches = [ + ./patches/mail-notification-dont-link-against-bsd-compat.patch + ]; - buildPhase = '' - ./jb build + patchFlags = "-p0"; + NIX_CFLAGS_COMPILE = "-Wno-error"; + + preConfigure = "./jb configure prefix=$out"; + + postConfigure = '' + substituteInPlace build/config \ + --replace "omf-dir|string|1|${gnome2.scrollkeeper}/share/omf" "omf-dir|string|1|$out/share/omf" \ + --replace "scrollkeeper-dir|string|1|${gnome2.scrollkeeper}/var/lib/scrollkeeper" "omf-dir|string|1|$out/var/lib/scrollkeeper" \ ''; - # the "./jb install" tries to install directly to nix store, which is not - # writable, so we have to copy the files ourselves - installPhase = '' - #GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install - - # create directories - mkdir -p $out/{bin,lib,libexec,share,etc,var} - - # copy executable - cp ./build/src/mail-notification $out/bin/ - - # copy icons - #mkdir -p $out/share/icons/hicolor - cp -r art/* $out/share/ - - # copy schemas - mkdir -p $out/etc/gconf/schemas/ - #GCONF_CONFIG_SOURCE="xml:merged:${gnome2.GConf}/etc/gconf/gconf.xml.defaults" ${gnome2.GConf}/bin/gconftool-2 --makefile-install-rule data/mail-notification.schemas.in.in - cp data/mail-notification.schemas.in.in $out/etc/gconf/schemas/ - - # copy properties dialogs - cp ui/* $out/share/ - ''; + buildPhase = "./jb build"; + installPhase = "./jb install"; enableParallelBuilding = true; meta = with stdenv.lib; { description = "Tray status icon, which notifies us when new email arrives"; homepage = "http://www.nongnu.org/mailnotify/"; - license = "GPL-3"; + license = with licenses; [ gpl3 ]; platforms = platforms.unix; maintainers = [ maintainers.eleanor ]; }; diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch deleted file mode 100644 index 4516f32c6f52..000000000000 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- jbsrc/lib/src/core/jb-feature.c.~1~ 2008-04-27 16:47:27.000000000 +0200 -+++ jbsrc/lib/src/core/jb-feature.c 2008-07-22 11:40:50.856886210 +0200 -@@ -164,8 +164,6 @@ - static void - gconf_configure (void) - { -- JBVariable *variable; -- - jb_require_program("gconftool-2"); - - if (! strcmp(jb_variable_get_string("gconf-config-source"), "autodetect")) -@@ -178,21 +176,6 @@ - jb_variable_set_string("gconf-config-source", config_source); - g_free(config_source); - } -- -- /* fix the default schemas dir on Ubuntu */ -- variable = jb_variable_get_variable_or_error("gconf-schemas-dir"); -- if (! variable->user_set) -- { -- static const char *ubuntu_dir = "$datadir/gconf/schemas"; -- char *expanded; -- -- expanded = jb_variable_expand(ubuntu_dir, NULL); -- -- if (g_file_test(expanded, G_FILE_TEST_IS_DIR)) -- jb_variable_set_string("gconf-schemas-dir", ubuntu_dir); -- -- g_free(expanded); -- } - } - - static void diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch deleted file mode 100644 index e0957715b4b2..000000000000 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-aarch64.patch +++ /dev/null @@ -1,1629 +0,0 @@ -diff -urN epienbroek-mail-notification-eab5c13/jbsrc/tools/config.guess epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.guess ---- epienbroek-mail-notification-eab5c13/jbsrc/tools/config.guess 2012-11-21 12:57:35.000000000 -0600 -+++ epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.guess 2013-03-08 02:14:30.621645440 -0600 -@@ -1,10 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, --# Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2007-07-22' -+timestamp='2012-09-25' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,9 +17,7 @@ - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -27,16 +25,16 @@ - # the same distribution terms that you use for the rest of that program. - - --# Originally written by Per Bothner . --# Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# Originally written by Per Bothner. Please send patches (context -+# diff format) to and include a ChangeLog -+# entry. - # - # This script attempts to guess a canonical system name similar to - # config.sub. If it succeeds, it prints the system name on stdout, and - # exits with 0. Otherwise, it exits with 1. - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -56,7 +54,8 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 - Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO -@@ -144,7 +143,7 @@ - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward -@@ -170,7 +169,7 @@ - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? -@@ -180,7 +179,7 @@ - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -201,6 +200,10 @@ - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; -+ *:Bitrig:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} -+ exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -@@ -223,7 +226,7 @@ - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) -- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -269,7 +272,10 @@ - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit ;; -+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -+ exitcode=$? -+ trap '' 0 -+ exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead -@@ -295,12 +301,12 @@ - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) -- echo powerpc-ibm-os400 -+ echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; -- arm:riscos:*:*|arm:RISCOS:*:*) -+ arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -324,14 +330,33 @@ - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; -+ s390x:SunOS:*:*) -+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; -+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) -+ echo i386-pc-auroraux${UNAME_RELEASE} -+ exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) -- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ eval $set_cc_for_build -+ SUN_ARCH="i386" -+ # If there is a compiler, see if it is configured for 64-bit objects. -+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. -+ # This test works for both compilers. -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ SUN_ARCH="x86_64" -+ fi -+ fi -+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize -@@ -375,23 +400,23 @@ - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-unknown-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; -@@ -461,8 +486,8 @@ - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -475,7 +500,7 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; -@@ -532,7 +557,7 @@ - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[45]) -+ *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -575,52 +600,52 @@ - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -- case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -- esac ;; -- esac -+ esac ;; -+ esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -+ sed 's/^ //' << EOF >$dummy.c - -- #define _HPUX_SOURCE -- #include -- #include -- -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); -- -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } -+ #define _HPUX_SOURCE -+ #include -+ #include -+ -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); -+ -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -640,7 +665,7 @@ - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -- grep __LP64__ >/dev/null -+ grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else -@@ -711,22 +736,22 @@ - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; -@@ -750,14 +775,14 @@ - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -@@ -769,40 +794,51 @@ - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) -- case ${UNAME_MACHINE} in -- pc98) -- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ UNAME_PROCESSOR=`/usr/bin/uname -p` -+ case ${UNAME_PROCESSOR} in - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - i*:windows32*:*) -- # uname -m includes "-pc" on this system. -- echo ${UNAME_MACHINE}-mingw32 -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; -- *:Interix*:[3456]*) -- case ${UNAME_MACHINE} in -+ *:Interix*:*) -+ case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; -- EM64T | authenticamd) -+ authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we -@@ -832,20 +868,68 @@ - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -- arm*:Linux:*:*) -+ aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ exit ;; -+ arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_PCS_VFP -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ fi -+ fi -+ exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ i*86:Linux:*:*) -+ LIBC=gnu -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -856,74 +940,33 @@ - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- mips:Linux:*:*) -+ mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU -- #undef mips -- #undef mipsel -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mipsel -+ CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips -+ CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif - EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -- /^CPU/{ -- s: ::g -- p -- }'`" -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -- ;; -- mips64:Linux:*:*) -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #undef CPU -- #undef mips64 -- #undef mips64el -- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mips64el -- #else -- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips64 -- #else -- CPU= -- #endif -- #endif --EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -- /^CPU/{ -- s: ::g -- p -- }'`" -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -- echo or32-unknown-linux-gnu -- exit ;; -- ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -+ padre:Linux:*:*) -+ echo sparc-unknown-linux-gnu - exit ;; -- alpha:Linux:*:*) -- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -- EV5) UNAME_MACHINE=alphaev5 ;; -- EV56) UNAME_MACHINE=alphaev56 ;; -- PCA56) UNAME_MACHINE=alphapca56 ;; -- PCA57) UNAME_MACHINE=alphapca56 ;; -- EV6) UNAME_MACHINE=alphaev6 ;; -- EV67) UNAME_MACHINE=alphaev67 ;; -- EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level -@@ -933,14 +976,17 @@ - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; -- parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu -+ exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -948,78 +994,18 @@ - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -+ tile*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- xtensa:Linux:*:*) -- echo xtensa-unknown-linux-gnu -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- i*86:Linux:*:*) -- # The BFD linker knows what the default object file format is, so -- # first see if it will tell us. cd to the root directory to prevent -- # problems with other programs or directories called `ld' in the path. -- # Set LC_ALL=C to ensure ld outputs messages in English. -- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -- | sed -ne '/supported targets:/!d -- s/[ ][ ]*/ /g -- s/.*supported targets: *// -- s/ .*// -- p'` -- case "$ld_supported_targets" in -- elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -- ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit ;; -- coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit ;; -- esac -- # Determine whether the default compiler is a.out or elf -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #ifdef __ELF__ -- # ifdef __GLIBC__ -- # if __GLIBC__ >= 2 -- LIBC=gnu -- # else -- LIBC=gnulibc1 -- # endif -- # else -- LIBC=gnulibc1 -- # endif -- #else -- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) -- LIBC=gnu -- #else -- LIBC=gnuaout -- #endif -- #endif -- #ifdef __dietlibc__ -- LIBC=dietlibc -- #endif --EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -- /^LIBC/{ -- s: ::g -- p -- }'`" -- test x"${LIBC}" != x && { -- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -- exit -- } -- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } -- ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both -@@ -1027,11 +1013,11 @@ - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. -+ # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) -@@ -1048,7 +1034,7 @@ - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) -@@ -1063,7 +1049,7 @@ - fi - exit ;; - i*86:*:5:[678]*) -- # UnixWare 7.x, OpenUNIX and OpenServer 6. -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; -@@ -1091,10 +1077,13 @@ - exit ;; - pc:*:*:*) - # Left here for compatibility: -- # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i386. -- echo i386-pc-msdosdjgpp -- exit ;; -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i586. -+ # Note: whatever this is, it MUST be the same as what config.sub -+ # prints for the "djgpp" host, or else GDB configury will decide that -+ # this is a cross-build. -+ echo i586-pc-msdosdjgpp -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; -@@ -1129,8 +1118,18 @@ - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && { echo i486-ncr-sysv4; exit; } ;; -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; -+ NCR*:*:4.2:* | MPRAS*:*:4.2:*) -+ OS_REL='.3' -+ test -r /etc/.relid \ -+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; -@@ -1143,7 +1142,7 @@ - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) -@@ -1163,10 +1162,10 @@ - echo ns32k-sni-sysv - fi - exit ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -- echo i586-unisys-sysv4 -- exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm -@@ -1192,11 +1191,11 @@ - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} -+ echo mips-nec-sysv${UNAME_RELEASE} - else -- echo mips-unknown-sysv${UNAME_RELEASE} -+ echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; -@@ -1206,6 +1205,12 @@ - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1233,6 +1238,16 @@ - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in -+ i386) -+ eval $set_cc_for_build -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ UNAME_PROCESSOR="x86_64" -+ fi -+ fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -@@ -1248,7 +1263,10 @@ - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NEO-?:NONSTOP_KERNEL:*:*) -+ echo neo-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1293,13 +1311,13 @@ - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} -+ echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) -- UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; -@@ -1314,11 +1332,14 @@ - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; -+ i*86:AROS:*:*) -+ echo ${UNAME_MACHINE}-pc-aros -+ exit ;; -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx -+ exit ;; - esac - --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- - eval $set_cc_for_build - cat >$dummy.c < - printf ("m68k-sony-newsos%s\n", - #ifdef NEWSOS4 -- "4" -+ "4" - #else -- "" -+ "" - #endif -- ); exit (0); -+ ); exit (0); - #endif - #endif - -@@ -1474,9 +1495,9 @@ - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - and -- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be -diff -urN epienbroek-mail-notification-eab5c13/jbsrc/tools/config.sub epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.sub ---- epienbroek-mail-notification-eab5c13/jbsrc/tools/config.sub 2012-11-21 12:57:35.000000000 -0600 -+++ epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.sub 2013-03-08 02:14:30.629644517 -0600 -@@ -1,10 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, --# Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2007-06-28' -+timestamp='2012-10-10' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,9 +21,7 @@ - # GNU General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -32,13 +30,16 @@ - - - # Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# diff and a properly formatted GNU ChangeLog entry. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. - # If it is invalid, we print an error message on stderr and exit with code 1. - # Otherwise, we print the canonical config type on stdout and succeed. - -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -+ - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases - # that are meaningful with *any* GNU software. -@@ -72,7 +73,8 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 - Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO -@@ -120,12 +122,18 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ knetbsd*-gnu* | netbsd*-gnu* | \ -+ kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -+ android-linux) -+ os=-linux-android -+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -+ ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -148,10 +156,13 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray) -+ -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; -+ -bluegene*) -+ os=-cnk -+ ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 -@@ -166,10 +177,10 @@ - os=-chorusos - basic_machine=$1 - ;; -- -chorusrdb) -- os=-chorusrdb -+ -chorusrdb) -+ os=-chorusrdb - basic_machine=$1 -- ;; -+ ;; - -hiux*) - os=-hiuxwe2 - ;; -@@ -214,6 +225,12 @@ - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -lynx*178) -+ os=-lynxos178 -+ ;; -+ -lynx*5) -+ os=-lynxos5 -+ ;; - -lynx*) - os=-lynxos - ;; -@@ -238,24 +255,32 @@ - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -+ | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | be32 | be64 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -+ | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -+ | le32 | le64 \ -+ | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | mcore | mep \ -+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -- | mips64vr | mips64vrel \ -+ | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ -@@ -268,29 +293,42 @@ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -+ | moxie \ - | mt \ - | msp430 \ -+ | nds32 | nds32le | nds32be \ - | nios | nios2 \ - | ns16k | ns32k \ -+ | open8 \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -+ | rl78 | rx \ - | score \ -- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu | strongarm \ -- | tahoe | thumb | tic4x | tic80 | tron \ -- | v850 | v850e \ -+ | spu \ -+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ -+ | ubicom32 \ -+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ -- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -- | z8k) -+ | x86 | xc16x | xstormy16 | xtensa \ -+ | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12) -- # Motorola 68HC11/12. -+ c54x) -+ basic_machine=tic54x-unknown -+ ;; -+ c55x) -+ basic_machine=tic55x-unknown -+ ;; -+ c6x) -+ basic_machine=tic6x-unknown -+ ;; -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; -@@ -300,6 +338,21 @@ - basic_machine=mt-unknown - ;; - -+ strongarm | thumb | xscale) -+ basic_machine=arm-unknown -+ ;; -+ xgate) -+ basic_machine=$basic_machine-unknown -+ os=-none -+ ;; -+ xscaleeb) -+ basic_machine=armeb-unknown -+ ;; -+ -+ xscaleel) -+ basic_machine=armel-unknown -+ ;; -+ - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. -@@ -314,29 +367,37 @@ - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -+ | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ -+ | be32-* | be64-* \ - | bfin-* | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -+ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -+ | le32-* | le64-* \ -+ | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -+ | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -- | mips64vr-* | mips64vrel-* \ -+ | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ -+ | mips64r5900-* | mips64r5900el-* \ -+ | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ -@@ -351,27 +412,36 @@ - | mmix-* \ - | mt-* \ - | msp430-* \ -+ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ -+ | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ -- | romp-* | rs6000-* \ -- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -+ | rl78-* | romp-* | rs6000-* | rx-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -- | tahoe-* | thumb-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -+ | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tile*-* \ - | tron-* \ -- | v850-* | v850e-* | vax-* \ -+ | ubicom32-* \ -+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -+ | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -- | xstormy16-* | xtensa-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* \ -+ | xstormy16-* | xtensa*-* \ - | ymp-* \ -- | z8k-*) -+ | z8k-* | z80-*) -+ ;; -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -@@ -389,7 +459,7 @@ - basic_machine=a29k-amd - os=-udi - ;; -- abacus) -+ abacus) - basic_machine=abacus-unknown - ;; - adobe68k) -@@ -435,6 +505,10 @@ - basic_machine=m68k-apollo - os=-bsd - ;; -+ aros) -+ basic_machine=i386-pc -+ os=-aros -+ ;; - aux) - basic_machine=m68k-apple - os=-aux -@@ -443,10 +517,35 @@ - basic_machine=ns32k-sequent - os=-dynix - ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ os=-linux -+ ;; -+ blackfin-*) -+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; -+ bluegene*) -+ basic_machine=powerpc-ibm -+ os=-cnk -+ ;; -+ c54x-*) -+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c55x-*) -+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c6x-*) -+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -+ cegcc) -+ basic_machine=arm-unknown -+ os=-cegcc -+ ;; - convex-c1) - basic_machine=c1-convex - os=-bsd -@@ -475,7 +574,7 @@ - basic_machine=craynv-cray - os=-unicosmp - ;; -- cr16) -+ cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; -@@ -514,6 +613,10 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ dicos) -+ basic_machine=i686-pc -+ os=-dicos -+ ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp -@@ -629,7 +732,6 @@ - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; --# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 -@@ -668,6 +770,14 @@ - basic_machine=m68k-isi - os=-sysv - ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ os=-linux -+ ;; -+ m68knommu-*) -+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - m88k-omron*) - basic_machine=m88k-omron - ;; -@@ -679,6 +789,13 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -+ microblaze*) -+ basic_machine=microblaze-xilinx -+ ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ os=-mingw64 -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 -@@ -715,10 +832,18 @@ - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; -+ msys) -+ basic_machine=i386-pc -+ os=-msys -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; -+ nacl) -+ basic_machine=le32-unknown -+ os=-nacl -+ ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 -@@ -783,6 +908,12 @@ - np1) - basic_machine=np1-gould - ;; -+ neo-tandem) -+ basic_machine=neo-tandem -+ ;; -+ nse-tandem) -+ basic_machine=nse-tandem -+ ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -813,6 +944,14 @@ - basic_machine=i860-intel - os=-osf - ;; -+ parisc) -+ basic_machine=hppa-unknown -+ os=-linux -+ ;; -+ parisc-*) -+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - pbd) - basic_machine=sparc-tti - ;; -@@ -857,9 +996,10 @@ - ;; - power) basic_machine=power-ibm - ;; -- ppc) basic_machine=powerpc-unknown -+ ppc | ppcbe) basic_machine=powerpc-unknown - ;; -- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ppc-* | ppcbe-*) -+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -@@ -953,6 +1093,9 @@ - basic_machine=i860-stratus - os=-sysv4 - ;; -+ strongarm-* | thumb-*) -+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sun2) - basic_machine=m68000-sun - ;; -@@ -1009,17 +1152,9 @@ - basic_machine=t90-cray - os=-unicos - ;; -- tic54x | c54x*) -- basic_machine=tic54x-unknown -- os=-coff -- ;; -- tic55x | c55x*) -- basic_machine=tic55x-unknown -- os=-coff -- ;; -- tic6x | c6x*) -- basic_machine=tic6x-unknown -- os=-coff -+ tile*) -+ basic_machine=$basic_machine-unknown -+ os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown -@@ -1088,6 +1223,9 @@ - xps | xps100) - basic_machine=xps100-honeywell - ;; -+ xscale-* | xscalee[bl]-*) -+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` -+ ;; - ymp) - basic_machine=ymp-cray - os=-unicos -@@ -1096,6 +1234,10 @@ - basic_machine=z8k-unknown - os=-sim - ;; -+ z80-*-coff) -+ basic_machine=z80-unknown -+ os=-sim -+ ;; - none) - basic_machine=none-none - os=-none -@@ -1134,7 +1276,7 @@ - we32k) - basic_machine=we32k-att - ;; -- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) -+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) -@@ -1181,9 +1323,12 @@ - if [ x"$os" != x"" ] - then - case $os in -- # First match some system type aliases -- # that might get confused with valid system types. -+ # First match some system type aliases -+ # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -+ -auroraux) -+ os=-auroraux -+ ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; -@@ -1204,21 +1349,23 @@ - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -+ | -sym* | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -- | -aos* \ -+ | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -- | -openbsd* | -solidbsd* \ -+ | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -- | -chorusos* | -chorusrdb* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -chorusos* | -chorusrdb* | -cegcc* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ -+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -@@ -1226,7 +1373,7 @@ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1265,7 +1412,7 @@ - -opened*) - os=-openedition - ;; -- -os400*) -+ -os400*) - os=-os400 - ;; - -wince*) -@@ -1314,7 +1461,7 @@ - -sinix*) - os=-sysv4 - ;; -- -tpf*) -+ -tpf*) - os=-tpf - ;; - -triton*) -@@ -1356,6 +1503,11 @@ - -zvmoe) - os=-zvmoe - ;; -+ -dicos*) -+ os=-dicos -+ ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1378,10 +1530,10 @@ - # system, and we'll never get to this point. - - case $basic_machine in -- score-*) -+ score-*) - os=-elf - ;; -- spu-*) -+ spu-*) - os=-elf - ;; - *-acorn) -@@ -1393,8 +1545,20 @@ - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ hexagon-*) -+ os=-elf -+ ;; -+ tic54x-*) -+ os=-coff -+ ;; -+ tic55x-*) -+ os=-coff -+ ;; -+ tic6x-*) -+ os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) -@@ -1414,14 +1578,11 @@ - ;; - m68000-sun) - os=-sunos3 -- # This also exists in the configure program, but was not the -- # default. -- # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; -- mep-*) -+ mep-*) - os=-elf - ;; - mips*-cisco) -@@ -1448,7 +1609,7 @@ - *-ibm) - os=-aix - ;; -- *-knuth) -+ *-knuth) - os=-mmixware - ;; - *-wec) -@@ -1553,7 +1714,7 @@ - -sunos*) - vendor=sun - ;; -- -aix*) -+ -cnk*|-aix*) - vendor=ibm - ;; - -beos*) diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch b/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch deleted file mode 100644 index c99b01eda48f..000000000000 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: epienbroek-mail-notification-eab5c13/jbsrc/lib/src/core/jb-util.c -=================================================================== ---- epienbroek-mail-notification-eab5c13.orig/jbsrc/lib/src/core/jb-util.c -+++ epienbroek-mail-notification-eab5c13/jbsrc/lib/src/core/jb-util.c -@@ -208,6 +208,10 @@ jb_message_result_string_format (const c - g_free(message); - } - -+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) -+static void print_warning_or_error (const char *prefix, const char *format, va_list args) __attribute__ ((format(printf, 1, 0))); -+#endif -+ - static void - print_warning_or_error (const char *prefix, const char *format, va_list args) - { From 9adbe60c81c781c5da1fc8c99d0cdffbb57062e3 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Mon, 5 Dec 2016 00:15:55 +0100 Subject: [PATCH 1174/1749] sbcl: 1.3.11 -> 1.3.12 --- pkgs/development/compilers/sbcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 0198dac1c444..8fa4741a4a14 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.11"; + version = "1.3.12"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0hkn760d4dhw1md0zqldbpc94nwp25d73sjdrdmhfqjcz6c2syh7"; + sha256 = "1hjr2xqazy4j0m58y4na6fz8ii3xflqairxy7vpd7ajbs00yqfc0"; }; patchPhase = '' From 8d926260ef93e20fe66b6e3743a410151a067d4a Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Sun, 4 Dec 2016 17:22:54 -0600 Subject: [PATCH 1175/1749] inform7: init at 6M62 --- lib/maintainers.nix | 1 + .../development/compilers/inform7/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 pkgs/development/compilers/inform7/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b908a261b1fa..76c27f30f07e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -272,6 +272,7 @@ matthiasbeyer = "Matthias Beyer "; maurer = "Matthew Maurer "; mbakke = "Marius Bakke "; + mbbx6spp = "Susan Potter "; mbe = "Brandon Edens "; mboes = "Mathieu Boespflug "; mcmtroffaes = "Matthias C. M. Troffaes "; diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix new file mode 100644 index 000000000000..7f1830430c45 --- /dev/null +++ b/pkgs/development/compilers/inform7/default.nix @@ -0,0 +1,30 @@ +{ stdenv, writeText, fetchzip, coreutils, perl, gnutar, gzip }: +let + version = "6M62"; +in stdenv.mkDerivation { + name = "inform7-${version}"; + buildInputs = [ perl coreutils gnutar gzip ]; + src = fetchzip { + url = "http://inform7.com/download/content/6M62/I7_6M62_Linux_all.tar.gz"; + sha256 = "0bk0pfymvsn1g8ci0pfdw7dgrlzb232a8pc67y2xk6zgpf3m41vj"; + }; + preConfigure = "touch Makefile.PL"; + buildPhase = ""; + installPhase = '' + mkdir -p $out + pushd $src + ./install-inform7.sh --prefix $out + popd + + substituteInPlace "$out/bin/i7" \ + --replace "/usr/bin/perl" "${perl}/bin/perl" + ''; + + meta = with stdenv.lib; { + description = "A design system for interactive fiction."; + homepage = http://inform7.com/; + license = licenses.artistic2; + maintainers = with maintainers; [ mbbx6spp ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e45c01bd821d..75bec95318be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2230,6 +2230,8 @@ in inetutils = callPackage ../tools/networking/inetutils { }; + inform7 = callPackage ../development/compilers/inform7 { }; + innoextract = callPackage ../tools/archivers/innoextract { }; ioping = callPackage ../tools/system/ioping { }; From 55eb7411462bffc81c2c6b5347868057625c10ac Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 5 Dec 2016 01:59:43 +0200 Subject: [PATCH 1176/1749] xsokoban: Fix build --- pkgs/games/xsokoban/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index 502771e18ee6..47d05b7e3f6a 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -11,16 +11,19 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 xproto libXpm libXt ]; + NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11"; + + hardeningDisable = [ "format" ]; + preConfigure = '' sed -e 's/getline/my_getline/' -i score.c - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXpm.dev}/include/X11" - for i in $NIX_CFLAGS_COMPILE; do echo $i; ls ''${i#-I}; done + chmod a+rw config.h cat >>config.h < Date: Mon, 5 Dec 2016 02:09:18 +0200 Subject: [PATCH 1177/1749] snack: Mark broken Besides the hardeningDisable I added, something else is broken. gcc -c -O -fPIC -DUSE_TCL_STUBS -DUSE_TK_STUBS -DOSS -I/nix/store/q2k3anmbnwklaxih3brk9g6mxzjv155z-tcl-8.6.6/include -I/tmp/nix-build-tcl-8.6.6.drv-0/tcl8.6.6/generic -I/tmp/nix-build-tk-8.6.6.drv-0/tk8.6.6/generic -DTCL_81_API -I./../generic -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 ./../generic/jkFormatMP3.c ./../generic/jkFormatMP3.c:34:26: error: expected declaration specifiers or '...' before '(' token #define roundf(x) (floor((x)+(float )0.5f)) ^ --- pkgs/development/libraries/snack/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index c2fdc8036c78..9bae9feb693e 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation { buildInputs = [ python tcl tk vorbis-tools pkgconfig xlibsWrapper ]; + hardeningDisable = [ "format" ]; + postInstall = "aoeu"; installPhase = '' @@ -27,5 +29,6 @@ stdenv.mkDerivation { description = "The Snack Sound Toolkit (Tcl)"; homepage = http://www.speech.kth.se/snack/; license = stdenv.lib.licenses.gpl2; + broken = true; }; } From 1e7bb272e14ad362dccce242c261b74d796d5de5 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 5 Dec 2016 02:17:41 +0200 Subject: [PATCH 1178/1749] U-Boot: Add platforms to legacy U-Boots Or they will be tried to be built on x86_64 since #19990. --- pkgs/misc/uboot/guruplug.nix | 4 ++++ pkgs/misc/uboot/nanonote.nix | 4 ++++ pkgs/misc/uboot/sheevaplug.nix | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix index 258ba999bf88..9f24f1da86a4 100644 --- a/pkgs/misc/uboot/guruplug.nix +++ b/pkgs/misc/uboot/guruplug.nix @@ -50,4 +50,8 @@ stdenv.mkDerivation { mkdir -p $out/bin cp tools/{envcrc,mkimage} $out/bin ''; + + meta = { + platforms = [ "armv5tel-linux" ]; + }; } diff --git a/pkgs/misc/uboot/nanonote.nix b/pkgs/misc/uboot/nanonote.nix index 8b2de80c79b3..2783927ef57c 100644 --- a/pkgs/misc/uboot/nanonote.nix +++ b/pkgs/misc/uboot/nanonote.nix @@ -57,4 +57,8 @@ stdenv.mkDerivation { mkdir -p $out/bin cp tools/{envcrc,mkimage} $out/bin ''; + + meta = { + platforms = [ "mipsel-linux" ]; + }; } diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix index 4d4f61c40a70..53d811d1a44e 100644 --- a/pkgs/misc/uboot/sheevaplug.nix +++ b/pkgs/misc/uboot/sheevaplug.nix @@ -54,4 +54,8 @@ stdenv.mkDerivation { mkdir -p $out/bin cp tools/{envcrc,mkimage} $out/bin ''; + + meta = { + platforms = [ "armv5tel-linux" ]; + }; } From f91458ca3848e69d98696998b30f4004f2b18add Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 5 Dec 2016 02:36:54 +0200 Subject: [PATCH 1179/1749] reattach-to-user-namespace: Set platforms --- .../darwin/reattach-to-user-namespace/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index 60b461a80408..0d5e21485b9a 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -2,15 +2,21 @@ stdenv.mkDerivation { name = "reattach-to-user-namespace-2.4"; + src = fetchgit { url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard.git"; sha256 = "0hrh95di5dvpynq2yfcrgn93l077h28i6msham00byw68cx0dd3z"; rev = "2765aeab8f337c29e260a912bf4267a2732d8640"; }; + buildFlags = "ARCHES=x86_64"; + installPhase = '' mkdir -p $out/bin cp reattach-to-user-namespace $out/bin/ ''; -} + meta = { + platforms = stdenv.lib.platforms.darwin; + }; +} From 571cf4f2095744011a5a7629a1ee71ea4d40a7ea Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 5 Dec 2016 02:40:04 +0200 Subject: [PATCH 1180/1749] uisp: Fix build --- pkgs/development/tools/misc/uisp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index 234ff82b50a0..6e2498bde64e 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/pkgs/development/tools/misc/uisp/default.nix @@ -8,9 +8,12 @@ stdenv.mkDerivation { sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw"; }; + NIX_CFLAGS_COMPILE = "-Wno-error"; + meta = { description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers"; license = stdenv.lib.licenses.gpl2; homepage = http://savannah.nongnu.org/projects/uisp; + platforms = stdenv.lib.platforms.linux; }; } From ad489cec10a9edc377fa0ca0651846f1beb7ac2f Mon Sep 17 00:00:00 2001 From: Greg Hale Date: Mon, 5 Dec 2016 01:36:42 +0000 Subject: [PATCH 1181/1749] Add pandoc dependency to heist to restore working heist tests --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index af433eb7382f..24299c9418db 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -186,6 +186,11 @@ self: super: { })) else super.hakyll; + # Heist's test suite requires system pandoc + heist = overrideCabal super.heist (drv: { + testToolDepends = [pkgs.pandoc]; + }); + # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required # on darwin: https://github.com/NixOS/cabal2nix/issues/146. hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; From 10b16b23273a711792697c213643de3731fb35ef Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 5 Dec 2016 08:48:14 +0100 Subject: [PATCH 1182/1749] mutt: 1.7.1 -> 1.7.2 --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 2bea04ceedb8..195cf13e4c29 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -20,11 +20,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "1pyns0xw52s4yma1a93pdcl4dirs55q2m1hd7w1r11nlhf7giip9"; + sha256 = "1yazrl82s9fxmamnlvwmsxhwrxnwv6kwakgfmawda8ndhwb50lqm"; }; patchPhase = optionalString (openssl != null) '' From 8dadb44196a07f6b4ab42b16fdb64f2fcc3fc94c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 28 Oct 2016 13:31:07 +0200 Subject: [PATCH 1183/1749] pythonPackages: use fixed-point combinator Use a fixed-point combinator for the Python package set to allow easier overriding of its contents. Earlier implementations were proposed in #16784 and #17428. This commit is by comparison much smaller and changes only what is needed. --- pkgs/top-level/all-packages.nix | 7 ------- pkgs/top-level/python-packages.nix | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34d24a89ff7e..e0b0656a59e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9897,37 +9897,30 @@ in # regardless. python26Packages = callPackage ./python-packages.nix { python = python26; - self = python26Packages; }; python27Packages = lib.hiPrioSet (recurseIntoAttrs (callPackage ./python-packages.nix { python = python27; - self = python27Packages; })); python33Packages = callPackage ./python-packages.nix { python = python33; - self = python33Packages; }; python34Packages = callPackage ./python-packages.nix { python = python34; - self = python34Packages; }; python35Packages = recurseIntoAttrs (callPackage ./python-packages.nix { python = python35; - self = python35Packages; }); python36Packages = (callPackage ./python-packages.nix { python = python36; - self = python36Packages; }); pypyPackages = callPackage ./python-packages.nix { python = pypy; - self = pypyPackages; }; ### DEVELOPMENT / R MODULES diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc5972bfbf0f..ca2e88da94e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1,7 +1,14 @@ -{ pkgs, stdenv, python, self }: +{ pkgs +, stdenv +, python +, overrides ? (self: super: {}) +}: with pkgs.lib; +let + packages = ( self: + let pythonAtLeast = versionAtLeast python.pythonVersion; pythonOlder = versionOlder python.pythonVersion; @@ -31323,4 +31330,7 @@ in { zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else (pkgs.zeitgeist.override{python2Packages=self;}).py; -} + +}); + +in fix' (extends overrides packages) From 31e32b6d9ee2712966e2b09a68d4f783c164ddd3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 4 Dec 2016 09:51:12 +0100 Subject: [PATCH 1184/1749] Python interpreters: add pkgs attribute A package set is constructed for a specific interpreter. Therefore, we add the possibility to override the package set to the interpreter. This should make it easier to override the interpreter and the package set at the same time. --- .../python/cpython/2.6/default.nix | 11 ++++++-- .../python/cpython/2.7/default.nix | 10 +++++-- .../python/cpython/3.3/default.nix | 10 +++++-- .../python/cpython/3.4/default.nix | 10 +++++-- .../python/cpython/3.5/default.nix | 10 +++++-- .../python/cpython/3.6/default.nix | 10 +++++-- .../interpreters/python/pypy/2.7/default.nix | 12 ++++++-- pkgs/top-level/all-packages.nix | 28 +++++-------------- 8 files changed, 59 insertions(+), 42 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.6/default.nix b/pkgs/development/interpreters/python/cpython/2.6/default.nix index 64f2b80d09fa..9a4c2d5b3981 100644 --- a/pkgs/development/interpreters/python/cpython/2.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.6/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false , sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage -, python26Packages }: +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) +}: assert zlibSupport -> zlib != null; @@ -100,13 +102,16 @@ let ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} ''; - passthru = rec { + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { inherit libPrefix; inherit zlibSupport; isPy2 = true; isPy26 = true; buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python26Packages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; interpreter = "${self}/bin/${executable}"; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index a6eeee25be96..4a25382997c3 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -10,12 +10,13 @@ , zlib , callPackage , self -, python27Packages , gettext , db , expat , libffi , CF, configd, coreutils +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -180,11 +181,14 @@ in stdenv.mkDerivation { rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev ''; - passthru = rec { + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = libPrefix; buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python27Packages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; isPy2 = true; isPy27 = true; interpreter = "${self}/bin/${executable}"; diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix index b25e2ffd0cb1..6a543a8a0ee0 100644 --- a/pkgs/development/interpreters/python/cpython/3.3/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix @@ -10,8 +10,9 @@ , zlib , callPackage , self -, python33Packages , CF, configd +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -102,11 +103,14 @@ in stdenv.mkDerivation { ''; - passthru = rec { + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { inherit libPrefix sitePackages x11Support; executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python33Packages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; isPy3 = true; isPy33 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 43edce8a44c2..623fa5d74f64 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -10,8 +10,9 @@ , zlib , callPackage , self -, python34Packages , CF, configd +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -111,11 +112,14 @@ in stdenv.mkDerivation { ''; - passthru = rec { + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { inherit libPrefix sitePackages x11Support; executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python34Packages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; isPy3 = true; isPy34 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index dd2cce707efe..7172e429f236 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -10,8 +10,9 @@ , zlib , callPackage , self -, python35Packages , CF, configd +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -110,11 +111,14 @@ in stdenv.mkDerivation { rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython* ''; - passthru = rec { + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { inherit libPrefix sitePackages x11Support; executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python35Packages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; isPy3 = true; isPy35 = true; interpreter = "${self}/bin/${executable}"; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index d5960ccde99f..f65989f5bb57 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -11,8 +11,9 @@ , zlib , callPackage , self -, python36Packages , CF, configd +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -99,11 +100,14 @@ in stdenv.mkDerivation { ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc" ''; - passthru = rec { + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { inherit libPrefix sitePackages x11Support; executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python36Packages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; isPy3 = true; isPy35 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index bce6d19d58d3..1fd9eaee4303 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi , sqlite, openssl, ncurses, python, expat, tcl, tk, xlibsWrapper, libX11 -, makeWrapper, callPackage, self, pypyPackages, gdbm, db }: +, makeWrapper, callPackage, self, gdbm, db +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) +}: assert zlibSupport -> zlib != null; @@ -120,14 +123,17 @@ let echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py ''; - passthru = rec { + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { inherit zlibSupport libPrefix; executable = "pypy"; isPypy = true; buildEnv = callPackage ../../wrapper.nix { python = self; }; interpreter = "${self}/bin/${executable}"; sitePackages = "site-packages"; - withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = pypyPackages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; }; enableParallelBuilding = true; # almost no parallelization without STM diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0b0656a59e7..b3ecfb0d67ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9895,33 +9895,19 @@ in # Therefore we do not recurse into attributes here, in contrast to # python27Packages. `nix-env -iA python26Packages.nose` works # regardless. - python26Packages = callPackage ./python-packages.nix { - python = python26; - }; + python26Packages = python26.pkgs; - python27Packages = lib.hiPrioSet (recurseIntoAttrs (callPackage ./python-packages.nix { - python = python27; - })); + python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); - python33Packages = callPackage ./python-packages.nix { - python = python33; - }; + python33Packages = python33.pkgs; - python34Packages = callPackage ./python-packages.nix { - python = python34; - }; + python34Packages = python34.pkgs; - python35Packages = recurseIntoAttrs (callPackage ./python-packages.nix { - python = python35; - }); + python35Packages = recurseIntoAttrs python35.pkgs; - python36Packages = (callPackage ./python-packages.nix { - python = python36; - }); + python36Packages = python36.pkgs; - pypyPackages = callPackage ./python-packages.nix { - python = pypy; - }; + pypyPackages = pypy.pkgs; ### DEVELOPMENT / R MODULES From 3d59b82925da364a509673fdb74ba69aa77d58db Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 4 Dec 2016 11:55:25 +0100 Subject: [PATCH 1185/1749] DOCS: update Python docs to reflect fixed-point combinator --- doc/languages-frameworks/python.md | 85 ++++++++++++++---------------- 1 file changed, 41 insertions(+), 44 deletions(-) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 121e123c8cfa..fc0100c5f2d5 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -434,6 +434,7 @@ Each interpreter has the following attributes: - `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation. - `sitePackages`. Alias for `lib/${libPrefix}/site-packages`. - `executable`. Name of the interpreter executable, e.g. `python3.4`. +- `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. ### Building packages and applications @@ -699,59 +700,55 @@ should also be done when packaging `A`. ### How to override a Python package? -Recursively updating a package can be done with `pkgs.overridePackages` as explained in the Nixpkgs manual. -Python attribute sets are created for each interpreter version. We will therefore override the attribute set for the interpreter version we're interested. -In the following example we change the name of the package `pandas` to `foo`. -``` -newpkgs = pkgs.overridePackages(self: super: rec { - python35Packages = (super.python35Packages.override { self = python35Packages;}) - // { pandas = super.python35Packages.pandas.override {name = "foo";}; - }; -}); -``` -This can be tested with -``` +We can override the interpreter and pass `packageOverrides`. +In the following example we rename the `pandas` package and build it. +```nix with import {}; -(let +let + python = let + packageOverrides = self: super: { + pandas = super.pandas.override {name="foo";}; + }; + in pkgs.python35.override {inherit packageOverrides;}; -newpkgs = pkgs.overridePackages(self: super: rec { - python35Packages = (super.python35Packages.override { self = python35Packages;}) - // { pandas = super.python35Packages.pandas.override {name = "foo";}; - }; -}); -in newpkgs.python35.withPackages (ps: [ps.blaze]) -).env -``` -A typical use case is to switch to another version of a certain package. For example, in the Nixpkgs repository we have multiple versions of `django` and `scipy`. -In the following example we use a different version of `scipy`. All packages in `newpkgs` will now use the updated `scipy` version. +in python.pkgs.pandas ``` +Using `nix-build` on this expression will build the package `pandas` +but with the new name `foo`. + +All packages in the package set will use the renamed package. +A typical use case is to switch to another version of a certain package. +For example, in the Nixpkgs repository we have multiple versions of `django` and `scipy`. +In the following example we use a different version of `scipy` and create an environment that uses it. +All packages in the Python package set will now use the updated `scipy` version. + +```nix with import {}; -(let - -newpkgs = pkgs.overridePackages(self: super: rec { - python35Packages = super.python35Packages.override { - self = python35Packages // { scipy = python35Packages.scipy_0_17;}; +( +let + packageOverrides = self: super: { + scipy = super.scipy_0_17; }; -}); -in newpkgs.python35.withPackages (ps: [ps.blaze]) +in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze]) ).env ``` -The requested package `blaze` depends upon `pandas` which itself depends on `scipy`. +The requested package `blaze` depends on `pandas` which itself depends on `scipy`. -A similar example but now using `django` +If you want the whole of Nixpkgs to use your modifications, then you can use `pkgs.overridePackages` +as explained in this manual. In the following example we build a `inkscape` using a different version of `numpy`. ``` -with import {}; - -(let - -newpkgs = pkgs.overridePackages(self: super: rec { - python27Packages = (super.python27Packages.override {self = python27Packages;}) - // { django = super.python27Packages.django_1_9; }; -}); -in newpkgs.python27.withPackages (ps: [ps.django_guardian ]) -).env +let + pkgs = import {}; + newpkgs = pkgs.overridePackages ( pkgsself: pkgssuper: { + python27 = let + packageOverrides = self: super: { + numpy = super.numpy_1_10; + }; + in pkgssuper.python27.override {inherit packageOverrides;}; + } ); +in newpkgs.inkscape ``` ### `python setup.py bdist_wheel` cannot create .whl @@ -772,9 +769,9 @@ or the current time: nix-shell --run "SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel" ``` or unset: -""" +``` nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel" -""" +``` ### `install_data` / `data_files` problems From 44cc1d71931dcd67b48d133991a3d0b54fff36f8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Dec 2016 12:58:31 +0100 Subject: [PATCH 1186/1749] pythonPackages.zipfile36: init at 0.1.3 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca2e88da94e4..24bdb9b8f12e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31330,6 +31330,27 @@ in { zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else (pkgs.zeitgeist.override{python2Packages=self;}).py; + zipfile36 = buildPythonPackage rec { + pname = "zipfile36"; + version = "0.1.3"; + name = "${pname}-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest test_zipfile.py + ''; + + meta = { + description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; + homepage = https://gitlab.com/takluyver/zipfile36; + license = licenses.psfl; + maintainer = maintainers.fridh; + }; + }; }); From 03aacfaddd92985c82d6c0638a9a6304aba54a11 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Dec 2016 12:58:50 +0100 Subject: [PATCH 1187/1749] pythonPackages.request_download: init at 0.1.1 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 24bdb9b8f12e..85feb55ffa0f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21731,6 +21731,27 @@ in { }; }; + requests_download = buildPythonPackage rec { + pname = "requests_download"; + version = "0.1.1"; + name = "${pname}-${version}"; + + format = "wheel"; + + src = pkgs.fetchurl { + url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.1-py2.py3-none-any.whl; + sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; + }; + + propagatedBuildInputs = with self; [ requests2 ]; + + meta = { + description = "Download files using requests and save them to a target path"; + homepage = https://www.github.com/takluyver/requests_download; + license = licenses.mit; + maintainer = maintainers.fridh; + }; + }; requests_oauthlib = buildPythonPackage rec { version = "0.4.1"; From c6a7d8e10f1e04ccef93d51459697c4b0a3a8f66 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Dec 2016 12:59:11 +0100 Subject: [PATCH 1188/1749] pythonPackages.flit: init at 0.10 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 85feb55ffa0f..3575018870f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6866,6 +6866,29 @@ in { propagatedBuildInputs = with self; [ rpkg offtrac urlgrabber fedora_cert ]; }); + flit = buildPythonPackage rec { + pname = "flit"; + version = "0.10"; + name = "${pname}-${version}"; + + format = "wheel"; + + src = pkgs.fetchurl { + url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl; + sha256 = "4566b2e1807abeb1fd7bfaa9b444447556f1720518edfb134b56a6a1272b0428"; + }; + + disabled = !isPy3k; + propagatedBuildInputs = with self; [ docutils requests2 requests_download zipfile36]; + + meta = { + description = "A simple packaging tool for simple packages"; + homepage = https://github.com/takluyver/flit; + license = licenses.bsd3; + maintainer = maintainers.fridh; + }; + }; + Flootty = buildPythonPackage rec { name = "Flootty-3.2.0"; From 42bad32e130378428647d88d6809f23591b85606 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Dec 2016 13:04:52 +0100 Subject: [PATCH 1189/1749] buildPythonPackage: refactor --- doc/languages-frameworks/python.md | 2 +- .../python/build-python-package-common.nix | 27 ++++ .../python/build-python-package-flit.nix | 19 +++ .../build-python-package-setuptools.nix | 56 ++++++++ .../python/build-python-package-wheel.nix | 20 +++ .../python/build-python-package.nix | 129 +++--------------- .../python/mk-python-derivation.nix | 4 + pkgs/top-level/python-packages.nix | 1 + 8 files changed, 148 insertions(+), 110 deletions(-) create mode 100644 pkgs/development/interpreters/python/build-python-package-common.nix create mode 100644 pkgs/development/interpreters/python/build-python-package-flit.nix create mode 100644 pkgs/development/interpreters/python/build-python-package-setuptools.nix create mode 100644 pkgs/development/interpreters/python/build-python-package-wheel.nix diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index fc0100c5f2d5..e7a8b034a112 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -523,7 +523,7 @@ All parameters from `mkDerivation` function are still supported. * `postShellHook`: Hook to execute commands after `shellHook`. * `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. * `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]. -* `format`: Format of the source. Options are `setup` for when the source has a `setup.py` and `setuptools` is used to build a wheel, and `wheel` in case the source is already a binary wheel. The default value is `setup`. +* `format`: Format of the source. Valid options are `setuptools` (default), `flit`, `wheel`, and `other`. `setuptools` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. In case you need to provide your own `buildPhase` and `installPhase` you can use `other`. * `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. * `checkInputs` Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`. diff --git a/pkgs/development/interpreters/python/build-python-package-common.nix b/pkgs/development/interpreters/python/build-python-package-common.nix new file mode 100644 index 000000000000..80d40013f157 --- /dev/null +++ b/pkgs/development/interpreters/python/build-python-package-common.nix @@ -0,0 +1,27 @@ +# This function provides generic bits to install a Python wheel. + +{ python +, bootstrapped-pip +}: + +{ buildInputs ? [] +# Additional flags to pass to "pip install". +, installFlags ? [] +, ... } @ attrs: + +attrs // { + buildInputs = buildInputs ++ [ bootstrapped-pip ]; + + installPhase = attrs.installPhase or '' + runHook preInstall + + mkdir -p "$out/${python.sitePackages}" + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" + + pushd dist + ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags} + popd + + runHook postInstall + ''; +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/build-python-package-flit.nix b/pkgs/development/interpreters/python/build-python-package-flit.nix new file mode 100644 index 000000000000..8628c3df769e --- /dev/null +++ b/pkgs/development/interpreters/python/build-python-package-flit.nix @@ -0,0 +1,19 @@ +# This function provides specific bits for building a flit-based Python package. + +{ flit +}: + +{ ... } @ attrs: + +attrs // { + buildInputs = [ flit ]; + buildPhase = attrs.buildPhase or '' + runHook preBuild + flit wheel + runHook postBuild + ''; + + # Flit packages do not come with tests. + installCheckPhase = attrs.checkPhase or ":"; + doCheck = attrs.doCheck or false; +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix new file mode 100644 index 000000000000..f077533ecfe4 --- /dev/null +++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix @@ -0,0 +1,56 @@ +# This function provides specific bits for building a setuptools-based Python package. + +{ lib +, python +, bootstrapped-pip +}: + +{ +# passed to "python setup.py build_ext" +# https://github.com/pypa/pip/issues/881 + setupPyBuildFlags ? [] +# Execute before shell hook +, preShellHook ? "" +# Execute after shell hook +, postShellHook ? "" +, ... } @ attrs: + +let + # use setuptools shim (so that setuptools is imported before distutils) + # pip does the same thing: https://github.com/pypa/pip/pull/3265 + setuppy = ./run_setup.py; + +in attrs // { + # we copy nix_run_setup.py over so it's executed relative to the root of the source + # many project make that assumption + buildPhase = attrs.buildPhase or '' + runHook preBuild + cp ${setuppy} nix_run_setup.py + ${python.interpreter} nix_run_setup.py ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel + runHook postBuild + ''; + + installCheckPhase = attrs.checkPhase or '' + runHook preCheck + ${python.interpreter} nix_run_setup.py test + runHook postCheck + ''; + + # Python packages that are installed with setuptools + # are typically distributed with tests. + # With Python it's a common idiom to run the tests + # after the software has been installed. + doCheck = attrs.doCheck or true; + + shellHook = attrs.shellHook or '' + ${preShellHook} + if test -e setup.py; then + tmp_path=$(mktemp -d) + export PATH="$tmp_path/bin:$PATH" + export PYTHONPATH="$tmp_path/${python.sitePackages}:$PYTHONPATH" + mkdir -p $tmp_path/${python.sitePackages} + ${bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path + fi + ${postShellHook} + ''; +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/build-python-package-wheel.nix b/pkgs/development/interpreters/python/build-python-package-wheel.nix new file mode 100644 index 000000000000..7be0a4c304a3 --- /dev/null +++ b/pkgs/development/interpreters/python/build-python-package-wheel.nix @@ -0,0 +1,20 @@ +# This function provides specific bits for building a wheel-based Python package. + +{ +}: + +{ ... } @ attrs: + +attrs // { + unpackPhase = '' + mkdir dist + cp $src dist/"''${src#*-}" + ''; + + # Wheels are pre-compiled + buildPhase = attrs.buildPhase or ":"; + installCheckPhase = attrs.checkPhase or ":"; + + # Wheels don't have any checks to run + doCheck = attrs.doCheck or false; +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index a92296cedbaa..e15405e2981d 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -7,120 +7,31 @@ , python , mkPythonDerivation , bootstrapped-pip +, flit }: -{ buildInputs ? [] - -# propagate build dependencies so in case we have A -> B -> C, -# C can import package A propagated by B -#, propagatedBuildInputs ? [] - -# passed to "python setup.py build_ext" -# https://github.com/pypa/pip/issues/881 -, setupPyBuildFlags ? [] - -# Execute before shell hook -, preShellHook ? "" - -# Execute after shell hook -, postShellHook ? "" - -# Additional flags to pass to "pip install". -, installFlags ? [] - -, format ? "setup" +let + setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python bootstrapped-pip; }; + flit-specific = import ./build-python-package-flit.nix { inherit flit; }; + wheel-specific = import ./build-python-package-wheel.nix { }; + common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; +in +{ +# Several package formats are supported. +# "setuptools" : Install a common setuptools/distutils based package. This builds a wheel. +# "wheel" : Install from a pre-compiled wheel. +# "flit" : Install a flit package. This builds a wheel. +# "other" : Provide your own buildPhase and installPhase. +format ? "setuptools" , ... } @ attrs: - - - let - # use setuptools shim (so that setuptools is imported before distutils) - # pip does the same thing: https://github.com/pypa/pip/pull/3265 - setuppy = ./run_setup.py; - formatspecific = - if format == "wheel" then - { - unpackPhase = '' - mkdir dist - cp $src dist/"''${src#*-}" - ''; + if format == "setuptools" then common (setuptools-specific attrs) + else if format == "flit" then common (flit-specific attrs) + else if format == "wheel" then common (wheel-specific attrs) + else if format == "other" then {} + else throw "Unsupported format ${format}"; - # Wheels are pre-compiled - buildPhase = attrs.buildPhase or ":"; - installCheckPhase = attrs.checkPhase or ":"; - - # Wheels don't have any checks to run - doCheck = attrs.doCheck or false; - } - else if format == "setup" then - { - # we copy nix_run_setup.py over so it's executed relative to the root of the source - # many project make that assumption - buildPhase = attrs.buildPhase or '' - runHook preBuild - cp ${setuppy} nix_run_setup.py - ${python.interpreter} nix_run_setup.py ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel - runHook postBuild - ''; - - installCheckPhase = attrs.checkPhase or '' - runHook preCheck - ${python.interpreter} nix_run_setup.py test - runHook postCheck - ''; - - # Python packages that are installed with setuptools - # are typically distributed with tests. - # With Python it's a common idiom to run the tests - # after the software has been installed. - doCheck = attrs.doCheck or true; - } - else - throw "Unsupported format ${format}"; - -in mkPythonDerivation ( attrs // { - - # To build and install a wheel we need pip - buildInputs = buildInputs ++ [ bootstrapped-pip ]; - -#inherit propagatedBuildInputs; - - configurePhase = attrs.configurePhase or '' - runHook preConfigure - - # patch python interpreter to write null timestamps when compiling python files - # this way python doesn't try to update them when we freeze timestamps in nix store - export DETERMINISTIC_BUILD=1 - - runHook postConfigure - ''; - - installPhase = attrs.installPhase or '' - runHook preInstall - - mkdir -p "$out/${python.sitePackages}" - export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - - pushd dist - ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags} - popd - - runHook postInstall - ''; - - shellHook = attrs.shellHook or '' - ${preShellHook} - if test -e setup.py; then - tmp_path=$(mktemp -d) - export PATH="$tmp_path/bin:$PATH" - export PYTHONPATH="$tmp_path/${python.sitePackages}:$PYTHONPATH" - mkdir -p $tmp_path/${python.sitePackages} - ${bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path - fi - ${postShellHook} - ''; - -} // formatspecific) +in mkPythonDerivation ( attrs // formatspecific ) \ No newline at end of file diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 0f798c63e8fa..c8fedaf75fc9 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -57,6 +57,10 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { inherit pythonPath; + # patch python interpreter to write null timestamps when compiling python files + # this way python doesn't try to update them when we freeze timestamps in nix store + DETERMINISTIC_BUILD=1; + buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath ++ [ (ensureNewerSourcesHook { year = "1980"; }) ] ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3575018870f3..122042072755 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30,6 +30,7 @@ let buildPythonPackage = makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix { inherit mkPythonDerivation; inherit bootstrapped-pip; + flit = self.flit; }); buildPythonApplication = args: buildPythonPackage ({namePrefix="";} // args ); From d228d528707d87e52e803b212dd595619a863aa8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Dec 2016 10:22:43 +0100 Subject: [PATCH 1190/1749] entrypoints example --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 122042072755..dfe5a8841eea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6564,6 +6564,21 @@ in { propagatedBuildInputs = with self; [ configparser ]; }; + entrypoints_flit = buildPythonPackage rec { + pname = "entrypoints"; + version = "0.2.2"; + name = "${pname}-${version}"; + format = "flit"; + + src = pkgs.fetchFromGitHub { + owner = "takluyver"; + repo = pname; + rev = version; + sha256 = "1asi3xfym1g9z24p9ivzyp4smnl600w8hghlv5dziabj6csj8s1h"; + }; + propagatedBuildInputs = with self; [ configparser ]; + }; + etcd = buildPythonPackage rec { name = "etcd-${version}"; version = "2.0.8"; From 74d0f5726916f92b357e5e14225d59e78f2a69c5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Dec 2016 10:31:53 +0100 Subject: [PATCH 1191/1749] Revert "entrypoints example" This reverts commit d228d528707d87e52e803b212dd595619a863aa8. THe example was not supposed to go in. --- pkgs/top-level/python-packages.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dfe5a8841eea..122042072755 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6564,21 +6564,6 @@ in { propagatedBuildInputs = with self; [ configparser ]; }; - entrypoints_flit = buildPythonPackage rec { - pname = "entrypoints"; - version = "0.2.2"; - name = "${pname}-${version}"; - format = "flit"; - - src = pkgs.fetchFromGitHub { - owner = "takluyver"; - repo = pname; - rev = version; - sha256 = "1asi3xfym1g9z24p9ivzyp4smnl600w8hghlv5dziabj6csj8s1h"; - }; - propagatedBuildInputs = with self; [ configparser ]; - }; - etcd = buildPythonPackage rec { name = "etcd-${version}"; version = "2.0.8"; From 8ba68644c6cd7b24e61260949e9c9377a24cee86 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 5 Dec 2016 11:11:44 +0100 Subject: [PATCH 1192/1749] pythonPackages.django_1_10: 1.10.3 -> 1.10.4 This is a bugfix release. See https://docs.djangoproject.com/en/1.10/releases/1.10.4/ --- 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 fc5972bfbf0f..6a7d67d5d90d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9820,12 +9820,12 @@ in { django_1_10 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.10.3"; + version = "1.10.4"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz"; - sha256 = "0c4c8zs7kzb0bdlpy4vlzv6va26dbazr32h91rldf6waxs6z14kg"; + sha256 = "0asw60i4r5cdxb2jp6r09pdrwxxp8mvwbkz7vnx15n0hwmig1xzz"; }; patches = [ From feae2732b145cef097c984f86893d9030be098d6 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 5 Dec 2016 11:12:24 +0100 Subject: [PATCH 1193/1749] pythonPackages.django_1_9: 1.9.11 -> 1.9.12 This is a bugfix release. See https://docs.djangoproject.com/en/1.10/releases/1.9.12/ --- 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 6a7d67d5d90d..9368c1424ba5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9852,12 +9852,12 @@ in { django_1_9 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.9.11"; + version = "1.9.12"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz"; - sha256 = "17bxmfp92bdwjachjqb5zdlay5fhv4125hc85ln4ggyz0f5zvp6s"; + sha256 = "0daaz2rp1rwwpzm5l29wcgg1gbw9yqzcv9x2dsjfz29n806q685x"; }; # patch only $out/bin to avoid problems with starter templates (see #3134) From a56e180629b7ef16ca27298d0fda8c6032dced9e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 5 Dec 2016 11:12:54 +0100 Subject: [PATCH 1194/1749] pythonPackages.django_1_8: 1.8.16 -> 1.8.17 This is a bugfix release. See https://docs.djangoproject.com/en/1.10/releases/1.8.17/ --- 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 9368c1424ba5..1cc032cc3801 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9876,12 +9876,12 @@ in { django_1_8 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.8.16"; + version = "1.8.17"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz"; - sha256 = "1pc1j3q64v65c573xwx64apjnf2v19nzxsidjiyp02c6l8bsyji2"; + sha256 = "01zb2l0gcdb2wgxmvvrhjj9ccdj1mfhn6zhqcdq04m7lzi4dc6q2"; }; # too complicated to setup From a63732ef9557c3f4baa74bf659efe4df6cd2ecf6 Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Fri, 25 Nov 2016 19:10:02 +0100 Subject: [PATCH 1195/1749] solc: 0.4.4 -> 0.4.6 --- pkgs/development/compilers/solc/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 928de23f04b5..e38983cea6ed 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchFromGitHub, boost, cmake, jsoncpp }: +{ stdenv, fetchgit, boost, cmake, jsoncpp }: stdenv.mkDerivation rec { - version = "0.4.4"; + version = "0.4.6"; name = "solc-${version}"; - src = fetchFromGitHub { - owner = "ethereum"; - repo = "solidity"; - rev = "v${version}"; - sha256 = "150prr7m0jnx3vhq0wy3avzsijxd3pn7c8jxdvf6jkcc408dgn6z"; + src = fetchgit { + url = "https://github.com/ethereum/solidity"; + rev = "2dabbdf06f414750ef0425c664f861aeb3e470b8"; + sha256 = "0q1dvizx60f7l97w8241wra7vpghimc9x7gzb18vn34sxv4bqy9g"; }; patchPhase = '' - echo >commit_hash.txt 4633f3def897db0f91237f98cf46e5d84fb05e61 + echo >commit_hash.txt 2dabbdf06f414750ef0425c664f861aeb3e470b8 ''; buildInputs = [ boost cmake jsoncpp ]; From 3798da2c410cb81a6f4ae4975a9245e54c2ff370 Mon Sep 17 00:00:00 2001 From: montag451 Date: Mon, 28 Nov 2016 08:12:52 +0100 Subject: [PATCH 1196/1749] libibverbs: add pkg-config support --- pkgs/development/libraries/libibverbs/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix index 8e37648adfcc..2243f832b7a6 100644 --- a/pkgs/development/libraries/libibverbs/default.nix +++ b/pkgs/development/libraries/libibverbs/default.nix @@ -46,6 +46,20 @@ in stdenv.mkDerivation rec { make -j$NIX_BUILD_CORES make install done + + mkdir -p $out/lib/pkgconfig + cat >$out/lib/pkgconfig/ibverbs.pc < Date: Mon, 28 Nov 2016 08:13:23 +0100 Subject: [PATCH 1197/1749] librdmacm: add pkg-config support --- .../libraries/librdmacm/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix index 2b8720357a13..791e59cbc906 100644 --- a/pkgs/development/libraries/librdmacm/default.nix +++ b/pkgs/development/libraries/librdmacm/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, libibverbs }: stdenv.mkDerivation rec { - name = "librdmacm-1.0.21"; + name = "librdmacm-${version}"; + version = "1.0.21"; src = fetchurl { url = "https://www.openfabrics.org/downloads/rdmacm/${name}.tar.gz"; @@ -10,6 +11,22 @@ stdenv.mkDerivation rec { buildInputs = [ libibverbs ]; + postInstall = '' + mkdir -p $out/lib/pkgconfig + cat >$out/lib/pkgconfig/rdmacm.pc < Date: Mon, 28 Nov 2016 08:15:56 +0100 Subject: [PATCH 1198/1749] corosync: 2.4.1 -> 2.4.2 + various improvements --- pkgs/servers/corosync/default.nix | 55 ++++++++++++++++++------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index d04a1d124faa..dc2f0f6fd709 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -1,50 +1,61 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb -, dbus ? null -, librdmacm ? null, libibverbs ? null -, libstatgrab ? null -, net_snmp ? null +, dbus, librdmacm, libibverbs, libstatgrab, net_snmp +, enableDbus ? false +, enableInfiniBandRdma ? false +, enableMonitoring ? false +, enableSnmp ? false }: with stdenv.lib; + stdenv.mkDerivation rec { - name = "corosync-2.4.1"; + name = "corosync-2.4.2"; src = fetchurl { url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz"; - sha256 = "0w8m97ih7a2g99pmjsckw4xwbgzv96xdgg62s2a4qbgnw4yl637y"; + sha256 = "1aab380mv4ivy5icmwvk7941jbs6ikm21p5ijk7brr4z608k0vpj"; }; - buildInputs = [ - makeWrapper pkgconfig nss nspr libqb - dbus librdmacm libibverbs libstatgrab net_snmp - ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; - # Remove when rdma libraries gain pkgconfig support - ibverbs_CFLAGS = optionalString (libibverbs != null) - "-I${libibverbs}/include/infiniband"; - ibverbs_LIBS = optionalString (libibverbs != null) "-libverbs"; - rdmacm_CFLAGS = optionalString (librdmacm != null) - "-I${librdmacm}/include/rdma"; - rdmacm_LIBS = optionalString (librdmacm != null) "-lrdmacm"; + buildInputs = [ + nss nspr libqb + ] ++ optional enableDbus dbus + ++ optional enableInfiniBandRdma [ librdmacm libibverbs ] + ++ optional enableMonitoring libstatgrab + ++ optional enableSnmp net_snmp; configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-logdir=/var/log/corosync" "--enable-watchdog" "--enable-qdevices" - ] ++ optional (dbus != null) "--enable-dbus" - ++ optional (librdmacm != null && libibverbs != null) "--enable-rdma" - ++ optional (libstatgrab != null) "--enable-monitoring" - ++ optional (net_snmp != null) "--enable-snmp"; + ] ++ optional enableDbus "--enable-dbus" + ++ optional enableInfiniBandRdma "--enable-rdma" + ++ optional enableMonitoring "--enable-monitoring" + ++ optional enableSnmp "--enable-snmp"; + + installFlags = [ + "sysconfdir=$(out)/etc" + "localstatedir=$(out)/var" + "COROSYSCONFDIR=$(out)/etc/corosync" + "INITDDIR=$(out)/etc/init.d" + "LOGROTATEDIR=$(out)/etc/logrotate.d" + ]; postInstall = '' wrapProgram $out/bin/corosync-blackbox \ --prefix PATH ":" "$out/sbin:${libqb}/sbin" ''; + enableParallelBuilding = true; + meta = { homepage = http://corosync.org/; description = "A Group Communication System with features for implementing high availability within applications"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ wkennington montag451 ]; }; } From 7f561ef302c471912d42ca368011869813ac21dc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Dec 2016 11:39:40 +0100 Subject: [PATCH 1199/1749] pythonPackages.cffi: 1.7.0 -> 1.9.1 --- 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 122042072755..739ed0ce78d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4734,11 +4734,11 @@ in { }; cffi = if isPyPy then null else buildPythonPackage rec { - name = "cffi-1.7.0"; + name = "cffi-1.9.1"; src = pkgs.fetchurl { url = "mirror://pypi/c/cffi/${name}.tar.gz"; - sha256 = "1pv0pf38h375r581zyckb1d2phcgkszsx2n6354g6qc3zmmdvmbf"; + sha256 = "563e0bd53fda03c151573217b3a49b3abad8813de9dd0632e10090f6190fdaf8"; }; propagatedBuildInputs = with self; [ pkgs.libffi pycparser ]; From 7d44426ccd2cbef148fd4afada6568b04b952bf0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Dec 2016 12:05:37 +0100 Subject: [PATCH 1200/1749] pythonPackages.zope_schema: disable tests See https://github.com/NixOS/nixpkgs/issues/20791 --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b2b995421ba..d02c45063bcc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27107,6 +27107,11 @@ in { propagatedBuildInputs = with self; [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict; + # ImportError: No module named 'zope.event' + # even though zope_event has been included. + # Package seems to work fine. + doCheck = false; + meta = { maintainers = with maintainers; [ goibhniu ]; }; From 954d9953941d6c94abb5d2d549bd18486d0b27ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 8 Oct 2016 19:07:20 +0200 Subject: [PATCH 1201/1749] nix-prefetch-git: escape string fields properly json requires certain characters to be escaped in strings. --- pkgs/build-support/fetchgit/nix-prefetch-git | 32 +++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 705d84c648bf..54945d203afb 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -322,6 +322,18 @@ clone_user_rev() { fi } +json_escape() { + local s="$1" + s="${s//\\/\\\\}" # \ + s="${s//\"/\\\"}" # " + s="${s//^H/\\\b}" # \b (backspace) + s="${s//^L/\\\f}" # \f (form feed) + s="${s// +/\\\n}" # \n (newline) + s="${s//^M/\\\r}" # \r (carriage return) + s="${s// /\\t}" # \t (tab) + echo "$s" +} print_results() { hash="$1" @@ -338,17 +350,15 @@ print_results() { fi fi if test -n "$hash"; then - echo "{" - echo " \"url\": \"$url\"," - echo " \"rev\": \"$fullRev\"," - echo " \"date\": \"$commitDateStrict8601\"," - echo -n " \"$hashType\": \"$hash\"" - if test -n "$fetchSubmodules"; then - echo "," - echo -n " \"fetchSubmodules\": true" - fi - echo "" - echo "}" + cat < Date: Sat, 8 Oct 2016 19:05:45 +0200 Subject: [PATCH 1202/1749] nix-prefetch-git: fix date field in some cases `git show` include tag information in the output this is suppressed by the parameter '-1' --- pkgs/build-support/fetchgit/nix-prefetch-git | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 54945d203afb..f71d9ac55bc0 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -291,8 +291,8 @@ _clone_user_rev() { pushd "$dir" >/dev/null fullRev=$( (git rev-parse "$rev" 2>/dev/null || git rev-parse "refs/heads/$branchName") | tail -n1) humanReadableRev=$(git describe "$fullRev" 2> /dev/null || git describe --tags "$fullRev" 2> /dev/null || echo -- none --) - commitDate=$(git show --no-patch --pretty=%ci "$fullRev") - commitDateStrict8601=$(git show --no-patch --pretty=%cI "$fullRev") + commitDate=$(git show -1 --no-patch --pretty=%ci "$fullRev") + commitDateStrict8601=$(git show -1 --no-patch --pretty=%cI "$fullRev") popd >/dev/null # Allow doing additional processing before .git removal From 9353d8c1ea1e66ca5de955c1926a966f39b30ca3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 4 Dec 2016 18:16:18 +0100 Subject: [PATCH 1203/1749] torsocks: 2.1.0 -> 2.2.0 --- pkgs/tools/security/tor/torsocks.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index ee4749683a52..9577bc4144f0 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "torsocks-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchgit { url = meta.repositories.git; rev = "refs/tags/v${version}"; - sha256 = "1l890pg0h2hqpkabsnwc6pq2qi8mfv58qzaaicc9y62rq5nmrrws"; + sha256 = "1xwkmfaxhhnbmvp37agnby1n53hznwhvx0dg1hj35467qfx985zc"; }; buildInputs = [ autoreconfHook ]; From 8aebb6b18107a31798f13eb793b7ca4129062580 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 4 Dec 2016 18:23:02 +0100 Subject: [PATCH 1204/1749] torsocks: expression cleanups - Remove redundant preConfigure torsocks installs into $libdir/torsocks, so setting libdir=$out/lib doesn't really help. To put the shared objects into $out/lib we'd have to manually move them into $out and patch various files (the script itself expects $libdir/torsocks). - Use nativeBuildInputs --- pkgs/tools/security/tor/torsocks.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 9577bc4144f0..01d426b2702a 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -10,10 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1xwkmfaxhhnbmvp37agnby1n53hznwhvx0dg1hj35467qfx985zc"; }; - buildInputs = [ autoreconfHook ]; - preConfigure = '' - export configureFlags="$configureFlags --libdir=$out/lib" - ''; + nativeBuildInputs = [ autoreconfHook ]; patchPhase = '' substituteInPlace src/bin/torsocks.in \ From 95608c3e8d222e19f57b1ec7924476529ff0ee2c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 4 Dec 2016 18:58:12 +0100 Subject: [PATCH 1205/1749] torsocks: redo patching, ensure getcap is available --- pkgs/tools/security/tor/torsocks.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 01d426b2702a..a28d477d3f87 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, which }: +{ stdenv, fetchgit, autoreconfHook, libcap }: stdenv.mkDerivation rec { name = "torsocks-${version}"; @@ -12,9 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - patchPhase = '' - substituteInPlace src/bin/torsocks.in \ - --replace which ${which}/bin/which + postPatch = '' + # Patch torify_app() + sed -i \ + -e 's,\(local app_path\)=`which $1`,\1=`type -P $1`,' \ + -e 's,\(local getcap\)=.*,\1=${libcap}/bin/getcap,' \ + src/bin/torsocks.in ''; meta = { From 07c0cdcba279be30faf8b1fd4443b274d3785f90 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 4 Dec 2016 19:31:27 +0100 Subject: [PATCH 1206/1749] torsocks: enable install check --- pkgs/tools/security/tor/torsocks.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index a28d477d3f87..466dc4b4e46c 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { src/bin/torsocks.in ''; + doInstallCheck = true; + installCheckTarget = "check-recursive"; + meta = { description = "Wrapper to safely torify applications"; homepage = http://code.google.com/p/torsocks/; From 407537a4bc33f0f74b00b84cbe97ac705ae05a07 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 13:13:12 +0100 Subject: [PATCH 1207/1749] privoxy: 3.0.24 -> 3.0.26 With some minor cosmetics --- pkgs/tools/networking/privoxy/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index a6dcd1fc0c3e..0c3abf76dc1b 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -2,14 +2,20 @@ stdenv.mkDerivation rec{ - name = "privoxy-3.0.24"; + name = "privoxy-${version}"; + version = "3.0.26"; src = fetchurl { - url = "mirror://sourceforge/ijbswa/Sources/3.0.22%20%28stable%29/${name}-stable-src.tar.gz"; - sha256 = "a381f6dc78f08de0d4a2342d47a5949a6608073ada34b933137184f3ca9fb012"; + url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${name}-stable-src.tar.gz"; + sha256 = "1n4wpxmahl8m2y3d1azxa8lrdbpaad007k458skxrpz57ss1br2p"; }; - buildInputs = [ autoreconfHook zlib pcre w3m man ]; + nativeBuildInputs = [ autoreconfHook w3m man ]; + buildInputs = [ zlib pcre ]; + + postInstall = '' + rm -rf $out/var + ''; meta = with stdenv.lib; { homepage = http://www.privoxy.org/; From ad88f1040e2556ba678afb33dac28387ddd3543a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 12:25:31 +0100 Subject: [PATCH 1208/1749] privoxy service: additional isolation --- nixos/modules/services/networking/privoxy.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix index 94beb78ef5a4..e74fe44d76ed 100644 --- a/nixos/modules/services/networking/privoxy.nix +++ b/nixos/modules/services/networking/privoxy.nix @@ -100,6 +100,11 @@ in after = [ "network.target" "nss-lookup.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${privoxy}/sbin/privoxy --no-daemon --user ${privoxyUser} ${confFile}"; + + serviceConfig.PrivateDevices = true; + serviceConfig.PrivateTmp = true; + serviceConfig.ProtectHome = true; + serviceConfig.ProtectSystem = "full"; }; }; From 3dcdc2d2b054933a5812411c44a11bb4114b309e Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 12:27:51 +0100 Subject: [PATCH 1209/1749] privoxy service: remove static uid The service owns no data, having a static uid serves no purpose. This frees up uid/gid 32 --- nixos/modules/misc/ids.nix | 2 -- nixos/modules/services/networking/privoxy.nix | 18 +++++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 41ee63a96035..bc69102ba394 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -58,7 +58,6 @@ #utmp = 29; # unused ddclient = 30; davfs2 = 31; - privoxy = 32; #disnix = 33; # unused osgi = 34; tor = 35; @@ -322,7 +321,6 @@ utmp = 29; #ddclient = 30; # unused davfs2 = 31; - privoxy = 32; disnix = 33; osgi = 34; tor = 35; diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix index e74fe44d76ed..49ca839a2c37 100644 --- a/nixos/modules/services/networking/privoxy.nix +++ b/nixos/modules/services/networking/privoxy.nix @@ -6,8 +6,6 @@ let inherit (pkgs) privoxy; - privoxyUser = "privoxy"; - cfg = config.services.privoxy; confFile = pkgs.writeText "privoxy.conf" '' @@ -88,18 +86,20 @@ in ###### implementation config = mkIf cfg.enable { - - users.extraUsers = singleton - { name = privoxyUser; - uid = config.ids.uids.privoxy; - description = "Privoxy daemon user"; - }; + + users.users.privoxy = { + isSystemUser = true; + home = "/var/empty"; + group = "privoxy"; + }; + + users.groups.privoxy = {}; systemd.services.privoxy = { description = "Filtering web proxy"; after = [ "network.target" "nss-lookup.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${privoxy}/sbin/privoxy --no-daemon --user ${privoxyUser} ${confFile}"; + serviceConfig.ExecStart = "${privoxy}/bin/privoxy --no-daemon --user privoxy ${confFile}"; serviceConfig.PrivateDevices = true; serviceConfig.PrivateTmp = true; From 497e6d2f1d149f5fbe004e15fe8c384eed993943 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 5 Dec 2016 16:38:17 +0300 Subject: [PATCH 1210/1749] haskellPackages.haskell-src-exts-simple: build against new haskell-src-exts --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 24299c9418db..6fb76bcfbee7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1018,7 +1018,7 @@ self: super: { }; # Needs new version. - haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_18_2; }; + haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_0; }; # Test suite fails a QuickCheck property. optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0; From e43a99ec9f715f3962422107118b981aec391b6e Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 16:25:46 +0100 Subject: [PATCH 1211/1749] electrum: 2.7.11 -> 2.7.12 --- pkgs/applications/misc/electrum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 458aed051a28..2ec212d493b8 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.7.11"; + version = "2.7.12"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0qy2ynyw57jgi7fw3xzsyy608yk4bhsda7qfw0j26zqinv52mrsb"; + sha256 = "0vxdfl208if7mdsnva1jg37bnay2dsz3ww157aqwcv1j6512fi1n"; }; propagatedBuildInputs = with python2Packages; [ From c1d98d959b38df00a1d933a5a9a381aa80096024 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Dec 2016 17:29:39 +0100 Subject: [PATCH 1212/1749] buildPythonPackage: add configurePhase, fixes #20926 I had removed the configurePhase in https://github.com/NixOS/nixpkgs/pull/20894 because it was empty. This seemed to break packages that use cmake. --- .../interpreters/python/build-python-package-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/interpreters/python/build-python-package-common.nix b/pkgs/development/interpreters/python/build-python-package-common.nix index 80d40013f157..63936a00b391 100644 --- a/pkgs/development/interpreters/python/build-python-package-common.nix +++ b/pkgs/development/interpreters/python/build-python-package-common.nix @@ -12,6 +12,11 @@ attrs // { buildInputs = buildInputs ++ [ bootstrapped-pip ]; + configurePhase = '' + runHook preConfigure + runHook postConfigure + ''; + installPhase = attrs.installPhase or '' runHook preInstall From 47d4575255ea8159c5e84c1774c43d0f2d1d2bc5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Dec 2016 12:46:57 +0100 Subject: [PATCH 1213/1749] pythonPackages.setuptools: 28.8.0 -> 30.2.0 --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 4 ++-- pkgs/development/python-modules/setuptools/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index ed8bbab29a7a..7c992921e948 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -6,8 +6,8 @@ let sha256 = "ea8033fc9905804e652f75474d33410a07404c1a78dd3c949a66863bd1050ebd"; }; setuptools_source = fetchurl { - url = "https://files.pythonhosted.org/packages/3b/7e/293d19ccd106119e35db4bf3e111b1895098f618b455b758aa636496cf03/setuptools-28.8.0-py2.py3-none-any.whl"; - sha256 = "2e59d06ac798efce29c567ee0e0687514efca529a665b8f364cf497cd10d21b2"; + url = "https://files.pythonhosted.org/packages/b8/cb/b919f52dd81b4b2210d0c5529b6b629a4002e08d49a90183605d1181b10c/setuptools-30.2.0-py2.py3-none-any.whl"; + sha256 = "b7e7b28d6a728ea38953d66e12ef400c3c153c523539f1b3997c5a42f3770ff1"; }; argparse_source = fetchurl { url = "https://pypi.python.org/packages/2.7/a/argparse/argparse-1.4.0-py2.py3-none-any.whl"; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index bba5a6c942b0..63e05736d796 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { shortName = "${pname}-${version}"; name = "${python.libPrefix}-${shortName}"; - version = "28.8.0"; + version = "30.2.0"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${shortName}.tar.gz"; - sha256 = "432a1ad4044338c34c2d09b0ff75d509b9849df8cf329f4c1c7706d9c2ba3c61"; + sha256 = "f865709919903e3399343c0b3c42f95e9aeddc41e38cfb334fb2bb5dfa384857"; }; buildInputs = [ python wrapPython ]; From 0dbc1e4b5b97afaca25339a3047a7c3d23369fbf Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 5 Dec 2016 13:48:33 -0500 Subject: [PATCH 1214/1749] minio: build on all 64bit platforms --- pkgs/servers/minio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index ee37107858b3..fef4d55b36c1 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = https://www.minio.io/; description = "An S3-compatible object storage server"; maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.x86_64; license = lib.licenses.asl20; }; } From ef26ce0102ad398117244e937ee9c5a40d7f2dc8 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 5 Dec 2016 21:09:22 +0100 Subject: [PATCH 1215/1749] sonarr: 2.0.0.4389 -> 2.0.0.4409 --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index a6f0fb800558..5deb3ea871b5 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4389"; + version = "2.0.0.4409"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "17vvfld6m1wr8yxvm9i7gaxny04ymvq86pizad816a73jk4h16my"; + sha256 = "1kaj1m4ifby8liks8i7fsbgwbajaqwd96yindqp5maf2n6px2nw2"; }; buildInputs = [ From 90292a8093fe20c2214afaae0d6f294837b5837e Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 5 Dec 2016 21:09:48 +0100 Subject: [PATCH 1216/1749] nzbget: 17.0-r1686 -> 17.1 --- pkgs/tools/networking/nzbget/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 4ba293dc12c2..18995553d0a3 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -3,12 +3,11 @@ stdenv.mkDerivation rec { name = "nzbget-${version}"; - version = "17.0-r1686"; - filename = "nzbget-17.0-testing-r1686"; + version = "17.1"; src = fetchurl { - url = "http://github.com/nzbget/nzbget/releases/download/v${version}/${filename}-src.tar.gz"; - sha256 = "0hk0hiccdk3bivdnc2635kqqdwgwf73wvis1wl9k0snds25dwfiw"; + url = "http://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; + sha256 = "0fcw43bigjmgxcz1jvqpd01sz4vciqsm311cbfv9lvmvv40gag2b"; }; buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls From 1915170dde9b05d8547b6b04f41400aeed67f1b2 Mon Sep 17 00:00:00 2001 From: Ignat Loskutov Date: Tue, 6 Dec 2016 00:28:09 +0300 Subject: [PATCH 1217/1749] idea.datagrip: init at 2016.3 --- pkgs/applications/editors/idea/default.nix | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 8c05026e7efe..b58d6816c974 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -115,6 +115,22 @@ let propagatedUserEnvPkgs = [ python ]; }; + buildDataGrip = { name, version, src, license, description, wmClass }: + (mkIdeaProduct { + inherit name version src wmClass jdk; + product = "DataGrip"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/datagrip/"; + inherit description license; + longDescription = '' + DataGrip is a new IDE from JetBrains built for database admins. + It allows you to quickly migrate and refactor relational databases, + construct efficient, statically checked SQL queries and much more. + ''; + maintainers = with maintainers; [ loskutov ]; + platforms = platforms.linux; + }; + }); in { @@ -321,4 +337,16 @@ in }; wmClass = "jetbrains-webstorm"; }; + + datagrip = buildDataGrip rec { + name = "datagrip-${version}"; + version = "2016.3"; + description = "Your Swiss Army Knife for Databases and SQL"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; + sha256 = "10nah7v330qrrczzz5jldnr0k7w2xzljiny32gm9pqmjbl0i70il"; + }; + wmClass = "jetbrains-datagrip"; + }; } From f4fd4678f0d51c0efc04cc91880d854e6e197976 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 5 Dec 2016 23:40:31 +0100 Subject: [PATCH 1218/1749] perl-Tk: 804.032_501 -> 804.033 Also remove unnecessary `configurePhase` and add X11 include path. Fixes #20932. --- pkgs/top-level/perl-packages.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 03c166b65fd4..485c0a95dc35 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13921,19 +13921,16 @@ let self = _self // overrides; _self = with self; { }; Tk = buildPerlPackage rec { - name = "Tk-804.032_501"; + name = "Tk-804.033"; src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/${name}.tar.gz"; - sha256 = "10fsvyr56gm59chc8b70n6bvhd3lh9c05sp8m4arcahid0rpgbwa"; + url = "mirror://cpan/authors/id/S/SR/SREZIC/${name}.tar.gz"; + sha256 = "84756e9b07a2555c8eecf88e63d5cbbba9b1aa97b1e71a3d4aa524a7995a88ad"; }; - makeMakerFlags = "X11LIB=${pkgs.xorg.libX11.out}/lib"; + makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib"; buildInputs = with pkgs; [ xorg.libX11 libpng ]; - configurePhase = '' - perl Makefile.PL PREFIX=$out $makeMakerFlags - ''; - doCheck = false; - meta ={ - homepage = "http://search.cpan.org/~srezic/Tk-804.032/Tk.pod"; + doCheck = false; # Expects working X11. + meta = { + homepage = https://metacpan.org/pod/distribution/Tk/Tk.pod; license = stdenv.lib.licenses.tcltk; }; }; From ee2d5e44c2492472faa5a1692ff5d1629dfc2287 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Dec 2016 00:00:24 +0100 Subject: [PATCH 1219/1749] pythonPackages.django_1_6: 1.6.11 -> 1.6.11.5 Switch to the reviewboard fork of Django 1.6 because it's not maintained upstream anymore. See https://www.reviewboard.org/news/2016/11/01/new-django-1-6-11-5-security-releases/. --- 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 d02c45063bcc..3e1ad03ecd95 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9956,14 +9956,14 @@ in { django_1_6 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.6.11"; + version = "1.6.11.5"; # Support to python-3.4 and higher was introduced in django_1_7 disabled = !(isPy26 || isPy27 || isPy33); src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.6/${name}.tar.gz"; - sha256 = "0misvia78c14y07zs5xsb9lv54q0v217jpaindrmhhw4wiryal3y"; + url = "https://downloads.reviewboard.org/releases/Django/1.6/Django-${version}.tar.gz"; + sha256 = "0yj0fw3iql031z8l5ik1fb25sk3l5bw2vc63bbyg5rz2k3znl4il"; }; # too complicated to setup From 601b47ab94e3aeb976d8eb9818b7f97f79edab58 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Dec 2016 00:02:59 +0100 Subject: [PATCH 1220/1749] pythonPackages.graphiteWeb: fix dependencies Fixes #20885. --- pkgs/top-level/python-packages.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e1ad03ecd95..3dfee9a6817b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10147,6 +10147,15 @@ in { }; }; + django_tagging_0_3 = self.django_tagging.override (attrs: rec { + name = "django-tagging-0.3.6"; + + src = pkgs.fetchurl { + url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; + sha256 = "03zlbq13rydfh28wh0jk3x3cjk9x6jjmqnx1i3ngjmfwbxf8x6j1"; + }; + propagatedBuildInputs = with self; [ django_1_6 ]; + }); django_classytags = buildPythonPackage rec { name = "django-classy-tags-${version}"; @@ -27951,7 +27960,7 @@ in { sha256 = "1c0kclbv8shv9nvjx19wqm4asia58s3qmd9fapchc6y9fjpjax6q"; }; - propagatedBuildInputs = with self; [ django django_tagging whisper pycairo ldap memcached ]; + propagatedBuildInputs = with self; [ django_1_6 django_tagging_0_3 whisper pycairo ldap memcached pytz ]; postInstall = '' wrapProgram $out/bin/run-graphite-devel-server.py \ From 8c1f5afdf3570c18da7d40bc767115f1254253c5 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 19:02:10 +0100 Subject: [PATCH 1221/1749] grsecurity: delay toggling of sysctls until system is up We generally trust init, so there's little point in having these enabled during early bootup; it accomplishes little except fill our logs with spam. --- nixos/modules/security/grsecurity.nix | 47 ++++++++++++++++++- .../linux/kernel/grsecurity-nixos-config.nix | 3 +- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 92afb74956eb..6838dbd111bb 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -109,19 +109,62 @@ in boot.kernel.sysctl = { # Read-only under grsecurity "kernel.kptr_restrict" = mkForce null; + + # All grsec tunables default to off, those not enabled below are + # *disabled*. We use mkDefault to allow expert users to override + # our choices, but use mkForce where tunables would outright + # conflict with other settings. + + # Enable all chroot restrictions by default (overwritten as + # necessary below) + "kernel.grsecurity.chroot_caps" = mkDefault 1; + "kernel.grsecurity.chroot_deny_bad_rename" = mkDefault 1; + "kernel.grsecurity.chroot_deny_chmod" = mkDefault 1; + "kernel.grsecurity.chroot_deny_chroot" = mkDefault 1; + "kernel.grsecurity.chroot_deny_fchdir" = mkDefault 1; + "kernel.grsecurity.chroot_deny_mknod" = mkDefault 1; + "kernel.grsecurity.chroot_deny_mount" = mkDefault 1; + "kernel.grsecurity.chroot_deny_pivot" = mkDefault 1; + "kernel.grsecurity.chroot_deny_shmat" = mkDefault 1; + "kernel.grsecurity.chroot_deny_sysctl" = mkDefault 1; + "kernel.grsecurity.chroot_deny_unix" = mkDefault 1; + "kernel.grsecurity.chroot_enforce_chdir" = mkDefault 1; + "kernel.grsecurity.chroot_findtask" = mkDefault 1; + "kernel.grsecurity.chroot_restrict_nice" = mkDefault 1; + + # Enable various grsec protections + "kernel.grsecurity.consistent_setxid" = mkDefault 1; + "kernel.grsecurity.deter_bruteforce" = mkDefault 1; + "kernel.grsecurity.fifo_restrictions" = mkDefault 1; + "kernel.grsecurity.harden_ipc" = mkDefault 1; + "kernel.grsecurity.harden_ptrace" = mkDefault 1; + "kernel.grsecurity.harden_tty" = mkDefault 1; + "kernel.grsecurity.ip_blackhole" = mkDefault 1; + "kernel.grsecurity.linking_restrictions" = mkDefault 1; + "kernel.grsecurity.ptrace_readexec" = mkDefault 1; + + # Enable auditing + "kernel.grsecurity.audit_ptrace" = mkDefault 1; + "kernel.grsecurity.forkfail_logging" = mkDefault 1; + "kernel.grsecurity.rwxmap_logging" = mkDefault 1; + "kernel.grsecurity.signal_logging" = mkDefault 1; + "kernel.grsecurity.timechange_logging" = mkDefault 1; } // optionalAttrs config.nix.useSandbox { # chroot(2) restrictions that conflict with sandboxed Nix builds "kernel.grsecurity.chroot_caps" = mkForce 0; + "kernel.grsecurity.chroot_deny_chmod" = mkForce 0; "kernel.grsecurity.chroot_deny_chroot" = mkForce 0; "kernel.grsecurity.chroot_deny_mount" = mkForce 0; "kernel.grsecurity.chroot_deny_pivot" = mkForce 0; - "kernel.grsecurity.chroot_deny_chmod" = mkForce 0; } // optionalAttrs containerSupportRequired { # chroot(2) restrictions that conflict with NixOS lightweight containers + "kernel.grsecurity.chroot_caps" = mkForce 0; "kernel.grsecurity.chroot_deny_chmod" = mkForce 0; "kernel.grsecurity.chroot_deny_mount" = mkForce 0; "kernel.grsecurity.chroot_restrict_nice" = mkForce 0; - "kernel.grsecurity.chroot_caps" = mkForce 0; + # Disable privileged IO by default, unless X is enabled + } // optionalAttrs (!config.services.xserver.enable) { + "kernel.grsecurity.disable_priv_io" = mkDefault 1; }; }; diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix index 2193dabd0bc4..e54ab8c4944f 100644 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix +++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix @@ -55,5 +55,6 @@ GRKERNSEC_MODHARDEN n GRKERNSEC_SYSCTL y GRKERNSEC_SYSCTL_DISTRO y -GRKERNSEC_SYSCTL_ON y +# Assume that appropriate sysctls are toggled once the system is up +GRKERNSEC_SYSCTL_ON n '' From 071fbcda2462114ce2bcabb97e011083024774a7 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 19:04:49 +0100 Subject: [PATCH 1222/1749] grsecurity: enable optional sysfs restrictions Fairly severe, but can be disabled at bootup via grsec_sysfs_restrict=0. For the NixOS module we ensure that it is disabled, for systemd compatibility. --- nixos/modules/security/grsecurity.nix | 3 ++- nixos/modules/security/grsecurity.xml | 9 ++++++--- .../os-specific/linux/kernel/grsecurity-nixos-config.nix | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 6838dbd111bb..3726b6c78185 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -59,7 +59,8 @@ in boot.kernelPackages = mkForce pkgs.linuxPackages_grsec_nixos; - boot.kernelParams = optional cfg.disableEfiRuntimeServices "noefi"; + boot.kernelParams = [ "grsec_sysfs_restrict=0" ] + ++ optional cfg.disableEfiRuntimeServices "noefi"; nixpkgs.config.grsecurity = true; diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index e41748358fbb..a991758021a1 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -151,9 +151,6 @@ a TCP simultaneous OPEN on that port before the connection is actually established. - /sys hardening: - breaks systemd. - Trusted path execution: a desirable feature, but requires some more work to operate smoothly on NixOS. @@ -357,6 +354,12 @@ pax_size_overflow_report_only: log size overflow violations but leave the violating task running + + + grsec_sysfs_restrict=[0|1]: toggle sysfs + restrictions. The NixOS module sets this to 0 + for systemd compatibility + diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix index e54ab8c4944f..96da936642d2 100644 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix +++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix @@ -29,6 +29,7 @@ PAX_KERNEXEC_PLUGIN_METHOD_BTS y # Additional grsec hardening not implied by auto constraints GRKERNSEC_IO y +GRKERNSEC_SYSFS_RESTRICT y # Disable protections rendered useless by redistribution GRKERNSEC_HIDESYM n From 31d79afbe5c0dc4f5343e842e40ada6738b1abb3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 19:14:02 +0100 Subject: [PATCH 1223/1749] grsecurity docs: note that pax_sanitize_slab defaults to fast --- nixos/modules/security/grsecurity.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index a991758021a1..97628b0fe329 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -347,7 +347,7 @@ pax_sanitize_slab={off|fast|full}: control kernel - slab object sanitization + slab object sanitization. Defaults to fast From 0e765c72e5c1f12d629d9d23d34f5fcb235e2833 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 19:19:33 +0100 Subject: [PATCH 1224/1749] grsecurity: enable module hardening --- nixos/modules/security/grsecurity.xml | 8 ++++---- pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index 97628b0fe329..5b3e4db03a13 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -153,10 +153,6 @@ Trusted path execution: a desirable feature, but requires some more work to operate smoothly on NixOS. - - Module hardening: would break user initiated module - loading. Might enable this at some point, depending on the potential - breakage. @@ -292,6 +288,10 @@ to override this behavior. + User initiated autoloading of modules (e.g., when + using fuse or loop devices) is disallowed; either load requisite modules + as root or add them to. + Virtualization: KVM is the preferred virtualization solution. Xen, Virtualbox, and VMWare are unsupported and most likely require a custom kernel. diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix index 96da936642d2..c426799f59dd 100644 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix +++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix @@ -31,6 +31,8 @@ PAX_KERNEXEC_PLUGIN_METHOD_BTS y GRKERNSEC_IO y GRKERNSEC_SYSFS_RESTRICT y +GRKERNSEC_MODHARDEN y + # Disable protections rendered useless by redistribution GRKERNSEC_HIDESYM n GRKERNSEC_RANDSTRUCT n @@ -51,9 +53,6 @@ GRKERNSEC_FORKFAIL y # Wishlist: support trusted path execution GRKERNSEC_TPE n -# Wishlist: enable this, but breaks user initiated module loading -GRKERNSEC_MODHARDEN n - GRKERNSEC_SYSCTL y GRKERNSEC_SYSCTL_DISTRO y # Assume that appropriate sysctls are toggled once the system is up From cc396697a6078d4137e1e1996989408d666fb3d8 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 23:55:40 +0100 Subject: [PATCH 1225/1749] grsecurity: enable ability to lock in readonly mounts --- pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix index c426799f59dd..64722635f41c 100644 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix +++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix @@ -30,6 +30,7 @@ PAX_KERNEXEC_PLUGIN_METHOD_BTS y # Additional grsec hardening not implied by auto constraints GRKERNSEC_IO y GRKERNSEC_SYSFS_RESTRICT y +GRKERNSEC_ROFS y GRKERNSEC_MODHARDEN y From 9578299bbe5c4f78468fcad6e66c5f4a14c61eb2 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 5 Dec 2016 23:56:22 +0100 Subject: [PATCH 1226/1749] grsecurity: 4.8.11-201611271225 -> 4.8.12-201612031658 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index 4937c2271c7a..715af76267ca 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.11"; + version = "4.8.12"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03w90vfjfcya38mcp1njasa5c67za203sgp9n3w52gms13s443yc"; + sha256 = "03i5q36aqlxir3dy213civkaz1lnwzzv6s3vaafgkdj7fzvqcx44"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index fa5984ebf8bc..124518c36b21 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.11"; - grrev = "201611271225"; - sha256 = "12vcy030vxi7h2dxyikfj8cirrifk9j186dbc2vk45dv4flcxpac"; + { kver = "4.8.12"; + grrev = "201612031658"; + sha256 = "06n96jk471xp7m8sf504bw9x6mk893jpymglgw037b21cbv88rrp"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 67e1c1b4a7ad5529cf0ac48bdbfc3164e072eae9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 5 Dec 2016 19:32:56 -0500 Subject: [PATCH 1227/1749] Add pythonPackages.wp_export_parser --- pkgs/top-level/python-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3dfee9a6817b..f6dc4685dc79 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31386,6 +31386,18 @@ in { }; }; + wp_export_parser = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "wp_export_parser"; + version = "1.0"; + src = pkgs.fetchFromGitHub { + owner = "RealGeeks"; + repo = "wp_export_parser"; + rev = "479211f6c5a7d034fd77762dfed381c3315cd773"; + sha256 = "1ad0mkixc0s86djwsvhp1qlvcfs25086nh0qw7bys49gz8shczzi"; + }; + }; + zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else (pkgs.zeitgeist.override{python2Packages=self;}).py; From 200715b022138c97977368e40428ffa01b33ccd3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 5 Dec 2016 19:38:26 -0500 Subject: [PATCH 1228/1749] scala: 2.12.0 -> 2.12.1 --- pkgs/development/compilers/scala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index decbf678c34f..bc7da3581deb 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "scala-2.12.0"; + name = "scala-2.12.1"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "085k7zl9v3vxaqwq0r0yyj53cb6syvq2safn4fgz3w00ks2fyxw2"; + sha256 = "0nf37ix3rrm50s7dacwlyr8fl1hgrbxbw5yz21qf58rj8n46ic2d"; }; propagatedBuildInputs = [ jre ] ; From c9d1d430ec34d667ce9d0b86f843801d1cf3b753 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 5 Dec 2016 19:40:11 -0500 Subject: [PATCH 1229/1749] linux: 4.9-rc7 -> 4.9-rc8 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 95e89005b0fb..394469d06fab 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9-rc7"; - modDirVersion = "4.9.0-rc7"; + version = "4.9-rc8"; + modDirVersion = "4.9.0-rc8"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0da5bf5cizvbn68d8pb5kyli3zkgsc8g61kn1b4d8gwvfxrb75hx"; + sha256 = "1xyham8by966mavk5wxy6va5cq2lf2d1jiqps70kcc4064v365r7"; }; features.iwlwifi = true; From 6b6f97fecce1d7c231ecd461443d051eff5005c3 Mon Sep 17 00:00:00 2001 From: "Rommel M. Martinez" Date: Tue, 6 Dec 2016 09:23:59 +0800 Subject: [PATCH 1230/1749] minikube: init at 0.13.1 --- .../networking/cluster/minikube/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/networking/cluster/minikube/default.nix diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix new file mode 100644 index 000000000000..857e8e72d12b --- /dev/null +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, kubernetes }: +let + arch = if stdenv.isLinux + then "linux-amd64" + else "darwin-amd64"; + checksum = if stdenv.isLinux + then "17r8w4lvj7fhh7qppi9z5i2fpqqry4s61zjr9zmsbybc5flnsw2j" + else "0jf0kd1mm35qcf0ydr5yyzfq6qi8ifxchvpjsydb1gm1kikp5g3p"; +in +stdenv.mkDerivation rec { + pname = "minikube"; + version = "0.13.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://storage.googleapis.com/minikube/releases/v${version}/minikube-${arch}"; + sha256 = "${checksum}"; + }; + + buildInputs = [ ]; + + propagatedBuildInputs = [ kubernetes ]; + + phases = [ "buildPhase" "installPhase" ]; + + buildPhase = '' + mkdir -p $out/bin + ''; + + installPhase = '' + cp $src $out/bin/${pname} + chmod +x $out/bin/${pname} + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/kubernetes/minikube; + description = "A tool that makes it easy to run Kubernetes locally"; + license = licenses.asl20; + maintainers = [ maintainers.ebzzry ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9702500fc382..a8c1bcf99bf1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13479,6 +13479,8 @@ in minidjvu = callPackage ../applications/graphics/minidjvu { }; + minikube = callPackage ../applications/networking/cluster/minikube { }; + minitube = callPackage ../applications/video/minitube { }; mimms = callPackage ../applications/audio/mimms {}; From 02ecd0f0f76248e6a40ee62686ea94165b464fb1 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Tue, 6 Dec 2016 00:46:48 -0500 Subject: [PATCH 1231/1749] pssh: init at 2.3.1 --- pkgs/tools/networking/pssh/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/pssh/default.nix diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix new file mode 100644 index 000000000000..7ae41a3e1766 --- /dev/null +++ b/pkgs/tools/networking/pssh/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "pssh-${version}"; + version = "2.3.1"; + + src = fetchFromGitHub { + owner = "lilydjwg"; + repo = "pssh"; + rev = "v${version}"; + sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq"; + }; + + meta = with stdenv.lib; { + description = "Parallel SSH Tools"; + longDescription = '' + PSSH provides parallel versions of OpenSSH and related tools, + including pssh, pscp, prsync, pnuke and pslurp. + ''; + inherit (src.meta) homepage; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ chris-martin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1927b7d6e17..602622c7a328 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3382,6 +3382,8 @@ in psmisc = callPackage ../os-specific/linux/psmisc { }; + pssh = callPackage ../tools/networking/pssh { }; + pstoedit = callPackage ../tools/graphics/pstoedit { }; psutils = callPackage ../tools/typesetting/psutils { }; From cac53b75a8a85394a132614f631196103693284f Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Tue, 6 Dec 2016 09:46:33 +0100 Subject: [PATCH 1232/1749] hipchat: 4.28.0.1659 -> 4.29.4.1662 --- .../networking/instant-messengers/hipchat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index e4cc2700c03f..326f95630707 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -4,7 +4,7 @@ let - version = "4.28.0.1659"; + version = "4.29.4.1662"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -44,7 +44,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "091njvbihn0l7j5ymnl8ynz51pcy9varbvvny880r8szldash90y"; + sha256 = "1cz9zv9aj8xdrjs6dgi7fpm4q9l9find4m8l0nmvac2s4r60vw6y"; } else throw "HipChat is not supported on ${stdenv.system}"; From d2fc461f6badbfd6cc2b32c42b8e6661c9675afc Mon Sep 17 00:00:00 2001 From: Mikael Brockman Date: Wed, 7 Sep 2016 17:06:21 +0300 Subject: [PATCH 1233/1749] awslogs: init at 0.7 fixes #20921 --- pkgs/tools/admin/awslogs/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/admin/awslogs/default.nix diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix new file mode 100644 index 000000000000..dffef09a5d4a --- /dev/null +++ b/pkgs/tools/admin/awslogs/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "awslogs-${version}"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "jorgebastida"; + repo = "awslogs"; + rev = "${version}"; + sha256 = "0dqf26h595l1fcnagxi8zsdarsxg3smsihxaqrvnki8fshhfdqsm"; + }; + + doCheck = false; + + propagatedBuildInputs = with pythonPackages; [ + boto3 termcolor dateutil docutils + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/jorgebastida/awslogs; + description = "AWS CloudWatch logs for Humans"; + maintainers = with maintainers; [ dbrock ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 602622c7a328..93a045522245 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -475,6 +475,8 @@ in awscli = pythonPackages.awscli; # Should be moved out of python-packages.nix + awslogs = callPackage ../tools/admin/awslogs { }; + aws_shell = python2Packages.aws_shell; # Should be moved out of python-packages.nix azure-cli = nodePackages.azure-cli; From 6bfffa9932e6f5aca58ecc72f5814ee49a901cb2 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Tue, 6 Dec 2016 11:17:27 +0000 Subject: [PATCH 1234/1749] digital-ocean: Init at 1.10.1 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6dc4685dc79..7b0825d09661 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5498,6 +5498,27 @@ in { }; }; + digital-ocean = buildPythonPackage rec { + name = "python-digitalocean-1.10.1"; + + propagatedBuildInputs = with self; [ requests2 ]; + + # Package doesn't distribute tests. + doCheck = false; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/python-digitalocean/${name}.tar.gz"; + sha256 = "12qybflfnl08acspz7rpaprmlabgrzimacbd7gm9qs5537hl3qnp"; + }; + + meta = { + description = "digitalocean.com API to manage Droplets and Images"; + homepage = https://pypi.python.org/pypi/python-digitalocean; + license = licenses.lgpl3; + maintainers = with maintainers; [ teh ]; + }; + }; + libtmux = buildPythonPackage rec { name = "libtmux-${version}"; version = "0.6.0"; From 63b0e869088e425bfca6e194faf6ffaa94e77b46 Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Tue, 6 Dec 2016 13:54:52 +0100 Subject: [PATCH 1235/1749] solc: add explanation for why not fetchFromGitHub --- pkgs/development/compilers/solc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index e38983cea6ed..0935891dcbd5 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -4,6 +4,7 @@ stdenv.mkDerivation rec { version = "0.4.6"; name = "solc-${version}"; + # Cannot use `fetchFromGitHub' because of submodules src = fetchgit { url = "https://github.com/ethereum/solidity"; rev = "2dabbdf06f414750ef0425c664f861aeb3e470b8"; From fc9e65c5589d5aa2443a1be75794ec0a5bcb2ea1 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Tue, 6 Dec 2016 14:16:30 +0100 Subject: [PATCH 1236/1749] pythonPackages.escapism: init at 0.0.1 --- pkgs/top-level/python-packages.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b0825d09661..d769053f0f84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6434,7 +6434,6 @@ in { }; }; - ds4drv = buildPythonPackage rec { name = "ds4drv-${version}"; version = "0.5.0"; @@ -6585,6 +6584,26 @@ in { propagatedBuildInputs = with self; [ configparser ]; }; + escapism = buildPythonPackage rec { + name = "escapism-${version}"; + version = "0.0.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/e/escapism/${name}.tar.gz"; + sha256 = "1yfyxwxb864xrmrrqgp85xgsh4yrrq5mmzvkdg19jwr7rm6sqx9p"; + }; + + # No tests distributed + doCheck = false; + + meta = { + description = "Simple, generic API for escaping strings"; + homepage = "https://github.com/minrk/escapism"; + license = licenses.mit; + maintainers = with maintainers; [ bzizou ]; + }; + }; + etcd = buildPythonPackage rec { name = "etcd-${version}"; version = "2.0.8"; From 1a427cf6251f5ed5205fd1c4c3164ac947d5c204 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 6 Dec 2016 14:29:29 +0100 Subject: [PATCH 1237/1749] privoxy: enable pie --- pkgs/tools/networking/privoxy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 0c3abf76dc1b..9a8dfca9f24a 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec{ sha256 = "1n4wpxmahl8m2y3d1azxa8lrdbpaad007k458skxrpz57ss1br2p"; }; + hardeningEnable = [ "pie" ]; + nativeBuildInputs = [ autoreconfHook w3m man ]; buildInputs = [ zlib pcre ]; From 148ee2cba9b1654a5d3abe5124b32aa7d03528e6 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 6 Dec 2016 15:41:03 +0100 Subject: [PATCH 1238/1749] privoxy: homepage now reachable via https --- pkgs/tools/networking/privoxy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 9a8dfca9f24a..12744456cc4a 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec{ ''; meta = with stdenv.lib; { - homepage = http://www.privoxy.org/; + homepage = https://www.privoxy.org/; description = "Non-caching web proxy with advanced filtering capabilities"; license = licenses.gpl2; platforms = platforms.all; From db0bd30a7cafc5d519fae7cb52e55673b319a4c1 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 6 Dec 2016 15:45:45 +0100 Subject: [PATCH 1239/1749] ion3: specify meta.{platforms,license} --- pkgs/applications/window-managers/ion-3/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index f41990730774..c13b950599ed 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -5,6 +5,8 @@ stdenv.mkDerivation { meta = { description = "Tiling tabbed window manager designed with keyboard users in mind"; homepage = http://modeemi.fi/~tuomov/ion; + platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.lgpl21; }; src = fetchurl { url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz; From 736169d01dd05e50b8a70212a28c9e7f61249348 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 6 Dec 2016 16:36:06 +0100 Subject: [PATCH 1240/1749] buildPythonPackage: yet another fix, fixes #20943 I didn't copy the old behaviour correctly with c1d98d959b38df00a1d933a5a9a381aa80096024 --- .../interpreters/python/build-python-package-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/build-python-package-common.nix b/pkgs/development/interpreters/python/build-python-package-common.nix index 63936a00b391..381606acd8b6 100644 --- a/pkgs/development/interpreters/python/build-python-package-common.nix +++ b/pkgs/development/interpreters/python/build-python-package-common.nix @@ -12,7 +12,7 @@ attrs // { buildInputs = buildInputs ++ [ bootstrapped-pip ]; - configurePhase = '' + configurePhase = attrs.configurePhase or '' runHook preConfigure runHook postConfigure ''; @@ -29,4 +29,4 @@ attrs // { runHook postInstall ''; -} \ No newline at end of file +} From 462a63bb1e6abafb2014b097e48703301283c97e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 6 Dec 2016 16:47:17 +0100 Subject: [PATCH 1241/1749] beets: add missing dependency six, fixes #20946 --- pkgs/tools/audio/beets/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 0c6dc9219c47..60cfe4a28148 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -84,6 +84,7 @@ in pythonPackages.buildPythonApplication rec { }; propagatedBuildInputs = [ + pythonPackages.six pythonPackages.enum34 pythonPackages.jellyfish pythonPackages.munkres From cffea60631714bb355e2993aaed93cb2145c86a4 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Tue, 6 Dec 2016 14:46:52 +0100 Subject: [PATCH 1242/1749] pythonPackages.pamela: init at 0.3.0 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b0825d09661..a84a1445767c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8392,7 +8392,24 @@ in { }; }; + pamela = buildPythonPackage rec { + name = "pamela-${version}"; + version = "0.3.0"; + src = pkgs.fetchurl { + url = "mirror://pypi/p/pamela/${name}.tar.gz"; + sha256 = "0ssxbqsshrm8p642g3h6wsq20z1fsqhpdvqdm827gn6dlr38868y"; + }; + + doCheck = false; + + meta = { + description = "PAM interface using ctypes"; + homepage = "http://github.com/minrk/pamela"; + license = licenses.mit; + }; + }; + pathtools = buildPythonPackage rec { name = "pathtools-${version}"; version = "0.1.2"; From 14e53ca5ab779f64aee599787ce070888c2af246 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 6 Dec 2016 13:07:02 -0500 Subject: [PATCH 1243/1749] sudolikeaboss: 0.2.1 -> 20161127-2d9afe1 --- pkgs/tools/security/sudolikeaboss/default.nix | 14 +++++---- pkgs/tools/security/sudolikeaboss/deps.nix | 29 +++++++++++++++---- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix index 6e2d6888f2e7..066fef39a82a 100644 --- a/pkgs/tools/security/sudolikeaboss/default.nix +++ b/pkgs/tools/security/sudolikeaboss/default.nix @@ -1,15 +1,20 @@ +# This file was generated by go2nix, then modified by hand for Darwin support. { stdenv, buildGoPackage, fetchFromGitHub, fixDarwinDylibNames, darwin }: + buildGoPackage rec { - name = "sudolikeaboss-${version}"; - version = "0.2.1"; + name = "sudolikeaboss-unstable-${version}"; + version = "20161127-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "2d9afe19f872c9f433d476e57ee86169781b164c"; goPackagePath = "github.com/ravenac95/sudolikeaboss"; + src = fetchFromGitHub { owner = "ravenac95"; repo = "sudolikeaboss"; - rev = "v${version}"; - sha256 = "1zsmy67d334nax76sq0g2sczp4zi19d94d3xfwgadzk7sxvw1z0m"; + inherit rev; + sha256 = "0ni3v4kanxfzxzjd48f5dgv62jbfrw7kdmq0snj09hw7ciw55yg6"; }; + goDeps = ./deps.nix; propagatedBuildInputs = with darwin.apple_sdk.frameworks; [ @@ -29,5 +34,4 @@ buildGoPackage rec { maintainers = [ maintainers.grahamc ]; platforms = platforms.darwin; }; - } diff --git a/pkgs/tools/security/sudolikeaboss/deps.nix b/pkgs/tools/security/sudolikeaboss/deps.nix index 04f831675fac..350306a24f4b 100644 --- a/pkgs/tools/security/sudolikeaboss/deps.nix +++ b/pkgs/tools/security/sudolikeaboss/deps.nix @@ -1,13 +1,30 @@ -# This file was generated by go2nix: https://github.com/kamilchm/go2nix -# v1.1.0 or 1.1.1, not 100% sure +# This file was generated by go2nix. [ + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "881bee4e20a5d11a6a88a5667c6f292072ac1963"; + sha256 = "176a09lp20f0qfhwwlh2xg0vk7z1g7gq8k2wr3sg1fd8m86wrzzg"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "b061729afc07e77a8aa4fad0a2fd840958f1942a"; + sha256 = "0q87n5an7ha2d8kl6gn9wi41rq0whsxq68w5x3nxz7w9vgkfnq1k"; + }; + } { goPackagePath = "github.com/urfave/cli"; fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "55f715e28c46073d0e217e2ce8eb46b0b45e3db6"; - sha256 = "0fvqxh1dx4f189y90fhrjapb4g51d7cp203jahxfb19k1k8c3942"; + rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; + sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; }; } { @@ -15,8 +32,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "2a824cf9226006580a06d9fa8f10901c17b49ed5"; - sha256 = "19hc83dsa8k1zbzb16v9yc44grscl9r4fxlpwqi3f6zqfrv0qk4n"; + rev = "0c96df335ed3f17f758cba1a2c71b7849dd828e3"; + sha256 = "02zn1f539y5yc1sx82ym8c3pp3z371d1ldhl20skwjwbdw1ln8hm"; }; } ] From 80f2e535b35c5d099ade15aa5c74bf0736e54919 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 6 Dec 2016 20:24:26 +0100 Subject: [PATCH 1244/1749] pdfpc: 4.0.3 -> 4.0.4 --- pkgs/applications/misc/pdfpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 812c7ec61145..848b39eeb07f 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "1fcwxvik3nnn0g37xvb30vxaxwrd881fw07fyfb9c6ami9bnva3p"; + sha256 = "07wpf3gkgiq7dpgsrv7whk0pzm18cni4s53hd7zz40319jmlaf4q"; }; nativeBuildInputs = [ cmake pkgconfig ]; From b165b5e9240d294a4f02d066e6acc290e9a48e6e Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Tue, 6 Dec 2016 22:26:41 +0100 Subject: [PATCH 1245/1749] portaudio: remove old version portaudioSVN The project is now using git and the sha for the source is wrong. Can not find other derivations using this. --- .../libraries/portaudio/svn-head.nix | 25 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/development/libraries/portaudio/svn-head.nix diff --git a/pkgs/development/libraries/portaudio/svn-head.nix b/pkgs/development/libraries/portaudio/svn-head.nix deleted file mode 100644 index 12b8257084b8..000000000000 --- a/pkgs/development/libraries/portaudio/svn-head.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchsvn, alsaLib, pkgconfig }: - -stdenv.mkDerivation rec { - revision = "1788"; - name = "portaudio-svn-r${revision}"; - - src = fetchsvn { - url = "https://subversion.assembla.com/svn/portaudio/portaudio/trunk"; - rev = revision; - sha256 = "0vhiy4lkmv0flhvkbbra71z5cfr3gbh27bbfcqqdc939b4z35lsi"; - }; - - buildInputs = [ alsaLib pkgconfig ]; - - meta = { - description = "Portable cross-platform Audio API"; - homepage = http://www.portaudio.com/; - # Not exactly a bsd license, but alike - license = "BSD"; - }; - - passthru = { - api_version = 19; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93a045522245..7f4e2caf062d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8917,8 +8917,6 @@ in portaudio = callPackage ../development/libraries/portaudio { }; - portaudioSVN = callPackage ../development/libraries/portaudio/svn-head.nix { }; - portmidi = callPackage ../development/libraries/portmidi {}; prison = callPackage ../development/libraries/prison { }; From 271c0f54518a8e5798cf7b27d99947c64998659e Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 6 Dec 2016 23:19:34 +0100 Subject: [PATCH 1246/1749] lib/generators: mkKeyValueLine -> mkKeyValueLine (#20920) Rename, since the previous name was potentially confusing. --- lib/generators.nix | 8 ++++---- lib/tests.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index 2c0cf5775f47..4d3c920b0ae3 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -21,10 +21,10 @@ rec { * character sep. If sep appears in k, it is escaped. * Helper for synaxes with different separators. * - * mkKeyValueLine ":" "f:oo" "bar" + * mkKeyValueDefault ":" "f:oo" "bar" * > "f\:oo:bar" */ - mkKeyValueLine = sep: k: v: + mkKeyValueDefault = sep: k: v: "${libStr.escape [sep] k}${sep}${toString v}"; @@ -33,7 +33,7 @@ rec { * mkKeyValue is the same as in toINI. */ toKeyValue = { - mkKeyValue ? mkKeyValueLine "=" + mkKeyValue ? mkKeyValueDefault "=" }: attrs: let mkLine = k: v: mkKeyValue k v + "\n"; in libStr.concatStrings (libAttr.mapAttrsToList mkLine attrs); @@ -63,7 +63,7 @@ rec { # apply transformations (e.g. escapes) to section names mkSectionName ? (name: libStr.escape [ "[" "]" ] name), # format a setting line from key and value - mkKeyValue ? mkKeyValueLine "=" + mkKeyValue ? mkKeyValueDefault "=" }: attrsOfAttrs: let # map function to string for each key val diff --git a/lib/tests.nix b/lib/tests.nix index afbaf11a7f7b..d33e3a824e34 100644 --- a/lib/tests.nix +++ b/lib/tests.nix @@ -135,8 +135,8 @@ runTests { # these tests assume attributes are converted to lists # in alphabetical order - testMkKeyValueLine = { - expr = generators.mkKeyValueLine ":" "f:oo" "bar"; + testMkKeyValueDefault = { + expr = generators.mkKeyValueDefault ":" "f:oo" "bar"; expected = ''f\:oo:bar''; }; From 5373ca9712cd275169aa8b47c321b13ab0259811 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 6 Dec 2016 23:24:42 +0100 Subject: [PATCH 1247/1749] haskell/ghcjs: fix ghcjs-ffiqq, add ghcjs-vdom (#20614) Both experimental libraries that are in the ghcjs GitHub organization, but are not yet officially released on hackage. --- .../haskell-modules/configuration-ghcjs.nix | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 894022c176be..826869f828b1 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -76,6 +76,7 @@ self: super: ''; }); + # experimental ghcjs-ffiqq = self.callPackage ({ mkDerivation, base, template-haskell, ghcjs-base, split, containers, text, ghc-prim }: @@ -85,15 +86,37 @@ self: super: src = pkgs.fetchFromGitHub { owner = "ghcjs"; repo = "ghcjs-ffiqq"; - rev = "da31b18582542fcfceade5ef6b2aca66662b9e20"; - sha256 = "1mkp8p9hispyzvkb5v607ihjp912jfip61id8d42i19k554ssp8y"; + rev = "b52338c2dcd3b0707bc8aff2e171411614d4aedb"; + sha256 = "08zxfm1i6zb7n8vbz3dywdy67vkixfyw48580rwfp48rl1s2z1c7"; }; libraryHaskellDepends = [ base template-haskell ghcjs-base split containers text ghc-prim ]; description = "FFI QuasiQuoter for GHCJS"; - license = stdenv.lib.licenses.mit; + license = pkgs.stdenv.lib.licenses.mit; }) {}; + # experimental + ghcjs-vdom = self.callPackage + ({ mkDerivation, base, ghc-prim, ghcjs-ffiqq, ghcjs-base, ghcjs-prim + , containers, split, template-haskell + }: + mkDerivation rec { + pname = "ghcjs-vdom"; + version = "0.2.0.0"; + src = pkgs.fetchFromGitHub { + owner = "ghcjs"; + repo = pname; + rev = "1c1175ba22eca6d7efa96f42a72290ade193c148"; + sha256 = "0c6l1dk2anvz94yy5qblrfh2iv495rjq4qmhlycc24dvd02f7n9m"; + }; + libraryHaskellDepends = [ + base ghc-prim ghcjs-ffiqq ghcjs-base ghcjs-prim containers split + template-haskell + ]; + license = pkgs.stdenv.lib.licenses.mit; + description = "bindings for https://github.com/Matt-Esch/virtual-dom"; + inherit (src) homepage; + }) {}; ghcjs-dom = overrideCabal super.ghcjs-dom (drv: { libraryHaskellDepends = with self; [ From c182733691b2e72f8bcf6d9d9f81a1c801df3449 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 7 Dec 2016 01:44:34 +0300 Subject: [PATCH 1248/1749] skype: return to stock qt4 Fix a SIGABRT, also finally get rid of qt4_clang. --- pkgs/top-level/all-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93a045522245..7755312e57de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8964,8 +8964,6 @@ in qt4 = pkgs.kde4.qt4; - qt4_clang = lowPrio (self.qt4.override { stdenv = clangStdenv; }); - qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true mesa = mesa_noglu; @@ -14565,9 +14563,7 @@ in siproxd = callPackage ../applications/networking/siproxd { }; - skype = callPackage_i686 ../applications/networking/instant-messengers/skype { - qt4 = pkgsi686Linux.qt4_clang; - }; + skype = callPackage_i686 ../applications/networking/instant-messengers/skype { }; skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; From 26d6722381e88959ffb1d131af67d6701b8e7230 Mon Sep 17 00:00:00 2001 From: "Rommel M. Martinez" Date: Wed, 7 Dec 2016 07:13:08 +0800 Subject: [PATCH 1249/1749] kubernetes: 1.4.5 -> 1.4.6 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 44444417f3c3..46f5d7fa50ac 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -17,13 +17,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "13lzprvifppnz2r189di7ff2jhvd071b6hxyny12p2hw1b3knnvb"; + sha256 = "1n5ppzr9hnn7ljfdgx40rnkn6n6a9ya0qyrhjhpnbfwz5mdp8ws3"; }; buildInputs = [ makeWrapper which go rsync go-bindata ]; From 705e29046de5eb5ec21894743835676343ef78cb Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Tue, 6 Dec 2016 15:39:34 -0600 Subject: [PATCH 1250/1749] icu: remove icu4c-54.1 Only zoom-us depends on icu4c-54.1. Since we know that version has some vulnerabilities, and zoom-us appears to work with icu4c-57.1, I remove the icu/54.1.nix file, remove icu_54_1 from all-packages.nix, and have zoom-us depend on icu (i.e., icu4c-57.1) --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- pkgs/development/libraries/icu/54.1.nix | 11 ----------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 pkgs/development/libraries/icu/54.1.nix diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index f0243f45b8f0..5f4e0ca1ee0d 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -4,7 +4,7 @@ , glib , gst_plugins_base , gstreamer -, icu_54_1 +, icu , libpulseaudio , libuuid , libxml2 @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { glib gst_plugins_base gstreamer - icu_54_1 + icu libpulseaudio libuuid libxml2 diff --git a/pkgs/development/libraries/icu/54.1.nix b/pkgs/development/libraries/icu/54.1.nix deleted file mode 100644 index a2465ce930ff..000000000000 --- a/pkgs/development/libraries/icu/54.1.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: - -let - icu = import ./default.nix { inherit stdenv fetchurl fetchpatch fixDarwinDylibNames; }; -in - stdenv.lib.overrideDerivation icu (attrs: { - src = fetchurl { - url = "http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.tgz"; - sha256 = "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl"; - }; - }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93a045522245..f685175ec41f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7473,7 +7473,6 @@ in hyena = callPackage ../development/libraries/hyena { }; icu = callPackage ../development/libraries/icu { }; - icu_54_1 = callPackage ../development/libraries/icu/54.1.nix { }; id3lib = callPackage ../development/libraries/id3lib { }; From 984d9ebb56edf3ef2b0690e45c357be35b741dc3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 29 Nov 2016 02:16:15 +0100 Subject: [PATCH 1251/1749] hidepid: polkit and systemd-logind compatibility `systemd.hideProcessInformation = true`, would break interactions requiring polkit arbitration such as initating poweroff/reboot as a normal user; the polkit daemon cannot be expected to make decisions about processes that don't exist as far as it is concerned. systemd-logind lacks the `sys_ptrace` capability and so needs to be part of the designated proc gid, even though it runs as root. Fixes https://github.com/NixOS/nixpkgs/issues/20948 --- nixos/modules/security/hidepid.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/security/hidepid.nix b/nixos/modules/security/hidepid.nix index ee351eb84473..96443fda758c 100644 --- a/nixos/modules/security/hidepid.nix +++ b/nixos/modules/security/hidepid.nix @@ -19,7 +19,9 @@ with lib; config = mkIf config.security.hideProcessInformation { users.groups.proc.gid = config.ids.gids.proc; + users.groups.proc.members = [ "polkituser" ]; boot.specialFileSystems."/proc".options = [ "hidepid=2" "gid=${toString config.ids.gids.proc}" ]; + systemd.services.systemd-logind.serviceConfig.SupplementaryGroups = [ "proc" ]; }; } From c56fa24745374b95ed4ec08a3004d8aab844da09 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 7 Dec 2016 15:01:03 +0900 Subject: [PATCH 1252/1749] styx: 0.3.1 -> 0.4.0 --- pkgs/applications/misc/styx/default.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index aa1c1deebd62..15e8453de515 100644 --- a/pkgs/applications/misc/styx/default.nix +++ b/pkgs/applications/misc/styx/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchFromGitHub, caddy, asciidoctor }: +{ stdenv, fetchFromGitHub, caddy, asciidoctor +, file, lessc, sass, multimarkdown }: stdenv.mkDerivation rec { name = "styx-${version}"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "styx-static"; repo = "styx"; rev = "v${version}"; - sha256 = "0wyibdyi4ld0kfhng5ldb2rlgjrci014fahxn7nnchlg7dvcc5ni"; + sha256 = "1s4465absxqwlwhn5rf51h0s1rw25ls581yjg0fy9kbyhy979qvs"; }; - server = caddy.bin; + setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`"; + + server = "${caddy.bin}/bin/caddy"; nativeBuildInputs = [ asciidoctor ]; - setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`"; + propagatedBuildInputs = [ + file + lessc + sass + asciidoctor + multimarkdown + ]; installPhase = '' mkdir $out @@ -24,6 +33,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/styx cp -r lib $out/share/styx cp -r scaffold $out/share/styx + cp builder.nix $out/share/styx mkdir -p $out/share/doc/styx asciidoctor doc/manual.adoc -o $out/share/doc/styx/index.html From 30d4eca088ce837cc1df5237fdcd84dff2218130 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 7 Dec 2016 15:01:29 +0900 Subject: [PATCH 1253/1749] styx-themes: init --- pkgs/applications/misc/styx/themes.nix | 92 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 94 insertions(+) create mode 100644 pkgs/applications/misc/styx/themes.nix diff --git a/pkgs/applications/misc/styx/themes.nix b/pkgs/applications/misc/styx/themes.nix new file mode 100644 index 000000000000..2b3570608afb --- /dev/null +++ b/pkgs/applications/misc/styx/themes.nix @@ -0,0 +1,92 @@ +{ fetchFromGitHub, stdenv }: + +let + + mkThemeDrv = args: stdenv.mkDerivation { + name = "styx-theme-${args.themeName}-${args.version}"; + + src = fetchFromGitHub ({ + owner = "styx-static"; + repo = "styx-theme-${args.themeName}"; + } // args.src); + + installPhase = '' + mkdir $out + cp -r * $out/ + ''; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + maintainer = with maintainers; [ ericsagnes ]; + description = "${args.themeName} theme for styx"; + platforms = platforms.all; + } // args.meta; + }; + +in +{ + agency = mkThemeDrv { + themeName = "agency"; + version = "2016-12-03"; + src = { + rev = "3604239cc5d940eee9c14ad2540d68a53cfebd7e"; + sha256 = "1kk8d5a3lb7fx1avivjd49gv0ffq7ppiswmwqlcsq87h2dbrqf61"; + }; + meta = { + license = stdenv.lib.licenses.asl20; + longDescription = '' + Agency Theme is a one page portfolio for companies and freelancers. + This theme features several content sections, a responsive portfolio + grid with hover effects, full page portfolio item modals, a timeline, + and a contact form. + ''; + }; + }; + + hyde = mkThemeDrv { + themeName = "hyde"; + version = "2016-12-03"; + src = { + rev = "b6b9b77839959fbf3c9ca3a4488617fa1831cd28"; + sha256 = "0d1k03mjn08s3rpc5rdivb8ahr345kblhqyihxnfgd1501ih9pg6"; + }; + meta = { + license = stdenv.lib.licenses.mit; + longDescription = '' + Hyde is a brazen two-column Jekyll theme that pairs a prominent sidebar + with uncomplicated content. + ''; + }; + }; + + orbit = mkThemeDrv { + themeName = "orbit"; + version = "2016-12-03"; + src = { + rev = "1d41745c689c4336d4e2bfbb2483b80e67ec96e4"; + sha256 = "19pp9dykqxmrixn3cvqpdpcqy547y9n5izqhz0c4a11mmm0v3v64"; + }; + meta = { + license = stdenv.lib.licenses.cc-by-30; + longDescription = '' + Orbit is a free resume/CV template designed for developers. + ''; + }; + }; + + showcase = mkThemeDrv { + themeName = "showcase"; + version = "2016-12-04"; + src = { + rev = "33feb0a09183e88d3580e9444ea36a255dffef60"; + sha256 = "01ighlnrja442ip5fhllydl77bfdz8yig80spmizivdfxdrdiyyf"; + }; + meta = { + license = stdenv.lib.licenses.mit; + longDescription = '' + Theme that show most of styx functionalities with a basic design. + ''; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 564e52777f79..4afa32a1125f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14596,6 +14596,8 @@ in styx = callPackage ../applications/misc/styx { }; + styx-themes = callPackage ../applications/misc/styx/themes.nix { }; + tecoc = callPackage ../applications/editors/tecoc { }; viber = callPackage ../applications/networking/instant-messengers/viber { }; From d76c48796e0b89fc2ea3082e2dafc5afe6cbbed0 Mon Sep 17 00:00:00 2001 From: demoslam Date: Tue, 6 Dec 2016 22:22:03 -0800 Subject: [PATCH 1254/1749] silver-searcher: 0.33.0 -> 1.0.2 --- pkgs/tools/text/silver-searcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 2f12020afc39..26e1f9ef2759 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "silver-searcher-${version}"; - version = "0.33.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "ggreer"; repo = "the_silver_searcher"; rev = "${version}"; - sha256 = "19705cgn8h476hkfyal3s5kx9mnz64hiz6dihnrx22fa3xvjfzlg"; + sha256 = "1c504x62yxf4b5k8ixvr97g97nd4kff32flxdjnvxvcrrnany8zx"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; From 08721190a5e71ead08f4283e075ad92a4628da06 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 7 Dec 2016 14:34:43 +0800 Subject: [PATCH 1255/1749] dropbox: 14.4.19 -> 15.4.22 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 3c1ae4b2bbde..edfa9a6d7550 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "14.4.19"; + version = "15.4.22"; sha256 = { - "x86_64-linux" = "06ln88dx6k1d2b2wwj66gj1gyy0s3xvs7m50v8i2ycdw3d9kimkw"; - "i686-linux" = "0mil1h86r8fmzxb6d7ycwz9yqkmj66k37zxxb2x8mw15l9qndrwf"; + "x86_64-linux" = "105a64w6rxhrg2dcpb4h4a2956x2r7flf41rszhw5nnczal0s8gx"; + "i686-linux" = "001c6dfdxip67w19h3zlx8w72kvnkl1hbkj7gqvw9lixmnq82fhr"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = From f067bca841e788cc744b285840b53d0610d57ddf Mon Sep 17 00:00:00 2001 From: David Terry Date: Wed, 7 Dec 2016 09:06:25 +0100 Subject: [PATCH 1256/1749] nixos: docs: note that channels are per user --- nixos/doc/manual/installation/upgrading.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index 65d395b0c88e..c974523f886c 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -101,6 +101,11 @@ channel by running which is equivalent to the more verbose nix-channel --update nixos; nixos-rebuild switch. +Channels are set per user. This means that running +nix-channel --add as a non root user (or without sudo) will not +affect configuration in /etc/nixos/configuration.nix + + It is generally safe to switch back and forth between channels. The only exception is that a newer NixOS may also have a newer Nix version, which may involve an upgrade of Nix’s database From 72004245891286f92542abd9517bc4d982eb7d06 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Wed, 7 Dec 2016 11:25:32 +0000 Subject: [PATCH 1257/1749] hashcat3: init at 3.10 --- .../security/hashcat/hashcat3/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/security/hashcat/hashcat3/default.nix diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix new file mode 100644 index 000000000000..ef41b0b2a0ed --- /dev/null +++ b/pkgs/tools/security/hashcat/hashcat3/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, makeWrapper, opencl-headers, opencl-icd }: + +assert stdenv.isLinux; + +stdenv.mkDerivation rec { + name = "hashcat-${version}"; + version = "3.10"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://hashcat.net/files_legacy/hashcat-${version}.tar.gz"; + sha256 = "1sg30d9as6xsl7b0i7mz26igachbv0l0yimwb12nmarmgdgmwm9v"; + }; + + buildInputs = [ opencl-headers makeWrapper ]; + + makeFlags = [ "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" ]; + + # $out is not known until the build has started. + configurePhase = '' + makeFlags="$makeFlags PREFIX=$out" + ''; + + postFixup = '' + wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${opencl-icd}/lib + ''; + + meta = { + description = "Fast password cracker"; + homepage = http://hashcat.net/hashcat/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.kierdavis ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b206f89402d..3701d224f8ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2101,6 +2101,7 @@ in hardlink = callPackage ../tools/system/hardlink { }; hashcat = callPackage ../tools/security/hashcat { }; + hashcat3 = callPackage ../tools/security/hashcat/hashcat3 { }; hash-slinger = callPackage ../tools/security/hash-slinger { }; From 797a784d6f45e26e11e970d3668a763621bf1b3c Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Wed, 7 Dec 2016 13:16:11 +0100 Subject: [PATCH 1258/1749] python-mapnik: add cairo to buildInputs --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d769053f0f84..f71b48d2c53a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8169,7 +8169,7 @@ in { disabled = isPyPy; doCheck = false; # doesn't find needed test data files buildInputs = with pkgs; - [ boost harfbuzz icu libjpeg libpng libtiff libwebp mapnik proj zlib ]; + [ boost cairo harfbuzz icu libjpeg libpng libtiff libwebp mapnik proj zlib ]; propagatedBuildInputs = with self; [ pillow pycairo ]; meta = with stdenv.lib; { From 76ef70af7d2bcdbac6c3ff5e182f3cbd7516f42f Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 07:24:13 -0500 Subject: [PATCH 1259/1749] imagemagick: 6.9.6-2 -> 6.9.6-7 for CVE-2016-9556 and CVE-2016-9559 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c7d1adfdd182..1095ff97fc5a 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -11,8 +11,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.6-2"; - sha256 = "139h9lycxw3lszn052m34xm0rqyanin4nb529vxjcrkkzqilh91r"; + version = "6.9.6-7"; + sha256 = "1ls3g4gpdh094n03szr9arpr0rfwd1krv2s9gnck8j0ab10ccgs5"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. From a11ad092d65d1ac63af1b9b8b6b39afa862d7c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 7 Dec 2016 13:25:18 +0100 Subject: [PATCH 1260/1749] digikam: remove file unintentionally resurrected ... in 8b565d647. Git's rename semantics is a real PITA. https://github.com/NixOS/nixpkgs/commit/8b565d647#commitcomment-20099695 --- pkgs/applications/graphics/digikam/5.1.nix | 120 --------------------- 1 file changed, 120 deletions(-) delete mode 100644 pkgs/applications/graphics/digikam/5.1.nix diff --git a/pkgs/applications/graphics/digikam/5.1.nix b/pkgs/applications/graphics/digikam/5.1.nix deleted file mode 100644 index 6bd572e99bba..000000000000 --- a/pkgs/applications/graphics/digikam/5.1.nix +++ /dev/null @@ -1,120 +0,0 @@ -{ stdenv, fetchurl, cmake, ecm, makeQtWrapper - -# For `digitaglinktree` -, perl, sqlite - -, qtbase -, qtxmlpatterns -, qtsvg -, qtwebkit - -, kconfigwidgets -, kcoreaddons -, kdoctools -, kfilemetadata -, knotifications -, knotifyconfig -, ktextwidgets -, kwidgetsaddons -, kxmlgui - -, bison -, boost -, eigen -, exiv2 -, flex -, jasper -, lcms2 -, lensfun -, libgphoto2 -, libkipi -, liblqr1 -, libusb1 -, marble -, mysql -, opencv -, threadweaver - -# For panorama and focus stacking -, enblend-enfuse -, hugin -, gnumake - -, oxygen -}: - -stdenv.mkDerivation rec { - name = "digikam-${version}"; - version = "5.1.0"; - - src = fetchurl { - url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; - sha256 = "1w97a5cmg39dgmjgmjwa936gcrmxjms3h2ww61qi1lny84p5x4a7"; - }; - - nativeBuildInputs = [ cmake ecm makeQtWrapper ]; - - buildInputs = [ - qtbase - qtxmlpatterns - qtsvg - qtwebkit - - kconfigwidgets - kcoreaddons - kdoctools - kfilemetadata - knotifications - knotifyconfig - ktextwidgets - kwidgetsaddons - kxmlgui - - bison - boost - eigen - exiv2 - flex - jasper - lcms2 - lensfun - libgphoto2 - libkipi - liblqr1 - libusb1 - marble.unwrapped - mysql - opencv - threadweaver - - oxygen - ]; - - enableParallelBuilding = true; - - cmakeFlags = [ - "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" - "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0" - "-DENABLE_MYSQLSUPPORT=1" - "-DENABLE_INTERNALMYSQL=1" - ]; - - fixupPhase = '' - substituteInPlace $out/bin/digitaglinktree \ - --replace "/usr/bin/perl" "${perl}/bin/perl" \ - --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" - - wrapQtProgram $out/bin/digikam \ - --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin" - - wrapQtProgram $out/bin/showfoto - ''; - - meta = { - description = "Photo Management Program"; - license = stdenv.lib.licenses.gpl2; - homepage = http://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - platforms = stdenv.lib.platforms.linux; - }; -} From e5cca82d7969879c1b50f1cd9325ebbbfa76839f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 6 Dec 2016 16:34:18 +0100 Subject: [PATCH 1261/1749] make-disk-image: run tune2fs after umount to skip fsck tune2fs marks the filesystem as clean to prevent resize2fs from complaining. But we were invoking it before we mounted the filesystem, so the counters would increase to 1 and it broke the functionality. By moving the call after the mount, I have confirmed it works by: $ nix-build nixos/tests/ec2.nix cc @rbvermaa @edolstra --- nixos/lib/make-disk-image.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 58d0cb38d75f..b8411f5e5ecd 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -61,9 +61,6 @@ pkgs.vmTools.runInLinuxVM ( # Create an empty filesystem and mount it. mkfs.${fsType} -L nixos $rootDisk - ${optionalString (fsType == "ext4") '' - tune2fs -c 0 -i 0 $rootDisk - ''} mkdir /mnt mount $rootDisk /mnt @@ -97,7 +94,9 @@ pkgs.vmTools.runInLinuxVM ( umount /mnt - # Do a fsck to make sure resize2fs works. - fsck.${fsType} -f -y $rootDisk + # Make sure resize2fs works + ${optionalString (fsType == "ext4") '' + tune2fs -c 0 -i 0 $rootDisk + ''} '' ) From 00b3d6957af15a22281eb2a88e732597d0b7a848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 7 Dec 2016 01:03:18 +0100 Subject: [PATCH 1262/1749] pythonPackages.chameleon: 2.15 -> 2.25 --- pkgs/top-level/python-packages.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f71b48d2c53a..1b08d0e6fb4a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9771,18 +9771,15 @@ in { chameleon = buildPythonPackage rec { - name = "Chameleon-2.15"; + name = "Chameleon-2.25"; src = pkgs.fetchurl { url = "mirror://pypi/C/Chameleon/${name}.tar.gz"; - sha256 = "bd1dfc96742c2a5b0b2adcab823bdd848e70c45a994dc4e51dd2cc31e2bae3be"; - }; + sha256 = "0va95cml7wfjpvgj3dc9xdn8psyjh3zbk6v51b0hcqv2fzh409vb"; + } ; buildInputs = with self; [] ++ optionals isPy26 [ ordereddict unittest2 ]; - # TODO: https://github.com/malthe/chameleon/issues/139 - doCheck = false; - meta = { maintainers = with maintainers; [ garbas domenkozar ]; platforms = platforms.all; From b6363c7bc89514e14573cf806326adac46ad06a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 7 Dec 2016 13:29:07 +0100 Subject: [PATCH 1263/1749] make-disk-image: make store validity fix optional This is useful for EC2 AMI generation to speedup the process. In my case it removes 13min out of 45min when generating an image on EC2. --- nixos/lib/make-disk-image.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index b8411f5e5ecd..e279803f2ea0 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -27,6 +27,10 @@ , name ? "nixos-disk-image" + # This prevents errors while checking nix-store validity, see + # https://github.com/NixOS/nix/issues/1134 +, fixValidity ? true + , format ? "raw" }: @@ -68,9 +72,11 @@ pkgs.vmTools.runInLinuxVM ( printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group "" - # Add missing size/hash fields to the database. FIXME: - # exportReferencesGraph should provide these directly. - ${config.nix.package.out}/bin/nix-store --verify --check-contents --option build-users-group "" + ${if fixValidity then '' + # Add missing size/hash fields to the database. FIXME: + # exportReferencesGraph should provide these directly. + ${config.nix.package.out}/bin/nix-store --verify --check-contents --option build-users-group "" + '' else ""} # In case the bootloader tries to write to /dev/sda… ln -s vda /dev/xvda From c677c35922b06f8861bfd97e79c3e8803e55fe0c Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 08:10:39 -0500 Subject: [PATCH 1264/1749] calamares: remove due to being broken and insecure. --- pkgs/tools/misc/calamares/default.nix | 57 --------------------------- pkgs/top-level/all-packages.nix | 6 --- 2 files changed, 63 deletions(-) delete mode 100644 pkgs/tools/misc/calamares/default.nix diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix deleted file mode 100644 index 9356eb365497..000000000000 --- a/pkgs/tools/misc/calamares/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, cmake, polkit-qt, libyamlcpp, python, boost, parted -, extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart -, ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtsvg, qttools }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "calamares"; - version = "1.1.4.2"; - - # release including submodule - src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1mh0nmzc3i1aqcj79q2s3vpccn0mirlfbj26sfyb0v6gcrvf707d"; - }; - - buildInputs = [ - cmake qtbase qtsvg qttools libyamlcpp python boost polkit-qt parted - extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart - ]; - - cmakeFlags = [ - "-DPYTHON_LIBRARY=${python}/lib/libpython${python.majorVersion}m.so" - "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" - "-DWITH_PARTITIONMANAGER=1" - ]; - - patchPhase = '' - sed -e "s,/usr/bin/calamares,$out/bin/calamares," \ - -i calamares.desktop \ - -i com.github.calamares.calamares.policy - - sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \ - -i src/modules/locale/timezonewidget/localeconst.h \ - -i src/modules/locale/SetTimezoneJob.cpp - - sed -e 's,/usr/share/i18n/locales,${glibc.out}/share/i18n/locales,' \ - -i src/modules/locale/timezonewidget/localeconst.h - - sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \ - -i src/modules/keyboard/keyboardwidget/keyboardglobal.h - - sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \ - -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp - ''; - - preInstall = '' - substituteInPlace cmake_install.cmake --replace "${polkit-qt}" "$out" - ''; - - meta = with stdenv.lib; { - description = "Distribution-independent installer framework"; - license = licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b206f89402d..922af73fd200 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -715,12 +715,6 @@ in caddy = callPackage ../servers/caddy { }; - calamares = qt5.callPackage ../tools/misc/calamares rec { - python = python3; - boost = pkgs.boost.override { python=python3; }; - libyamlcpp = callPackage ../development/libraries/libyaml-cpp { boost=boost; }; - }; - capstone = callPackage ../development/libraries/capstone { }; catch = callPackage ../development/libraries/catch { }; From e42f6a11acb1cdd5b8bb033ac275ff15e1e48d11 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 08:49:24 -0500 Subject: [PATCH 1265/1749] gstreamer: 1.10.1 -> 1.10.2 for multiple CVEs CVE-2016-9807, CVE-2016-9808, CVE-2016-9809, CVE-2016-9810, CVE-2016-9811, CVE-2016-9812, CVE-2016-9813, CVE-2016-9634, CVE-2016-9635, CVE-2016-9636 https://gstreamer.freedesktop.org/releases/1.10/#1.10.2 --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/base/default.nix | 5 ++--- pkgs/development/libraries/gstreamer/core/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/ges/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/good/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/libav/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/python/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/ugly/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/vaapi/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/validate/default.nix | 5 ++--- 10 files changed, 20 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 4e18e4d16b2c..7479c153af21 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -14,7 +14,7 @@ let inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.10.1"; + name = "gst-plugins-bad-1.10.2"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "07cjra4fclrk6lpdm5hrsgp79aqpklx3v3l9scain091zvchwghk"; + sha256 = "0fisnnfpp3s8pbm6hjrfi4wjpq2da8c6w3ns9pjcg7590f9wm587"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 319f7c75a750..c3e8f3c65a15 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.10.1"; + name = "gst-plugins-base-1.10.2"; meta = { description = "Base plugins and helper libraries"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "1jbnr6vbklzli493xdd8y5sflm32r90lifpacxw9vbvs9hlyxkv6"; + sha256 = "086yjwmp4fykcqkj6zqhwrk2z49981kl8x545vz2wvblrc7x9h7v"; }; outputs = [ "out" "dev" ]; @@ -44,4 +44,3 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; } - diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 55da05c4c971..8b27fa7ad3b3 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.10.1"; + name = "gstreamer-1.10.2"; meta = { description = "Open source multimedia framework"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "1npnpyrw8603ivi5g3ziglvh3hq2shypid2vjcmki6g6w2bgk3gn"; + sha256 = "0rcd4ya4k99x6ngm9v78as7ql0rqibkwshc13lb4rjdszs0qw3hm"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 06776de9340c..a45c190b0207 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.10.1"; + name = "gstreamer-editing-services-1.10.2"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "048dxpbzmidbl1sb902nx8rkg8m0z69f3dn7vfhs1ai68x2hzip9"; + sha256 = "0hx7bwj8li88qq09slvdxlnfq76hr35nyjvd4ixrz5gmkpmrl5fv"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index ba6f79c138ab..fbf67fb34f54 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -10,7 +10,7 @@ let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.10.1"; + name = "gst-plugins-good-1.10.2"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "1hkcap9l2603266gyi6jgvx7frbvfmb7xhfhjizbczy1wykjwr57"; + sha256 = "04rksbhjj2yz32g523cfabwqn2s3byd94dpbxghxr0p9ridk53qr"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 7ae10f50c4d6..447b679898a4 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,7 +9,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.10.1"; + name = "gst-libav-1.10.2"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "1ivjbh5g0l5ykfpc16kq5x2jz8d4ignyha14jpiz3pz6w26qpci7"; + sha256 = "0g778j7w4vpbhwjzyrzpajvr26nxm6vqby84v8g1w1hz44v71pd3"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 78127e3ce98a..880b5d734d41 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -6,14 +6,14 @@ let inherit (pythonPackages) python pygobject3; in stdenv.mkDerivation rec { - name = "gst-python-1.10.1"; + name = "gst-python-1.10.2"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "04xhh0z0c0s6aq7kvmfs4r6yl1pjnqz0krp05pbjy62ayx5b61ak"; + sha256 = "1sljnqkxf2ix6yzghrapw5irl0rbp8aa8w2hggk7i6d9js10ls71"; }; patches = [ ./different-path-with-pygobject.patch ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index df5b682a2371..981a05b4f1f7 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.10.1"; + name = "gst-plugins-ugly-1.10.2"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "1hl385fys7hfx5ffipavvhciq6hwm731rs4d6r9fn7h9qagxbv55"; + sha256 = "17gc2zd3v6spmm2d6912sqfcyyv5f2ghdhq31f5kx5mw5r6ds0zk"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index f18b9fc214dc..f136df099bf2 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "0d6sw5j7x3ah7zlcipy7w3fwag0fqxyfgc8q4phnazgk16kcmblr"; + sha256 = "1abzaj9kczap1xmalgzid1k3gqcn1ghnn76cn2kclc1gbfwd4ccy"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 2f5ba2372ce7..a05bbd3e9a2f 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gst-validate-1.10.1"; + name = "gst-validate-1.10.2"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "0x9z0kizi44swsrx8mdc6xlmn9dksdfifchp5h6liibp7qd6gbh7"; + sha256 = "1mwyk3b19aq78mjhmrpc7qqs9flrykrn1j763g5wx546swc489xy"; }; outputs = [ "out" "dev" ]; @@ -31,4 +31,3 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; } - From 61e9862bc0fa2013267ec076a1c414ffe3b27aca Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Wed, 7 Dec 2016 15:25:31 +0100 Subject: [PATCH 1266/1749] nodejs: 7.1.0 -> 7.2.1 --- pkgs/development/web/nodejs/v7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix index 544f438cf86a..659aa47985aa 100644 --- a/pkgs/development/web/nodejs/v7.nix +++ b/pkgs/development/web/nodejs/v7.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "7.1.0"; + version = "7.2.1"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "10a9rwi9v8ylpxydfh1f59smqbljk5axqwghp1qszqwh40d87bjm"; + sha256 = "03fqv6k8y42ldnrz4iirhwg6wdyw8z95h9h40igiriicbnm072y0"; }; }) From 59134519eefd1bc2b855b7e918e3f380e8c222dc Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Wed, 7 Dec 2016 17:58:36 +0100 Subject: [PATCH 1267/1749] fix win-dll-link.sh setup hook (#20925) if a dll is symlink then dll files from the symlinked directory need to be taken --- pkgs/build-support/setup-hooks/win-dll-link.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/win-dll-link.sh b/pkgs/build-support/setup-hooks/win-dll-link.sh index be63f69ca10b..634a9d18f00d 100644 --- a/pkgs/build-support/setup-hooks/win-dll-link.sh +++ b/pkgs/build-support/setup-hooks/win-dll-link.sh @@ -33,7 +33,7 @@ _linkDLLs() { # That DLL might have its own (transitive) dependencies, # so add also all DLLs from its directory to be sure. local dllPath2 - for dllPath2 in "$dllPath" "$(dirname "$dllPath")"/*.dll; do + for dllPath2 in "$dllPath" "$(dirname $(readlink "$dllPath" || echo "$dllPath"))"/*.dll; do if [ -e ./"$(basename "$dllPath2")" ]; then continue; fi ln -sr "$dllPath2" . linkCount=$(($linkCount+1)) From 49187304d8fcd8272f0e85e4f78a603ed1055cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 7 Dec 2016 18:25:04 +0100 Subject: [PATCH 1268/1749] libdwarf: security 20161021 -> 20161124 /cc #20972. It seems safe API+ABI-wise: https://abi-laboratory.pro/tracker/timeline/libdwarf/ Also nitpicks: meta.homepage, etc. Note: `darwin.dtrace` probably contains an embedded copy of libdwarf, which I didn't (attempt to) fix. --- pkgs/development/libraries/libdwarf/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index a064769ec843..eda68fc73d3f 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, libelf }: stdenv.mkDerivation rec { - name = "libdwarf-20161021"; + name = "libdwarf-20161124"; src = fetchurl { url = "http://www.prevanders.net/${name}.tar.gz"; - sha512 = "733523fd5c58f878d65949c1812b2f46b40c4cc3177bc780c703ec71f83675d4b84e81bc1bcca42adf69b5e122562e4ce8e9a8743af29cc6fafe78ed9f8213fd"; + sha512 = "38e480bce5ae8273fd585ec1d8ba94dc3e865a0ef3fcfcf38b5d92fa1ce41f8b" + + "8c95a7cf8a6e69e7c6f638a3cc56ebbfb37b6317047309725fa17e7929096799"; }; - configureFlags = " --enable-shared --disable-nonshared"; + configureFlags = [ "--enable-shared" "--disable-nonshared" ]; preConfigure = '' cd libdwarf @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://reality.sgiweb.org/davea/dwarf.html; + homepage = https://www.prevanders.net/dwarf.html; platforms = stdenv.lib.platforms.linux; }; } From 1039d9d7ebafa38aabe7f96e69dbedac8beb39c5 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Dec 2016 16:52:34 -0200 Subject: [PATCH 1269/1749] arc-theme: 2016-10-13 -> 2016-11-25 --- pkgs/misc/themes/arc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index 09599604a472..523ac16bf6a2 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "arc-theme"; - version = "2016-10-13"; + version = "2016-11-25"; src = fetchFromGitHub { owner = "horst3180"; repo = pname; - rev = "a9ce9d56ae61f23592fa4a8c200085dde7b43e07"; - sha256 = "02w8nckd4q548shdgml9ndnbnq1g7nq6v8df89mx4l3lc9r6354y"; + rev = "d641d3de1641a9aa0a0f6ac1bacec91d9fdd3326"; + sha256 = "06ysd19bpqsng2bp2gqzn0wpjhldxgwvlzngrs6mkm9hr7ky5z00"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From a634fe83a32b57ebd3e98bfa69d314d0b8770958 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Dec 2016 17:10:45 -0200 Subject: [PATCH 1270/1749] arc-icon-theme: 2016-07-07 -> 2016-11-22 --- pkgs/data/icons/arc-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index 760329a94bfa..91e379de223a 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "arc-icon-theme"; - version = "2016-07-07"; + version = "2016-11-22"; src = fetchFromGitHub { owner = "horst3180"; repo = package-name; - rev = "664c05e723ac2971feb123d7baca3d298248e7f9"; - sha256 = "10vicnrv2v7y4capvllaz9x3nzjkjj9fs1dspjjjg6if3gcif7m4"; + rev = "55a575386a412544c3ed2b5617a61f842ee4ec15"; + sha256 = "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd"; }; nativeBuildInputs = [ autoreconfHook ]; From 1494ede691aaccdd9c26ecee1440e43c2966ea6a Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Dec 2016 17:27:42 -0200 Subject: [PATCH 1271/1749] paper-icon-theme: 2016-06-08 -> 2016-11-05 --- pkgs/data/icons/paper-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index 4baaca194bf3..13adb7efaafc 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "paper-icon-theme"; - version = "2016-06-08"; + version = "2016-11-05"; src = fetchFromGitHub { owner = "snwh"; repo = package-name; - rev = "6aa0a2c8d802199d0a9f71579f136bd6476d5d8e"; - sha256 = "07ak1lnvd0gwaclkcvccjbxikh701vfi07gmjp4zcqi6b5crl7f5"; + rev = "2a1f25a47fe8fb92e9d4db5537bbddb539586602"; + sha256 = "0v956wrfraaj5qznz86q7s3zi55xd3gxmg7pzcfsw2ghgfv13swd"; }; nativeBuildInputs = [ autoreconfHook ]; From 1678119dcc9ce7623bd8ad0932cdaa9d0486a1b9 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Dec 2016 17:38:07 -0200 Subject: [PATCH 1272/1749] paper-gtk-theme: 2016-05-27 -> 2016.08-16 --- pkgs/misc/themes/paper/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix index 5dfb54fa493c..32883127c064 100644 --- a/pkgs/misc/themes/paper/default.nix +++ b/pkgs/misc/themes/paper/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }: stdenv.mkDerivation rec { - version = "2016-05-27"; + version = "2016-08-16"; name = "paper-gtk-theme-${version}"; src = fetchFromGitHub { owner = "snwh"; repo = "paper-gtk-theme"; - rev = "06fb8b41743dd99410c08a9beabc323e6631d009"; - sha256 = "1gffjsgs43rvxs8ryd5c3yfrp3a69d5wvjmiixwwp1qn1fr46dni"; + rev = "f75724fd76fd2e5681a367cca246a51f845320c3"; + sha256 = "0dqllzjk9ggnbh8vvy2c81p3wq6cj73r30hk7gqhrn8i91w8p896"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth"; homepage = "http://snwh.org/paper"; license = licenses.gpl3; - maintainers = [ maintainers.simonvandel maintainers.romildo ]; platforms = platforms.linux; + maintainers = [ maintainers.simonvandel maintainers.romildo ]; }; } From dd5eb0d03af850977934d71ebffaaa1ca6c66cbc Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Dec 2016 17:56:14 -0200 Subject: [PATCH 1273/1749] elementary-icon-theme: 4.0.1 -> 4.0.1.1 --- pkgs/data/icons/elementary-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix index b15e8dea5bc8..008a41125315 100644 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.0.1.1"; package-name = "elementary-icon-theme"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz"; - sha256 = "0cbgbd9fqxk6rbsrj0gbh1rcapkkdlaig79kilq798v94jfdskrl"; + sha256 = "1p20569lxgkif4gzvgpisd8vg93zxd6447y634lv7ay85nq4lx76"; }; dontBuild = true; From 979a1a10438de2fa7822376b077aa4d2d25c4786 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Dec 2016 18:33:28 -0200 Subject: [PATCH 1274/1749] numix-icon-theme: 2016-10-05 -> 2016-11-13 --- pkgs/data/icons/numix-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index be224f418e80..8732172ead4c 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2016-10-05"; + version = "2016-11-13"; package-name = "numix-icon-theme"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "e03eb71454c176a98733eafa268ff79995f8159d"; - sha256 = "1f8prwq9zvzfk0ncwzbrwkpjggc8nadny81dqv1cr0014jc85bxi"; + rev = "45878a1195abd997341c91d51381625644f9a356"; + sha256 = "0in7vx8mdwbfkgylh9p95kcsnn7dnv2vpmv788n0bbgldxmrldga"; }; dontBuild = true; From 0a0996969321f2557a645eb6033312b7da7192a5 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Dec 2016 18:45:25 -0200 Subject: [PATCH 1275/1749] numix-gtk-theme: 2016-06-12 -> 2016-11-19 --- pkgs/misc/themes/numix/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix index b8dac2540090..740bafe8bd44 100644 --- a/pkgs/misc/themes/numix/default.nix +++ b/pkgs/misc/themes/numix/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2016-06-12"; + version = "2016-11-19"; name = "numix-gtk-theme-${version}"; src = fetchFromGitHub { repo = "numix-gtk-theme"; owner = "numixproject"; - rev = "1d941a15971f43fb2f5675c7059bf313b78797fc"; - sha256 = "14b1gl761acdza4bkqr6dvsblvi2wsph79j5jircxfd3wgvm756i"; + rev = "0e4a840bd1ec434ba660418caaa59ada05d8660e"; + sha256 = "09nacjwrl5k3dgji2smdv6q5v23qjzfayic044bnjfm5d3p3yf6n"; }; nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out + patchShebangs . ''; meta = { From 41256881bf8407cfc07370059634030574830090 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 7 Dec 2016 15:01:32 +0000 Subject: [PATCH 1276/1749] gti: 2015-05-21 -> 2016-12-07 No need to replace gcc with cc thanks to https://github.com/rwos/gti/pull/26 --- pkgs/tools/misc/gti/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix index 3705dd832e9d..726c7a115eef 100644 --- a/pkgs/tools/misc/gti/default.nix +++ b/pkgs/tools/misc/gti/default.nix @@ -2,19 +2,15 @@ stdenv.mkDerivation rec { name = "gti-${version}"; - version = "2015-05-21"; + version = "2016-12-07"; src = fetchFromGitHub { owner = "rwos"; repo = "gti"; - rev = "edaac795b0b0ff01f2347789f96c740c764bf376"; - sha256 = "1wki7d61kcmv9s3xayky9cz84qa773x3y1z88y768hq8ifwadcbn"; + rev = "d78001bd5b4b6f6ad853b4ec810e9a1ecde1ee32"; + sha256 = "0449h9m16x542fy6gmhqqkvkg7z7brxw5vmb85nkk1gdlr9pl1mr"; }; - prePatch = '' - substituteInPlace Makefile --replace gcc cc - ''; - installPhase = '' mkdir -p $out/bin $out/share/man/man6 cp gti $out/bin From 6f0564bb8cbdc2d85ad82d27d9ea93ec0c6970f6 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sat, 3 Dec 2016 04:22:13 -0500 Subject: [PATCH 1277/1749] melpa-packages: 2016-12-07 Removals: - debian-bug: cvs server timed out - elang: removed from melpa --- .../editors/emacs-modes/melpa-generated.nix | 1739 +++++++++-------- 1 file changed, 953 insertions(+), 786 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 7214f1c850d1..8ac53e85728f 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -316,12 +316,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "20150906.1008"; + version = "20161202.725"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "6b3365063ddfb88d5527618217bb56166349ad4e"; - sha256 = "0n9zagwh3rz7b76irj4ya8wskffns9v1c1pivsdqgpd76spvl7n5"; + rev = "ad75d193bb8962136e1ecac04d33352dd70fb72e"; + sha256 = "0pchbhcs3bjf8r6f24lcf29in011502ncr2gi72faww6iz0pb285"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -380,8 +380,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "f2247f2515ee2eb0ff866bcbbf69d9f62b7b7780"; - sha256 = "1d3zyaqgng0q41nnifmwwwwd9bm0w7yhkpj6lwir3m0pg5lrcw48"; + rev = "7d3beb299399bc9d8190190fa59943b2a70a7f63"; + sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -464,8 +464,8 @@ src = fetchFromGitHub { owner = "xiaohanyu"; repo = "ac-geiser"; - rev = "cecfcf1a5c4be580b9337d9f4f9337c6ae1e0d91"; - sha256 = "0zaia963kpnqmlxafp0m0jibzz6fvvjj7f1v4lcwb9cvs2b7vq1m"; + rev = "502d18a8a0bd4b5fdd495a99299ba2a632c5cd9a"; + sha256 = "0h2kakb4f5hgzf5l2kpqngalcmc4402lkg1pvs88c8z4rqp2vfvz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/586ef409e3ae758b459b625d4bf0108f0525a085/recipes/ac-geiser"; @@ -985,12 +985,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20160925.1210"; + version = "20161203.1059"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "822628e39345b77f9444fdfc17bd660b7831e536"; - sha256 = "002wi64awig3kdyihqdisxsfaiailyjw90ah9j1i6qqasgvm9acn"; + rev = "3691a0ca4d897d1b5f51795a14dc33b4ee48dd4a"; + sha256 = "0yhy6cq19zllc8cycpq5assdgdmhl77ybs7xr3q99m0jqx20g5xx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1173,12 +1173,12 @@ addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "addressbook-bookmark"; - version = "20161123.407"; + version = "20161130.150"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "addressbook-bookmark"; - rev = "98bb27cea55250bbd32e44002b48cd59e436c089"; - sha256 = "0lv7jn4s0fb995z3hy2s3z22yg69zncxc9hwsmpdgh56ds1mw68i"; + rev = "ad3c73369b804a48803fdfdf2ab613e6220260de"; + sha256 = "012kfqkmpagn8jrp09acpx631qmjim7b33j0pahv1fcqhin89pn6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark"; @@ -1299,12 +1299,12 @@ aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aggressive-indent"; - version = "20161016.1016"; + version = "20161201.1001"; src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; - rev = "a8c462fbc03ef74e65f4d4a323ae3581f99e9683"; - sha256 = "00j7mvzn1qsbk5xcw4h2wzwp1wzjvdn9qa3s0laa9x33k6kpxbha"; + rev = "dfdf3b23d147a3b4d5e8ed80ee9ea098f65ca48c"; + sha256 = "01rb57qamwyaip3ar81vdxyri0s4vpbvpyphhcijin0a8ny33qwa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; @@ -1570,12 +1570,12 @@ all-the-icons-dired = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "all-the-icons-dired"; - version = "20161113.1217"; + version = "20161203.605"; src = fetchFromGitHub { owner = "jtbm37"; repo = "all-the-icons-dired"; - rev = "e0244106e06a7cf769bcf36a34fff211d8f67e62"; - sha256 = "1xgp72ycnl1m1lx3cnygd0nssn6nr0x543rq1cmdxdr6snf5j152"; + rev = "3ccab8ae4113e03ff2c7b103d388fa6ec1447d9c"; + sha256 = "0rbcbhsw5js9wx29pp65s7q6mxhbz1jskhvzl0k4gqlk4m6gqcxq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8e432e3cd316ffeb7e0b68b855e23bcc3b9491/recipes/all-the-icons-dired"; @@ -1591,12 +1591,12 @@ amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "20161116.534"; + version = "20161124.550"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "a50cbdd53bc0e1ed0f96a425bd29f5b706161c18"; - sha256 = "12wxjgvxhnmn27dl2p5m90nxmfkk64w1fn4zmxn2a4fpvb7y579s"; + rev = "977b53e28b3141408fff4814be8b67ee23650cac"; + sha256 = "0m80bwar80qsga735cqrn6rbvfz4w9a036zh8inhsigylv3vwqjv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -2081,11 +2081,11 @@ anything = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything"; - version = "20160822.1852"; + version = "20161207.238"; src = fetchgit { url = "http://repo.or.cz/r/anything-config.git"; - rev = "86560874b1c77932502efd42727b783ebc2d173b"; - sha256 = "1ng89ajvhrzbp7cfpb6vhq7507ybi18gicn0j89m3yrl7vfiwx4n"; + rev = "43e88980a29618dc03f96ce38b67b2a7caadd9d9"; + sha256 = "0dcaqss1b3myn8b4xfpyhnp9h2xniainayflhhgdk88y7vbfx0j7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1700e86cb35617178f5d7c61c88718ac7849f9b/recipes/anything"; @@ -2696,12 +2696,12 @@ assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }: melpaBuild { pname = "assess"; - version = "20161114.1451"; + version = "20161203.327"; src = fetchFromGitHub { owner = "phillord"; repo = "assess"; - rev = "9521b074808d30c50d45eba7d5c186c79d165e8c"; - sha256 = "164kapf9n5gqgnsg3rrlb5r2j9sq5yn7kf1bd1vfh3i5zdlhl0wy"; + rev = "47ce039423f660174d097698615aaad6c77e87fb"; + sha256 = "16b0fdz1nj25bkzb3hyarwa2zgk23dn9598a4ljbr9smdl2pdv6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess"; @@ -3820,12 +3820,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20161005.720"; + version = "20161129.621"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "591102f3826b1ab0731866a4926e708e6fc014cc"; - sha256 = "0cwrk8iaibd280w4c5yr0swfglsx9fwjqqshky2m1fc5kf332vpv"; + rev = "f7861aa9607c0f05b3336443df5380a6daba0485"; + sha256 = "0vxam51g7r4wixw7w8frk1af6m5n7bswjbjya77dnwxcizgwiq6m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -3904,8 +3904,8 @@ version = "20161120.1200"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "485778b352fd"; - sha256 = "010qb68d0vv6h3wqlmrav6qvazm8dcjgkqr9yn4j8s5x3c94a5cn"; + rev = "110e20a7a86c"; + sha256 = "0s18bbfw4kcv9iij1016pamq394rg8xr7016qp6cxyklp9hivcdm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/axiom-environment"; @@ -5236,7 +5236,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20161118.1618"; + version = "20161127.1727"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "05jf7rbaxfxrlmk2vq09p10mj80p529raqfy3ajsk8adgqsxw1lr"; @@ -5276,12 +5276,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20161116.1212"; + version = "20161125.448"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "0ca91753aeb3a523b56e745f83087017ffefd5de"; - sha256 = "04zv2kl3mvn61k9zwr6j7scxv8mfi13gvnyx1hdzbrb28dw22dg3"; + rev = "981d5becae30a31b6ef4f87680386148d0535455"; + sha256 = "0755qhf0h7m18hwv6lkpgi0jcrcm58w4l3815m3kl86q1yz2mpda"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5814,12 +5814,12 @@ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bui"; - version = "20161115.1058"; + version = "20161122.946"; src = fetchFromGitHub { owner = "alezost"; repo = "bui.el"; - rev = "76f45f8c821cc5f2e0da721a0ad025b625feaa70"; - sha256 = "1nx99a50g123jxrlnbpxn5i8imh8320jjsh9r067iqbj6dl3hajf"; + rev = "65884653411b116029680d6c3154edd0eb9e5e9a"; + sha256 = "1xiy7q79zbqyf0phq97zgkprj0j577xbnh24zh3fbs9i6nbiv46x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; @@ -6341,7 +6341,7 @@ version = "20151009.845"; src = fetchsvn { url = "http://caml.inria.fr/svn/ocaml/trunk/emacs/"; - rev = "16554"; + rev = "16555"; sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw"; }; recipeFile = fetchurl { @@ -6551,8 +6551,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "85cd10f23b6eeddfc74da440fb6d7217ab0a6c52"; - sha256 = "11k6vyjadn0fjbvlssj0q4c7w1wadxd7cl4dii40c7q97nznmhky"; + rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500"; + sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -6593,8 +6593,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "85cd10f23b6eeddfc74da440fb6d7217ab0a6c52"; - sha256 = "11k6vyjadn0fjbvlssj0q4c7w1wadxd7cl4dii40c7q97nznmhky"; + rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500"; + sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -6780,8 +6780,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "26e76a63dd9b5fe3c9bddec93c3fd65e3436a595"; - sha256 = "18xr1hz602y684f1hzg3k5qnkxkymkw7r4ssbgxql6gpjqxpk918"; + rev = "334d1fc9b5638725ac7454dee5e95ea4f6ba8793"; + sha256 = "1n8bz9j5qwkbyfp4jf5wr1injwybwnm66hp2rlfqnlrf9w54pyi2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6820,7 +6820,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11894"; + rev = "11909"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -7171,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 = "20161117.524"; + version = "20161123.1614"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "2636a572b6d3b3b529658db465fc5eebc75859fb"; - sha256 = "0hyafgarsriw678arwim4n1jg31zf41yzjsmgpfcd0nn9gpb1q0q"; + rev = "68d73adfe17a51c3e2ce8e5e3a0efd5ae800d32f"; + sha256 = "02j722h445ibdy1g6fxpsk8hb3d1f41cncibygqppp4nr0rqkfc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7399,12 +7399,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20161121.312"; + version = "20161201.757"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "adab93a7a2b00e03b75aa6086b0457a2e94cc85e"; - sha256 = "1nrpdah0n7ym0mhk59ifpndxnyi1myv6bwvk1b9m87r7mbw2zzw0"; + rev = "d19cf7d9d36c93eda56e1de63705a9c6c92e92ef"; + sha256 = "1hn6kzbz3n1jxfsv23m49b0rjjzh7inf4klm31avhyndgas3bvgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7675,8 +7675,8 @@ version = "20161004.253"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "287759"; - sha256 = "1z80wgs7p8xhlfpdisyhhpk4ha0azpbicrp8hqlkrzn7rmlgmiij"; + rev = "288906"; + sha256 = "0m24mss1ra1k46vn473qlnjbm0zzw4s154gnhf0lpk4f80b9wy11"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7881,12 +7881,12 @@ clj-refactor = callPackage ({ cider, clojure-mode, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }: melpaBuild { pname = "clj-refactor"; - version = "20161005.344"; + version = "20161127.1306"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "8bacd65fb89a530f8e72b5ee78593e7dfcef57e3"; - sha256 = "1pj72q9mqjj22h5cplxgplp1wcljcyg46ni8j6xh3ys3j8bs3jyp"; + rev = "0be07c6ca67a9ef52022286342c22eb4e0f3133c"; + sha256 = "0g113b4mm5ggb67vmj57zy6p1q61pzff9hq06y2sm5lx8r5a3rk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8145,12 +8145,12 @@ clomacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clomacs"; - version = "20161122.316"; + version = "20161124.552"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "cbc902307a158949f3060fde1d2994b5c8e6aa6c"; - sha256 = "0lb93vf8kh92c026x7mjkzx46gvddadlc6mps1kzy3vyrp0vj3p1"; + rev = "0938671fef3311c5d7c1e46e06d5264e98254c96"; + sha256 = "08qaw7g5mldi886hr0i46wihmij2sip81bdj9p8r4zmvm1gxly00"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -8163,6 +8163,27 @@ license = lib.licenses.free; }; }) {}; + closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "closql"; + version = "20161130.925"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "closql"; + rev = "8b063e70808049210b749164b8f22f56924b9949"; + sha256 = "1qhm8zmidinr35lk0pff6nla3d05cqf81hjb55yrwvdvyr5gyl1k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; + sha256 = "13ybna20w2d1b3n0y5p1ybhkw0j0zh5nd43p1yvf8h1haj983l87"; + name = "closql"; + }; + packageRequires = [ emacs emacsql-sqlite ]; + meta = { + homepage = "https://melpa.org/#/closql"; + license = lib.licenses.free; + }; + }) {}; closure-lint-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closure-lint-mode"; @@ -8271,12 +8292,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }: melpaBuild { pname = "cmake-ide"; - version = "20161023.1225"; + version = "20161203.804"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "16449deab6d160c7f0d3d0e50013b6606e958138"; - sha256 = "0fhahc1c8a7qdndgj4gp1lkxw6k80m8ajab8z9w4r8793gbvdrd8"; + rev = "379f8a45e6a210da53b7ee76f081420f371a2c2f"; + sha256 = "189pvk3kgay05s671dq4xsqvvylz7rl38djr3hw5finjkrb26rkf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8296,8 +8317,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "8288d16126193e86bb6880a7d7b749649ad83e2c"; - sha256 = "1667641a08jhxv6n0ni1k8pdn42bf6qg3bj5z7h9mn8kl0jsq6ha"; + rev = "b620772b11fe396194148ec4768bd59ad89fb91f"; + sha256 = "1n057g3fmycy6j0yw8a0avn1iblp0ymn24x2dv3b3pff26w7xfhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8331,22 +8352,22 @@ license = lib.licenses.free; }; }) {}; - cmd-to-echo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + cmd-to-echo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shell-split-string }: melpaBuild { pname = "cmd-to-echo"; - version = "20161105.505"; + version = "20161203.1333"; src = fetchFromGitHub { owner = "mallt"; repo = "cmd-to-echo"; - rev = "b8915d5f0a79767c29f38ccb7b4416390436e932"; - sha256 = "1z79pd169ml8cx6rzyv8gbivdcg49g4s0w4cabw85rv45fd7rpfa"; + rev = "e0e874fc0e1ad6d291e39ed76023445297ad438a"; + sha256 = "0wi097yk9p1xcfmps1g58xvvlv60akwky4y0pxdz6pa31w9jd1q8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d559cee8b263d3615f48924d62341f1ce1ab2630/recipes/cmd-to-echo"; sha256 = "0bz0zbzagrz26cvqpwl1pfwayyc49bjawk641yc6kl8gnsnv3z73"; name = "cmd-to-echo"; }; - packageRequires = [ emacs s ]; + packageRequires = [ emacs s shell-split-string ]; meta = { homepage = "https://melpa.org/#/cmd-to-echo"; license = lib.licenses.free; @@ -8559,22 +8580,22 @@ license = lib.licenses.free; }; }) {}; - coffee-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + coffee-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "coffee-mode"; - version = "20160808.1712"; + version = "20161124.832"; src = fetchFromGitHub { owner = "defunkt"; repo = "coffee-mode"; - rev = "026222983aee3842f6ddac9024364dcaacd9a73e"; - sha256 = "13icfx0h89hb2180srqnvrm415cijn2v5l8i8hdv820wkd2v9lx8"; + rev = "d7d554cbf435aa875fbf56e67c4374375a164a93"; + sha256 = "1glif3jxh31cmy2rgz39bc2bbrlgh87v5wd5c93f7slb45gkinqi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode"; sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1"; name = "coffee-mode"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/coffee-mode"; license = lib.licenses.free; @@ -9039,12 +9060,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20161113.1747"; + version = "20161126.1629"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "1c516df435577b2c85995c1cbe80a9968d9ae6a0"; - sha256 = "0s2dkxp1lzpma0jddh4k2fn78nsnkggcsvih4faankh05jay9i7b"; + rev = "ec7a8608853f41d42c357f214de069ae06c9d576"; + sha256 = "13bdf1h09v6vn5947pl9hg90wp0ch6ng713fnwglca6lk5rf5fqd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9215,12 +9236,12 @@ company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20160715.344"; + version = "20161201.631"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "1929d2172875a27133d06196cd3427b7c475b7c5"; - sha256 = "16zy87nzc0aa7zc9wmbx6x0dxkhcs7q787gwf50s1hkxlw80djgr"; + rev = "20f3ede0ca3a90a68b700704bff830ca18598f73"; + sha256 = "0fdpxd2lh3y5iyhwphpcdv29bm5v8pcwhbj4xhbky7dn28kbl9c4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9331,8 +9352,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "f2247f2515ee2eb0ff866bcbbf69d9f62b7b7780"; - sha256 = "1d3zyaqgng0q41nnifmwwwwd9bm0w7yhkpj6lwir3m0pg5lrcw48"; + rev = "7d3beb299399bc9d8190190fa59943b2a70a7f63"; + sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9925,8 +9946,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "f11500fbc6bf66ff27deaf6988f31b8a13860468"; - sha256 = "1rbc9wvpjliv0ah0zy181q9q05fi0ihl0ap0ghli56ri05s6fhp2"; + rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73"; + sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -10169,22 +10190,22 @@ license = lib.licenses.free; }; }) {}; - copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "copyit"; - version = "20160607.1005"; + version = "20161126.429"; src = fetchFromGitHub { owner = "zonuexe"; repo = "emacs-copyit"; - rev = "c973d3650208a033aaf845989d023f9c6e572ddd"; - sha256 = "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w"; + rev = "f50d033b129d467fb517a351adf3f16cabd82a62"; + sha256 = "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit"; sha256 = "1m28irqixzl44c683dxvc5x6l3qcqlpy6jzk6629paqkdi5mx1c0"; name = "copyit"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib emacs s ]; meta = { homepage = "https://melpa.org/#/copyit"; license = lib.licenses.free; @@ -10197,8 +10218,8 @@ src = fetchFromGitHub { owner = "zonuexe"; repo = "emacs-copyit"; - rev = "c973d3650208a033aaf845989d023f9c6e572ddd"; - sha256 = "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w"; + rev = "f50d033b129d467fb517a351adf3f16cabd82a62"; + sha256 = "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit-pandoc"; @@ -10256,12 +10277,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20161119.850"; + version = "20161207.331"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "7e02815e31eb2227b7ef5fe8015913f259ced7f0"; - sha256 = "1gf1liwggddsizldx9sa4qw44skq72qmmzx5h3582sxncqjjp8mk"; + rev = "3b15585257c083706c32d0988f1982018fb17e9b"; + sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10316,6 +10337,27 @@ license = lib.licenses.free; }; }) {}; + counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "counsel-gtags"; + version = "20161024.633"; + src = fetchFromGitHub { + owner = "syohex"; + repo = "emacs-counsel-gtags"; + rev = "59e7abc97715507e3c524a3e7132d38ed7ab0a12"; + sha256 = "01i1ilp87hg9s5bh4n7msf8ljx9h7ml3cxlawqh7y8c04m83yamp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags"; + sha256 = "12qyb1lnzyd2rr4ankpqi30h0bj66ap5qw87y4605k0j44vhnsax"; + name = "counsel-gtags"; + }; + packageRequires = [ counsel emacs ]; + meta = { + homepage = "https://melpa.org/#/counsel-gtags"; + license = lib.licenses.free; + }; + }) {}; counsel-osx-app = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-osx-app"; @@ -10340,12 +10382,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20161022.1525"; + version = "20161204.1156"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "675d17d2dc8c5016e6aecff76af3bd39ec4c5536"; - sha256 = "0x9lfavgm7pgnxqsn530mjdv2qdl0vcp20irg2g26cy16y555w7k"; + rev = "86ddf43616f2560f2b60b3f154783af25cd2e03b"; + sha256 = "1plr44jaznk1kdphjb7wm1mnxxg75fm6s0pnqmxmi6830gfviylh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -10445,12 +10487,12 @@ cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cpputils-cmake"; - version = "20160928.549"; + version = "20161201.1441"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cpputils-cmake"; - rev = "6ea0b6abb1274f61e47c2a0cc09451d6824f7a60"; - sha256 = "1691dk3iqswljhjap6g5n3lfskkwz3k0dg3yk6ga84ys586mm804"; + rev = "2c48c1bacee286d927038bf0c893678931f0f956"; + sha256 = "03a0y508znl91c6893wf5l9d98nc4dbfgg9c594c542mdbrk54z0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake"; @@ -10610,22 +10652,22 @@ license = lib.licenses.free; }; }) {}; - cricbuzz = callPackage ({ enlive, fetchFromGitHub, fetchurl, lib, melpaBuild }: + cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cricbuzz"; - version = "20160703.158"; + version = "20161130.2036"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; - rev = "7c0c495312c18bc6c8db9ddad94efbd4b6328a9b"; - sha256 = "0jvr6ya40qq9q064k2gzkrqw00xffjmslfjxa2xz2vi25m6jyv92"; + rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45"; + sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906b144e01aed96d62efbc34a8af2973135f6194/recipes/cricbuzz"; sha256 = "1ad2afyn3xny3rgb8yy6w87f33idlrmis1vx0b6s8ppafv9z74j0"; name = "cricbuzz"; }; - packageRequires = [ enlive ]; + packageRequires = [ dash enlive s ]; meta = { homepage = "https://melpa.org/#/cricbuzz"; license = lib.licenses.free; @@ -10988,8 +11030,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "3257eadf70826fb3ef060c46f85b7a4d60464b1d"; - sha256 = "1c5nfzsj4bi2rk3d3r2iw03kkpc5dg9p3q3xzj7cxfg2wmg1xaxk"; + rev = "f66ed8d4cf4cd9caa26351e27185329ca74c4cc5"; + sha256 = "0yh4hynpq7wxwnl10nrhfbxa160p8d211637x665rqqcgsc40sp3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11273,8 +11315,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "530729168f51e071bbff6259dab6426425777e92"; - sha256 = "15nq08fhxg02ilmin6y0119y85z2y1rnllgj8g12kg71zghqwj0s"; + rev = "1b61bc346a8233f6ef7576bbbba0cb8a19c46efb"; + sha256 = "1czd04vvl7gzaj1fmzkmd36cpsg22d3gg7sqyfh742ycw1ggkpzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11374,12 +11416,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20161121.123"; + version = "20161128.545"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "8fd6c58d0d7ce9df77f465a456e3c3fe2e00ec0a"; - sha256 = "0bbw4bvrxfhg9fmm9fp1p3cwr1j9z9kysmk3n0jq5xryxsnpk8kl"; + rev = "daf31ca666a2b82d305b60255234b84d70b8d037"; + sha256 = "1172qv32z80nafcmj4b60bv678ab565w9smpsdpvravrp5z4sdca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11395,12 +11437,12 @@ dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dante"; - version = "20161120.1330"; + version = "20161125.455"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "9f1d1120326fa9028770b33a150c7dfee49d6de4"; - sha256 = "0n76vywm6nsmlhq9papaxnqi2mwg9sszjgzxpxz0bi1y30a392ll"; + rev = "6280169aec81fe9deb3a78d722ae0ab15866e78e"; + sha256 = "0vdvs76bhrq07ak25vasg6pq1hfdjhksl325g5idsjjnhvb0mp83"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -11689,12 +11731,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20161121.1329"; + version = "20161204.1138"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "7db073f60a2505bf49e9b94cfedd235f1e01e471"; - sha256 = "1cryijlb79r4dlkmb0nwaamfi18cw0bfr2c1js7vvp5lqs8sb87w"; + rev = "cd9899342bc94e59aa42275554810e50d045aaa4"; + sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b047625aebdbf7b5d644b55afbdccfc6c4ac14a8/recipes/dashboard"; @@ -11878,12 +11920,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20161110.548"; + version = "20161127.118"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "85cd10f23b6eeddfc74da440fb6d7217ab0a6c52"; - sha256 = "11k6vyjadn0fjbvlssj0q4c7w1wadxd7cl4dii40c7q97nznmhky"; + rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500"; + sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -11896,26 +11938,6 @@ 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"; @@ -12813,12 +12835,12 @@ dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-icon"; - version = "20161030.1510"; + version = "20161206.130"; src = fetchFromGitLab { owner = "xuhdev"; repo = "dired-icon"; - rev = "6869d1aee10317f2d4fc49d343d642d422b7117b"; - sha256 = "1cn8nfai0xsyds3824f0kw5237lyggw0zgk1d60alznm5xyzwlhb"; + rev = "4397e7858d5e63c251acc2741d78fe8e178cb206"; + sha256 = "0g97lii8n9pal46kipw59nj78qv3l0gpy6rwbd702gxccj94glgv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon"; @@ -13867,12 +13889,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20161031.249"; + version = "20161123.2356"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "2e9438cf132da1bbb25b93769754c29bd7e48a6c"; - sha256 = "1dqmnija2s1dmf0kq3d4nf212jyyqa5rjnrg4l2rlxkkfgxjdqaz"; + rev = "074156c4cc5e71fcd9dc4bfb68792403acfdaa16"; + sha256 = "0shsh1rj01a6bcr6sm073p60spy61vqnr8nhkcfa6lh2ccigxv43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -14022,12 +14044,12 @@ doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20161118.1805"; + version = "20161206.2238"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "4074e83f9c6426aa3b9129b1510aa97b281d9e90"; - sha256 = "0a3c3q9acxk8i94lrhg0cccz58zr34xhphfh7q1140qfvgv0h1ql"; + rev = "d27dc431972d4b645cc41412e6fe052bf8d9f061"; + sha256 = "1pqmbq4lbcyxhkzqxany8il9crh8sqgaamn45fbjrm70g6g80yak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; @@ -14470,7 +14492,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1770969"; + rev = "1773071"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -14571,12 +14593,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20161120.1027"; + version = "20161126.2045"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "358f2687d1adc536b5fde9b14e24ebeb1e9f458f"; - sha256 = "1g293b0yfhg1ncbnqyjm2ccm098jd9q4yb0xj85nz78ilf91ff19"; + rev = "14a6751d3858a21a8d4bdeff18f7f7b07daf056d"; + sha256 = "1khnzv5kzw2654yjalnvabdxrp3ahjl9sfl1x28l4valm8b5ndj4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; @@ -15095,12 +15117,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20161114.205"; + version = "20161206.1633"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "e4e9e261f7420763b82f509e35cb6802f83cb15f"; - sha256 = "1kcbciayn8i3cmw8bxikpdrk9z3i66h1zgnbnbjm84xvxppins61"; + rev = "87546fbf0202ca4f476b77f8afaaa532f38dd2d9"; + sha256 = "0wwk3xv0qv9fl7crdfbldsnwxwnhqqsq0kgyp4vfwjqyrj78cb66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15116,12 +15138,12 @@ ebib-handy = callPackage ({ chinese-pyim, ebib, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ebib-handy"; - version = "20160509.1556"; + version = "20161126.140"; src = fetchFromGitHub { owner = "tumashu"; repo = "ebib-handy"; - rev = "62215c400934a5d5c98bcb906d122b1e6f71b7c2"; - sha256 = "0z89gggdgy2icnc6vwwbqbpnzbixxm6njgkz37zrrpwk23jsx1pb"; + rev = "e4815b2d127300361b8528681d2d36ad5465e574"; + sha256 = "03pnapalpdyfcy4irmxwljpwxmbcgz3dzbxd8b0058gkhzan9vrz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8843caa0d80000c70d3b264854f50daac94e6962/recipes/ebib-handy"; @@ -15176,12 +15198,12 @@ eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "20161019.838"; + version = "20161206.908"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "f2247f2515ee2eb0ff866bcbbf69d9f62b7b7780"; - sha256 = "1d3zyaqgng0q41nnifmwwwwd9bm0w7yhkpj6lwir3m0pg5lrcw48"; + rev = "7d3beb299399bc9d8190190fa59943b2a70a7f63"; + sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -15467,6 +15489,27 @@ license = lib.licenses.free; }; }) {}; + edit-indirect-region-latex = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild }: + melpaBuild { + pname = "edit-indirect-region-latex"; + version = "20161128.2245"; + src = fetchFromGitHub { + owner = "niitsuma"; + repo = "edit-indirect-region-latex"; + rev = "05043f2c0c9838947d3ca4b51b695deb7c47612e"; + sha256 = "0dgac0nk9x4sz4lisxb5badrzpcjqjwgi79hhl1y6mafzm0ncqs2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/688f0b6802d04d133afc3de7371f65b8d5d2bad4/recipes/edit-indirect-region-latex"; + sha256 = "0lsqz09c4p2gl1xd673783hmmh7y5iq4kw521q7hiza4xbaiwpr3"; + name = "edit-indirect-region-latex"; + }; + packageRequires = [ edit-indirect emacs ht ]; + meta = { + homepage = "https://melpa.org/#/edit-indirect-region-latex"; + license = lib.licenses.free; + }; + }) {}; edit-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-list"; @@ -15533,12 +15576,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20161108.6"; + version = "20161205.1743"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "6006bdf8a524b57e54de09309e98439226ed9e33"; - sha256 = "0hc0av6s8qn3aym9bw541j9c25fxn0hds3f28aavdsj8c67d482z"; + rev = "627588cdecba03faad831fae380f1540551b893f"; + sha256 = "0yivg6caiqhflijj8m24nl2s3klazy3sbd2bli145hrddfjhzn8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15693,8 +15736,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "c886d70c85d57e93c6c73499bc7416c66fe28bfb"; - sha256 = "06bsq8vgalblz4wwlaq6visv3ip2dbg9q094iavxnv2536mkylvm"; + rev = "60c403e10a530ac503367bc538d9d0f48478089e"; + sha256 = "0y3g5n77qph41d07zblj962g247j9bzcp28mdp80k229w1j8x90i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -15771,12 +15814,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20161116.1344"; + version = "20161205.1432"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "7d82b45f537cd18cbce858591d9c76a5ce6c291d"; - sha256 = "1ndnwpcyg8aqcidxc527gp90q6snls3490diijxcy7483k9z2awk"; + rev = "0805f4b15419bb92641bf09735be9bc2c72a3838"; + sha256 = "07d26n946j19v0swx89d53mdsw1w3ar85ickswhj5fz1m3g9r4fc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -15813,12 +15856,12 @@ eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eink-theme"; - version = "20161111.854"; + version = "20161207.410"; src = fetchFromGitHub { owner = "maio"; repo = "eink-emacs"; - rev = "de50a6296707d8db9ee0d3ffd001bae89d5e7e4a"; - sha256 = "0v3z48jnlbg3xwbv58kgi55b8q65gac66062yykcg3p7qcyx0az8"; + rev = "40e7a7d31ee160175aa89583609d3f953fb066c6"; + sha256 = "0701c7x8wwr99d5l50k8n2a6zx7dh067d702v032g5axh7lqsn2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme"; @@ -15880,8 +15923,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "417fbc84e2458954969d748b1dac504f126cdecc"; - sha256 = "175xgcd2lymgyzk2fgiws1zycwcaljhjzdinimhxziz6v7007sy5"; + rev = "840c4b1c8aecde69e79c5ec944a62fb8e9e82f74"; + sha256 = "1nvd2jlb3qaharij3hqcp98vzawyf4p0f72fwd61ld13bmxlxyvi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16122,27 +16165,6 @@ license = lib.licenses.free; }; }) {}; - elang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names }: - melpaBuild { - pname = "elang"; - version = "20160104.656"; - src = fetchFromGitHub { - owner = "vkazanov"; - repo = "elang"; - rev = "30dc30c2c55e902fb213865aa79e2cbbc0dbc88e"; - sha256 = "1wikmzl9gi72h6fxawj0h20828n4vypw9rrv35kqnl4gfrdmxzkk"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1cb66c2a6272a804d7a81fc506643e80f11da306/recipes/elang"; - sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy"; - name = "elang"; - }; - packageRequires = [ names ]; - meta = { - homepage = "https://melpa.org/#/elang"; - license = lib.licenses.free; - }; - }) {}; eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eldoc-eval"; @@ -16227,12 +16249,12 @@ electric-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "electric-spacing"; - version = "20161113.916"; + version = "20161127.720"; src = fetchFromGitHub { owner = "xwl"; repo = "electric-spacing"; - rev = "7231d6e238420c32af0dec4ad82f7ca1d17f4344"; - sha256 = "1xy9ibkvkndqxpbsia43l0g53yjf2idf99rhdcsf9xqyaknchx2q"; + rev = "b9a4bb5e9a5867d089779e62e1e51072ffc3c8f8"; + sha256 = "0a7ikd46xwjpc8ya2cb75xabrihn58ihk4r1wpsqj6dkhifch47p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a78c0044f8b7a0df1af1aba407be4d7865c98c59/recipes/electric-spacing"; @@ -16465,12 +16487,12 @@ elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "elisp-refs"; - version = "20161114.1550"; + version = "20161205.444"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "5d55d0ffc5aa0d12ebcedb027d0a307564238ecd"; - sha256 = "0x6vqldg0nmgx5kzijamygmba7hlhnniyf6k1s3mdy5w8ib6vd6a"; + rev = "412dafa219ab4eac6eddcc793588d26d2df6fe21"; + sha256 = "0nl39ikk8nlc0xar8r8s2g9dp2n52qi1gmksnck7klbphmw6xx3n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; @@ -16801,12 +16823,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }: melpaBuild { pname = "elpy"; - version = "20161028.215"; + version = "20161125.56"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "5c900ff6b5524e216247f52ed4085734d815dacb"; - sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik"; + rev = "1332a08d5895acc5d14f23dea927fb8e715bd415"; + sha256 = "1alsygm1n24y4asf0l0bgg3l0i628m7xpva8xfw1vw69r06dvypp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy"; @@ -17332,12 +17354,12 @@ emlib = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emlib"; - version = "20161113.829"; + version = "20161126.723"; src = fetchFromGitHub { owner = "narendraj9"; repo = "emlib"; - rev = "818254e86fccb45c7b938d149a588ceae43c29d2"; - sha256 = "0zr26za7n0s07c1gz7jxscpdwspi2rkljzcjblvgg0zy7p0g09cg"; + rev = "dea2af00f551ea580c641d86dd69219f7d4f3685"; + sha256 = "0p52pkq3wvnhg0l7cribhc39zl1cjjxgw9qzpmwd0jw1g1lslwbm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46b3738975c8082d9eb6da9fe733edb353aa7069/recipes/emlib"; @@ -17456,12 +17478,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "20160724.729"; + version = "20161204.633"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "d3e3bace6b648f5b60d833a72a50603545102934"; - sha256 = "1kmkza1x1xajdswdmvxasglpr8fl9vr1pi3yhi7a9cqqa5s1y2ah"; + rev = "ce142304d1fe6b096b9b984e40e55c8cc54217c1"; + sha256 = "1s8jmkcr11fp93hmyxq7c781lx7krc5xsk99ar0h50v2hpnmzgbb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -17645,12 +17667,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20160928.550"; + version = "20161124.940"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "4eccfc7ce43d4dfd3cf65ea86b2975abb4b4e9ad"; - sha256 = "1n5pmcd6d71pcgjwkqnmh6midcyp7ahc5yry3r38my3shrwirqc2"; + rev = "62609316f269bed9e6775f9614783789a79268e7"; + sha256 = "04wwi7f6cma1s0nhw2k756k3x3sjsc5s7iq1q6zlq4wmz08czg6v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -17687,12 +17709,12 @@ emr = callPackage ({ cl-lib ? null, clang-format, dash, emacs, fetchFromGitHub, fetchurl, iedit, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }: melpaBuild { pname = "emr"; - version = "20160613.1430"; + version = "20161206.1325"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "emacs-refactor"; - rev = "27f324c5da2f7c5a13f1f5e970606cf45f24199f"; - sha256 = "10pbs3wk40ahskz63gfjkqrsj86fy363w50bzlm5ipa82plwgic0"; + rev = "d1b2db7b4aa60379528c68753e0fb7952c803830"; + sha256 = "0y01flz5q3q9kdxgw9n4bxagygvy73y6x5k83kyxrjiz4m3xz21p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr"; @@ -17867,12 +17889,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20161110.1316"; + version = "20161203.1059"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "d46a4fda456f42f71e8a2ef91347f463f81cf2f6"; - sha256 = "0s2351irpi29ry29cvzix1603n41qp2smgfgcylq14d38xz9a0jc"; + rev = "8a0e14c292814c072633681bc8d06a8b821be052"; + sha256 = "1xfnj7khfqx6m1121jlym35bfw3dgw1p5kx6qs0g15s8bnjbp3bj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -17977,6 +17999,27 @@ license = lib.licenses.free; }; }) {}; + epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "epkg"; + version = "20161201.1358"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "epkg"; + rev = "846c5ee182e6572af3034c5b43d439a6c915d243"; + sha256 = "17i68vsl1grffs7j5n7lzkwi870fci7y84q5i7qwvip3vhpxlczr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; + sha256 = "0vvkjjaffvwvsvld3c6hwd18icmp2lc7f9yqvclifpadi98dhpww"; + name = "epkg"; + }; + packageRequires = [ closql dash emacs ]; + meta = { + homepage = "https://melpa.org/#/epkg"; + license = lib.licenses.free; + }; + }) {}; epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; @@ -18441,12 +18484,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20161122.2237"; + version = "20161206.1258"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "427d0e47afe66d0c870c026ba5b8a93bb0b76415"; - sha256 = "0g783js3hi7i3q23mca422w3zlxv2i5f1l838ddwxyzzdzyg5if5"; + rev = "d5d7e5b6a5537cdcfcc79efd43bbde138fc7863c"; + sha256 = "1jj7pgcbspallki9in4dn2d0wzis873r89y5kniycnydqfzadpjs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -18483,12 +18526,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20161108.47"; + version = "20161129.304"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "8fade0888ff75fafb2abb512cfb97bcb5472fec1"; - sha256 = "07jksnfp4xwl1059pj2aphc5saqbcgsfixy7bhz3k70j9zv6dgad"; + rev = "a0d365fc3c41464e77d24942aa3255788c5959a5"; + sha256 = "0sikbfbh8im6lrgylbnidgz7jzz3prip5xxmj1vx077jsbs263al"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -18812,22 +18855,22 @@ license = lib.licenses.free; }; }) {}; - eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-git-prompt"; - version = "20160509.138"; + version = "20161126.758"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-git-prompt"; - rev = "826d2ebdec0808493955a4544dc91b575f6c4ecf"; - sha256 = "00gaq8vz8vnhh0j2i66mp763hm3dfxkxz3j782nsfml81sngkww0"; + rev = "fb56e851c1baac68249c34043bd5db9c9420141e"; + sha256 = "08mhjps17w3kfmmbdws1lqzphr2ayl160i0ckd4552jdyzd28vvs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt"; sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s"; name = "eshell-git-prompt"; }; - packageRequires = [ cl-lib dash emacs s ]; + packageRequires = [ cl-lib dash emacs ]; meta = { homepage = "https://melpa.org/#/eshell-git-prompt"; license = lib.licenses.free; @@ -18878,12 +18921,12 @@ eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-z"; - version = "20151110.2046"; + version = "20161206.2249"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-z"; - rev = "5a1317a58d9761c200d0ad49dc4793dec9f9490f"; - sha256 = "0znk2wmvk7b5mi727cawbddvzx74dlm1lwsxgkiylx2qp299ark0"; + rev = "033924f138f19f22a30c1845e728691e5615fa38"; + sha256 = "0kp9yw56l8bl4zqganclnpf6x5g2rmcf23265n8cp24j6d7c7r4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z"; @@ -19652,8 +19695,8 @@ src = fetchFromGitHub { owner = "Dewdrops"; repo = "evil-exchange"; - rev = "6e80e2509bcc14d84ca04e3c463c04e4c999efa4"; - sha256 = "1ffhkl7ssfbngvgdjaxqdihi246lgcsgwqc5m8lil7s00xrj3gw2"; + rev = "8902966aec2709b7e680d13c362d74b7f89b909b"; + sha256 = "1jfjgh75ycm6i01zpnz8y1hp205w61rqbvargk3rp65c34j48dcd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b06397c032d24a8da4074ad97cdb30d0c468e20/recipes/evil-exchange"; @@ -19858,12 +19901,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "20160728.751"; + version = "20161130.847"; src = fetchFromGitHub { owner = "justbur"; repo = "evil-magit"; - rev = "077354f8ebd5da76937bf8f5df5d484f8a0ccc62"; - sha256 = "05llzcdbg84x04a98b6r7d0m8631hk83hjq33hwd4n8ixp85dg20"; + rev = "9251065b73c5023fc21d56f5b94c505cb7bee52d"; + sha256 = "17jnqd73i680fpmghghadc4d4xlg39xfjx3ra8sll0h1xf4xkspi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfc6cc3581323c81d5f347895aaddfdc71001f22/recipes/evil-magit"; @@ -19897,22 +19940,22 @@ license = lib.licenses.free; }; }) {}; - evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20161121.418"; + version = "20161130.454"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "8a56092b38755de9f314faa3b137805bd5ce5fef"; - sha256 = "1i0gfhc0pi67dl451i2n6sn20mxp7nr6py43zrahrjwakh5xqhfg"; + rev = "e9f77f7d6a14434a8ca3280d721b96c0984fa7eb"; + sha256 = "11mhgw0xa8kn73svgvzpmvvnkj2ja4mxs030vlzkh4scvlfa98dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq"; name = "evil-matchit"; }; - packageRequires = []; + packageRequires = [ evil ]; meta = { homepage = "https://melpa.org/#/evil-matchit"; license = lib.licenses.free; @@ -19921,12 +19964,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20161122.812"; + version = "20161123.1318"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "6d260c2badf52dca81aa3589d16ce6684b5ecc3e"; - sha256 = "1k55xipsscs059rbsxidk7w1zlxlyslhwaag36i4i3plhh1zwl9f"; + rev = "5db7d1cb39d3193089407deee4a2b21a5b1ef782"; + sha256 = "1lghqmdlbz56a9g0p5r4wgw24zj8ymqjarx03zxqqmjigy9792h4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20149,6 +20192,27 @@ license = lib.licenses.free; }; }) {}; + evil-replace-with-register = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-replace-with-register"; + version = "20161127.2159"; + src = fetchFromGitHub { + owner = "Dewdrops"; + repo = "evil-ReplaceWithRegister"; + rev = "c979aa2f4d730d2a741358e357d18544edd46cd2"; + sha256 = "168qqbsjwblhrq92mw0v1f86d3q1m2f5rh37xikj1bk589c2izp9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bd98aebefc13da5a129d1d3f1c8878e4a70654/recipes/evil-replace-with-register"; + sha256 = "0qyym6vwjs0aqf2p28rh96v30pgxg060pxyij0vrfj469wzmlrj9"; + name = "evil-replace-with-register"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://melpa.org/#/evil-replace-with-register"; + license = lib.licenses.free; + }; + }) {}; evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-rsi"; @@ -21107,12 +21171,12 @@ fasd = callPackage ({ fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: melpaBuild { pname = "fasd"; - version = "20151207.2316"; + version = "20161203.2208"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "emacs-fasd"; - rev = "8726a367048054add81ecea7543de00688056735"; - sha256 = "0m2qn3rd16s7ahyw6f9a4jb73sdc8bqp6d03p450yzcn36lw78z5"; + rev = "9883cf23f632357fa42ffde3e4942bf9022a4fac"; + sha256 = "12i5n7aw9nhlh1ghj98jsigbj55qx85v0i8j154sqv7spx8anf2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f0fefb25f03677080c9adeeb48046d6ea163053/recipes/fasd"; @@ -21397,8 +21461,8 @@ src = fetchFromGitHub { owner = "snarfed"; repo = "fillcode"; - rev = "ae5f6c6de81a7681c8f883e7fce36fd0f2b3c1e8"; - sha256 = "1x9wmxbcmd6qgdyzrl978nczfqrgyk6xz3rnh5hffbapy1v1rw47"; + rev = "1f64f0303a3157eabec355fd155571bb0c042489"; + sha256 = "0cgrswhbmzyfpkrp8iznsn1lxnb61dz2f0181pqd9gdf55qrk67m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85eb403503aa83799a6072bfe21bf66c8177ca73/recipes/fillcode"; @@ -21455,10 +21519,10 @@ }) {}; find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-dired-plus"; - version = "20160515.950"; + version = "20161128.1426"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/find-dired+.el"; - sha256 = "0a2wgdrj6yxvpmzqiqpgzj3gbf04fvbhrfa3213hiah1k9l066m5"; + sha256 = "1h4q2v88wvfmzdmaqnp9fywna7n9a94kziz6hjdf1xhc5a7lxqsc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+"; @@ -21474,12 +21538,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20161026.145"; + version = "20161202.2205"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "4f7d96fde81c41b023515d33d635a76f8ba647cc"; - sha256 = "01fcqs3jckrqfg4i3axgzdp53mxfxa4lbc9xsfssi0fxq4b7clh6"; + rev = "1c50ca72acd816c5d5b3fbdb605bbd85a0172b11"; + sha256 = "0nzn5bccxr8nsxqbc2gx17hrydbx511h4ba6bz3gaf78qfppn2ff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -22098,12 +22162,12 @@ fluxus-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }: melpaBuild { pname = "fluxus-mode"; - version = "20161112.1659"; + version = "20161124.1145"; src = fetchFromGitHub { owner = "defaultxr"; repo = "fluxus-mode"; - rev = "512b104fbcd5f70dcdc7ae58c627340f036ae133"; - sha256 = "054wahxnx204y8bqmmq1824caidwvvnlr2l88ar4ax0l5bmhxdyg"; + rev = "6670eeda008e2f0180e549624da708d5aa3599f6"; + sha256 = "1r2i88qv7zxcgccvyxpgq36ilsv3rdplx52pvd6kvfcw7whym205"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3396e0da67153ad051b8551bf34630d32f974f4/recipes/fluxus-mode"; @@ -23106,12 +23170,12 @@ flycheck-scala-sbt = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, sbt-mode }: melpaBuild { pname = "flycheck-scala-sbt"; - version = "20161122.1022"; + version = "20161127.1321"; src = fetchFromGitHub { owner = "rjmac"; repo = "flycheck-scala-sbt"; - rev = "1e78ac4922a8073ba6ec78672404a2008233f9ca"; - sha256 = "0iqrr56zgk8yvjc6wvz34pjv1nki6zj8g9b8i0kha31y8pz4n2sy"; + rev = "5b2c7a24b5b57573d0f9dbc759158bf90fa305da"; + sha256 = "08p2acxa8irqb75d6ygk4rvh3i25faz06ilmqj3a3lf0xs0v5adc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0afc1e5b31689a5ba52443e2878114d9ec0e7757/recipes/flycheck-scala-sbt"; @@ -23236,8 +23300,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "f11500fbc6bf66ff27deaf6988f31b8a13860468"; - sha256 = "1rbc9wvpjliv0ah0zy181q9q05fi0ihl0ap0ghli56ri05s6fhp2"; + rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73"; + sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -24426,12 +24490,12 @@ forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forth-mode"; - version = "20161120.1244"; + version = "20161201.113"; src = fetchFromGitHub { owner = "larsbrinkhoff"; repo = "forth-mode"; - rev = "312f3860aa84793bec30b3f5410b786ad3b45f2a"; - sha256 = "03b3z2qlv5rv5a47xpzlg5da1wc4hj24kpqh83j5wrpbddc8lans"; + rev = "0d22cedbaf2530386eeb5faff8feef6a7a25ee82"; + sha256 = "1y3kr2k7h7w7d8k2ivj06fy4cqhw7gin39id2m3zfidq1cln02aw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1c8b5b9fe8f17905de801f5d7dea28ca73daa4e/recipes/forth-mode"; @@ -24489,12 +24553,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20161011.2319"; + version = "20161207.141"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "bba892a595efa1e376637dab6b31473faffdf754"; - sha256 = "0c77dkc5rqzybym2n7mqi5jhkr1g0r77yrfmbpakbc2l0550bg8r"; + rev = "cd164b75fdad957a8ac2548d0ddff84ae3359488"; + sha256 = "01dlnkzm2rl6lli2r9rz8kd9w4xp236ag6i3gdr5raflylf2yxp4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -24712,12 +24776,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20161103.300"; + version = "20161130.653"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "cb70988aae85b03a26be9b3e2a70742658ff2502"; - sha256 = "111mz7fgacmfvrbv32yzmmxmx1pf7xb6rj7n7pwz51raid7a23p8"; + rev = "22cf1815574c2d463c6a790afc7378db9d701fc2"; + sha256 = "1jqh518kn5c7gk8dqbx28inq71a1i95qafixa5kbh8my6kka7yr1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -24762,11 +24826,11 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20161007.2213"; + version = "20161123.2000"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "0590ebf914cad5794ca22e052a5df4c93d3fb924"; - sha256 = "0k77ls6rxr6nax39b5f1gzhj3rr4yzinp354dqqvz82yc473pnb0"; + rev = "4e3fe96d3db816da1a1e252eb3a9c1d6424fa786"; + sha256 = "0fm2wxll3y5ypjqp324znzi94dpxpkbn9s0zf2klgjzd8mb97x5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -25028,12 +25092,12 @@ gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "20160320.228"; + version = "20161203.231"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "268ee8b4554446104d200de3ffbd2f067b20cb3f"; - sha256 = "16x3fz2ljrmqhjy7w96fhp3j9ja2gib042c363yfrzwa7q5rxzd2"; + rev = "a803f9e4509b8f8fed17ef25737d941bbe846c96"; + sha256 = "1avbdfw3hvwqnrlg3hv8p64m9gqgvwl9ggqzn6rhxh1zlr7i5cwy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; @@ -25110,12 +25174,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "20161122.117"; + version = "20161201.1330"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "2ce3a7ef135f570239820d37fd6e7a338a680c27"; - sha256 = "1l9qw6zglna3wvrvayiqfl65vn19i5hrv3mrk05yj3lvi6h4wh70"; + rev = "04fd7b24c705e1ea1c8b3b8e4ff178ed7ecc6d12"; + sha256 = "1jsfgm57i928wgn4540m48jady61i7k0bka1mw1i462m3wc62nba"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -25173,12 +25237,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20161109.950"; + version = "20161202.1657"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "847ccd4f86714ba145f2b19af6ddab2441f5c6cb"; - sha256 = "1g2m5r68l69i9j3pmcaccdk2qaaf4jfynhfxa7191id6gvhk3np0"; + rev = "6893f692259c0241049bf614147160c44dd4ba3e"; + sha256 = "12gimg3qhnl2r2hx00q602k1rnjcj49hc1v7a23d58c0gmqr4yb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -25194,12 +25258,12 @@ general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20161108.2042"; + version = "20161203.1641"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "e0473d2bdbdffd97c159cb610978a13d0b9dfa38"; - sha256 = "1x734lvxpppd3njydmagiw6a0khjc3mqmicv4bgw8l0yd5b2fqjk"; + rev = "11f21c9c53091bc538652f1448e75557ad526b9c"; + sha256 = "0pyyvab0l5xbkm4w9sc34g68vz56qsy8fkhj5nh00rigwi9pcsla"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -25215,12 +25279,12 @@ general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general-close"; - version = "20161122.1306"; + version = "20161207.434"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "general-close"; - rev = "4bad5dadf32d99fb41214cac62a08b6f5c69b234"; - sha256 = "1b04ny938lvgkdza5ih17clmpxbwhwxliczq4kx0wq301djgnwp0"; + rev = "ee920766ed53b29dc87f4ec400b8212c9a8c1198"; + sha256 = "0krc3lp5k8nm67623v6lr41sj1fnyvp4axbs2pgh0biiq7yaff2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close"; @@ -25387,8 +25451,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "9ef3e67f219ab24246f0e73246f08533ff53b9cf"; - sha256 = "0v5bibr5mhllgsh2j3cjl8nh4x7sqjlyydvy3vl1zxhxwrx825iq"; + rev = "8be4885d8638b52acb16f26ce03f4182902c0a7b"; + sha256 = "1jpf76kmqhmhz6gizm9njiid9ahlk5254ag71fgqhij5a0cqijm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -25551,12 +25615,12 @@ gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: melpaBuild { pname = "gist"; - version = "20161118.2026"; + version = "20161127.855"; src = fetchFromGitHub { owner = "defunkt"; repo = "gist.el"; - rev = "222ce5eff8f31ccf783fb9082734c3f6551e7c80"; - sha256 = "18wfx3n96x8dwl8fpfrkz3ad0aw6sy19hhk595df282bhz9h5995"; + rev = "62888de7f776c867a51cee4d5d55edc561e519cc"; + sha256 = "0xvmrpx3gbdancxhggw7k7r2bzlwmni9vynsjf5ddpv5alw2bscx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist"; @@ -25677,12 +25741,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20161108.1335"; + version = "20161206.1703"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "6e23f2de27a5de23ba36305c7f5e823db44541ec"; - sha256 = "0vn4ibfvbnqgb5hc9sd8ysmd80ky7i1q5vhqxgiffm94ir8ihn5m"; + rev = "b7ccae8b3d516693e5c77d1b64538d18eecf12e9"; + sha256 = "1zxfl2bdkizf3836z4k9250vs6mlm2anr22p7ajzxkz5pk132wbk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -25695,22 +25759,22 @@ license = lib.licenses.free; }; }) {}; - git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, helm, lib, melpaBuild, projectile, s }: + git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }: melpaBuild { pname = "git-commit-insert-issue"; - version = "20160122.749"; + version = "20161206.1051"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "git-commit-insert-issue"; - rev = "df1c86ac1ec9f40b11fa5c7400966ef97f4c3c67"; - sha256 = "1vdyrqg2w5q4xmazqqh2ymjnrp9p1x5172nllwryz43jvvxaw05s"; + rev = "fcfbb9cea98426c65edeb989f7470fbd5ce4b608"; + sha256 = "12rzzysjq7c8jnhwlyppgcn8h9am95iw3la1h1y3bxpfisxkshy8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2356f63464e06c37514447c315c23735da22383a/recipes/git-commit-insert-issue"; sha256 = "0mhpszm2y178dxgjv3kh2n744hg2kd60h16zbgmjf4f8228xw8j3"; name = "git-commit-insert-issue"; }; - packageRequires = [ github-issues helm projectile s ]; + packageRequires = [ github-issues gitlab helm projectile s ]; meta = { homepage = "https://melpa.org/#/git-commit-insert-issue"; license = lib.licenses.free; @@ -25845,12 +25909,12 @@ git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-link"; - version = "20161019.1718"; + version = "20161203.1823"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "efd2a9a40b07e93cd5030d8b409d380c77fca88b"; - sha256 = "0yhk4r5fdlmiw7n0cpdbjqcsm2vkm37qwwvkb7xz9046mkdag6gy"; + rev = "255f42e72f7565eeb7feb40e18507348dfccec0a"; + sha256 = "1333vll16snfg135hbczl8d0l8smqz98kz89jv4fcyp9gs6g8sp7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; @@ -25908,12 +25972,12 @@ git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-timemachine"; - version = "20161115.1420"; + version = "20161125.142"; src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "6e2754b02afc059d431de71724a7186f051d965a"; - sha256 = "198rqljshrjypl7a08z62lmw1q8fz38zg6k5h6jv7kz0as3md4pz"; + rev = "d67901fd3f87f4836386d85a4a7df8a300d47147"; + sha256 = "0rgcr26snphimiigs3krzb577zd6xpzzhw1mcvmq2cjbc6hi6sdn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; @@ -26202,12 +26266,12 @@ gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "gitter"; - version = "20160916.1128"; + version = "20161203.9"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "gitter.el"; - rev = "18dcb779350367af49d34b4a1c6c3f576657c327"; - sha256 = "1rwxq13i0cpcf55lfmycdy1igyqg58w9g7cjrksfadp06w74k84p"; + rev = "6e92491ddb7079f868ffcc07d69bc82ef35d7d2b"; + sha256 = "16hnw8bcbbnwzw9mbb98icri7q7zl39b60r9gn5gr3bxaarbh9dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter"; @@ -26412,12 +26476,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20161122.2133"; + version = "20161129.303"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "3e22988086760f62eee7b6b2a2e3e23392234b74"; - sha256 = "12mc8cvi9b92hmybzbnp0pd22dgcysxc0wklngkcj6ssq6ybzzzr"; + rev = "8a2bdfe945ff2d1a78f6159528f6ad3420701046"; + sha256 = "0spn4lkvilmy48xvkpma4l30i7rzxknp56nr2kcvpdlb0mk3svzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -26791,8 +26855,8 @@ src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-impl"; - rev = "f5dbee749009a1bd1933d8c2adb7ccda2c330374"; - sha256 = "1nb4adj32qxh4cvxlqvf9ypjymni4jbzswhnw7mzlbma4h2jkk8b"; + rev = "3544b590e9867f2697c2be62389a4c1edb39aed8"; + sha256 = "0dsn8dpfsikchbcsr009sfhics87hzb3fch4wxxxlhgh5j77nxiv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl"; @@ -26829,12 +26893,12 @@ go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: melpaBuild { pname = "go-playground"; - version = "20161122.804"; + version = "20161203.1747"; src = fetchFromGitHub { owner = "grafov"; repo = "go-playground"; - rev = "b3b5c98dbc86f7ae6fc631c29f55807bfb8dea89"; - sha256 = "10habaq2f6rh7fdpa5mv76zfvmls7g0n4hq5ka27g2yb30qqhllr"; + rev = "d0d772bb60c872d81572c5293d5d0a7517e4b839"; + sha256 = "1gf8djbnm6x9d9s2qg33cfrn2fbxh5pq441rrfi7il13vgf83v70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground"; @@ -27018,12 +27082,12 @@ godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "godoctor"; - version = "20161029.2346"; + version = "20161205.143"; src = fetchFromGitHub { owner = "microamp"; repo = "godoctor.el"; - rev = "b1cf6ea7e8fa23daa05e98b443ad9b5ee6badb9a"; - sha256 = "1shcxjhkk3l4vn1v16p86cxs00w5v02nmx2ariid5qrq2636gv8z"; + rev = "f892a4dbabe61186540d6035c5185fd929a6a543"; + sha256 = "1cg09mihvqchgvdxwlrg9vcdj1kvmmy8zmlkscxi6smaxbi0yvjm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor"; @@ -27249,12 +27313,12 @@ google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-translate"; - version = "20160909.1358"; + version = "20161206.1408"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; - rev = "a1e95d9f01550b5170db052887be3d45482dddc1"; - sha256 = "1w81wxv3yyhrzbj2f7s8nfcw3w5j5ijjfzqsm5z0bjvkvcp4nbm4"; + rev = "52d34c96b400b1b933c727933279f79256951b19"; + sha256 = "1acck34q5dqizx2wsm0q31lzwx0wwyzv6g53naf5m94bjw7xv088"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; @@ -27414,12 +27478,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20161020.1626"; + version = "20161201.1112"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "3a056363adc4b1a0125f5bda9a0395010d805615"; - sha256 = "01czx49dkxg5wvb2aqk474dmsnr63cmhziim2v8hrv546gp31v46"; + rev = "5b4d52150638665b6378a65b3d579c74718c5bff"; + sha256 = "1x46axy950x8japxiabrf293x7jn146jrdimznmckkapfszxrpdg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -27495,6 +27559,27 @@ license = lib.licenses.free; }; }) {}; + grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "grab-x-link"; + version = "20161130.2147"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "grab-x-link"; + rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76"; + sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link"; + sha256 = "1kni49n1v716w4hjfm49mk25jshfc6idpby0k58qvngbfqk3kzy5"; + name = "grab-x-link"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/grab-x-link"; + license = lib.licenses.free; + }; + }) {}; gradle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "gradle-mode"; @@ -27636,12 +27721,12 @@ graphene-meta-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "graphene-meta-theme"; - version = "20160724.454"; + version = "20161204.807"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene-meta-theme"; - rev = "ba3c197b6331668c4fcee4053594ba1bd34929b6"; - sha256 = "0qbk53r97h234f2vj8ndf57kardaz2g2dgf35i08j9b416aw6ck5"; + rev = "62cc73fee31f1bd9474027b83a249feee050271e"; + sha256 = "1ydl6dlg5z4infq8j09izwgs6n97yza6nbq5rs1xfv00zd9gr63c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44af719ede73c9fe7787272d7868587ce8966e3d/recipes/graphene-meta-theme"; @@ -27720,11 +27805,11 @@ grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grass-mode"; - version = "20161102.621"; + version = "20161130.732"; src = fetchhg { url = "https://bitbucket.com/tws/grass-mode.el"; - rev = "fe70088c54b9"; - sha256 = "0prqgkbn0gm8g0fapkcd8192yyl2h3agn7qrlf5vrfx6780bsyw0"; + rev = "c7e2817461c3"; + sha256 = "095v1l46axada3vnhp1ypim6b789y39jlyy5466im02fjfjkcadg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode"; @@ -28134,12 +28219,12 @@ gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gxref"; - version = "20161116.2359"; + version = "20161126.706"; src = fetchFromGitHub { owner = "dedi"; repo = "gxref"; - rev = "5fc61367185ca5e2bd5a7a92c1317c60b7edf13f"; - sha256 = "0x8wz1wrdzdyvghbng1j0kd8gv0q70vkqzqzwhyhzvmsx2x2cs97"; + rev = "7cb746755a47e90aa286e32f49fd3417f632e98b"; + sha256 = "07qbrk904iw3c4kj5ql5hy9znkpi8hcf5b9aag2x5m2c6jh066y1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref"; @@ -28780,12 +28865,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20161123.409"; + version = "20161207.428"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "0941293fb7129c83f04c584474ad1d85a6595ba3"; - sha256 = "0f9cy590kxa8m03748byvn9fzp17gziw3zbwbshkrrznj3pzr4mc"; + rev = "097ce9e789e91f5ed1461e4379f3e785738a6cfe"; + sha256 = "0qm7piplx7i6bf5mq9ncxzm57fs0api9sy83impqvh980ilwkv43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -28864,12 +28949,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "20161122.1853"; + version = "20161203.523"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "1e882d3b409ae46aef98f01e6bcd0bea72a2c801"; - sha256 = "1pip5hp4phi8kyr7z2w9px6p45w0xzb96rdrb6yn66cl6kafwqli"; + rev = "323524bd65d59f11d1a940a46a60448da85a2a63"; + sha256 = "1bmkn6hn02fichylmr5pla3lbhixcn6h1znp77dg5j80npzb27yw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -28990,12 +29075,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20161119.412"; + version = "20161202.236"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "472a41231bcb1b2a610ebc0387e495b2d84538f2"; - sha256 = "0dh1b7hdvpr3l3vsqg5kaai07nqrdd5yvl4r7lxy1xa7ayl32xq3"; + rev = "3193f2a408d76c36db588ec85191b0dc22fa21a6"; + sha256 = "1qysjyd7c05iylwfxmvqjwq9pkp8yxrhmsnki6i8dpypjlbji997"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -29347,12 +29432,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20161113.908"; + version = "20161206.2324"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "0941293fb7129c83f04c584474ad1d85a6595ba3"; - sha256 = "0f9cy590kxa8m03748byvn9fzp17gziw3zbwbshkrrznj3pzr4mc"; + rev = "097ce9e789e91f5ed1461e4379f3e785738a6cfe"; + sha256 = "0qm7piplx7i6bf5mq9ncxzm57fs0api9sy83impqvh980ilwkv43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -29435,8 +29520,8 @@ src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "bf80144f7cb810a0db89036b886d0e6f580ef7d7"; - sha256 = "1r3x72pd9wzqrkkwafmv64lcr9f1mrzbm1f3qv5fvv5xrs3qib2h"; + rev = "414e2a19664c21010622e41da49ef90cfc8075c7"; + sha256 = "02dgbprhvrij4k5wgvfgx8wpi36wwk5rsyfsya13mz6navx5nqgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c3ea21430473ef22d5ea9c8b2cf7ec9689883a/recipes/helm-dash"; @@ -29641,12 +29726,12 @@ helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-firefox"; - version = "20160604.52"; + version = "20161202.517"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-firefox"; - rev = "f196980c047800ef6650f880e26e0b7c29278a20"; - sha256 = "0xl2nakprgjf65haa0xn0jkh69skmbp3k6q1bamvqijgvra9waa0"; + rev = "294850c4ce16ae25f2214f863cee0118add60974"; + sha256 = "1kaa58xlnr82qsvdzn8sxk5kkd2lxqnvfciyw7kfi2fdrl6nr4pf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/257e452d37768d2f3a6e0a5ccd062d128b2bc867/recipes/helm-firefox"; @@ -29876,8 +29961,8 @@ src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "6b5abd45030d0c505bd4db7cc2a949ab5fa6d3ca"; - sha256 = "0chjyvp98g0wviisnbw07cmv3fzfmzcw2ygbn4jh5frr9kpchkf5"; + rev = "5ef4b5ff81707214c0c141d8bf219b1645fefe17"; + sha256 = "1a0cs7yf6yb4pkgknb1515a24649d3v5i7jjcfvw831jwc51gnca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -30522,12 +30607,12 @@ helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }: melpaBuild { pname = "helm-notmuch"; - version = "20160412.1206"; + version = "20161127.2308"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-notmuch"; - rev = "e3c41e6b1458c6fb686bbcc8c8827dca98f306d0"; - sha256 = "04c6k1rxdi175kwn146sb2nxd13mvx3irr9fbqykcfv81609kqx3"; + rev = "7d03cd9fed32b49a1f200c65ed38086c9f19cfaf"; + sha256 = "10nx6wnd2vfqxv9zr8brml0l9mfx8rrid3lbqgs8wr9313ra3360"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch"; @@ -30540,22 +30625,22 @@ license = lib.licenses.free; }; }) {}; - helm-open-github = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }: + helm-open-github = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-open-github"; - version = "20151226.642"; + version = "20161203.604"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-open-github"; - rev = "4c5a47003b2efed1c3437e91121a77d082cf64c8"; - sha256 = "1wkmbc7247f209krvw4dzja3z0wyny12x5yi1cn3fnfh5nx04851"; + rev = "553f3ab0fe0a028015e9b6cb7c35fb139ec222fc"; + sha256 = "1xj5b44nkdvbxhk1bnllqm2qq393w22ccy708prrhiq8fmk53aa8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-open-github"; sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx"; name = "helm-open-github"; }; - packageRequires = [ cl-lib gh helm-core ]; + packageRequires = [ emacs gh helm-core ]; meta = { homepage = "https://melpa.org/#/helm-open-github"; license = lib.licenses.free; @@ -30879,12 +30964,12 @@ helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-rage"; - version = "20161117.700"; + version = "20161201.222"; src = fetchFromGitHub { owner = "bomgar"; repo = "helm-rage"; - rev = "06ee938ee8c7c9c98a3f627c5c36de7645f5f28d"; - sha256 = "1zzidm622w3fgk9f5daj6njfjmfl1yrpdx03xrhg4raibh8j53lm"; + rev = "d9a342e2bbdabe86d6c25bb1939c55e3a2a12381"; + sha256 = "05amzj09jwn0ypnk53i1m1pzxqxghxcfv6s9y0gxnxhr440rbjhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage"; @@ -30939,6 +31024,27 @@ license = lib.licenses.free; }; }) {}; + helm-rdefs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-rdefs"; + version = "20161129.2136"; + src = fetchFromGitHub { + owner = "saidie"; + repo = "emacs-helm-rdefs"; + rev = "cd3a6b3af3015ee58ef30cb7c81c79ebe5fc867b"; + sha256 = "0ji7ak9pkmw0wxzmw5a1amvn3pkj90v9jv1yi12w388njxn7qsvj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1c7a20847513dc1153d54a3a700bc120f71dc6b/recipes/helm-rdefs"; + sha256 = "0z3nrqrz63j9nxkbxdsjj3z8zhsqlik28iry3j1plgsxq1mhrn0y"; + name = "helm-rdefs"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-rdefs"; + license = lib.licenses.free; + }; + }) {}; helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-recoll"; @@ -31131,12 +31237,12 @@ helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }: melpaBuild { pname = "helm-smex"; - version = "20160530.1236"; + version = "20161202.1252"; src = fetchFromGitHub { owner = "ptrv"; repo = "helm-smex"; - rev = "c8f007c75b00be155b62d6b44f1f275a914bf31c"; - sha256 = "0i8qhlyil4p11lnb6f1x9qv7f5131dg0f74anbvnc1wjga0jifzx"; + rev = "7af4e4b44671f739b39584fc50c20084700701ac"; + sha256 = "1dhzglpd48mb47iyii8igb1dldvnr4alg18m7g8xb529dx8z9wni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex"; @@ -31757,10 +31863,10 @@ }) {}; highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight"; - version = "20161103.1410"; + version = "20161127.1729"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight.el"; - sha256 = "15l0bg0pa24bm9lg3f8ghf326k5k5sa1x4lpg1749asvj5q8bjk4"; + sha256 = "19niikr5608xq67hcknmg5s7qxcb867ff79xcn58162px8d41v3k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight"; @@ -32167,8 +32273,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "295246ef496f3f2bff45a098433f171e0350b889"; - sha256 = "0g5k67znhzvxczby8pq8hcisjcgikf7yv2pwxz62cspfr2ylhvwk"; + rev = "4b0b4f44bcf14d603f88842d66a62099f1e81a47"; + sha256 = "0hfr0njzz5czprqb4sg06vhdfs7vsw079p7v8xilz32s3priz4lq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -32657,12 +32763,12 @@ hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "hound"; - version = "20160731.2106"; + version = "20161130.1955"; src = fetchFromGitHub { owner = "ryoung786"; repo = "hound.el"; - rev = "209b87b64a0477718e5f0ec721a1a4b7f323ddff"; - sha256 = "0w7vknf8nz9a3rqwzpdp1lnscx0kamgyrd9mvravkp6644kjw3k4"; + rev = "dd95fc10b79029142c95307e895da0bc92bba28c"; + sha256 = "0c0fjfb8l0ladxw8b2ylnrnzw8k0xffl40hnkrc4bdzbl48zn55g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90cfc34eb4e8be7bf887533b85feba91131a435b/recipes/hound"; @@ -32845,16 +32951,16 @@ htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "htmlize"; - version = "20130207.1202"; + version = "20161206.1142"; src = fetchFromGitHub { - owner = "dunn"; - repo = "htmlize-mirror"; - rev = "aa6e2f6dba6fdfa200c7c55efe29ff63380eac8f"; - sha256 = "1vkqxgirc82vc44g7xhhr041arf93yirjin3h144kjyfkgkplnkp"; + owner = "hniksic"; + repo = "emacs-htmlize"; + rev = "f74ea313ad364ffd648e330b2e6ddabb89f6e797"; + sha256 = "16jxd5nfpqlg46zzp0yvvn5aynprd5xv655fcql8cvxkkg111d5z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8d1d4a17daa60f577c3f88f757997fa42f7b527e/recipes/htmlize"; - sha256 = "03rv3myds696gasfqw3lwvsjd680xgwcf9kilblzxdidd7l6n5xf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; + sha256 = "16nvvsi4nxi0zzk5a6mwmp43p0ls20zdx9r18mxz6bsaw6jangh2"; name = "htmlize"; }; packageRequires = []; @@ -32866,12 +32972,12 @@ http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "http"; - version = "20161122.819"; + version = "20161127.1449"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "http.el"; - rev = "e1e9f7fb5240ec17ff21988993ca8dcb873ea78f"; - sha256 = "0r7nbhnw5mxwqlmb0diylfmiyrb7vvdqaa5h9hb746vf7pwqgcz0"; + rev = "18057d0967015979ee7e59598b1d3410d5966fcb"; + sha256 = "1bw9369c3r172p14rb74vqs0243696rqf46z627p1w73afq48zy5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http"; @@ -32989,12 +33095,12 @@ hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hungry-delete"; - version = "20161120.2203"; + version = "20161128.2238"; src = fetchFromGitHub { owner = "nflath"; repo = "hungry-delete"; - rev = "8df35d81fbbd236147b8c746bd5f542bd75dbe63"; - sha256 = "0j97bfhrajki2a78pchrw5n6pcsk2gc2spk9s8fb0bmnqqpknmnf"; + rev = "78a787a87aceb821818bbe2a322fbf2e5cbf80c3"; + sha256 = "171s7akqcpj0jcbm8w19b4n9kdzw0acf7cv0ymwdz5mmgmfiy292"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete"; @@ -33094,12 +33200,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20161117.1028"; + version = "20161204.505"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "a72d68a0f6492af6201fbdb88211cb2f7488f3be"; - sha256 = "00k9q0fv5ca4g397f39fiyjzp827b7biyx2gly69xxgir44j9jgb"; + rev = "2751f00c2c3daa8cc00f0fee7d01c803ddde7bb2"; + sha256 = "146w0mqgcaz80la42i6i9si8kii6dn8al7iaj0ay292sq9f9dbfl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -33261,10 +33367,10 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20161118.1605"; + version = "20161127.1745"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el"; - sha256 = "0x082kilmzq26f9pwwbq2bid98s9mjyfwljcwz2qlj8fbihwjn6l"; + sha256 = "1j7x19jlr42mdncc3ignyra1m3w5a5gf0x51hjygrk7fh627i1jr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/icicles"; @@ -33298,12 +33404,12 @@ id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "id-manager"; - version = "20160425.216"; + version = "20161124.2045"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-id-manager"; - rev = "cf0c3743f6a1a1d63637e25fff2ffa948ba40f3a"; - sha256 = "0xd0zhbabb9cx4rsapvq6qs40w4q2cav6p16vrka54rmr98544vl"; + rev = "98bd85db17914af59e7b75c89e82117323965af2"; + sha256 = "0fj3gsjpm58p7526c95g8fqkch51ic3h2rvr36fhmxqxd5baj5xf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64a61b3801a0cafec87b1875eaec5950746f716d/recipes/id-manager"; @@ -34294,22 +34400,22 @@ license = lib.licenses.free; }; }) {}; - import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: melpaBuild { pname = "import-js"; - version = "20161114.1455"; + version = "20161128.1613"; src = fetchFromGitHub { owner = "galooshi"; repo = "emacs-import-js"; - rev = "231d3d5924adea2d0127aa50acbd2b6a4bab5d25"; - sha256 = "1zsjaz69gbfmsy0zr6byag31m9jv3nglhxhz56xzhaabsk218f74"; + rev = "4818ece32dae9df773972815559617b803a3ac2c"; + sha256 = "08hk5z5n1jk6wkwqn5lwk530ykrdf2v5xzds9z540vmk4dzv406q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js"; sha256 = "0qzr4vfv3whdly73k7x621dwznca7nlhd3gpppr2w2sg12jym5ha"; name = "import-js"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs grizzl ]; meta = { homepage = "https://melpa.org/#/import-js"; license = lib.licenses.free; @@ -34360,12 +34466,12 @@ indicators = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indicators"; - version = "20161029.706"; + version = "20161203.349"; src = fetchFromGitHub { owner = "Fuco1"; repo = "indicators.el"; - rev = "a9f228bab20285d599976d3acd506b38e03a0ff3"; - sha256 = "0wfdg3ijysvfi1vbgnc50m1f8c6mcg3qhhz987qflxkb8vdrcnqy"; + rev = "d80155197d4a5691ca038c2f3cc14cf4b2a4a3d0"; + sha256 = "1xrc3q7nnfcfycklrj7r6w36sipc7am1izx9kjqzalarkajlcsfl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72c96bad0d0b5a4f738fd1b2afe5d302eded440d/recipes/indicators"; @@ -34465,12 +34571,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "20161019.1425"; + version = "20161204.1637"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "df014b0717d5b35b54587fcfcda6f753d3e1091e"; - sha256 = "1vbykxzy4b4vgnvrjj9vwi2m4f65i1wkw2kiy0l4abssrdwsnsdc"; + rev = "e05cc847385f9160703ae00b8046bb2a9eafdd64"; + sha256 = "1zgqvsgv6b6bysw22yybkasra45fy9i8v7dp8bhnkiwgldjsk98i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -34507,12 +34613,12 @@ inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inflections"; - version = "20161017.157"; + version = "20161126.1727"; src = fetchFromGitHub { owner = "eschulte"; repo = "jump.el"; - rev = "23984a363dcb1a5faad2e5d0a731b7d593d97efc"; - sha256 = "1s0cw1vcagx1rxpk00nnca8bnqphvblyi7p5rjj6fiq5rb5adqqj"; + rev = "9519c675e8a650f6afade7d870e925d0fb50f112"; + sha256 = "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections"; @@ -34527,10 +34633,10 @@ }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20161031.727"; + version = "20161127.1748"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "11kili1v46sji4ymdz1a3fx159hzdk4r39irhlsmxy3zrnzwlaxj"; + sha256 = "0mz8vq55r3n89187q2qc60n0s5iigv0i19pzb3zxbca8769vlbdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+"; @@ -34609,12 +34715,12 @@ init-open-recentf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "init-open-recentf"; - version = "20160822.701"; + version = "20161206.645"; src = fetchFromGitHub { owner = "zonuexe"; repo = "init-open-recentf.el"; - rev = "a4f5338a14302d44fa5aebb1ddc7aff3dc9abbe3"; - sha256 = "0iph5cpz2dva1rnvp5xynmkndny87z308pziadk1qgf05mc0i61d"; + rev = "7d8fb124806291f7f6ef2ec3a664ea25899b6d68"; + sha256 = "0vswa7304s7m6cirbaky9rmrxjb2aylvif2vg2p6l274k37c4jyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db8b6eced50726c788d7343137f6b4558575abf/recipes/init-open-recentf"; @@ -34860,12 +34966,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20161123.613"; + version = "20161204.626"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "eaa1b303d63650732a7146e2fdb1a601d791c344"; - sha256 = "1rhhdaysj7vfslwmjqs92xyqm9vggsr9m50lxn6ndhan0xlvzcb9"; + rev = "c03881e03973972b44fa0e775ed2e832ebb76815"; + sha256 = "1dlpnnajp1qg4kc99c9zhwxwy36cjicnfvbnlvjwn6flz415lavx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -35192,10 +35298,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20161115.1908"; + version = "20161205.1445"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "17ldy140kn4zgji12x4qaijg06r858zjwbvxjwarrv1rl2cny59m"; + sha256 = "02k88x6gn9sk7w352q2vgzgfmmv0p2gv4k7wm9k5pyymy0j9skna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -35210,10 +35316,10 @@ }) {}; isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-prop"; - version = "20161117.1101"; + version = "20161127.1755"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch-prop.el"; - sha256 = "1i832162b6cjlygnzmi8yjjc37dxamz1mnhlli5pif9xwa5g824m"; + sha256 = "1nni8lbmh215icv2n5kzq59vbnjq2z3h021drk6szdxm5hcsgmg4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop"; @@ -35418,12 +35524,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20161118.1213"; + version = "20161204.48"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "7e02815e31eb2227b7ef5fe8015913f259ced7f0"; - sha256 = "1gf1liwggddsizldx9sa4qw44skq72qmmzx5h3582sxncqjjp8mk"; + rev = "3b15585257c083706c32d0988f1982018fb17e9b"; + sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -35439,12 +35545,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20161119.412"; + version = "20161202.236"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "472a41231bcb1b2a610ebc0387e495b2d84538f2"; - sha256 = "0dh1b7hdvpr3l3vsqg5kaai07nqrdd5yvl4r7lxy1xa7ayl32xq3"; + rev = "3193f2a408d76c36db588ec85191b0dc22fa21a6"; + sha256 = "1qysjyd7c05iylwfxmvqjwq9pkp8yxrhmsnki6i8dpypjlbji997"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -35506,8 +35612,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "7e02815e31eb2227b7ef5fe8015913f259ced7f0"; - sha256 = "1gf1liwggddsizldx9sa4qw44skq72qmmzx5h3582sxncqjjp8mk"; + rev = "3b15585257c083706c32d0988f1982018fb17e9b"; + sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -35710,12 +35816,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "20161121.1422"; + version = "20161124.500"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "1ec4939d81e410c081b709505d812775bb8338e8"; - sha256 = "12yqbkfr5yds9kysjs159h6xvlx0ppf7c95fwhd4nx63ycyidg2x"; + rev = "fc0c467db0549cfa3d96ff6e0f56d0c84c493ba6"; + sha256 = "17iq0dn862xaak898lc7fmfbzxl9pyycwlmm5wn9kbbq8p6y7nrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -36046,12 +36152,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }: melpaBuild { pname = "jdee"; - version = "20161119.911"; + version = "20161206.1410"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "9ec9a5e6bcc22490ca06ddc05dd174fe03c6fa0d"; - sha256 = "0z6bp76q9r6h4bps340xw9vg8adm3gmdmaiya6d01ymaid7qfydn"; + rev = "e903628a0260787e4fd0834b314cba63cee53f63"; + sha256 = "1444yzxxfmwq5igcxlzd9yknghqbzinimsc23zbsk21in31rrnlj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -36358,12 +36464,12 @@ jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jq-mode"; - version = "20160222.440"; + version = "20161128.748"; src = fetchFromGitHub { owner = "ljos"; repo = "jq-mode"; - rev = "ce63cb10e5a69c9017ceccf8adb7ab33450b057e"; - sha256 = "08wffbljnaxz2sh72vsqpq1lc47mnh4d47fl71dvw4pqs50zp8v0"; + rev = "f2dc70af890694828b8227b2727240e82780d7e5"; + sha256 = "18hprvhlwf110j7anyrrrjp4xjr3556yipz7n4jyqj69i0kvjw5c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode"; @@ -36526,12 +36632,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20161117.1621"; + version = "20161205.1446"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "2a796499afd95a5b9f0eb2fb338102e917f30c93"; - sha256 = "07i41zblbb733wj7wgpdwqnw0ml0mkkh053prbk8g8ghwcrm65ld"; + rev = "3106e3c47dde930fdd4867e8583fd7e9bb418996"; + sha256 = "06wvjbxn6dbrwi26flqbs6y8c4dw7nr0bdsplwzw2ikwpdsgjsrv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -36572,8 +36678,8 @@ src = fetchFromGitHub { owner = "thomblake"; repo = "js3-mode"; - rev = "7fceb21ec56aac7af4b189bb0c0d0cf620327f5a"; - sha256 = "18c0s3i21b77pi5y86zi7jg9pwxc0h5dzznjiyrig0jab0cksln5"; + rev = "229aeb374f1b1f3ee5c59b8ba3eebb6385c232cb"; + sha256 = "0yd2lck1kq01pxk86jpxff5ih6fxx1a1wvl7v8b5ys7gi33fjqz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/805a7c7fee2bafd8785813963bf91ac1ca417fd1/recipes/js3-mode"; @@ -36839,12 +36945,12 @@ julia-shell = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "julia-shell"; - version = "20160514.728"; + version = "20161125.1110"; src = fetchFromGitHub { owner = "dennisog"; repo = "julia-shell-mode"; - rev = "b9d82d0cb8d4d50c385e03312f08ab5d7676bf67"; - sha256 = "056pyq31fq86fskwhqny8n6jzavgcjv979kkg9hwbz7h90zvf9q4"; + rev = "583a0b2ca20461ab4356929fd0f2212c22341b69"; + sha256 = "182r7x7w3xnx7c54izz3rlz0khcwh7v21m89qpq99f9dvcs6273k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812c6a8498949d8bd9828a95433c539da87c1c8/recipes/julia-shell"; @@ -36878,22 +36984,22 @@ license = lib.licenses.free; }; }) {}; - jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }: + jump = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }: melpaBuild { pname = "jump"; - version = "20161016.2313"; + version = "20161126.1728"; src = fetchFromGitHub { owner = "eschulte"; repo = "jump.el"; - rev = "23984a363dcb1a5faad2e5d0a731b7d593d97efc"; - sha256 = "1s0cw1vcagx1rxpk00nnca8bnqphvblyi7p5rjj6fiq5rb5adqqj"; + rev = "9519c675e8a650f6afade7d870e925d0fb50f112"; + sha256 = "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump"; sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364"; name = "jump"; }; - packageRequires = [ findr inflections ]; + packageRequires = [ cl-lib findr inflections ]; meta = { homepage = "https://melpa.org/#/jump"; license = lib.licenses.free; @@ -37594,8 +37700,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "3de25e142921667a5df95ee886b38c868dab927c"; - sha256 = "1pkfi0gz7wm5xig6im25r6f12mw34n113nn9hbwpd0vsxyl6pv5p"; + rev = "0ebcdb7e4eb5dcab919779111374191bcf0f03a6"; + sha256 = "16g5s7s3rdd8jvm9g3bhdq3xwgx5gf4nxdjw2pbqhiparnkkqsz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -37671,22 +37777,22 @@ license = lib.licenses.free; }; }) {}; - kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20161007.1409"; + version = "20161126.1914"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "5d767f98a65101cd32ea2dcc897967649b964a8f"; - sha256 = "0v3lh67a2z0hl7qzcnp5cihgfl7421dircrsi7n0csbzla02wxqq"; + rev = "ddb4e59bcbac9d198f0ba6c5e8acebb4c5005946"; + sha256 = "0gkg0n71fg74a95ckpblizwlp3a59iqqlcq7ix0q6055q6gcvixc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; sha256 = "0f3n7b3plsw28xpz07lf5pv71b6s2xjhq2h23gpyg0r69v99chh5"; name = "kodi-remote"; }; - packageRequires = [ request ]; + packageRequires = [ json let-alist request ]; meta = { homepage = "https://melpa.org/#/kodi-remote"; license = lib.licenses.free; @@ -37909,8 +38015,8 @@ src = fetchFromGitHub { owner = "ksjogo"; repo = "labburn-theme"; - rev = "6c217731977a9bd66330e9cd1e2bddfda47118bd"; - sha256 = "0mqgjq6l7b7rcky86fd1mwxwnvn269b8gj6v0y72hhkk1cmrh17s"; + rev = "3d180e556e20520081cbd05ec51aeb527bb48846"; + sha256 = "11p86v1qmgrxsv4zr14ygs43s9vdn4kscxr3gbjxz31ikbxf9w3g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; @@ -37925,10 +38031,10 @@ }) {}; lacarte = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lacarte"; - version = "20151231.1409"; + version = "20161127.1758"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/lacarte.el"; - sha256 = "01vs0v17l76zwyrblf9c6x0xg5fagd4qv8pr1fwfw7kl64hb9aa2"; + sha256 = "0bpjrnxfxfmrjj07hf5sgxjm4v8i6hr7ssq235jbh4r29vgf9qlc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85457b78a0fcc4ac0e0910d09594397b21cb1aa8/recipes/lacarte"; @@ -38007,12 +38113,12 @@ language-detection = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "language-detection"; - version = "20161122.2344"; + version = "20161123.1013"; src = fetchFromGitHub { owner = "andreasjansson"; repo = "language-detection.el"; - rev = "14302e31a319dceb6ec78cf3d7cc93d8402e2cab"; - sha256 = "1ci5ixj0cqcbsabh4gwhicimnmlcl3wl8nv69ydvi60yfwhgq5fh"; + rev = "54a6ecf55304fba7d215ef38a4ec96daff2f35a4"; + sha256 = "0p8kim8idh7hg9398kpgjawkxq9hb6fraxpamdkflg8gjk0h5ppa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed2b68d0a11e5db0e7f2f5cbb2eb93c298bcb765/recipes/language-detection"; @@ -38132,12 +38238,12 @@ latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-unicode-math-mode"; - version = "20160708.902"; + version = "20161201.835"; src = fetchFromGitHub { owner = "Christoph-D"; repo = "latex-unicode-math-mode"; - rev = "54ddb8742c50a338639625183f7315278fa7369c"; - sha256 = "1yp6nicz0zzd28hfpi94shgj76l1h68mbw875c7x9abyhfz06sfm"; + rev = "3b82347291edcb32e4062b0048c367a3079b3e8c"; + sha256 = "1xylfg8xpyb2m0qnysf58cl05ibbg4drhgq7msiiql2qrdzvpx9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c021dfad8928c1a352e0ef5526eefa6c0a9cb37/recipes/latex-unicode-math-mode"; @@ -38279,12 +38385,12 @@ ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20161030.1103"; + version = "20161204.758"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "20901f226c0fc32dbd2a2836bdf6525389205313"; - sha256 = "0y1vsr7szjvcy6dk6v98rdm1hkvyn8mg6lj18dcm1kwaxgbycdih"; + rev = "187851c47cd5a2ab397fbbdb09d2cf9ce6d50cae"; + sha256 = "1xhc5cvw7j6ninfw5knxqsjyxwg7p7ccf24gx72ik4gmddlki1x9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode"; @@ -38384,12 +38490,12 @@ lentic = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild, s }: melpaBuild { pname = "lentic"; - version = "20160721.1552"; + version = "20161202.1352"; src = fetchFromGitHub { owner = "phillord"; repo = "lentic"; - rev = "90a05765ebe890c0da88fe5177171473fe729574"; - sha256 = "1s82s5d7www2blz4zbyjdxwiqg9xb24gk5scxd8b8xqr7wd20sqj"; + rev = "678db9327209a1e6200c9272f4080595dc68f8a5"; + sha256 = "1wziqwclrkrz6bs66mj2rqcgavyf11l7iaz8vksv7vw6fh18bpbs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cbb6f9cc3c1040b80fbf3f2df2ac2c3c8d18b6b1/recipes/lentic"; @@ -38468,12 +38574,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20161119.1315"; + version = "20161202.46"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "1d4e77898228dbed46971a3f483bbca6c526643c"; - sha256 = "0b1lwccpkzzd8gpqsbn9y4drdsgg0vp48z21mnlnkfza9hnmb1l5"; + rev = "a8c6fc562043f1f4821d44e097713db2c67526ce"; + sha256 = "0l55k47szdhk4hhkddpfq6lrya9gc5n0ayslzjvz8g07g3m6p1y3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -38528,12 +38634,12 @@ lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lfe-mode"; - version = "20160810.1940"; + version = "20161204.908"; src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "1023ef8057335e627b7a2b20b2b144068aaab7c3"; - sha256 = "0041gwmkcjsk9c0j316hl1s588wxa7dkn8vm1fc2s9nsvhang8ab"; + rev = "64653b77c1d1a61f7e968d50fc1ffb1c03711b5d"; + sha256 = "0296fbnbl3rvrk1x8xbaq7y14jz3qvr1wkrqb5fx30bfjjfk3zc9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -38845,12 +38951,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20161121.56"; + version = "20161129.743"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "30e7745dd9a14a75c2eb1651c047304369e540e1"; - sha256 = "1i46w7m1pmvws6cgmaxwq3kajz6nirrz1bw7kq03ndx03nxc20d8"; + rev = "806b7dd5deb620751afc88480888e9bcc9f38e88"; + sha256 = "1c0zxjkq25a5aqxmbmnjih44as21g6yva05h9srxzbwn0w45mv4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -39158,12 +39264,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20161122.2243"; + version = "20161125.2208"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "3fde06dde5d541b7be4536bdbebaa6cd1e01a5ad"; - sha256 = "1nmsvmkv6r0qny2l8s52hld11mv74kbksz0j4vqji624im1d659w"; + rev = "469ed0ccf146deab8c2ebbb162be7be31709da0a"; + sha256 = "1qv6v27fjfq0h3i7d2nry752r9fwqf5llilngy5l3yimqddm2k4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -39245,8 +39351,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "e547b01b86f262d20c875cf3e2ecf7af0bea1e8d"; - sha256 = "1ldlla2bh1073c0hy9g6zrngmpf017jnq0sap4hcw1bg1dbcwyh9"; + rev = "1517e2ed72820d41a169f195c500d7adf2ff65ea"; + sha256 = "1bi1pk6yl31fg8yv6c7dkkb57ahs9cig2dy0lw137n4bgrd4l3jd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -39864,12 +39970,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20161123.617"; + version = "20161206.2039"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "74f9ef2e7c7de93aa6784b55064fee0a58239b97"; - sha256 = "0z8j9537kh4567knx942hc4fhqg3xnmryhlc6xyawd97k6acv60n"; + rev = "b7ccae8b3d516693e5c77d1b64538d18eecf12e9"; + sha256 = "1zxfl2bdkizf3836z4k9250vs6mlm2anr22p7ajzxkz5pk132wbk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -40039,12 +40145,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20161123.504"; + version = "20161206.1703"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "74f9ef2e7c7de93aa6784b55064fee0a58239b97"; - sha256 = "0z8j9537kh4567knx942hc4fhqg3xnmryhlc6xyawd97k6acv60n"; + rev = "b7ccae8b3d516693e5c77d1b64538d18eecf12e9"; + sha256 = "1zxfl2bdkizf3836z4k9250vs6mlm2anr22p7ajzxkz5pk132wbk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -40144,12 +40250,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: melpaBuild { pname = "magithub"; - version = "20161105.1817"; + version = "20161129.934"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "55ef2b694109e8f4caeb7cebd49345bbce7e5749"; - sha256 = "05k68hx83dvnvr1mkw8pmyn77dh7wa7j5q8awcjswxqw2pkxcmxy"; + rev = "c9bff9889650bee96c6d4f5cd46ac469ac1c3dbb"; + sha256 = "0vzln1b6cf90nnv7a28n2w781qrc17sss1s8h6i7fmnaldr0913j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; @@ -40459,12 +40565,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20161121.1435"; + version = "20161202.2205"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "6a0e74bfff0f1d74d179ebdf7894eb6e15381bd4"; - sha256 = "03hbyf0bj3lywbl919khnmhqwwkj7bcnvlhnspa8psi5xl6m05zq"; + rev = "2282848c1ab80f606390824711ca4a80548e6dac"; + sha256 = "0ckm7a0x367k3vv8ighl2ah2h8nwsgzqn30makrr7gqid6fas92s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -40645,22 +40751,22 @@ license = lib.licenses.free; }; }) {}; - markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }: + markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, web-server, websocket }: melpaBuild { pname = "markdown-preview-mode"; - version = "20161122.1102"; + version = "20161207.59"; src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; - rev = "c9c9bfb4490b52ff1b6ef05d4e108a04b3bfed75"; - sha256 = "1zzy47m9hxjxvqc34p99r4gda1czvcracsmkfylj1rr2frilhvsx"; + rev = "e1fce78ad3b96799675765140e0fa6936467be62"; + sha256 = "0dwrb0b0ninasf538lsv41gq4v3pw15i6mc90cs3nqi50i5l64c6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode"; sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg"; name = "markdown-preview-mode"; }; - packageRequires = [ cl-lib markdown-mode websocket ]; + packageRequires = [ cl-lib markdown-mode web-server websocket ]; meta = { homepage = "https://melpa.org/#/markdown-preview-mode"; license = lib.licenses.free; @@ -41477,12 +41583,12 @@ mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mew"; - version = "20161030.1807"; + version = "20161123.1840"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "15469053c8d7996b82270179d879d6e1e038282b"; - sha256 = "1ss01b1add6p8fgxaqy1nc5h9ycr87a647qyaqbm2knza0xrbhni"; + rev = "90485fb0f21c250d308d1952ccad1049e766fcd8"; + sha256 = "03bksshs2n3jxiccbgd86kbbwm79hmvsrbxw4yyjv311w8p2i1gw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; @@ -41690,8 +41796,8 @@ src = fetchFromGitHub { owner = "ksjogo"; repo = "mini-header-line"; - rev = "38e1f4711b57b07876aa5cdab5af741ace0aeb83"; - sha256 = "0v9s7fdy7r16m988880jxmlx7ypgwgav11fa4yixx4dximgbc2lc"; + rev = "d8c3b6e93ad631d22564c273f61463dc9ded49ba"; + sha256 = "07r231xz45k1b3pzix308jn24s0gl8vgdbcd4vdh6p154znvcbm5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/122db5436ff9061713c0d3d8f44c47494067843e/recipes/mini-header-line"; @@ -42201,12 +42307,12 @@ mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-icons"; - version = "20160808.525"; + version = "20161125.2230"; src = fetchFromGitHub { owner = "ryuslash"; repo = "mode-icons"; - rev = "0b5e76b2418d455bf7cf8ee52dd3354964626b5e"; - sha256 = "1z9jrc85mlgcqpyys9filyaav7f8asn2w5dd2q5wp4s7i3gj8mc2"; + rev = "1b3ab62793b0e5f31e1ee2d8053a219ec34287f8"; + sha256 = "0jz2mb3xinjkxw4dzgpfpxzzi27j9wdzbnn7rnfwkpj66v4fcl20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons"; @@ -42321,12 +42427,12 @@ moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moe-theme"; - version = "20160907.727"; + version = "20161129.115"; src = fetchFromGitHub { owner = "kuanyui"; repo = "moe-theme.el"; - rev = "01274c8538f6e95ce8b82e0db672746cbeab6b23"; - sha256 = "0h7nlrhcg6sclrmw075n1rsv3rjsi8z0sgr1al998pv4a3w4m6bj"; + rev = "1a77b2ee52f5077ef3a31c794ecf13b37b3b4fd3"; + sha256 = "1gimdcrkbanzl1zxxw2955k7a4ygyqgls12g31g8nvjjp46hgjhr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme"; @@ -42447,12 +42553,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20161116.1128"; + version = "20161206.1333"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "586062ec38807b709b888adf3bd80ffb5388f86c"; - sha256 = "13qx220ayf678milahq4xrhlhiljfmbscxikq0dlfdv39157ynlc"; + rev = "47afc7419ddd26462ad6e66e122b244c334da0b9"; + sha256 = "1bkfqlfag62mixd933d1ryvnbaq3ny2bgbqbagqbrgprl7558577"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -42697,8 +42803,8 @@ src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "bde4de0a4e1404127b0a48897d8cd1d1cb8a263d"; - sha256 = "0wwl9f01b9sgs8n19a4i7h08xaf6zdljf2plbdpyy4gzi2iiqcc4"; + rev = "ad7622969366e40401af877db75940ae23b5e4fc"; + sha256 = "0d2xabp9dkzixn7kqsxpapjcy846wgsh27l468pl2ar6pxnwwc86"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -42987,12 +43093,12 @@ mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mu4e-maildirs-extension"; - version = "20160911.41"; + version = "20161205.2"; src = fetchFromGitHub { owner = "agpchil"; repo = "mu4e-maildirs-extension"; - rev = "b695dcf4688e288488a6dd1583de3782df0a4549"; - sha256 = "1bwgrhsbf6frxvn8l66yi3qm1l7dc54dkjzdsad0mdas1vmibh0l"; + rev = "0b7908280c97c1fe29de0d10ac2715344e36b1e4"; + sha256 = "0ifwf5skadck4x11v6s12pdfraxcmdj335jmhvgn3r4gzg55qgl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension"; @@ -43089,11 +43195,11 @@ multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-project"; - version = "20150314.744"; + version = "20161204.223"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/multi-project"; - rev = "f7fd0ae6819e"; - sha256 = "0lcx73vzm7zwvzzc53pfb5y16bhvq9cm9fdy63d3242s8v834z3c"; + rev = "a6fd748acd9b"; + sha256 = "0j6lq5sxrn5yvxja5ag0q01bic6r6hbnfr7010ahc3bwl78yslc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; @@ -44125,12 +44231,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20161115.628"; + version = "20161124.739"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "5c7c66d6d0c14f45bbdfdf04610243c805a4c298"; - sha256 = "0wp55fpqqw0lz3n8ng0g5dydbipcxxvl679m65jla0ciqgj2fh8d"; + rev = "c5e15a42f0a95b8c675c739903ee4aa24ad41b8e"; + sha256 = "1hrh1h1dxwfsylwc03kj6yp5g7a85b53jahkvzyjyzmnnylw3zpw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -44381,8 +44487,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "3082aa69b7be2a2a0607441a7a2615d78aa983d7"; - sha256 = "0i7qadg281mv6f0ccafmn7fbcg9civqv65gz8wal9v975mh5nzsw"; + rev = "7d705a3dfcd09a31c67c440ca2120d3994357e57"; + sha256 = "0x2bkdbv0p5rj4nwybnajdwbyhnbyk4vxjlpmf5zljs5kc49h3zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -44423,8 +44529,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "7ee43df8622cc0589d54248fb44cebe1c1d991d2"; - sha256 = "10lzqqxd7nmzlma05ralfkzg3yk8j1qxvnnk12y466q8gbxk7fca"; + rev = "ceeedb58d23950f0ae3944484bca331e5cbb8053"; + sha256 = "1pnh32h2ga5ny6b4snzlsv4fbp30dzmkhs58aajp5zx05bngvgkr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -44545,12 +44651,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20161120.1243"; + version = "20161130.519"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "e1f11f07bcd2e2bae8b7217b0f6795d0cb0e6b8c"; - sha256 = "0dmkmvdm5ygm2dwwf7bgwhv9qv5l0h41a00s0l7ic9bclpx5yz50"; + rev = "12a4cc1155b938da947cce5b3dff7ffb91f2203c"; + sha256 = "1x7xmqvmna5h5dg352v6pzm9ijdivaz7wcc2nhnshxc5pywpc1cg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -44692,8 +44798,8 @@ version = "20161117.425"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "518843747835903b77889da30ce8c4518a5c0574"; - sha256 = "1wc0wslpscx79cy1acjw5yl7nk0jj5gx1r6j13mc9pd5hrfh5rxh"; + rev = "71f1228a518f08e94dc1ea4e2147f80d3484c615"; + sha256 = "0mc0pmykw0a9yz61jsfpj3gk83hv5d8zhjnvwvjgkwm5akaidf8f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -45066,8 +45172,8 @@ version = "20161122.1222"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "485778b352fd"; - sha256 = "010qb68d0vv6h3wqlmrav6qvazm8dcjgkqr9yn4j8s5x3c94a5cn"; + rev = "110e20a7a86c"; + sha256 = "0s18bbfw4kcv9iij1016pamq394rg8xr7016qp6cxyklp9hivcdm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ob-axiom"; @@ -45335,12 +45441,12 @@ ob-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-mongo"; - version = "20160504.1434"; + version = "20161130.152"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "ob-mongo"; - rev = "abfe62e964f6f3e097f94111ae14247e1f442134"; - sha256 = "1xrapp8mvxlbz0v5s3lrmfacijdgs6qrpklbk85rswx1gisl0kmb"; + rev = "d64a507c2f9e2a1f8062acae50199541fc23be65"; + sha256 = "0xlddh28z9afqj8j9brcncrbwsyqzmv432zayn9ajjj1vk1avsxg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e020ea3ef89a3787d498c2f698c82c5073c9ee32/recipes/ob-mongo"; @@ -47186,12 +47292,12 @@ org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "20161117.637"; + version = "20161126.1955"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "2977efc1c7d7de5a8c806277e08883aa80c40930"; - sha256 = "0w34j1rql98ca2fi77p4hx3kbkd13xqq9iym72d0qmphzh8xbqmb"; + rev = "28b460821c6227402ed2cb3222ea45bb99f7d43e"; + sha256 = "1x3y5jlcvqzzxi1rvhj9hbirgbav82m7kqmc49cjcdga5zs4x458"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -47273,8 +47379,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "a43eaccfce3b25999d91349f2c00b209970693ab"; - sha256 = "1g9wm439gy56884lbbs9kycymsd46pziwqhr33522dw7nnxr27pi"; + rev = "47ca6c129c4c7557eb8ae4cd3c656fb8b3c4b0b6"; + sha256 = "0406jas337gkx1m81560anck7bznxbb9v0kylcm99j7z10nrmizc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -47290,11 +47396,11 @@ org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mac-link"; - version = "20160808.220"; + version = "20161126.239"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "a43eaccfce3b25999d91349f2c00b209970693ab"; - sha256 = "1g9wm439gy56884lbbs9kycymsd46pziwqhr33522dw7nnxr27pi"; + rev = "47ca6c129c4c7557eb8ae4cd3c656fb8b3c4b0b6"; + sha256 = "0406jas337gkx1m81560anck7bznxbb9v0kylcm99j7z10nrmizc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -47444,12 +47550,12 @@ org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: melpaBuild { pname = "org-pdfview"; - version = "20161105.1652"; + version = "20161130.1053"; src = fetchFromGitHub { owner = "markus1189"; repo = "org-pdfview"; - rev = "8de30861216eaa2a922a2eccb6e7b1392f70a58d"; - sha256 = "1n5m3smgn3rxq9l110m3hqxip1xnyk4mjf70822ald4fv3l33q32"; + rev = "9de96eef6f187a10cd910e3bc3eb274d38856819"; + sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview"; @@ -47525,22 +47631,22 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, projectile }: + org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "org-projectile"; - version = "20161103.2316"; + version = "20161205.1508"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "a68ef488404f175d8b8867ad958233f927e451f1"; - sha256 = "0xvy108m4gqkzh00zgch8c163kri10rzgshbmz9kx9vgsqki2m1r"; + rev = "e2b78ca7fbd2e3b873d3ab9bb7196be4d7613f92"; + sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile"; sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm"; name = "org-projectile"; }; - packageRequires = [ dash emacs pcache projectile ]; + packageRequires = [ dash emacs projectile ]; meta = { homepage = "https://melpa.org/#/org-projectile"; license = lib.licenses.free; @@ -47639,12 +47745,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20161117.630"; + version = "20161129.417"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "72ee7410b218d39a3629f3e092e10ecb37e183db"; - sha256 = "14jf4qdi3lnm8k8cdl99bmy7zqh0brdrbz166hhlih7sn1lgsywa"; + rev = "d3319a7a3d724ee51a9b97328bf778324e4ab9e7"; + sha256 = "0s3h1yji4z42nd2pc50mddpvpkgi7066c3l1kb6jaywaj3yw2bi1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -48916,12 +49022,12 @@ ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: melpaBuild { pname = "ox-pandoc"; - version = "20161101.1920"; + version = "20161125.35"; src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; - rev = "973bb43495213e883383cf263ce173e36e09fb66"; - sha256 = "0g6jil43c8761ynhy77g0fvddw9wg9f6lzs5fr24hwj30q9vlnyz"; + rev = "d9cf410096fb27be8eb13b2207697f8530f62abf"; + sha256 = "0c8nfvh9vn850i3minfqvri2py48ycgz3sf5p1l0a3k98s4x4jl3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc"; @@ -49231,12 +49337,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20161111.1451"; + version = "20161124.1615"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "46562bac48a22fdc8492b76d63722c1dbcfe2e63"; - sha256 = "1l0rhdlzkvx1zzif8k3y1b8wxmi3yf08k7ynzzz5dgidxdvg1bd0"; + rev = "633fbff47fd4872d55d672029300c043e13e966e"; + sha256 = "0mr0yry397777gmvqj3z7b9zy47k3k3ghr03jyjafra4kjm85x00"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -49294,12 +49400,12 @@ package-utils = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-utils"; - version = "20161115.108"; + version = "20161125.930"; src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; - rev = "6f283b06ab87cce071fe71a9b22eb791d4da0289"; - sha256 = "0ihynkr446w065wd8psljdyrax53mcpv18l1k5kzlhp9hplykaqw"; + rev = "1ad19f3a9de68ae68e6dd2d4dad31532b4de1700"; + sha256 = "04ckdz80paj1dz1q659cgm7hkdh828ckxlch6iq18abr1ijzl8vm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils"; @@ -49378,12 +49484,12 @@ page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "page-break-lines"; - version = "20161015.1709"; + version = "20161205.2251"; src = fetchFromGitHub { owner = "purcell"; repo = "page-break-lines"; - rev = "65fc27e4c89eb0b37dd3a8e87c32ceba78f37f42"; - sha256 = "0lxfjryq13zg0ikbn1ydqghs57z6yxqwb5wvzkn98mf98iq6nlsp"; + rev = "c133848345ceef91e257aab8804c61f31c31b264"; + sha256 = "1d0b2pb2s04l7nkcn7yhrbcm927bsinyiayxn59in7p3mqlcmsnb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22b6035987994c11d5e2564862efb1e56848c3b6/recipes/page-break-lines"; @@ -49501,12 +49607,12 @@ pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pandoc"; - version = "20160607.1010"; + version = "20161128.357"; src = fetchFromGitHub { owner = "zonuexe"; repo = "pandoc.el"; - rev = "5f96efe8804cf949de2896fcb3015513275b9118"; - sha256 = "1r1rzaidg3pd8q5alv76drv843hwj9yzkn5hsaf4qnqrkkqwly8y"; + rev = "198d262d09e30448f1672338b0b5a81cf75e1eaa"; + sha256 = "0njc6xlwa8hihyqrk0hs12sb6rs7jma2wpjfr8xsj9p8jld4y359"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c21ff09d67fad2658e0de08bc2edb7588c504a/recipes/pandoc"; @@ -50316,12 +50422,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20161113.514"; + version = "20161207.521"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "3c1cc818e7f32b918ac2ef3b48940f25d72e9e1e"; - sha256 = "06v3y0y9l32wqwpg80g9ii0miahvpxcx9jkhpykydvm0q0vb68ww"; + rev = "3ecbbaf1606d23fb1abbefb6d359f47aaf153f84"; + sha256 = "1jn118f3mdz7wb1a58myahj4ir29rwxbfx1595gjcxkkpw0cyw11"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -50504,12 +50610,12 @@ persistent-overlays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persistent-overlays"; - version = "20160426.1221"; + version = "20161127.2300"; src = fetchFromGitHub { owner = "mneilly"; repo = "Emacs-Persistent-Overlays"; - rev = "e89a04643dc4532882352888755d9d5e26c46ae4"; - sha256 = "0iw9qsqy1aszwfzfslyxz31zav4xq8pbrx0mwxqix5lvy7768ppp"; + rev = "f563c8b966edc78c9d806661c4eb80e4781c4eab"; + sha256 = "0csllpkpjf4csw3zfaw8k05jg078najfmjz6pz1jcl6b4sxjdfqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3673c87c5ca883b4f713efeae912c3ad991c667/recipes/persistent-overlays"; @@ -50903,12 +51009,12 @@ phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phoenix-dark-pink-theme"; - version = "20150406.2002"; + version = "20161206.1519"; src = fetchFromGitHub { owner = "j0ni"; repo = "phoenix-dark-pink"; - rev = "314602b2e68c4054159ab3f0f6f6b658f232ada5"; - sha256 = "042yw44d5pwykl177sdh209drc5f17yzhq0mxrf7qhycbjs4h8cg"; + rev = "bd4962562a3d9f7330b9fbe8684ac6ba76feaab5"; + sha256 = "0mm8gyw6qzn6bkghrdsar0gbyv6sz5x2m3dii0frablgw9zac4nj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme"; @@ -51008,12 +51114,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20160910.1801"; + version = "20161205.1642"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "7337424d83aa77fbb5d12ba2a54293744ab30d36"; - sha256 = "1zn9c9ja36yf22mbfsfa32zrd5mwx2kqsnf740l4qnn9gwpvi5mg"; + rev = "f2dc941cef948fd35947c9f0f6fa2e9ad10e174d"; + sha256 = "11vk2di9r6059ymb1j9qvi3gxcyk4fpl7ni7pap9hyhxf3gayknh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -51306,8 +51412,8 @@ src = fetchFromGitHub { owner = "cute-jumper"; repo = "pinyinlib.el"; - rev = "238f27746dafac576f0aa686b37dacfdd2327127"; - sha256 = "0wbdhd3wqha3ahyakdjj4ki3998l0fafi86l26gkir1bq2qpkmcs"; + rev = "457b5ac6611d0f35ff2444e62008c798b45ae368"; + sha256 = "0kxsam8zb1rdw82d4jpa2n9kcdk05iscymgan39izgaa0w422s0r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib"; @@ -51533,12 +51639,12 @@ platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "platformio-mode"; - version = "20160327.1820"; + version = "20161206.636"; src = fetchFromGitHub { owner = "ZachMassia"; repo = "PlatformIO-Mode"; - rev = "4b514ea9c82c95cbe8756cbbcac4638b4e2790aa"; - sha256 = "0xiss3c6inz27yf08974mm4wg9dx8rcqqj77zp4rxhyhiqxzv338"; + rev = "9cd77621fb1aa64c6d2b346cef99373d659e4999"; + sha256 = "1myq0k8hnd8niwwskbfyy17lhgislzx9gshgsfhr8xg6b4id3p1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/platformio-mode"; @@ -51719,8 +51825,8 @@ version = "20160827.857"; src = fetchgit { url = "git://git.savannah.gnu.org/gettext.git"; - rev = "1d12aeb7334104f77070361492ff7cc8225503f5"; - sha256 = "15c1lij2c40xmqbq44xv6wvinjcq4j0l80rcc4yvdv8ik436phmg"; + rev = "7eb592d6a7071a4d8d33f15668c33da79ec42780"; + sha256 = "0d3vqx0khw46g9692cd7nf5xpgbmsw9r79s4jmm11wsz552fp7d1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; @@ -51859,12 +51965,12 @@ polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "polymode"; - version = "20160805.448"; + version = "20161205.46"; src = fetchFromGitHub { owner = "vspinu"; repo = "polymode"; - rev = "8a39ed6817298508c71f28effb0354a00f2235b4"; - sha256 = "1knms39cd97hkwi3ya6asnzri15fbskqq8zb4ly9ax8a358ryaz3"; + rev = "ef56a732cbfe86e982d5c982c0c7bd3909c7f840"; + sha256 = "13pj6hxz5018qyv08xh9q3bmng9qrikpnv55a3c1y8v0z68ppmkr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/polymode"; @@ -52090,12 +52196,12 @@ popup-switcher = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "popup-switcher"; - version = "20160622.1024"; + version = "20161130.656"; src = fetchFromGitHub { owner = "kostafey"; repo = "popup-switcher"; - rev = "a17ac13a08119f4164f25514f08556f7ce660ae4"; - sha256 = "1vymgdyzvx0d5i4da9q0x29x8d0lxi084rq68i6gi686x5nhglil"; + rev = "86809fbd3c3c3d566043043b6577ccf8133ac855"; + sha256 = "1r8g3wxyklkck9af1x7rg7hyj8fnf28fd34p12vv17mhnqzb4x4y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7d1897c4c4a6f4b4527279e6dad976219d7b78/recipes/popup-switcher"; @@ -52876,12 +52982,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20161118.530"; + version = "20161130.1025"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "0231a7bb4b70ef3ee0e6a30185e9791a028e718b"; - sha256 = "1vrhd7j4dk8pkm2vlh46hckfw63vpzrkylk3v5y2l4khg5ak66wb"; + rev = "fe0cb5597d9e87ceebfadd1815beadfc04a194f1"; + sha256 = "0yg7xbv0mnrcc6kgh8ci6pxzfjiq1qkrw6hx2zs5m4ryfrrfclz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -53153,8 +53259,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "c9504715634948c9f8f306330449f296d926b74e"; - sha256 = "0pvxh58vvvgrlf6gjrhg016k7hys8wmraxd38k0kdjw4srisj319"; + rev = "607b92149948393311d66329b9851f5971662f19"; + sha256 = "1pdszacywqkk2p5f9jigbm0brz0i5a1n9lijl1kcx4lblzyq755d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -53167,22 +53273,22 @@ license = lib.licenses.free; }; }) {}; - psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psc-ide"; - version = "20161012.143"; + version = "20161204.958"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "756bead9d5153a6ed47e4f86f42be0c49c95cace"; - sha256 = "0mkvnhyl5lxbzjks8769pgzzafhi9z1sr768c67zmgbzz6fl0rmi"; + rev = "59766a43a2cdf6f44ba9fa038f9997963f191e1c"; + sha256 = "0aam1vwlidfsqpdnv2s642pzdqngjb4j6lm5ms8fm1q589fc8vys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9"; name = "psc-ide"; }; - packageRequires = [ cl-lib company dash dash-functional s ]; + packageRequires = [ cl-lib company dash dash-functional emacs s ]; meta = { homepage = "https://melpa.org/#/psc-ide"; license = lib.licenses.free; @@ -53296,12 +53402,12 @@ pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20160915.252"; + version = "20161206.1934"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "bff32a818ccc9e400210b942bd5e67fa21551148"; - sha256 = "1ad5n8v40acj17qficbzrnixbmg5wplmbd8h1z9hdxhbrkwy5323"; + rev = "cd4cc093c62735c3947f4f7ff458a2a0a153645f"; + sha256 = "1bbqm704cfm76qd6fh9x4lij72hchciy60hjp2wxv2n5j51xqlq7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -53380,12 +53486,12 @@ puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "puppet-mode"; - version = "20161020.309"; + version = "20161204.713"; src = fetchFromGitHub { owner = "voxpupuli"; repo = "puppet-mode"; - rev = "0a7177c8b0437f1e716da428053fa8d5113a2f51"; - sha256 = "1ma0yyf176nz3df5mxzim715g40g4v2snb51ljxax2rs1az04wxb"; + rev = "bfa9512bcaa91cc2068d280d646d7a794da82905"; + sha256 = "09jfb9xldpcg7z9hh7yka1pcrm008h6sx209lhnwmg2qn5dj4rsb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; @@ -53887,8 +53993,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "23e59c80cfcba5878b7f634464a203017ab91187"; - sha256 = "1gylvfl2bd6f5n60g0l5z2ymaasgvcj1a5ar5fh46snsln5j83zl"; + rev = "dcebae55d3b3246078658cd3a2f100f80a8cff32"; + sha256 = "0gmia3yd9rvvriy04m91zrgx2sd1if141317741vv250ji4lql7w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -54030,12 +54136,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20161120.952"; + version = "20161124.930"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "ef639cf5bfa8bbe6a4321eb58534768dcc7608ca"; - sha256 = "0ay3jbpp70r6a02rwk6bll0blzv7f61k081jlby5y1g1xd753p2g"; + rev = "d30c9033fde2f4ce03b4f4792792a9603cd26bab"; + sha256 = "1bgzkbhl00cc60y0d34cx7i6y560wf9jx9fb3d4wz06vh3322mb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -55084,8 +55190,8 @@ src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "4246e34d7a6f668f5d9d403de054ef68e6d89548"; - sha256 = "0rnqs09q30rshp3lyslwh3rxgn7ay370y9ain1bhf2p2ww9j3m5i"; + rev = "809658d30038e4fab186d47730a3790abf7cd2a1"; + sha256 = "0r1xz8l2513xhzc0dv97g4r6pxnyk5kwcih4jfribhxil0xjd5g0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -55399,8 +55505,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "d68a46821809251d04eea062916238131130b477"; - sha256 = "0a0p57x1gizbzp793l0k7mra5qv36ml8zzpva47l34lhywd914xn"; + rev = "40f94f3c63087c05ff989dd3dc27db0ef9a638e5"; + sha256 = "1fjr85b5k8zfcdsa4si602r12x0pa7xb208y3j5ld35gwmwr493x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -55478,12 +55584,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "20161118.1715"; + version = "20161205.549"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "9ade146339e9883a65b109497574910d9e618aed"; - sha256 = "1ff79jyfk2aahxazsa9drsq4j4sl2n88b52ikk3dmsrl08bvvzvq"; + rev = "3609642fc83f344783e7c8229edb529264ca1eea"; + sha256 = "01qc7qsyhcm3i0ix4zhzwiq770mf2z0831gz1ybjaa6f5lwqslx5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -55750,12 +55856,12 @@ repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }: melpaBuild { pname = "repl-toggle"; - version = "20161120.200"; + version = "20161203.414"; src = fetchFromGitHub { owner = "tomterl"; repo = "repl-toggle"; - rev = "bd2d28738368a047d5f407034f78839a7e514489"; - sha256 = "1h58a2darz4k1aj480xahhp29gh2cg41pymidymjx4wi2ygic4pr"; + rev = "50044030969d68e9f78a6db4e0a9229f5f3eaec3"; + sha256 = "0gi4pdfgyhl2lss5p71p0jxifni6zl0fv7n4cj42hbalgfyxfv79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da4be8c67584ea0ae35c7c9ee33334db5061a538/recipes/repl-toggle"; @@ -55771,12 +55877,12 @@ replace-from-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-from-region"; - version = "20150406.1729"; + version = "20161203.1306"; src = fetchFromGitHub { owner = "rubikitch"; repo = "replace-from-region"; - rev = "cff9fdf4ca351f8c5848e3516ccd76cc9be6ffa8"; - sha256 = "0w9ry16crcgc6aiq0xwzf7b301kkw6i44jc0dhfj621bhgmf30aj"; + rev = "959ab7b2e2f19f3b559fd1228597530ce0694d7c"; + sha256 = "0xmslc7r0lsi7566ajrr9sqvzmfp7qjgfg13pf6n63rb3rsk72ny"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/replace-from-region"; @@ -56602,12 +56708,12 @@ rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "rspec-mode"; - version = "20160715.509"; + version = "20161129.1525"; src = fetchFromGitHub { owner = "pezra"; repo = "rspec-mode"; - rev = "9e254cef81dc5533739efab2d81a575df0334629"; - sha256 = "1wcdq3hyb0q7l6nj6qbaf32m3mhfiph4kdd6frxf0fb93b8rpciz"; + rev = "8e05e95548da58c63d8b805d4516eb892621f8e3"; + sha256 = "1n93vjzjmbs7yna74rpn57ckps903fdam2ljh6jm5a9ivsxnc2mn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode"; @@ -56623,12 +56729,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20161115.1841"; + version = "20161126.1011"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1360dac22af6b227a209aa9840336bab7f1b21e2"; - sha256 = "06cnvxfvwcli2rr6wgsncp30jxmpyq0zbp2yrbxhyl7q9g875s85"; + rev = "cc36a69e4190ed2b071c136b332ec4bca10e967b"; + sha256 = "11h8r79v79fhhbjyxlazzqrqxw8abf6xy6a9bh4gp0j7l4kmch98"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -56689,7 +56795,7 @@ version = "20161115.2259"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56884"; + rev = "57016"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -56769,7 +56875,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56884"; + rev = "57016"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -57332,12 +57438,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20161117.1519"; + version = "20161202.227"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "dd0c42a1eb739529cab2becb791badfd2c4148da"; - sha256 = "0ca9pd3si7gw7wsibryhhr9in6ymask2icv79qrdcpz4qhlhby52"; + rev = "035af95164f7bce342d4663aa7da00852dfec500"; + sha256 = "06j16hgvzbbp9d4bvn3fdsmw3isaw017dydjyiqmjpfzbaxg9yac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -57357,8 +57463,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "dd2e9af171bd343af080b37add48a0edbf043a07"; - sha256 = "06q66m6i97i7a5qpxslgwighaqbn23gfhjjr4baxpi7cs04xyfbf"; + rev = "51923888a39137f2c46bf3a650fef66206e81b2c"; + sha256 = "18vf195fd2p8wiw4qag1pq1vrv6ria8j76lgzf3ghkqj0s7bd5rb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -57479,11 +57585,11 @@ schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "schrute"; - version = "20161024.54"; + version = "20161124.1227"; src = fetchgit { url = "https://bitbucket.org/shackra/dwight-k.-schrute"; - rev = "1bfcd4a24ac833448355facc82255344d61d8fa2"; - sha256 = "157jkf810dd954l5zv49w8ajwkfjwqx0mwga0s4jdrq2ial797f4"; + rev = "08ab6565fa94f3a8016163fe6f7be1932af1156b"; + sha256 = "0l1k6wjjr569lk5k8ydwq13041kn889g20qbzf79qj1ws96rim4m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute"; @@ -57829,6 +57935,27 @@ license = lib.licenses.free; }; }) {}; + sdlang-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sdlang-mode"; + version = "20161130.2311"; + src = fetchFromGitHub { + owner = "CyberShadow"; + repo = "sdlang-mode"; + rev = "d42a6eedefeb44919fbacf58d302b6df18f05bbc"; + sha256 = "0r6sm7b15scmjcpdcqvm55hdsvyw5d2g7mrfhsx2hs8sqz64gkwc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/691af79137015f15a3d383439e534e255ba4b36d/recipes/sdlang-mode"; + sha256 = "1z6n374z55dr2c6xdwgvmpznd5gk9y23k136zmy29b68j2kswj6l"; + name = "sdlang-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/sdlang-mode"; + license = lib.licenses.free; + }; + }) {}; search-web = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "search-web"; @@ -58038,12 +58165,12 @@ selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "selectric-mode"; - version = "20160824.1522"; + version = "20161125.429"; src = fetchFromGitHub { owner = "rbanffy"; repo = "selectric-mode"; - rev = "dcbfc60658ab698e7c43baa5871af7aff2e35823"; - sha256 = "1fd3liqdhd0dw1kkgjz3qvajnlr8k60gbcgfzy3s858q2x6ranfl"; + rev = "a8e8c8899c749bd36bdd161e161cdc51301defc6"; + sha256 = "1dj8vccdk1s0ynl5znpg02xp182srn3s8cqcxqrxjllp7wbgab31"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode"; @@ -58532,12 +58659,12 @@ shell-pop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shell-pop"; - version = "20160611.540"; + version = "20161127.623"; src = fetchFromGitHub { owner = "kyagi"; repo = "shell-pop-el"; - rev = "38e702f6980f4ac9d8a836cb8b7fe3b406aa52bd"; - sha256 = "02ga9h8s5lh1z6nqgi4d6icsdc1z46hk713vzfr3q1sdir1nbf58"; + rev = "788250f22a4e652407eef117f19d6f4b56d7f919"; + sha256 = "0dd4hxbw6q9fazdjqdlfvv2g7fggmfhfmmy9ncipy4v8yd2d74pn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44150bddc9b276ab9fb2ab6a92a11383a3ed03b0/recipes/shell-pop"; @@ -59030,12 +59157,12 @@ simp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simp"; - version = "20160315.924"; + version = "20161206.2151"; src = fetchFromGitHub { owner = "re5et"; repo = "simp"; - rev = "f74467507983a3c8a8b61268e07219fbaa628ae5"; - sha256 = "177bhvynqsdfwwqhhlh1v0pqvscy3xv6hhxi7fb42l5dmsw5b97z"; + rev = "13959cabdc7a10d8878592ef4333b3e6df2f1483"; + sha256 = "1wph7r7r9s867wr6j17fqch8hmj20fksrhl80bw2k4vyscaj0f22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45ff5b788e12218f8e2df7e53444796ca4b929fc/recipes/simp"; @@ -59238,12 +59365,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "20160922.801"; + version = "20161130.609"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "ea82d5e3e1226605e7b04054a77cca7431fe4709"; - sha256 = "0p6zlm46pq9id74bqpgscqczpkk991mzh8d6264g5qxj0az22iia"; + rev = "070aa311b0a08b530394c53d0c52c6438efbc20c"; + sha256 = "0zx49kd3wrqx6f52nk8rzqx3ay3qbcygibcidw6w7drvxnxjgd04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -59322,12 +59449,12 @@ skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "skewer-mode"; - version = "20161122.905"; + version = "20161205.419"; src = fetchFromGitHub { owner = "skeeto"; repo = "skewer-mode"; - rev = "051068d58a724695bb067e268d317c8bfd222ba9"; - sha256 = "0pczkbmgf5slr05lrsg8q6a67hbmvl20yb9w86j205y8hq5zz4pb"; + rev = "3417b6f306dfcddde17b86f29a336b76420cce89"; + sha256 = "05bz5bsj3vkfjp1wh477fzjlkv5hbhr4anfxlx2a1r7wimmlrmbd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode"; @@ -59382,22 +59509,22 @@ license = lib.licenses.free; }; }) {}; - sl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sl"; - version = "20160729.2101"; + version = "20161206.730"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "sl.el"; - rev = "76a8eae2b3fc449ed81b2a577c53939434851635"; - sha256 = "1nkgqva4l4nwpixavky8gm38371z7mrkpqdkgrya4j5mrx4kiw86"; + rev = "be3ef1bad689ce9f7e20a15728a07d75eb9066a9"; + sha256 = "18xdny9da1vr79jlnhm34kvjrm0wy82ir7885a64z77pjbnxxs2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7188a93d33e38f360930b5090c6ef872116f8a7c/recipes/sl"; sha256 = "0h90ajikr6kclsy73vs9f50jg8z3d6kqbpanm9ryh2pw3sd4rnii"; name = "sl"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/sl"; license = lib.licenses.free; @@ -59406,12 +59533,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20161113.1832"; + version = "20161202.2316"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "70e4c3450a489185220756ea8ccef8ab453ff07f"; - sha256 = "09591nsimwavdzbdz8kj374yy8gglcc5w7gpqvxq4fnrkfda6dgd"; + rev = "d0924e13fe88bd8f920d55bea7317d714f6992d9"; + sha256 = "1ij55zldz90ima8q9ay6957rzki9gcqfdfq70lgy41bgcafqp3qv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -60158,12 +60285,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20161121.358"; + version = "20161203.436"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "b661715c377a02e8fb71209cd918f1188d1923d3"; - sha256 = "1g05h5fzwg63r6n85gphg4giz2cw6miqckdjbwcam098dk1igyby"; + rev = "f55a741c9e54b271c7fd9c213937fb668e6771d6"; + sha256 = "0rx8wgpxfc31ynm2lzqnnbqzx8c308hv9flxv2qs1ajj4c55wrpz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -60514,12 +60641,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20161122.1546"; + version = "20161123.2130"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "327c168febbde24c2b39cc10d26c9cfc9189e130"; - sha256 = "1jlv8sr2g3i335h7hp8y39b77wla9hac1b0bk2imalr14lz04vly"; + rev = "e4a0916d3b60dc4b7e98db59a2c2e2db4bb71fea"; + sha256 = "1463949imwyg3kd4988fz38i472lppvphga0qinn27ddwkrf0v0s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -60661,12 +60788,12 @@ solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; - version = "20161009.838"; + version = "20161203.301"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "43d25005f8c06cd145b9fe55c7f9c4b626293b1b"; - sha256 = "19hl3pfr04l3pli0dnall9gbymh0k17m9r5dzm36dx3a7m5v3j4l"; + rev = "f4840394caba81909eacc8807cab904a0af87419"; + sha256 = "0s6zs2mmwwq6df8yiwp8ykz3qqfn7scwkz35rj7bzdnbls8rwaaq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -61025,12 +61152,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20161024.1259"; + version = "20161205.1104"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "30068e248b9db11a2eb37dd20b96cbf8ac574326"; - sha256 = "0c9w02vkbd70wx4ddv5q2qk7agigllh6aabw6y80ph1fdvyadnzy"; + rev = "069cb4c14e33270a6316fa7e60a1cee20eb7f13e"; + sha256 = "18xr5vy1va2ppd8fbrmrjgm0izly9fzjznp6mp3b85qfczv1wz4k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -61109,12 +61236,12 @@ sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20161029.531"; + version = "20161127.955"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "74b901d5689ee4864c4d552d7052b8f128f77339"; - sha256 = "0dr42d0grgbmvfiw7v6lpxfgiqkhx8srkyql196gd2yrixmndrzx"; + rev = "1a806aabb8d9405c3d09248f6cd9905883c05b71"; + sha256 = "07fg44skbkkwwjd3173ilf0p6fp6sp0bwz1s1ccqjcsb7p21mrvn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -61666,12 +61793,12 @@ srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "srefactor"; - version = "20161116.2201"; + version = "20161130.2112"; src = fetchFromGitHub { owner = "tuhdo"; repo = "semantic-refactor"; - rev = "f98172442c1a3da1a57f7d1f8d44ffedda4e3025"; - sha256 = "1dlzipvafjbnv8ih62ldfyv7yri0zz0gkfnhdlkv4l1482xdg5yn"; + rev = "8707d93ede4b45c6173641d3482b0d8ffbbeb860"; + sha256 = "1k4jsklaqmzg6lmrb1sgkwrqpl3qvycqxqdfc129vrg4gybhsavz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23115ab231ab108678608f2ad0a864f896cd0f2/recipes/srefactor"; @@ -61750,12 +61877,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20161120.148"; + version = "20161206.2115"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "61a16be9fb34486b68e116dd57a4a0a057b8a3e5"; - sha256 = "1v01yl1jf93dsqn6myc2yj6z2cjr9pq2q3cawj5kn21qc53q33fd"; + rev = "740c27df2a6cfc688267e97ee8017b8fb3ac624c"; + sha256 = "0qy02zifxfwvvy12jfx83lrkdjlglfb6m5ifm4b8waa6nbmfpvy2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; @@ -62004,8 +62131,8 @@ version = "20140213.348"; src = fetchgit { url = "git://repo.or.cz/stgit.git"; - rev = "ef93c20469c08feef7fd915bb773b53e0673679b"; - sha256 = "08xjp9r2cx9jp4gvnadm1x72mqicwkj6rzmzgm976xrndi47cakm"; + rev = "0accbea79b9cae8dae68ff64d35fd342792c15dc"; + sha256 = "13ab7k0c5az712ph2a879da84mwijvb1mxzn59cv3xkriabndk4p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit"; @@ -62535,12 +62662,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20161119.1334"; + version = "20161205.450"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "99baeba41c06f8ac67570de679405d83a8962fb0"; - sha256 = "0piwn9bpfiiv8vgk9bhrvlh25kfh1sa1a7dqpp6dsrvg1swjqwj1"; + rev = "19bfa7d6c2356a62647c7fe85876a88ab3b6475f"; + sha256 = "0sh3nryhcr2spxjh7p0jsjyfhvmqnwjayzz2zrwv3xi2vdgg8gb8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -62907,12 +63034,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20161011.747"; + version = "20161206.155"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "7e02815e31eb2227b7ef5fe8015913f259ced7f0"; - sha256 = "1gf1liwggddsizldx9sa4qw44skq72qmmzx5h3582sxncqjjp8mk"; + rev = "3b15585257c083706c32d0988f1982018fb17e9b"; + sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -63260,12 +63387,12 @@ syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }: melpaBuild { pname = "syslog-mode"; - version = "20161116.506"; + version = "20161124.910"; src = fetchFromGitHub { owner = "vapniks"; repo = "syslog-mode"; - rev = "c2f0e4024efe07af7c8aa431c3dd3640c22f39ad"; - sha256 = "01f0qr0mvqj9dh9zzk9y70kivyrdvcn45gpzakqi7vnkvqap86lv"; + rev = "b2582df8f6c1125636f113100a77edcde0879c22"; + sha256 = "0am4dfaxflhyn4f0vx79w3p302fi0rr1zh7cx07s9id5q4ws7ddm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/478b307f885a06d9ced43758d8c117370152baae/recipes/syslog-mode"; @@ -63323,12 +63450,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20160928.1956"; + version = "20161201.2217"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "7769000ba6b395dfaa2c6b0fce48ae5d5cd9a035"; - sha256 = "1vqcqrq8qk9n512rbwi2lcvjiy0wqmybwa2lmrkv49yshqjhm5ld"; + rev = "fa1277d1cd955b031a943d52d370e97aec3f2cac"; + sha256 = "1j1q60hjfx6ma82j6dil0a16jrablzskh76l0gcdq0c8rjdqb4i4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -63641,8 +63768,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "6eb5781af166bb8850e83fe7bb9be74f274f2b99"; - sha256 = "1yzx5ijjpg7dn6vnp66qq8fazb389wkpki4kpn3jvwc2462i2z6r"; + rev = "d5b75f52d9ffdbc5cc391fedc3f81d86091839b3"; + sha256 = "12nnyqg1lqa858c35b8z44wrbrznga8bwsnhm0hqcazy9bjin84v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -64040,8 +64167,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "c020ba5433998de5b743ca06728fffaa99d002eb"; - sha256 = "07fvmlnc2ck72cyrwgibfbsqcg7knrbar488m1i6an0lqd98gbhm"; + rev = "3f4794d39aa87163cb96a43fa48635a0a6f16b95"; + sha256 = "1zglja6lmid3hldykn7gs5xnmn080m06c1idpxgbggzjh7bvl246"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -64061,8 +64188,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "c020ba5433998de5b743ca06728fffaa99d002eb"; - sha256 = "07fvmlnc2ck72cyrwgibfbsqcg7knrbar488m1i6an0lqd98gbhm"; + rev = "3f4794d39aa87163cb96a43fa48635a0a6f16b95"; + sha256 = "1zglja6lmid3hldykn7gs5xnmn080m06c1idpxgbggzjh7bvl246"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -64306,12 +64433,12 @@ theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "theme-changer"; - version = "20130725.1919"; + version = "20161130.1440"; src = fetchFromGitHub { owner = "hadronzoo"; repo = "theme-changer"; - rev = "c28ea477e8277c03e14657f167695e3c4bf3c11f"; - sha256 = "0njmn5dy773v9kmwclw1m79rh52xnxl8mswcaagni2z3dvlvw4m8"; + rev = "60e3dd7cbd237225fef34179168006501a27b06b"; + sha256 = "06y36i3h5m85d6b47cr0hghhbkd8kv23lm6ipc9swkmq0hl3pxfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d08b24a2aec1012751054c68f7d55bac1bd1fd11/recipes/theme-changer"; @@ -64491,8 +64618,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "84d6af4cf903571319e0ebddd7beb12bc93fb752"; - sha256 = "1809p5fi1si0l4qfw99d3rkcd1jsfyrvrqwf7xxvwxwjca3zqdxi"; + rev = "7ab125a253e5aebbf2a0ed9a0a1602a4b879eca7"; + sha256 = "11wsdxjjw4l7h79achnw6kq5qs3dwyinkfn4r26bijapmk60626s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -64548,12 +64675,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20161123.255"; + version = "20161205.2257"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "9e5baa6ced305f440f67bcc803e24f0a03ec2b0a"; - sha256 = "1xbj704y91300g6nbr01abf9xsfrpc3qykpz5jm35ra54hnvj11c"; + rev = "2351b8240faaf7fc7785516c0480d54e78e0d3e3"; + sha256 = "14wfh3siwsxdicb382w9ygjmz6xxqm1724xypxva4n26666fc2da"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -65589,8 +65716,8 @@ src = fetchFromGitHub { owner = "josteink"; repo = "ts-comint"; - rev = "2e71708dcd6f3af62501912904c85075d70edc7c"; - sha256 = "1m8rcz6yj8j49jxyjg330bgw3d6mqmzf3f1ja1ngjsfhpkl27v99"; + rev = "53e0326149d74ac13850f052dcdae4a070d63480"; + sha256 = "0jrl161lkjdk9appn42g8nybj7sdrpvr0h7c48kj4vvsfmlmrikp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84e7004395083b66fce7ff4676af818bc798058a/recipes/ts-comint"; @@ -65688,12 +65815,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20160710.1045"; + version = "20161129.1516"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "1e68a0addca6165b8f1cadfcd15c0b7ef5184e9a"; - sha256 = "11g1gimcp4w59pd316my8zmi4y78zf9avxhck829f817a97kf5fn"; + rev = "f2c75b3dce0760a84d2558d9e8ef43d5f4559c47"; + sha256 = "1nsj9iqinmnw10b0ij636nikdfhz946rd97751pzk4irwsbycxyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -65940,12 +66067,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20161123.6"; + version = "20161130.1944"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "d5c4fb27c896e37d6adaa61f55b275ba9efa7b98"; - sha256 = "09kg5axl0aazfglzp0zm5wj3rrqkvdhiwlafliw2icrspygnk7ra"; + rev = "f72826e564dc9d7b60dd9df3c6337f33b02560bf"; + sha256 = "1mhsznkg7hnhb7ypbx0ljg3scawz6dsa5l2vaapb51akaf87a267"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -66000,12 +66127,12 @@ typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }: melpaBuild { pname = "typit"; - version = "20160531.931"; + version = "20161125.1205"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "0e5b374830e85a32b51a4cc8206df8e494378cb2"; - sha256 = "1jv5qmp3xs37py7d9aln4jn85j65h9pp5vb2dcmd8rlszhplsrng"; + rev = "0ec57775db48d3a2d73998d569626cc720618786"; + sha256 = "15wl6vymbdc3fzsk4fn12j7nzdg9iqzfi3lnw68bl0p00s3i37pg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -66046,8 +66173,8 @@ src = fetchFromGitHub { owner = "ksjogo"; repo = "typoscript-mode"; - rev = "0d414e15c8217b5ed42080c84f1c4cc39fdb18ab"; - sha256 = "1i6667dn8avk2lm37lq2ga3d716d34yqz5zqd8j1lq4xyjaq3qj6"; + rev = "478070b6946cbc6b73249bb6e5f35366aabe9f99"; + sha256 = "13lawwhn2asr20213h1ijy827kfxs9qzhizkwzsa2sm2s0262rja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/701de09cb97cbfa49a3a81aaeb9577817566efa2/recipes/typoscript-mode"; @@ -68114,12 +68241,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20161119.924"; + version = "20161203.834"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "de14f795f0256642eb03fbaf3182896619203c66"; - sha256 = "09qfc1q4954p5fxgcrkgd9rhff3f2cq1sgs6ydznqmsah5nvfcr0"; + rev = "f0aec22fd9cbefb8246f8ae533716b7cce016077"; + sha256 = "0zmn8jyvs164kim3avvdaw66rmdh6nqbm5qi6bpz5i0zb3w36jzn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -68450,12 +68577,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20161121.2003"; + version = "20161205.1129"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "b5a9d7d1ce028ce904cb8479a10440ad6c839221"; - sha256 = "184if1gyxnvrqjd3i59kjg5sndaa0fq50l267qgbxv807w9akha3"; + rev = "786d800f61e25a1892c44f68a3e21c0507d03a1d"; + sha256 = "0whh6srdw1byr3zq84q3z847jlfsiqvmz2pybkvvdc4j5bfbr7hx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -69008,8 +69135,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "d9ebfc6c8722"; - sha256 = "038glxpcl6d9js0kaxaqmfz6xlz50z28nny9biarx1mhjvy70lwp"; + rev = "c8c2934f6674"; + sha256 = "0wsnmwfkiyic40v8dl65ccxv3n3hazmlxlbqr8v6ggr8kcx4ydyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -69046,12 +69173,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20161109.403"; + version = "20161201.925"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "7b6ac3acf02fcfe118685011d46bb8f6b5cc493c"; - sha256 = "0vvr6agl2db16wppgg8rcd3q9sq5c8xcc518hmxq9drdhgn1az1s"; + rev = "ee41302fea917eb113182bc1eb8d44de882233f8"; + sha256 = "165shk1bi5lhbx06mavvlpcqvdjpnwdp29l9gqnyxclc7nm0i05b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -69235,12 +69362,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20161122.954"; + version = "20161206.201"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "7f4b1367ba8d86f7c2d8a47f7dd9ac87c4104620"; - sha256 = "0n0gdvhzaqkacj44ia5mnx9xcq213apmwxbkm0xhlmmirz6l336h"; + rev = "c1a5e644320b98467a31b0c363edc8229927ed78"; + sha256 = "11pb3sd1jn5jfhx0q4pwpiszaadbyag9zjb6iy6sl1nhs2z22acn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -69571,12 +69698,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20161116.1343"; + version = "20161202.1016"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "4b58d598a48f7d8203c1673ceaa05e2fa4f83b68"; - sha256 = "0b0i2vxmzr79f6va19nn6ls1gl2hv4nk8w8w6hmghcsbdi4npmg3"; + rev = "de18e02b5fbbc82de463727d519ccf8aa45fe997"; + sha256 = "1n40lp273zjjd82ggzvibzxcp8szyxdqpz8c61mdfq8hyk174nmm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -69673,6 +69800,27 @@ license = lib.licenses.free; }; }) {}; + xah-math-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "xah-math-input"; + version = "20161206.1107"; + src = fetchFromGitHub { + owner = "xahlee"; + repo = "xah-math-input"; + rev = "4f36d0d949ec8d930aa5e3a0cdaa9fb136244436"; + sha256 = "184kciyvs9qgzlf33y11y8x4rixfg1sx067qh67yjwgl2wzwbwfm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input"; + sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a"; + name = "xah-math-input"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/xah-math-input"; + license = lib.licenses.free; + }; + }) {}; xah-replace-pairs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-replace-pairs"; @@ -69785,8 +69933,8 @@ src = fetchFromGitHub { owner = "vibhavp"; repo = "emacs-xkcd"; - rev = "2c538d41a9728939cc5e8292faa78ed50997877d"; - sha256 = "0p9p3w8i5w1pzh3y3yxz0rg5gywfq4m5anbiyrdn84vdd42jij4x"; + rev = "66e928706fd660cfdab204c98a347b49c4267bdf"; + sha256 = "0znhjwlpgg05g39b16ddgw3a71a93fn2dicfsxjkziffn2a95m0s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac99eee00b76501d830373a13369f6a2a1239b5/recipes/xkcd"; @@ -70012,12 +70160,12 @@ xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "20161110.1630"; + version = "20161128.1657"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "34318edd4a552f194affb9858fce241747d0c79c"; - sha256 = "0kv843wl0j1zwpcxmzbbpci6yrjvyhamwxbv7568yv5hzscm0sh7"; + rev = "67860d31c4a4e8e8781bf2c8888f40001614f54a"; + sha256 = "01if8ggkpli7md0yg4c3gv8nn0di3drs2frcfm9cd4d4jc7wc7l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -70345,12 +70493,12 @@ yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yapfify"; - version = "20160822.1207"; + version = "20161202.1055"; src = fetchFromGitHub { owner = "JorisE"; repo = "yapfify"; - rev = "0931e0f4ee3ed060be87f529cac4950af534ffac"; - sha256 = "1dzhxldakjqnnihvggwbmi48l0dim49l463bahb3kr8493rd8c9x"; + rev = "c22db3683133ed4aff78e280983ec0621ca1cf1f"; + sha256 = "05nilm9adpymx1gs1qvcrrgyv13vf5lm13rp12ljbndk0gx4n8x6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify"; @@ -70450,12 +70598,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20161110.1226"; + version = "20161201.1520"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "8412d71e44576c6e9f182109219a8a71cf9d4311"; - sha256 = "0x4lbg6psffpw0s4nji6iyp3iqdip5l6m2hkcg4y5va048hr4hbf"; + rev = "7b013dbbdbaa692199616e5ef727b5d4e3149e63"; + sha256 = "1l8n4ab0ls5zmdn6l8836qc220s4lh05q99bzad716h42p5va4gd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -70489,6 +70637,25 @@ license = lib.licenses.free; }; }) {}; + yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "yatex"; + version = "20161001.518"; + src = fetchhg { + url = "https://www.yatex.org/hgrepos/yatex/"; + rev = "0c098405a3c9"; + sha256 = "0vk5wk7b05lyr1724wnwxlwfcw7myghpcis0ya1v11pwlad1vwha"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; + sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; + name = "yatex"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/yatex"; + license = lib.licenses.free; + }; + }) {}; yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaxception"; @@ -70534,12 +70701,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20161121.5"; + version = "20161128.358"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "f11500fbc6bf66ff27deaf6988f31b8a13860468"; - sha256 = "1rbc9wvpjliv0ah0zy181q9q05fi0ihl0ap0ghli56ri05s6fhp2"; + rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73"; + sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -70770,22 +70937,22 @@ license = lib.licenses.free; }; }) {}; - zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline }: + zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20161108.858"; + version = "20161202.731"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "32873003d1c120f7f4fe1438df9a4c1c08785996"; - sha256 = "0g6yknx9gdpk8ccqcjzq4rglrrlpi8npm7klfrv3xiz48sb6igaj"; + rev = "5ebe8195d77b0c35baccd4279d6e0b92731c35fa"; + sha256 = "1mdihfra7p7hvqsif1zlwnw46kvqp70r67f7qkwnlwhywgggvkvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; name = "zerodark-theme"; }; - packageRequires = [ all-the-icons flycheck magit powerline ]; + packageRequires = [ all-the-icons flycheck magit ]; meta = { homepage = "https://melpa.org/#/zerodark-theme"; license = lib.licenses.free; @@ -70961,10 +71128,10 @@ }) {}; zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "zones"; - version = "20160819.1426"; + version = "20161127.1801"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/zones.el"; - sha256 = "1dmcslyf9wm6hmyj8lshs97s3pn6y5m5q4i75p4gzrsgqgyc0h5f"; + sha256 = "09lwqkfcz97jpzfr4q5ir6m8zxligkkf70b2ppnnchhmdghs0yx8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f768556f3fbe2537d6ebb08a5285d040e851e85d/recipes/zones"; From 6ef023a62b55a0564c9d542ee3ac151ac1b9e647 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sat, 3 Dec 2016 04:24:29 -0500 Subject: [PATCH 1278/1749] melpa-stable-packages: 2016-12-07 Removals: - elang: removed from melpa --- .../emacs-modes/melpa-stable-generated.nix | 690 +++++++++++++----- 1 file changed, 512 insertions(+), 178 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 4df78d2202b2..38ab70fd4f99 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -191,12 +191,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "1.6.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "610ff778697eb5499394be3fc3652756d0bfb772"; - sha256 = "1sdgpyq5p824dnxv6r7djwvhyhdmnis8k6992klr8iz7anhxzdam"; + rev = "ad75d193bb8962136e1ecac04d33352dd70fb72e"; + sha256 = "0pchbhcs3bjf8r6f24lcf29in011502ncr2gi72faww6iz0pb285"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -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.7"; + version = "2.8"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "a50cbdd53bc0e1ed0f96a425bd29f5b706161c18"; - sha256 = "12wxjgvxhnmn27dl2p5m90nxmfkk64w1fn4zmxn2a4fpvb7y579s"; + rev = "977b53e28b3141408fff4814be8b67ee23650cac"; + sha256 = "0m80bwar80qsga735cqrn6rbvfz4w9a036zh8inhsigylv3vwqjv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -3888,6 +3888,27 @@ license = lib.licenses.free; }; }) {}; + closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "closql"; + version = "0.3.2"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "closql"; + rev = "5e9d64288863d6d33fac73ccf356427215daa9fb"; + sha256 = "0snhwix51bfs6gsg2knklkg791k2mvn3ydyk388k3k9xmn5sr7xj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; + sha256 = "13ybna20w2d1b3n0y5p1ybhkw0j0zh5nd43p1yvf8h1haj983l87"; + name = "closql"; + }; + packageRequires = [ emacs emacsql-sqlite ]; + meta = { + homepage = "https://melpa.org/#/closql"; + license = lib.licenses.free; + }; + }) {}; cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; @@ -3933,12 +3954,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.7.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "5cfc2e926af645840c6a0464451af18f08528879"; - sha256 = "13kxazjv6vsxsiyyr7qk0gnw4q55z0pa5icz0b4swvm96c4kywg3"; + rev = "db3499df5d06ab2cacc61e9f7720a33456aeafe4"; + sha256 = "17ab5xln94z2ybvn8s9pivyd6xvi9h448fxjc8yk7605zsjmr9i0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4965,6 +4986,27 @@ license = lib.licenses.free; }; }) {}; + counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "counsel-gtags"; + version = "0.1"; + src = fetchFromGitHub { + owner = "syohex"; + repo = "emacs-counsel-gtags"; + rev = "8066dd4cd6eb157345fb43788bacf2c5d746b497"; + sha256 = "07kxv56p340a913673h30q65814ji7lwc6gsn9vcr18rsdaj7qwi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags"; + sha256 = "12qyb1lnzyd2rr4ankpqi30h0bj66ap5qw87y4605k0j44vhnsax"; + name = "counsel-gtags"; + }; + packageRequires = [ counsel emacs ]; + meta = { + homepage = "https://melpa.org/#/counsel-gtags"; + license = lib.licenses.free; + }; + }) {}; coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }: melpaBuild { pname = "coverage"; @@ -5070,22 +5112,22 @@ license = lib.licenses.free; }; }) {}; - cricbuzz = callPackage ({ enlive, fetchFromGitHub, fetchurl, lib, melpaBuild }: + cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cricbuzz"; - version = "0.2.3"; + version = "0.2.8"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; - rev = "7c0c495312c18bc6c8db9ddad94efbd4b6328a9b"; - sha256 = "0jvr6ya40qq9q064k2gzkrqw00xffjmslfjxa2xz2vi25m6jyv92"; + rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45"; + sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906b144e01aed96d62efbc34a8af2973135f6194/recipes/cricbuzz"; sha256 = "1ad2afyn3xny3rgb8yy6w87f33idlrmis1vx0b6s8ppafv9z74j0"; name = "cricbuzz"; }; - packageRequires = [ enlive ]; + packageRequires = [ dash enlive s ]; meta = { homepage = "https://melpa.org/#/cricbuzz"; license = lib.licenses.free; @@ -5175,6 +5217,27 @@ license = lib.licenses.free; }; }) {}; + csv = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "csv"; + version = "2.1"; + 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; + }; + }) {}; ctable = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctable"; @@ -5323,12 +5386,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.25.1"; + version = "0.25.2pre0"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "278a567621d586af74a1c845de0a1426b686c72e"; - sha256 = "0wqnjcspdysn0fd4ckd49wbvi4x2gbl91asgrmijac1lq6k9vj2j"; + rev = "1b61bc346a8233f6ef7576bbbba0cb8a19c46efb"; + sha256 = "1czd04vvl7gzaj1fmzkmd36cpsg22d3gg7sqyfh742ycw1ggkpzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -5470,12 +5533,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "7db073f60a2505bf49e9b94cfedd235f1e01e471"; - sha256 = "1cryijlb79r4dlkmb0nwaamfi18cw0bfr2c1js7vvp5lqs8sb87w"; + rev = "cd9899342bc94e59aa42275554810e50d045aaa4"; + sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b047625aebdbf7b5d644b55afbdccfc6c4ac14a8/recipes/dashboard"; @@ -5993,12 +6056,12 @@ dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-icon"; - version = "0.3"; + version = "0.4"; src = fetchFromGitLab { owner = "xuhdev"; repo = "dired-icon"; - rev = "7fc95de6d7722b304124a890e4fb577e16897b1f"; - sha256 = "079vcbdgn4fgbi1kkcf3na3cwmkm41mx43f4gkbzk8hv4vzgr4kb"; + rev = "bd10690402aa451e65cbadb192356386cd855abd"; + sha256 = "1millrv2rgiswnh9hrprqx2lmbi9h8fasgin5clhixafhmp9l6sf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon"; @@ -6354,6 +6417,27 @@ license = lib.licenses.free; }; }) {}; + docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "docker-tramp"; + version = "0.1"; + src = fetchFromGitHub { + owner = "emacs-pe"; + repo = "docker-tramp.el"; + rev = "d8b510365d8e65551f4f792f251e7212411708c3"; + sha256 = "0lxvzmfg52fhxrhbvp92zwp7cv4i1rlxnkyyzgngj3sjm7y60yvg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker-tramp"; + sha256 = "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w"; + name = "docker-tramp"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/docker-tramp"; + license = lib.licenses.free; + }; + }) {}; dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dockerfile-mode"; @@ -7443,27 +7527,6 @@ license = lib.licenses.free; }; }) {}; - elang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names }: - melpaBuild { - pname = "elang"; - version = "0.0.1"; - src = fetchFromGitHub { - owner = "vkazanov"; - repo = "elang"; - rev = "ae42437603d6dc84d3850bc45496a82b8583703e"; - sha256 = "0hlj6jn9gmi00sqghxswkxpgk65c4gy2k7010vpkr2257rd4f3gq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1cb66c2a6272a804d7a81fc506643e80f11da306/recipes/elang"; - sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy"; - name = "elang"; - }; - packageRequires = [ names ]; - meta = { - homepage = "https://melpa.org/#/elang"; - license = lib.licenses.free; - }; - }) {}; eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eldoc-eval"; @@ -7569,6 +7632,27 @@ license = lib.licenses.free; }; }) {}; + elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: + melpaBuild { + pname = "elisp-refs"; + version = "1.1"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "refs.el"; + rev = "e309c87a91012305ecb37124a758609c64e0ca4a"; + sha256 = "0wvz5ysaj2dnqhkp5xdqsm45fxwlhym5j8rn4g0h7g7zwdi3c6c6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; + sha256 = "16h7dccmzvmap3knnwhjq79wm82xm3whria70vq5msl2y252f6cx"; + name = "elisp-refs"; + }; + packageRequires = [ dash f list-utils loop s ]; + meta = { + homepage = "https://melpa.org/#/elisp-refs"; + license = lib.licenses.free; + }; + }) {}; elisp-slime-nav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-slime-nav"; @@ -8164,12 +8248,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "d3e3bace6b648f5b60d833a72a50603545102934"; - sha256 = "1kmkza1x1xajdswdmvxasglpr8fl9vr1pi3yhi7a9cqqa5s1y2ah"; + rev = "ce142304d1fe6b096b9b984e40e55c8cc54217c1"; + sha256 = "1s8jmkcr11fp93hmyxq7c781lx7krc5xsk99ar0h50v2hpnmzgbb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -8473,6 +8557,27 @@ license = lib.licenses.free; }; }) {}; + epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "epkg"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "epkg"; + rev = "de33177656d8f48b65abbb71ab4d25b7bd799dee"; + sha256 = "0lhb8b4i8r8a6pagwa0p3iqb1bk25as4nd4pjwbdjn0800ncv9nh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; + sha256 = "0vvkjjaffvwvsvld3c6hwd18icmp2lc7f9yqvclifpadi98dhpww"; + name = "epkg"; + }; + packageRequires = [ closql dash emacs ]; + meta = { + homepage = "https://melpa.org/#/epkg"; + license = lib.licenses.free; + }; + }) {}; epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; @@ -8891,22 +8996,22 @@ license = lib.licenses.free; }; }) {}; - eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-git-prompt"; - version = "0.1"; + version = "0.1.1"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-git-prompt"; - rev = "826d2ebdec0808493955a4544dc91b575f6c4ecf"; - sha256 = "00gaq8vz8vnhh0j2i66mp763hm3dfxkxz3j782nsfml81sngkww0"; + rev = "fb56e851c1baac68249c34043bd5db9c9420141e"; + sha256 = "08mhjps17w3kfmmbdws1lqzphr2ayl160i0ckd4552jdyzd28vvs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt"; sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s"; name = "eshell-git-prompt"; }; - packageRequires = [ cl-lib dash emacs s ]; + packageRequires = [ cl-lib dash emacs ]; meta = { homepage = "https://melpa.org/#/eshell-git-prompt"; license = lib.licenses.free; @@ -8936,12 +9041,12 @@ eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-z"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-z"; - rev = "cc9a4b505953a9b56222896a6f973145aeb154b9"; - sha256 = "179xqh0rs8w3d03gygg9sy4qp5xqgfgl4c0ycrknip9zrnbmph4i"; + rev = "033924f138f19f22a30c1845e728691e5615fa38"; + sha256 = "0kp9yw56l8bl4zqganclnpf6x5g2rmcf23265n8cp24j6d7c7r4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z"; @@ -9415,22 +9520,22 @@ license = lib.licenses.free; }; }) {}; - evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "2.1.7"; + version = "2.2.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "4846518b5999892ceaf3ef143cc734685bca325f"; - sha256 = "0009443f7a1k2746qr7p06jv4ksq0w3sf22pjbm0jrnhaw0p66cx"; + rev = "e9f77f7d6a14434a8ca3280d721b96c0984fa7eb"; + sha256 = "11mhgw0xa8kn73svgvzpmvvnkj2ja4mxs030vlzkh4scvlfa98dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq"; name = "evil-matchit"; }; - packageRequires = []; + packageRequires = [ evil ]; meta = { homepage = "https://melpa.org/#/evil-matchit"; license = lib.licenses.free; @@ -10195,12 +10300,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.2.5"; + version = "5.2.7"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "2b7e35e5121beba73309acd8e9586987e8e2b8a6"; - sha256 = "0wm2ddv1198wmgppigk68n3g6qcfcj446xcpf2fy7s29ck71scm1"; + rev = "1ac2c0a717a1a0b70839625f2aaad2c18c21f729"; + sha256 = "0vmigmbr4fc36sahpf0bj65isa4sf1xhn1v2qvnidbx8qg18hm2f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -11951,12 +12056,12 @@ gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "6.1"; + version = "6.1.2"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "268ee8b4554446104d200de3ffbd2f067b20cb3f"; - sha256 = "16x3fz2ljrmqhjy7w96fhp3j9ja2gib042c363yfrzwa7q5rxzd2"; + rev = "a803f9e4509b8f8fed17ef25737d941bbe846c96"; + sha256 = "1avbdfw3hvwqnrlg3hv8p64m9gqgvwl9ggqzn6rhxh1zlr7i5cwy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; @@ -12329,12 +12434,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "570a0320bdd7437fc35a36d78a1c28e1ee19ce88"; - sha256 = "040wc4nj9r3vlma42sc24x4w25rm2kpzwyq44jw3njjk3b7q9avp"; + rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88"; + sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -12746,6 +12851,27 @@ license = lib.licenses.free; }; }) {}; + gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: + melpaBuild { + pname = "gitter"; + version = "1"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "gitter.el"; + rev = "bd2ba457109dd5d3e4b419e3ef5cbd3b5c9498d6"; + sha256 = "1fzl40bwdfbcq55p3kvbzjqr5w0703imzgrmqcf4f6jhav127zk6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter"; + sha256 = "1ad5abqgfh6x2fcqbbdvgbg8xin69j0h93z7bav1hs3jla7mgwnv"; + name = "gitter"; + }; + packageRequires = [ emacs let-alist ]; + meta = { + homepage = "https://melpa.org/#/gitter"; + license = lib.licenses.free; + }; + }) {}; glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "glab"; @@ -13061,6 +13187,27 @@ license = lib.licenses.free; }; }) {}; + go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: + melpaBuild { + pname = "go-playground"; + version = "1.0"; + src = fetchFromGitHub { + owner = "grafov"; + repo = "go-playground"; + rev = "2e1497517d13d813768b3f8e25bb3cce7a449acd"; + sha256 = "08ka2wlwq5v13ni8n5zd5vp4iynwcirsqdw0an20gqg0hrcvs1ba"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground"; + sha256 = "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6"; + name = "go-playground"; + }; + packageRequires = [ emacs go-mode gotest ]; + meta = { + homepage = "https://melpa.org/#/go-playground"; + license = lib.licenses.free; + }; + }) {}; go-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-scratch"; @@ -13085,12 +13232,12 @@ godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "godoctor"; - version = "0.0.7"; + version = "0.0.9"; src = fetchFromGitHub { owner = "microamp"; repo = "godoctor.el"; - rev = "3482c9b119aeb3d81c1a07876bde5cdafe933ede"; - sha256 = "1shcxjhkk3l4vn1v16p86cxs00w5v02nmx2ariid5qrq2636gv8z"; + rev = "f892a4dbabe61186540d6035c5185fd929a6a543"; + sha256 = "1cg09mihvqchgvdxwlrg9vcdj1kvmmy8zmlkscxi6smaxbi0yvjm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor"; @@ -13274,12 +13421,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "b9bcc6f44098b110772a4c947f0a233f207955c5"; - sha256 = "1x62skbqgjskrbsxqn1b377z1y0vp2ivf9k2f0g595lg2zfcycjf"; + rev = "ab40ac7324b5d45b8f1677d87ec0d26349448d41"; + sha256 = "0rb55f4yx8wpqs93xy80wn6k8pyrhj8zh3q5lbi78afgscjrgjlr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -13313,6 +13460,27 @@ license = lib.licenses.free; }; }) {}; + grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "grab-x-link"; + version = "0.4.1"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "grab-x-link"; + rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76"; + sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link"; + sha256 = "1kni49n1v716w4hjfm49mk25jshfc6idpby0k58qvngbfqk3kzy5"; + name = "grab-x-link"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/grab-x-link"; + license = lib.licenses.free; + }; + }) {}; gradle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "gradle-mode"; @@ -13454,12 +13622,12 @@ graphene-meta-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "graphene-meta-theme"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene-meta-theme"; - rev = "ba3c197b6331668c4fcee4053594ba1bd34929b6"; - sha256 = "0qbk53r97h234f2vj8ndf57kardaz2g2dgf35i08j9b416aw6ck5"; + rev = "62cc73fee31f1bd9474027b83a249feee050271e"; + sha256 = "1ydl6dlg5z4infq8j09izwgs6n97yza6nbq5rs1xfv00zd9gr63c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44af719ede73c9fe7787272d7868587ce8966e3d/recipes/graphene-meta-theme"; @@ -13520,8 +13688,8 @@ version = "0.1"; src = fetchhg { url = "https://bitbucket.com/tws/grass-mode.el"; - rev = "fe70088c54b9"; - sha256 = "0prqgkbn0gm8g0fapkcd8192yyl2h3agn7qrlf5vrfx6780bsyw0"; + rev = "c7e2817461c3"; + sha256 = "095v1l46axada3vnhp1ypim6b789y39jlyy5466im02fjfjkcadg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode"; @@ -13763,6 +13931,27 @@ license = lib.licenses.free; }; }) {}; + gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gxref"; + version = "0.1"; + src = fetchFromGitHub { + owner = "dedi"; + repo = "gxref"; + rev = "15723a9d910d7dd9ea18cab0336332cf988aeceb"; + sha256 = "1l5d1kh2dy3w42i8c3z63c7mzarxixxiby2g7ay2i809yxj10y1n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref"; + sha256 = "06qlfjclfx00m8pr7lk6baim3vjk5i0m75i1p4aihp2vflvgjaby"; + name = "gxref"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gxref"; + license = lib.licenses.free; + }; + }) {}; hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; @@ -14101,12 +14290,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5ed5d1e2a8561f306333c817e52ae0b4c73680e9"; - sha256 = "1hsn2r8sw40rzc2w8vq4sr2xjm3xh2lg6j4dn068nyzszh932chi"; + rev = "2fca3400574e5f2666c942c674ce0f8e6ca6b232"; + sha256 = "1qbvgp2pca0n5ahpc1gss8ldn07mgs96xxgb5dg62b08ch8ry2jf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -14353,12 +14542,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5ed5d1e2a8561f306333c817e52ae0b4c73680e9"; - sha256 = "1hsn2r8sw40rzc2w8vq4sr2xjm3xh2lg6j4dn068nyzszh932chi"; + rev = "2fca3400574e5f2666c942c674ce0f8e6ca6b232"; + sha256 = "1qbvgp2pca0n5ahpc1gss8ldn07mgs96xxgb5dg62b08ch8ry2jf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -14875,22 +15064,43 @@ license = lib.licenses.free; }; }) {}; - helm-open-github = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }: + helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }: + melpaBuild { + pname = "helm-notmuch"; + version = "1.0"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "helm-notmuch"; + rev = "7d03cd9fed32b49a1f200c65ed38086c9f19cfaf"; + sha256 = "10nx6wnd2vfqxv9zr8brml0l9mfx8rrid3lbqgs8wr9313ra3360"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch"; + sha256 = "1ixdc1ba4ygxl0lpg6ijk06dgj2hfv5p5k6ivq60ss0axyisnnv0"; + name = "helm-notmuch"; + }; + packageRequires = [ helm notmuch ]; + meta = { + homepage = "https://melpa.org/#/helm-notmuch"; + license = lib.licenses.free; + }; + }) {}; + helm-open-github = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-open-github"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-open-github"; - rev = "95140bbacc66320a032d3cdd9e1c31aeb47eb83d"; - sha256 = "1hq1nnmgkx0a8sv6g8k4v9f0102qg7jga0hcjnr8lcji51nqrcya"; + rev = "553f3ab0fe0a028015e9b6cb7c35fb139ec222fc"; + sha256 = "1xj5b44nkdvbxhk1bnllqm2qq393w22ccy708prrhiq8fmk53aa8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-open-github"; sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx"; name = "helm-open-github"; }; - packageRequires = [ cl-lib gh helm-core ]; + packageRequires = [ emacs gh helm-core ]; meta = { homepage = "https://melpa.org/#/helm-open-github"; license = lib.licenses.free; @@ -15148,6 +15358,27 @@ license = lib.licenses.free; }; }) {}; + helm-rdefs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-rdefs"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "saidie"; + repo = "emacs-helm-rdefs"; + rev = "cd3a6b3af3015ee58ef30cb7c81c79ebe5fc867b"; + sha256 = "0ji7ak9pkmw0wxzmw5a1amvn3pkj90v9jv1yi12w388njxn7qsvj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1c7a20847513dc1153d54a3a700bc120f71dc6b/recipes/helm-rdefs"; + sha256 = "0z3nrqrz63j9nxkbxdsjj3z8zhsqlik28iry3j1plgsxq1mhrn0y"; + name = "helm-rdefs"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-rdefs"; + license = lib.licenses.free; + }; + }) {}; helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-recoll"; @@ -15232,6 +15463,27 @@ license = lib.licenses.free; }; }) {}; + helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }: + melpaBuild { + pname = "helm-smex"; + version = "0.2"; + src = fetchFromGitHub { + owner = "ptrv"; + repo = "helm-smex"; + rev = "7af4e4b44671f739b39584fc50c20084700701ac"; + sha256 = "1dhzglpd48mb47iyii8igb1dldvnr4alg18m7g8xb529dx8z9wni"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex"; + sha256 = "02jvq2hyq4wwc9v8gaxr9vkjldc60khdbjf71p8w2iny5w3k0jbj"; + name = "helm-smex"; + }; + packageRequires = [ emacs helm smex ]; + meta = { + homepage = "https://melpa.org/#/helm-smex"; + license = lib.licenses.free; + }; + }) {}; helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, spaces }: melpaBuild { pname = "helm-spaces"; @@ -15718,12 +15970,12 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "17e0db99ca41f10a8cc2daff812d1c7bae048a8b"; - sha256 = "0my7xaphyh3rm6yfnim2p5fpp6ldj8y57g4kpnldw6vw4kd57x3j"; + rev = "a23312464fc6462d559462a44cd74735e9f73421"; + sha256 = "0sy0fjmh1m36ajzfmxa2j9akws5qa8a4f1qmj3wgj9vdqd043mr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -15862,6 +16114,27 @@ license = lib.licenses.free; }; }) {}; + htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "htmlize"; + version = "1.50"; + src = fetchFromGitHub { + owner = "hniksic"; + repo = "emacs-htmlize"; + rev = "f74ea313ad364ffd648e330b2e6ddabb89f6e797"; + sha256 = "16jxd5nfpqlg46zzp0yvvn5aynprd5xv655fcql8cvxkkg111d5z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; + sha256 = "16nvvsi4nxi0zzk5a6mwmp43p0ls20zdx9r18mxz6bsaw6jangh2"; + name = "htmlize"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/htmlize"; + license = lib.licenses.free; + }; + }) {}; httpcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "httpcode"; @@ -15907,12 +16180,12 @@ hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hungry-delete"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "nflath"; repo = "hungry-delete"; - rev = "8df35d81fbbd236147b8c746bd5f542bd75dbe63"; - sha256 = "0j97bfhrajki2a78pchrw5n6pcsk2gc2spk9s8fb0bmnqqpknmnf"; + rev = "78a787a87aceb821818bbe2a322fbf2e5cbf80c3"; + sha256 = "171s7akqcpj0jcbm8w19b4n9kdzw0acf7cv0ymwdz5mmgmfiy292"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete"; @@ -16705,12 +16978,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "d130ede56a1203d0aa1c8e5bca5fedbfb14e7ce8"; - sha256 = "11zsprv5ycnfqi358dd4cx70dbn6a8hccd4prf28lln7vhldbmjz"; + rev = "54eb6bf6d68d71bdac63fcb2042d8e1c554b427f"; + sha256 = "0yqcl2r8kwdl99704vm8qsdzziidznp0gpyr29ipya7fl24nkfxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -16789,12 +17062,12 @@ init-open-recentf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "init-open-recentf"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "zonuexe"; repo = "init-open-recentf.el"; - rev = "39da6a50e7f39e6ccd9aada0c20d8b6d501cb487"; - sha256 = "06w1vnfhjy8g62z6xajin5akgh30pa0kk56am61kv6mi5ia8fc96"; + rev = "a4f5338a14302d44fa5aebb1ddc7aff3dc9abbe3"; + sha256 = "0iph5cpz2dva1rnvp5xynmkndny87z308pziadk1qgf05mc0i61d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db8b6eced50726c788d7343137f6b4558575abf/recipes/init-open-recentf"; @@ -16956,12 +17229,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "0.1.19"; + version = "0.1.20"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "fe0b045aadef5590eb33e03c1512430e5d52d639"; - sha256 = "18phlz8b2qwiy1mwqri02syxp7564ca0kmcdlw8m7wz6xqdr9vih"; + rev = "402722b5ad035b87fc08bc73343f05610a5fcb3c"; + sha256 = "143y94b4spslh06x4klvsvil7ywn3cmrad4mg1qc0y0h0d9ksd4v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -17269,12 +17542,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "0.25"; + version = "0.26"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "1ec4939d81e410c081b709505d812775bb8338e8"; - sha256 = "12yqbkfr5yds9kysjs159h6xvlx0ppf7c95fwhd4nx63ycyidg2x"; + rev = "fc0c467db0549cfa3d96ff6e0f56d0c84c493ba6"; + sha256 = "17iq0dn862xaak898lc7fmfbzxl9pyycwlmm5wn9kbbq8p6y7nrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -17458,12 +17731,12 @@ jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jq-mode"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "ljos"; repo = "jq-mode"; - rev = "7f03354a4c1e26796482c39ce543d1d1f075a18d"; - sha256 = "0ws0297v6sairvsk665wrfzymfi599g5ljshfnpmi81qnnnbwjgf"; + rev = "3237634ab42566eb50f54e4b7f3896ffd20a8e53"; + sha256 = "063j0kfp2ybaw5r9hvn9rrksh874xpm9xvpiycv33lf7kdsp5lh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode"; @@ -18298,12 +18571,12 @@ latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-unicode-math-mode"; - version = "0.2.6"; + version = "0.3.1"; src = fetchFromGitHub { owner = "Christoph-D"; repo = "latex-unicode-math-mode"; - rev = "54ddb8742c50a338639625183f7315278fa7369c"; - sha256 = "1yp6nicz0zzd28hfpi94shgj76l1h68mbw875c7x9abyhfz06sfm"; + rev = "3b82347291edcb32e4062b0048c367a3079b3e8c"; + sha256 = "1xylfg8xpyb2m0qnysf58cl05ibbg4drhgq7msiiql2qrdzvpx9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c021dfad8928c1a352e0ef5526eefa6c0a9cb37/recipes/latex-unicode-math-mode"; @@ -18449,8 +18722,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "9a8bea502793f5467df77cfea14ea2de07bc26bc"; - sha256 = "0izym69gnz32c4y49s0amavxzjgm1pqlks7xchr5zdz7wqs7wb25"; + rev = "d722d3662b191b61310dc9bba78f9a77f512b742"; + sha256 = "0j5gjlsk92y14kxgvd80q9vwyhmjkphpzadcswyjxikgahwg1avz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -18746,12 +19019,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "8f782f58aa2fa2c805b6f488ade9e1c33fed6edb"; - sha256 = "0vmkqlgiahcc6aa0ky4jjdc5nxnn2i7qwfl6wkgy5rmq051nk4k0"; + rev = "469ed0ccf146deab8c2ebbb162be7be31709da0a"; + sha256 = "1qv6v27fjfq0h3i7d2nry752r9fwqf5llilngy5l3yimqddm2k4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -19040,12 +19313,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "570a0320bdd7437fc35a36d78a1c28e1ee19ce88"; - sha256 = "040wc4nj9r3vlma42sc24x4w25rm2kpzwyq44jw3njjk3b7q9avp"; + rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88"; + sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -19194,12 +19467,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "570a0320bdd7437fc35a36d78a1c28e1ee19ce88"; - sha256 = "040wc4nj9r3vlma42sc24x4w25rm2kpzwyq44jw3njjk3b7q9avp"; + rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88"; + sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -19551,12 +19824,12 @@ markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }: melpaBuild { pname = "markdown-preview-mode"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; - rev = "25f1de28390a0b7be493e8f168749d851784ce12"; - sha256 = "116jms95wfdhlbcyn10nqq452jkplvhqwsl7al8f1zx4rn22snra"; + rev = "2fc9f06fdf8489a2d5661b794941abb6f863f194"; + sha256 = "0grljxihip0xyfm47ljwz6hy4kn30vw69bv4w5dw8kr33d51y5ym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode"; @@ -19866,7 +20139,7 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; @@ -20369,12 +20642,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "3.0.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "586062ec38807b709b888adf3bd80ffb5388f86c"; - sha256 = "13qx220ayf678milahq4xrhlhiljfmbscxikq0dlfdv39157ynlc"; + rev = "47afc7419ddd26462ad6e66e122b244c334da0b9"; + sha256 = "1bkfqlfag62mixd933d1ryvnbaq3ny2bgbqbagqbrgprl7558577"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -21209,12 +21482,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "c176eae5d97f627c946ad43c980a1300e3cbeb50"; - sha256 = "1fs50qll79w0kiyh4jr9kj08ara4s8mhfybx2x1s01xnd6yzjhk8"; + rev = "12a4cc1155b938da947cce5b3dff7ffb91f2203c"; + sha256 = "1x7xmqvmna5h5dg352v6pzm9ijdivaz7wcc2nhnshxc5pywpc1cg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -21290,11 +21563,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.23.2"; + version = "0.23.3"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "c9ec90ae7f22d817aa0ddb5e1a0ae80715071b5e"; - sha256 = "1bhyi64qir93sd8d1c2gawc2p7d9mqfq7cn7p5hvh8bv2w3hkq14"; + rev = "fd7f3d0829725bf9ce209cf597dfb0acd4d59b10"; + sha256 = "0w1nwr7brgapnzsbp9cjcx30lk90ir5hscllpxzw44sq25ir85g5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -22410,12 +22683,12 @@ org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: melpaBuild { pname = "org-pdfview"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "markus1189"; repo = "org-pdfview"; - rev = "c1ca137ef90e442592ce88ef16437dc7dfa9c5dd"; - sha256 = "14lshgyrlzjcrqdfsn17llm70ijbs86cv9mccy87vlr01rbsz6lj"; + rev = "3a96bfb57cb158ac02cfb4225512699c66f5221d"; + sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview"; @@ -22449,22 +22722,22 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, projectile }: + org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "org-projectile"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "e17aa19d50284cd2c7ff45ce201f33c06626295e"; - sha256 = "0i7fy95jyi7nbgafb9xxfdgwfgs0cyqagx7s7z3b07sr6p0krxcv"; + rev = "e2b78ca7fbd2e3b873d3ab9bb7196be4d7613f92"; + sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile"; sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm"; name = "org-projectile"; }; - packageRequires = [ dash emacs pcache projectile ]; + packageRequires = [ dash emacs projectile ]; meta = { homepage = "https://melpa.org/#/org-projectile"; license = lib.licenses.free; @@ -22714,12 +22987,12 @@ org-tracktable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-tracktable"; - version = "0.3"; + version = "0.3.1"; src = fetchFromGitHub { owner = "tty-tourist"; repo = "org-tracktable"; - rev = "c38a0019fdc5aac0f9b65e04c86c997fe5a32fb0"; - sha256 = "1yh4p3i0ajfnsvh057h8dpf4rqvvblmfgzj6vyn9dmcl5is1ir2q"; + rev = "8e0e60a582a034bd66d5efb72d513140b7d4d90a"; + sha256 = "1aq7qv5jyc2x2a4iphnzmmsvak6dbi7nwdcf3m8nly8w75vrl5lj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57263d996e321f842d0741898370390146606c63/recipes/org-tracktable"; @@ -22910,12 +23183,12 @@ orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orglink"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "tarsius"; repo = "orglink"; - rev = "3b617ba7290ee550caab1aa055a6bedabe33d6fd"; - sha256 = "0d1i30jbfbv0hm77sf278ism28ds5lz7675ji8f1gf01rfkchjbn"; + rev = "50debcf3508d2252bdce35c8822af1b3a81fd2dd"; + sha256 = "1b86c4pyc7cs02lrhnk93gh3czp9wajm17wd9mhszcbdn996rnhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink"; @@ -25003,12 +25276,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "960e9f9a978386529eab9a56663c8d79654c4cce"; - sha256 = "1xmlkvrkcrwn6jnl9mxgdyclrwxsr1b7rlikmpw1qhdrwpg86vh5"; + rev = "fe0cb5597d9e87ceebfadd1815beadfc04a194f1"; + sha256 = "0yg7xbv0mnrcc6kgh8ci6pxzfjiq1qkrw6hx2zs5m4ryfrrfclz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -26242,12 +26515,12 @@ repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }: melpaBuild { pname = "repl-toggle"; - version = "0.3.3"; + version = "0.4.0"; 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"; @@ -26575,6 +26848,27 @@ license = lib.licenses.free; }; }) {}; + rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: + melpaBuild { + pname = "rjsx-mode"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "felipeochoa"; + repo = "rjsx-mode"; + rev = "20c7bd0e704dfc1c391edf78765c8b0ec4f5b3c0"; + sha256 = "142zihjqgdq4bfy1hp0pz6k109ngii4kyc8xrdvd9yvzc0y5vp8a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; + sha256 = "0w3ij8k8058pfw443chm1kn30ia0f5rfbg03w9ddw86xb3wa2q0b"; + name = "rjsx-mode"; + }; + packageRequires = [ emacs js2-mode ]; + meta = { + homepage = "https://melpa.org/#/rjsx-mode"; + license = lib.licenses.free; + }; + }) {}; robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; @@ -26704,12 +26998,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "95ffd54ca9554f5df5ac4f65c49eb595c5aeb3c9"; - sha256 = "02ygv4bag4z1msaqzc6fqgmbz6lg7laihnq6zp76n35inqa9a4w8"; + rev = "8b6d0cdf57c951769ead8aad1d8538308e1b6861"; + sha256 = "07qjpvkhv556p3pfm1hxswky4irp7f4wxb2blcvk3s7qmqirqshj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -27082,11 +27376,11 @@ schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "schrute"; - version = "0.2"; + version = "0.2.2"; src = fetchgit { url = "https://bitbucket.org/shackra/dwight-k.-schrute"; - rev = "99857394886e516d5ebd63fedff200bceaef1d4d"; - sha256 = "0z1cnmyn7r0l93ivl5hr4illmrm9wdyza8822l175a62n9pr8hv6"; + rev = "08ab6565fa94f3a8016163fe6f7be1932af1156b"; + sha256 = "0l1k6wjjr569lk5k8ydwq13041kn889g20qbzf79qj1ws96rim4m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute"; @@ -27731,12 +28025,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "2.2.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "9984ad77e63ae8d40e863cf1b0d8339ede986792"; - sha256 = "04giklbd1fsw2zysr7aqg17h6cpyn4i9jbknm4d4v6581f2pcl93"; + rev = "070aa311b0a08b530394c53d0c52c6438efbc20c"; + sha256 = "0zx49kd3wrqx6f52nk8rzqx3ay3qbcygibcidw6w7drvxnxjgd04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -28799,6 +29093,27 @@ license = lib.licenses.free; }; }) {}; + ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ssh-deploy"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "cjohansson"; + repo = "emacs-ssh-deploy"; + rev = "94fc9e677c864bd2c302c4842b95f7580cda6cef"; + sha256 = "1zxgqlfipbympgg8i58r1pwn50fq6vb42y8fmipxy25s0j3x53k7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; + sha256 = "07kryxspjy8lr1a2m0bppa3xgbzwk180z4a8har37ygm3hdpj50x"; + name = "ssh-deploy"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ssh-deploy"; + license = lib.licenses.free; + }; + }) {}; stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stan-mode"; @@ -31935,8 +32250,8 @@ version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "d9ebfc6c8722"; - sha256 = "038glxpcl6d9js0kaxaqmfz6xlz50z28nny9biarx1mhjvy70lwp"; + rev = "c8c2934f6674"; + sha256 = "0wsnmwfkiyic40v8dl65ccxv3n3hazmlxlbqr8v6ggr8kcx4ydyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -31973,12 +32288,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.5.7"; + version = "2.5.8"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "1a6c49bfdef5aacce14b76f06adda3b66d1f3847"; - sha256 = "1ignivq4df5a716p7n4cm6jbv9zly9b1ssn39a49wzvy9ch5m76q"; + rev = "ab73c028e8dbe088d7545406efc5c5c7b8fd503a"; + sha256 = "1hf2py6dby3wnvzv027x0555532aapn20bkhb7x8k020c6yr59s9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -32537,6 +32852,25 @@ license = lib.licenses.free; }; }) {}; + yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "yatex"; + version = "1.78"; + src = fetchhg { + url = "https://www.yatex.org/hgrepos/yatex/"; + rev = "0c098405a3c9"; + sha256 = "0vk5wk7b05lyr1724wnwxlwfcw7myghpcis0ya1v11pwlad1vwha"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; + sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; + name = "yatex"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/yatex"; + license = lib.licenses.free; + }; + }) {}; yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaxception"; @@ -32673,22 +33007,22 @@ license = lib.licenses.free; }; }) {}; - zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline }: + zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "3.7"; + version = "4.1"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "a9fc16f317cade7db85433e66c80ba784e07a975"; - sha256 = "1b5zg2w7nfcszwbqhxan470vvsrpqwddwjj9kzgh6qxcl81y7s1p"; + rev = "63df2ae09a9e1d670f0694f7c15f19f9170e2407"; + sha256 = "18a0g33z70yqr066cxm9d17jwvrx8hpgp0v2c6swk05h9b4h3pb2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; name = "zerodark-theme"; }; - packageRequires = [ all-the-icons flycheck magit powerline ]; + packageRequires = [ all-the-icons flycheck magit ]; meta = { homepage = "https://melpa.org/#/zerodark-theme"; license = lib.licenses.free; From fe727a19c10bd7ddf72a71ee573c269ac7431b27 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 23 Nov 2016 15:06:15 -0600 Subject: [PATCH 1279/1749] rebar3: 3.1.0 -> 3.3.2 --- .../tools/build-managers/rebar3/default.nix | 68 +++++++++---------- .../rebar3/hermetic-bootstrap.patch | 46 ++++++++----- .../rebar3/hermetic-rebar3.patch | 38 +++++------ 3 files changed, 81 insertions(+), 71 deletions(-) diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index d8938e2d4689..bfc6dce1e1a1 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,45 +3,20 @@ tree, fetchFromGitHub, hexRegistrySnapshot }: let - version = "3.1.0"; + version = "3.3.2"; bootstrapper = ./rebar3-nix-bootstrap; - erlware_commons = fetchHex { - pkg = "erlware_commons"; - version = "0.19.0"; - sha256 = "1gfsy9bbhjb94c5ghff2niamn93x2x08lnklh6pp7sfr5i0gkgsv"; - }; - ssl_verify_hostname = fetchHex { - pkg = "ssl_verify_hostname"; - version = "1.0.5"; - sha256 = "1gzavzqzljywx4l59gvhkjbr1dip4kxzjjz1s4wsn42f2kk13jzj"; + bbmustache = fetchHex { + pkg = "bbmustache"; + version = "1.3.0"; + sha256 = "042pfgss8kscq6ssg8gix8ccmdsrx0anjczsbrn2a6c36ljrx2p6"; }; certifi = fetchHex { pkg = "certifi"; version = "0.4.0"; sha256 = "04bnvsbssdcf6b9h9bfglflds7j0gx6q5igl1xxhx6fnwaz37hhw"; }; - providers = fetchHex { - pkg = "providers"; - version = "1.6.0"; - sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g"; - }; - getopt = fetchHex { - pkg = "getopt"; - version = "0.8.2"; - sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk"; - }; - bbmustache = fetchHex { - pkg = "bbmustache"; - version = "1.0.4"; - sha256 = "04lvwm7f78x8bys0js33higswjkyimbygp4n72cxz1kfnryx9c03"; - }; - relx = fetchHex { - pkg = "relx"; - version = "3.17.0"; - sha256 = "1xjybi93m8gj9f9z3lkc7xbg3k5cw56yl78rcz5qfirr0223sby2"; - }; cf = fetchHex { pkg = "cf"; version = "0.2.1"; @@ -49,14 +24,39 @@ let }; cth_readable = fetchHex { pkg = "cth_readable"; - version = "1.2.2"; - sha256 = "0kb9v4998liwyidpjkhcg1nin6djjzxcx6b313pbjicbp4r58n3p"; + version = "1.2.3"; + sha256 = "0wfpfismzi2q0nzvx9qyllch4skwmsk6yqffw8iw2v48ssbfvfhz"; + }; + erlware_commons = fetchHex { + pkg = "erlware_commons"; + version = "0.21.0"; + sha256 = "0gxb011m637rca2g0vhm1q9krm3va50rz1py6zf8k92q4iv9a2p7"; }; eunit_formatters = fetchHex { pkg = "eunit_formatters"; version = "0.3.1"; sha256 = "0cg9dasv60v09q3q4wja76pld0546mhmlpb0khagyylv890hg934"; }; + getopt = fetchHex { + pkg = "getopt"; + version = "0.8.2"; + sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk"; + }; + providers = fetchHex { + pkg = "providers"; + version = "1.6.0"; + sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g"; + }; + ssl_verify_fun = fetchHex { + pkg = "ssl_verify_fun"; + version = "1.1.1"; + sha256 = "0pnnan9xf4r6pr34hi28zdyv501i39jwnrwk6pr9r4wabkmhb22g"; + }; + relx = fetchHex { + pkg = "relx"; + version = "3.21.1"; + sha256 = "00590aqy0rfzgsnzxqgwbmn90imxxqlzmnmapy6bq76vw2rynvb8"; + }; rebar3_hex = fetchHex { pkg = "rebar3_hex"; version = "1.12.0"; @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz"; - sha256 = "0r4wpnpi81ha4iirv9hcif3vrgc82qd51kah7rnhvpym55wcy9ml"; + sha256 = "14nhc1bmna3b4y9qmd0lzpi0jdaw92r7ljg7vlghn297awsjgg6c"; }; inherit bootstrapper; @@ -97,7 +97,7 @@ stdenv.mkDerivation { cp --no-preserve=mode -R ${cth_readable} _build/default/lib/cth_readable cp --no-preserve=mode -R ${eunit_formatters} _build/default/lib/eunit_formatters cp --no-preserve=mode -R ${relx} _build/default/lib/relx - cp --no-preserve=mode -R ${ssl_verify_hostname} _build/default/lib/ssl_verify_hostname + cp --no-preserve=mode -R ${ssl_verify_fun} _build/default/lib/ssl_verify_fun cp --no-preserve=mode -R ${rebar3_hex} _build/default/plugins/rebar3_hex ''; diff --git a/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch b/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch index 40f430a558bb..fa7a18f24d2f 100644 --- a/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch +++ b/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch @@ -1,5 +1,5 @@ diff --git a/bootstrap b/bootstrap -index 35759b0..939c838 100755 +index c36fddb..9fcb718 100755 --- a/bootstrap +++ b/bootstrap @@ -7,9 +7,11 @@ main(_) -> @@ -9,42 +9,44 @@ index 35759b0..939c838 100755 - inets:start(), - inets:start(httpc, [{profile, rebar}]), - set_httpc_options(), -+ %% Removed for hermeticity on Nix ++ %% Removed for hermeticity on Nix + %% -+ %% inets:start(), -+ %% inets:start(httpc, [{profile, rebar}]), -+ %% set_httpc_options(), - ++ %% inets:start(), ++ %% inets:start(httpc, [{profile, rebar}]), ++ %% set_httpc_options(), + %% Fetch and build deps required to build rebar3 BaseDeps = [{providers, []} -@@ -74,12 +76,12 @@ default_registry_file() -> +@@ -73,13 +75,13 @@ default_registry_file() -> + CacheDir = filename:join([Home, ".cache", "rebar3"]), filename:join([CacheDir, "hex", "default", "registry"]). - - fetch_and_compile({Name, ErlFirstFiles}, Deps) -> + +-fetch_and_compile({Name, ErlFirstFiles}, Deps) -> - case lists:keyfind(Name, 1, Deps) of - {Name, Vsn} -> - ok = fetch({pkg, atom_to_binary(Name, utf8), list_to_binary(Vsn)}, Name); - {Name, _, Source} -> - ok = fetch(Source, Name) - end, ++fetch_and_compile({Name, ErlFirstFiles}, _Deps) -> + %% case lists:keyfind(Name, 1, Deps) of + %% {Name, Vsn} -> + %% ok = fetch({pkg, atom_to_binary(Name, utf8), list_to_binary(Vsn)}, Name); + %% {Name, _, Source} -> + %% ok = fetch(Source, Name) + %% end, - + %% Hack: erlware_commons depends on a .script file to check if it is being built with %% rebar2 or rebar3. But since rebar3 isn't built yet it can't get the vsn with get_key. -@@ -88,63 +90,63 @@ fetch_and_compile({Name, ErlFirstFiles}, Deps) -> - +@@ -88,67 +90,67 @@ fetch_and_compile({Name, ErlFirstFiles}, Deps) -> + compile(Name, ErlFirstFiles). - + -fetch({pkg, Name, Vsn}, App) -> - Dir = filename:join([filename:absname("_build/default/lib/"), App]), - case filelib:is_dir(Dir) of - false -> -- CDN = "https://s3.amazonaws.com/s3.hex.pm/tarballs", +- CDN = "https://repo.hex.pm/tarballs", - Package = binary_to_list(<>), - Url = string:join([CDN, Package], "/"), - case request(Url) of @@ -85,7 +87,11 @@ index 35759b0..939c838 100755 - end. - -get_http_vars(Scheme) -> -- proplists:get_value(Scheme, get_rebar_config(), []). +- OS = case os:getenv(atom_to_list(Scheme)) of +- Str when is_list(Str) -> Str; +- _ -> [] +- end, +- proplists:get_value(Scheme, get_rebar_config(), OS). - -set_httpc_options() -> - set_httpc_options(https_proxy, get_http_vars(https_proxy)), @@ -101,7 +107,7 @@ index 35759b0..939c838 100755 +%% Dir = filename:join([filename:absname("_build/default/lib/"), App]), +%% case filelib:is_dir(Dir) of +%% false -> -+%% CDN = "https://s3.amazonaws.com/s3.hex.pm/tarballs", ++%% CDN = "https://repo.hex.pm/tarballs", +%% Package = binary_to_list(<>), +%% Url = string:join([CDN, Package], "/"), +%% case request(Url) of @@ -142,7 +148,11 @@ index 35759b0..939c838 100755 +%% end. + +%% get_http_vars(Scheme) -> -+%% proplists:get_value(Scheme, get_rebar_config(), []). ++%% OS = case os:getenv(atom_to_list(Scheme)) of ++%% Str when is_list(Str) -> Str; ++%% _ -> [] ++%% end, ++%% proplists:get_value(Scheme, get_rebar_config(), OS). + +%% set_httpc_options() -> +%% set_httpc_options(https_proxy, get_http_vars(https_proxy)), @@ -154,6 +164,6 @@ index 35759b0..939c838 100755 +%% set_httpc_options(Scheme, Proxy) -> +%% {ok, {_, _, Host, Port, _, _}} = http_uri:parse(Proxy), +%% httpc:set_options([{Scheme, {{Host, Port}, []}}], rebar). - + compile(App, FirstFiles) -> Dir = filename:join(filename:absname("_build/default/lib/"), App), diff --git a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch index 634dda8c45ae..3adfb7ee9e3b 100644 --- a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch +++ b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch @@ -1,8 +1,8 @@ -diff a/src/rebar3.erl b/src/rebar3.erl -index c1a1ae4..1bf1ea0 100644 +diff --git a/src/rebar3.erl b/src/rebar3.erl +index 47dc25a..edda250 100644 --- a/src/rebar3.erl +++ b/src/rebar3.erl -@@ -294,9 +294,11 @@ start_and_load_apps(Caller) -> +@@ -304,9 +304,11 @@ start_and_load_apps(Caller) -> ensure_running(crypto, Caller), ensure_running(asn1, Caller), ensure_running(public_key, Caller), @@ -12,16 +12,16 @@ index c1a1ae4..1bf1ea0 100644 + ensure_running(ssl, Caller). +%% Removed due to the hermicity requirements of Nix +%% -+%% inets:start(), -+%% inets:start(httpc, [{profile, rebar}]). - ++%% inets:start(), ++%% inets:start(httpc, [{profile, rebar}]). + ensure_running(App, Caller) -> case application:start(App) of -diff a/src/rebar_hermicity.erl b/src/rebar_hermicity.erl +diff --git a/src/rebar_hermeticity.erl b/src/rebar_hermeticity.erl new file mode 100644 -index 0000000..d814e2a +index 0000000..8f6cc7d --- /dev/null -+++ b/src/rebar_hermicity.erl ++++ b/src/rebar_hermeticity.erl @@ -0,0 +1,42 @@ +%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- +%% ex: ts=4 sw=4 et @@ -49,7 +49,7 @@ index 0000000..d814e2a +%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +%% THE SOFTWARE. +%% ------------------------------------------------------------------- -+-module(rebar_hermicity). ++-module(rebar_hermeticity). + +-export([request/5]). + @@ -63,23 +63,23 @@ index 0000000..d814e2a + ?ERROR("A request is being made that violates Nix hermicity " + "This request has been stopped. Details of the request " + "are as follows:", []), -+ ?ERROR("Requesnt: ~p ~s", [Method, Url]), ++ ?ERROR("Request: ~p ~s", [Method, Url]), + erlang:halt(1). -diff a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl -index ec7e09d..03be343 100644 +diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl +index 5817817..2ea1703 100644 --- a/src/rebar_pkg_resource.erl +++ b/src/rebar_pkg_resource.erl -@@ -104,7 +104,7 @@ make_vsn(_) -> +@@ -107,7 +107,7 @@ make_vsn(_) -> {error, "Replacing version of type pkg not supported."}. - + request(Url, ETag) -> - case httpc:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]}, -+ case rebar_hermicity:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]}, ++ case rebar_hermeticity:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]}, [{ssl, ssl_opts(Url)}, {relaxed, true}], [{body_format, binary}], rebar) of -diff a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl -index 5e1e253..ea25b9e 100644 +diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl +index 75c609e..4283c23 100644 --- a/src/rebar_prv_update.erl +++ b/src/rebar_prv_update.erl @@ -52,7 +52,7 @@ do(State) -> @@ -87,7 +87,7 @@ index 5e1e253..ea25b9e 100644 {ok, Url} -> ?DEBUG("Fetching registry from ~p", [Url]), - case httpc:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, -+ case rebar_hermicity:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, ++ case rebar_hermeticity:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, [], [{stream, TmpFile}, {sync, true}], rebar) of {ok, saved_to_file} -> From ab9688a63adffc78ef38d45d7891a5be2459fbd5 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 23 Nov 2016 15:07:31 -0600 Subject: [PATCH 1280/1749] rebar3: Fix typos and support name-version-tag The fixup_app_name/1 change notably supports packages like proper-1.1.1-beta. --- .../tools/build-managers/rebar3/rebar3-nix-bootstrap | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap index 30ff235d12cf..81257dd8c0cb 100755 --- a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap +++ b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap @@ -41,7 +41,7 @@ main(Args) -> {ok, RequiredData} = gather_required_data_from_the_environment(ArgData), do_the_bootstrap(RequiredData). -%% @doc There are two modes 'registery_only' where the register is +%% @doc There are two modes 'registry_only' where the register is %% created from hex and everything else. -spec do_the_bootstrap(#data{}) -> ok. do_the_bootstrap(RequiredData = #data{registry_only = true}) -> @@ -55,7 +55,7 @@ do_the_bootstrap(RequiredData) -> %% @doc %% Argument parsing is super simple only because we want to keep the %% dependencies minimal. For now there can be two entries on the -%% command line, "registery-only" and "debug-info" +%% command line, "registry-only" and "debug-info" -spec parse_args([string()]) -> #data{}. parse_args(Args0) -> PossibleArgs = sets:from_list(["registry-only", "debug-info"]), @@ -146,13 +146,14 @@ make_symlink(Path, TargetFile) -> %% @doc %% This takes an app name in the standard OTP - format -%% and returns just the app name. Why? because rebar is doesn't +%% and returns just the app name. Why? because rebar doesn't %% respect OTP conventions in some cases. -spec fixup_app_name(string()) -> string(). fixup_app_name(FileName) -> case string:tokens(FileName, "-") of [Name] -> Name; - [Name, _Version] -> Name + [Name, _Version] -> Name; + [Name, _Version, _Tag] -> Name end. -spec bootstrap_registry(#data{}) -> ok. From 6a86b603f9be415b09ee592ea0c29b76cd167da4 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 23 Nov 2016 16:03:23 -0600 Subject: [PATCH 1281/1749] lfe: 1.1.1 -> 1.2.1 - Use buildRebar3 instead of mkDerivation, obviating the need for setup-hook.sh - Manually build proper and patch rebar.config s.t. it doesn't try to fetch it - Set checkTarget = "travis" and actually run the tests --- pkgs/development/interpreters/lfe/default.nix | 34 +++++++++++++------ .../interpreters/lfe/no-test-deps.patch | 13 +++++++ .../interpreters/lfe/setup-hook.sh | 5 --- 3 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/interpreters/lfe/no-test-deps.patch delete mode 100644 pkgs/development/interpreters/lfe/setup-hook.sh diff --git a/pkgs/development/interpreters/lfe/default.nix b/pkgs/development/interpreters/lfe/default.nix index c7957275f9e7..cafcc4c28ee8 100644 --- a/pkgs/development/interpreters/lfe/default.nix +++ b/pkgs/development/interpreters/lfe/default.nix @@ -1,19 +1,33 @@ -{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash }: +{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, beamPackages }: -stdenv.mkDerivation rec { - name = "lfe-${version}"; - version = "1.1.1"; +let + inherit (beamPackages) buildRebar3 buildHex; + proper = buildHex rec { + name = "proper"; + version = "1.1.1-beta"; + sha256 = "0hnkhs761yjynw9382w8wm4j3x0r7lllzavaq2kh9n7qy3zc1rdx"; + + configurePhase = '' + ${erlang}/bin/escript write_compile_flags include/compile_flags.hrl + ''; + }; +in +buildRebar3 rec { + name = "lfe"; + version = "1.2.1"; src = fetchFromGitHub { owner = "rvirding"; - repo = "lfe"; + repo = name; rev = version; - sha256 = "0w1vpjqj8ni43gi84i0mcml4gfaqhmmd9s46di37cngpdw86i3bz"; + sha256 = "0j5gjlsk92y14kxgvd80q9vwyhmjkphpzadcswyjxikgahwg1avz"; }; - buildInputs = [ erlang makeWrapper ]; - - setupHook = ./setup-hook.sh; + buildInputs = [ makeWrapper ]; + beamDeps = [ proper ]; + patches = [ ./no-test-deps.patch ]; + doCheck = true; + checkTarget = "travis"; # These installPhase tricks are based on Elixir's Makefile. # TODO: Make, upload, and apply a patch. @@ -24,7 +38,7 @@ stdenv.mkDerivation rec { rm -Rf $ebindir install -m755 -d $ebindir - install -m644 ebin/* $ebindir + install -m644 _build/default/lib/lfe/ebin/* $ebindir install -m755 -d $bindir for bin in bin/lfe{,c,doc,script}; do install -m755 $bin $bindir; done diff --git a/pkgs/development/interpreters/lfe/no-test-deps.patch b/pkgs/development/interpreters/lfe/no-test-deps.patch new file mode 100644 index 000000000000..8c3faf1ff402 --- /dev/null +++ b/pkgs/development/interpreters/lfe/no-test-deps.patch @@ -0,0 +1,13 @@ +diff --git a/rebar.config b/rebar.config +index 1d5a68e..ca33be7 100644 +--- a/rebar.config ++++ b/rebar.config +@@ -2,7 +2,7 @@ + + {erl_opts, [debug_info]}. + +-{profiles, [{test, [{deps, [proper]}]}]}. ++%% {profiles, [{test, [{deps, [proper]}]}]}. + + {pre_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", ct, + "bin/lfe bin/lfec" diff --git a/pkgs/development/interpreters/lfe/setup-hook.sh b/pkgs/development/interpreters/lfe/setup-hook.sh deleted file mode 100644 index 2405dcea15f3..000000000000 --- a/pkgs/development/interpreters/lfe/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addLfeLibPath() { - addToSearchPath ERL_LIBS $1/lib/lfe/lib -} - -envHooks+=(addLfeLibPath) From e0b850147d10564308d7f49850ecbf7168afa7e7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 19:29:06 -0500 Subject: [PATCH 1282/1749] openafs: 1.6.17 -> 1.6.20 for CVE-2016-9772 From release notes: OPENAFS-SA-2016-003: file and directory names leak due to reuse of directory objects without zeroing the contents (12461 12462 12463 12464 12465) --- pkgs/servers/openafs-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 52a7941d0932..6383ce12bc1d 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.version}"; - version = "1.6.17"; + version = "1.6.20"; src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "16532f4951piv1g2i539233868xfs1damrnxql61gjgxpwnklhcn"; + sha256 = "0qar94k9x9dkws4clrnlw789q1ha9qjk06356s86hh78qwywc1ki"; }; nativeBuildInputs = [ autoconf automake flex yacc perl which ]; From 0683c1a35ca9513d53a7df94cabdd91f9f1cd2a1 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 19:38:50 -0500 Subject: [PATCH 1283/1749] p7zip: patch for CVE-2016-9296 --- pkgs/tools/archivers/p7zip/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 7c952a8f7294..c11c437fa37a 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "p7zip-${version}"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f"; }; + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/p/p7zip/16.02+dfsg-2/debian/patches/12-CVE-2016-9296.patch"; + sha256 = "0inblicg24gcbaq84n0mr6w4yc5ak65mh9wxml96wlhdf7ph2i3m"; + }) + ]; + preConfigure = '' makeFlagsArray=(DEST_HOME=$out) buildFlags=all3 From 4c5a1980198eb482e2e73c30beb8c0d13e07d246 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 19:46:54 -0500 Subject: [PATCH 1284/1749] teeworlds: 0.6.3 -> 0.6.4 for CVE-2016-9400 --- pkgs/games/teeworlds/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index ea337c208dff..504353afebef 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "teeworlds-0.6.3"; + name = "teeworlds-0.6.4"; src = fetchurl { - url = "https://downloads.teeworlds.com/teeworlds-0.6.3-src.tar.gz"; - sha256 = "0yq7f3yan07sxrhz7mzwqv344nfmdc67p3dg173631w9fb1yf3j9"; + url = "https://downloads.teeworlds.com/teeworlds-0.6.4-src.tar.gz"; + sha256 = "1qlqzp4wqh1vnip081lbsjnx5jj5m5y4msrcm8glbd80pfgd2qf2"; }; # we always want to use system libs instead of these From 86da9839b17127c0ca474dc56a58717160bbcc6c Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 20:16:05 -0500 Subject: [PATCH 1285/1749] xen: Patch for CVE-2016-9385, CVE-2016-9377, and CVE-2016-9378 --- pkgs/applications/virtualization/xen/4.5.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 271ab7e7fe96..e7a46a24965d 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchgit, ... } @ args: +{ callPackage, fetchurl, fetchpatch, fetchgit, ... } @ args: let # Xen 4.5.5 @@ -54,7 +54,23 @@ let xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch - ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch ]; + ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch + (fetchpatch { + url = "https://bugzilla.redhat.com/attachment.cgi?id=1218547"; + name = "CVE-2016-9385.patch"; + sha256 = "0l5drg862708ngy49jl65vmv6iwxlm7h8b4vabnffc2496f2gbwk"; + }) + (fetchpatch { + url = "https://bugzilla.redhat.com/attachment.cgi?id=1218536"; + name = "CVE-2016-9377-CVE-2016-9378-part1.patch"; + sha256 = "1dy8xvnkdvc44ywzzlswmkljjva44c0ndw7538iicr3qyf0244n4"; + }) + (fetchpatch { + url = "https://bugzilla.redhat.com/attachment.cgi?id=1218537"; + name = "CVE-2016-9377-CVE-2016-9378-part2.patch"; + sha256 = "0iz36s2w6bh5h9i1a9gj1c748fq1dj90kcg2yzld1m26qx21qrr5"; + }) + ]; }; in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) From d71dbd733c0fde876219086bf978cd5b2abe7917 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 7 Dec 2016 20:26:47 -0500 Subject: [PATCH 1286/1749] chromium: 54.0.2840.100 -> 55.0.2883.75 --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 1c71e7419a15..fa24ed9146f5 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1dw5difl42jch8pppk9z7ivvw0ah7azjx81allfm85ys075h0ppm"; - sha256bin64 = "1vd3ia7s7k8dkcc9sg1wmbi6x54wf7jmiavixnqb5swglczxfmxz"; - version = "55.0.2883.44"; + sha256 = "0mafk3cxwc16qbd7jzqj8rw1ys6s2bv7f9byixjcgssvjf073ksv"; + sha256bin64 = "0sb2d7vyrckkbg823rnl7y3k6q3kvmxp13lpm0ncy821cx89m89a"; + version = "55.0.2883.75"; }; dev = { - sha256 = "1pfgb5dnygyxiwfq6ini5s159c178zz7235npaag7k8gcc10ybnz"; - sha256bin64 = "14s185361inkqh8ykl94xhgv01z68gxqh7j6gyb4jbr0rhcsd9pl"; - version = "56.0.2906.0"; + sha256 = "1g4jy8zpmgqh9br2jcvbrnnr8fc5i4s5hvv01bs433rlcgaqk066"; + sha256bin64 = "08vzar0zshf39390xhr8l7gvzai9pxcqzwqzrmizaaqi9m5pijdr"; + version = "56.0.2924.18"; }; stable = { - sha256 = "1pw91kqqvm9nkz9i6wmm83wnqzl34q8rxw1sjcpfr4qcg15gbrz2"; - sha256bin64 = "05w9yadn7kwn0aiqd2mrg67lpk413zp6xkgwxnwni7z13j3zrw49"; - version = "54.0.2840.100"; + sha256 = "0mafk3cxwc16qbd7jzqj8rw1ys6s2bv7f9byixjcgssvjf073ksv"; + sha256bin64 = "0qfqj8067vjqklg1zm203dh6c29sbhk6w7flvi8h3z28y1pws2qw"; + version = "55.0.2883.75"; }; } From 7c29e476a76b691ca30cbbe07f75f589c11861e7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 7 Dec 2016 13:12:47 -0600 Subject: [PATCH 1287/1749] qt5.6/5.7: PaX compat qtwebengine * paxmark QtWebEngineProcess so it executes on PaX kernels * when building on host w/PaX apply patch to fix mksnapshot Patch taken from Gentoo[1], slightly modified to use paxctl directly. [1] https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch --- .../qt-5/5.6/qtwebengine/default.nix | 6 ++- .../qtwebengine-paxmark-mksnapshot.patch | 46 +++++++++++++++++++ .../libraries/qt-5/5.7/default.nix | 2 +- .../default.nix} | 4 ++ .../qtwebengine-paxmark-mksnapshot.patch | 46 +++++++++++++++++++ 5 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebengine/qtwebengine-paxmark-mksnapshot.patch rename pkgs/development/libraries/qt-5/5.7/{qtwebengine.nix => qtwebengine/default.nix} (90%) create mode 100644 pkgs/development/libraries/qt-5/5.7/qtwebengine/qtwebengine-paxmark-mksnapshot.patch diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix index 29a5349ecea8..96b6cca75aaf 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix @@ -11,6 +11,7 @@ , coreutils , pkgconfig, python2 +, stdenv # lib.optional, needsPax }: qtSubmodule { @@ -60,11 +61,14 @@ qtSubmodule { ]; patches = [ ./chromium-clang-update-py.patch - ]; + ] ++ stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + postInstall = '' cat > $out/libexec/qt.conf < $out/libexec/qt.conf < Date: Wed, 7 Dec 2016 12:33:47 -0600 Subject: [PATCH 1288/1749] zoom-us: 2.052458.0531 -> 2.0.707090.1031, paxmark * paxmark zoom to fix execution on PaX-enabled kernels[1] * Requires moving from qt55 to qt56 * Put libs as buildInputs so that wrapQtProgram sees their paths! * Don't use bundled Qt libs. (if these should be used, we shouldn't put our own on rpath, etc.) [1] Without this, program fails to start (but doesn't exit), and the following exception is logged a few times: Dec 07 12:24:26 hostname kernel: grsec: denied RWX mmap of by /nix/store/v1i2bff9fs7w1vycv0y615phhs7hky87-zoom-us/share/.zoom-wrapped[.zoom-wrapped:23812] uid/euid:1000/1 zoom still won't run unless using a pax-fixed version of qtwebengine. ( see: https://github.com/NixOS/nixpkgs/pull/20991 ) --- .../instant-messengers/zoom-us/default.nix | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 5f4e0ca1ee0d..4e9f00b03404 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -10,7 +10,7 @@ , libxml2 , libxslt , makeQtWrapper -, qt55 +, qt56 , sqlite , stdenv , xlibs @@ -27,15 +27,15 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; - version = "2.0.52458.0531"; + version = "2.0.70790.1031"; src = fetchurl { - url = "https://zoom.us/client/${version}/zoom_${version}_x86_64.tar.xz"; - sha256 = "16d64pn9j27v3fnh4c9i32vpkr10q1yr26w14964n0af1mv5jf7a"; + url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; + sha256 = "0kkg3bqv8zwhpxgrssa7ds00dxhdimnq2vfklgrdqn5qzbij31hd"; }; phases = [ "unpackPhase" "installPhase" ]; nativeBuildInputs = [ makeQtWrapper ]; - libPath = stdenv.lib.makeLibraryPath [ + buildInputs = [ alsaLib gcc.cc glib @@ -46,10 +46,12 @@ stdenv.mkDerivation rec { libuuid libxml2 libxslt - qt55.qtbase - qt55.qtdeclarative - qt55.qtscript - qt55.qtwebkit + qt56.qtbase + qt56.qtdeclarative + qt56.qtlocation + qt56.qtscript + qt56.qtwebchannel + qt56.qtwebengine sqlite xlibs.xcbutilkeysyms xorg.libX11 @@ -61,13 +63,15 @@ stdenv.mkDerivation rec { xorg.xcbutilimage zlib ]; + + libPath = stdenv.lib.makeLibraryPath buildInputs; + installPhase = '' mkdir -p $out/share cp -r \ application-x-zoom.png \ audio \ imageformats \ - chrome.bmp \ config-dump.sh \ dingdong1.pcm \ dingdong.pcm \ @@ -77,13 +81,7 @@ stdenv.mkDerivation rec { platforminputcontexts \ platforms \ platformthemes \ - Qt \ - QtMultimedia \ - QtQml \ - QtQuick \ - QtQuick.2 \ - QtWebKit \ - QtWebProcess \ + leave.pcm \ ring.pcm \ ring.wav \ version.txt \ @@ -98,6 +96,7 @@ stdenv.mkDerivation rec { --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath ${libPath} \ $out/share/zoom + paxmark m $out/share/zoom wrapQtProgram "$out/share/zoom" mkdir -p $out/bin ln -s $out/share/zoom $out/bin/zoom-us From e8220d326433c234533332e89cdcda2880f82986 Mon Sep 17 00:00:00 2001 From: Dmytro Rets Date: Thu, 8 Dec 2016 11:50:31 +0200 Subject: [PATCH 1289/1749] Update broadcom URL for broadcom-sta driver. --- pkgs/os-specific/linux/broadcom-sta/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 5814c184e660..c548b55105de 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { name = "broadcom-sta-${version}-${kernel.version}"; src = fetchurl { - url = "http://www.broadcom.com/docs/linux_sta/${tarball}"; + url = "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/${tarball}"; sha256 = hashes."${stdenv.system}"; }; From c71aee28fe7585a954824d3d5b078c44bccde31a Mon Sep 17 00:00:00 2001 From: Protean Security Date: Thu, 8 Dec 2016 11:33:45 +0100 Subject: [PATCH 1290/1749] rox-filer: init at 2.11 (#20854) --- lib/maintainers.nix | 1 + pkgs/desktops/rox/rox-filer/default.nix | 77 +++++++++++++++++++ .../rox-filer-2.11-in-source-build.patch | 16 ++++ pkgs/top-level/all-packages.nix | 4 + 4 files changed, 98 insertions(+) create mode 100644 pkgs/desktops/rox/rox-filer/default.nix create mode 100644 pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 2a3b10905539..b56dce798201 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -141,6 +141,7 @@ ehmry = "Emery Hemingway "; eikek = "Eike Kettner "; elasticdog = "Aaron Bull Schaefer "; + eleanor = "Dejan Lukan "; elitak = "Eric Litak "; ellis = "Ellis Whitehead "; epitrochoid = "Mabry Cervin "; diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix new file mode 100644 index 000000000000..e7edfd62151b --- /dev/null +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -0,0 +1,77 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared_mime_info, hicolor_icon_theme }: + +let + version = "2.11"; + name = "rox-filer-${version}"; +in stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "mirror://sourceforge/rox/rox-filer-${version}.tar.bz2"; + sha256 = "a929bd32ee18ef7a2ed48b971574574592c42e34ae09f36604bf663d7c101ba8"; + }; + + buildInputs = [ pkgconfig libxml2 gtk shared_mime_info hicolor_icon_theme libSM ]; + + patches = [ + ./rox-filer-2.11-in-source-build.patch + ]; + + # go to the source directory after unpacking the sources + setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/"; + + # patch source with defined patches + patchFlags = "-p0"; + + # patch the main.c to disable the lookup of the APP_DIR environment variable, + # which is used to lookup the location for certain images when rox-filer + # starts; rather override the location with an absolute path to the directory + # where images are stored to prevent having to use a wrapper, which sets the + # APP_DIR environment variable prior to starting rox-filer + preConfigure = '' + sed -i -e "s:g_strdup(getenv(\"APP_DIR\")):\"$out\":" src/main.c + mkdir build + cd build + ''; + + configureScript = "../src/configure"; + + installPhase = '' + mkdir -p "$out" + cd .. + cp -av Help Messages Options.xml ROX images style.css .DirIcon "$out" + + # create the man/ directory, which will be moved from $out to share/ in the fixup phase + mkdir "$out/man/" + cp -av ../rox.1 "$out/man/" + + # the main executable + mkdir "$out/bin/" + cp -v ROX-Filer "$out/bin/rox" + + # mime types + mkdir -p "$out/ROX/MIME" + cd "$out/ROX/MIME" + ln -sv text-x-{diff,patch}.png + ln -sv application-x-font-{afm,type1}.png + ln -sv application-xml{,-dtd}.png + ln -sv application-xml{,-external-parsed-entity}.png + ln -sv application-{,rdf+}xml.png + ln -sv application-x{ml,-xbel}.png + ln -sv application-{x-shell,java}script.png + ln -sv application-x-{bzip,xz}-compressed-tar.png + ln -sv application-x-{bzip,lzma}-compressed-tar.png + ln -sv application-x-{bzip-compressed-tar,lzo}.png + ln -sv application-x-{bzip,xz}.png + ln -sv application-x-{gzip,lzma}.png + ln -sv application-{msword,rtf}.png + ''; + + meta = with stdenv.lib; { + description = "Fast, lightweight, gtk2 file manager"; + homepage = "http://rox.sourceforge.net/desktop"; + license = with licenses; [ gpl2 lgpl2 ]; + platforms = platforms.linux; + maintainers = [ maintainers.eleanor ]; + }; +} diff --git a/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch b/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch new file mode 100644 index 000000000000..11bd80044595 --- /dev/null +++ b/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch @@ -0,0 +1,16 @@ +--- src/configure 2011-10-09 16:32:14.000000000 +0200 ++++ src/configure2 2016-03-20 09:26:31.640891863 +0100 +@@ -2132,13 +2132,6 @@ + + + ac_config_headers="$ac_config_headers config.h" +- +- +- if [ -f configure ]; then +- as_fn_error $? "Please run configure from the build directory (try ../AppRun --compile)" "$LINENO" 5 +- exit 1 +-fi +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 922af73fd200..e516fad6b0eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16415,6 +16415,10 @@ in theme-vertex = callPackage ../misc/themes/vertex { }; + rox-filer = callPackage ../desktops/rox/rox-filer { + gtk = gtk2; + }; + xfce = xfce4-12; xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { }); From f39d13cd3e577d546445df4bcd6cbe2905b655c1 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 7 Dec 2016 04:53:55 +0100 Subject: [PATCH 1291/1749] grsecurity doc: describe work-around for gitlab Fixes https://github.com/NixOS/nixpkgs/issues/20959 --- nixos/modules/security/grsecurity.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index 5b3e4db03a13..a7bcf4924f01 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -325,6 +325,19 @@ + + The gitlab service () + requires a variant of the ruby interpreter + built without `mprotect()` hardening, as in + + services.gitlab.packages.gitlab = pkgs.gitlab.override { + ruby = pkgs.ruby.overrideAttrs (attrs: { + postFixup = "paxmark m $out/bin/ruby"; + }); + }; + + + From 5fd4ffe00f750c5fcd37bee1acb743fc1c643b9d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 8 Dec 2016 12:22:09 +0100 Subject: [PATCH 1292/1749] grsecurity: 4.8.12-201612031658 -> 201612062306 --- 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 124518c36b21..20e4ec1fd7e1 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.12"; - grrev = "201612031658"; - sha256 = "06n96jk471xp7m8sf504bw9x6mk893jpymglgw037b21cbv88rrp"; + grrev = "201612062306"; + sha256 = "16ddiqx3sry07d7gy7y7rm8fxaa8v9lgih5l4dd2i39m35za11fq"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 1d5ce684a3fb93679f3bd29cbcbd12e358ea0b26 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 8 Dec 2016 10:10:25 -0200 Subject: [PATCH 1293/1749] xdgmenumaker: exclude darwin from platforms Travis reports hash mismatch during the darwin build, although the hash has been obtained using 'nix-prefetch-url' (on NixOS). Exclude darwin from platforms until the cause is identified. --- pkgs/applications/misc/xdgmenumaker/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 0d89510644ad..8155c1ca4148 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { description = "Command line tool that generates XDG menus for several window managers"; homepage = https://github.com/gapan/xdgmenumaker; license = licenses.gpl2Plus; - platforms = platforms.unix; + # NOTE: exclude darwin from platforms because Travis reports hash mismatch + platforms = with platforms; filter (x: !(elem x darwin)) unix; maintainers = [ maintainers.romildo ]; }; } From 5743506c6ee1ab4f068bf13f553778e3d2147b9e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Dec 2016 14:19:19 +0100 Subject: [PATCH 1294/1749] aws-sdk-cpp: Use multiple outputs --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 3f5ebd9a8c13..d5d7371aebf3 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "09vag1ybfqvw37djmd9g740iqjvg8nwr4p0xb21rfj06vazrdg4b"; }; + # FIXME: might be nice to put different APIs in different outputs + # (e.g. libaws-cpp-sdk-s3.so in output "s3"). + outputs = [ "out" "dev" ]; + buildInputs = [ cmake curl libuuid ]; cmakeFlags = From 6a90b88d27cbd03221b8e6717b8bc225e0abee48 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Dec 2016 09:59:47 -0500 Subject: [PATCH 1295/1749] loc: 0.3.3 -> 0.3.4 --- pkgs/development/misc/loc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 9e928bdde6fa..bc3034292742 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -3,17 +3,17 @@ with rustPlatform; buildRustPackage rec { - version = "0.3.3"; + version = "0.3.4"; name = "loc-${version}"; src = fetchFromGitHub { owner = "cgag"; repo = "loc"; - rev = "e2dfe2c1452f25f58974b545292b11dc450afd3d"; - sha256 = "1kp5iawig6304gs1289aivgsq44zhnn0ykqv9ymwpvj0g12l4l8r"; + rev = "9f3590f6299a1be3560f00de7f4f8bef61a02642"; + sha256 = "0dga8prwnnmsa616jh64wzic957ff0491xghm0bjlns35ajc8lif"; }; - depsSha256 = "01jww6d4dzb5pq6vcrp3xslhxic0vp0gicsddda4adzqg1lab8c2"; + depsSha256 = "1xcfhbnz208dk7xb748v8kv28zbhyr7wqg9gsgbiw3lnvc2a3nn6"; meta = { homepage = "http://github.com/cgag/loc"; From 5e73d5d8ab2a3231cc9f9c9cf2f529e8a7a6e229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 8 Dec 2016 13:07:53 -0200 Subject: [PATCH 1296/1749] numix-icon-theme-square: init at 2016-11-23 (#20988) Travis reports hash mismatch during the darwin build, although the hash has been obtained using 'nix-prefetch-url' (on NixOS). Exclude darwin from platforms until the cause is identified. --- .../icons/numix-icon-theme-square/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/data/icons/numix-icon-theme-square/default.nix diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix new file mode 100644 index 000000000000..4485351b9c39 --- /dev/null +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, numix-icon-theme }: + +stdenv.mkDerivation rec { + version = "2016-11-23"; + + package-name = "numix-icon-theme-square"; + + name = "${package-name}-${version}"; + + src = fetchFromGitHub { + owner = "numixproject"; + repo = package-name; + rev = "1c30eb02aea3d95c49f95c212702b56e93ac9043"; + sha256 = "1d2car4dsh1dnim9jlakm035ydqd1f115cagm6zm8gwa5w9annag"; + }; + + buildInputs = [ numix-icon-theme ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/icons + cp -a Numix-Square{,-Light} $out/share/icons/ + ''; + + meta = with stdenv.lib; { + description = "Numix icon theme (square version)"; + homepage = https://numixproject.org; + license = licenses.gpl3; + platforms = with platforms; allBut darwin; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e516fad6b0eb..130ded8d9c05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11908,6 +11908,8 @@ in numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { }; + numix-icon-theme-square = callPackage ../data/icons/numix-icon-theme-square { }; + oldstandard = callPackage ../data/fonts/oldstandard { }; oldsindhi = callPackage ../data/fonts/oldsindhi { }; From 3a98749bd13c31c3926c00c7bce531d2b14f7c32 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 13:43:01 +0100 Subject: [PATCH 1297/1749] pari: 2.9.0 -> 2.9.1 --- pkgs/applications/science/math/pari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 27153ea9b083..64784facfb96 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "pari-${version}"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "0rljznrvjgy71n4hlpgx1l1yy1qx52mly68k3c05ds21mlvzg92a"; + sha256 = "0rq7wz9df1xs4acdzzb5dapx8vs6m5py39n2wynw2qv4d2b0ylfw"; }; buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ]; From ed9fd96a77f10617df3802785ded0a76cc3bf9bb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 13:44:01 +0100 Subject: [PATCH 1298/1749] apache-jena: 3.1.0 -> 3.1.1 --- pkgs/servers/nosql/apache-jena/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 7360cbbcebaa..13001b1813f2 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena"; - version = "3.1.0"; + version = "3.1.1"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "1nfb567v9s17j31l75v5gkdalmkrqba7ahz3z8gzz4kpmdzdhajk"; + sha256 = "0sxhpasc3qkj1axkccvckv8wiwcc5v6f4yri49inc3sl02pvvanp"; }; buildInputs = [ makeWrapper From d03260099f051b9b855ff3e0a43ce83bf877ffd6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 13:45:02 +0100 Subject: [PATCH 1299/1749] nilfs-utils: 2.2.5 -> 2.2.6 --- pkgs/tools/filesystems/nilfs-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index d71b6332321a..c5cc4f053a23 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, libuuid, libselinux }: let sourceInfo = rec { - version = "2.2.5"; + version = "2.2.6"; url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2"; - sha256 = "0a5iavbjj8c255mfl968ljmj3cb217k7803cc1sdaskacwnykdq2"; + sha256 = "1rjj6pv7yx5wm7b3w6hv88v6r53jqaam5nrnkw2and4ifhsprf3y"; baseName = "nilfs-utils"; name = "${baseName}-${version}"; }; From 9ad8afbf66288169ed24bbc8b1c5be5476983f50 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 13:46:04 +0100 Subject: [PATCH 1300/1749] freeipmi: 1.5.4 -> 1.5.5 --- pkgs/tools/system/freeipmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index cd8485e25737..de6c91518654 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - version = "1.5.4"; + version = "1.5.5"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "1m8zvnyjyjap07vvc5z90nyghabbb6bjcyyc7qswj66qsmssf135"; + sha256 = "0lzzvhzbdl1cxin4xz3lirqxsjwmjr5ac0qr4g21cqsv2j6vj85f"; }; buildInputs = [ libgcrypt readline ]; From 64402bb9e0f77d33deb766440197ff5fd78de584 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 13:46:21 +0100 Subject: [PATCH 1301/1749] getmail: 4.51.0 -> 4.52.0 --- pkgs/tools/networking/getmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 64bad55d88b2..c3fe609f4cdc 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - version = "4.51.0"; + version = "4.52.0"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "1nzdjm62lrg7qbh8xz2irj9wxf2861s3ld6zd5fbcgpjy3v588mw"; + sha256 = "0pzplrlxwbxydvfw4kkwn60l40hk1h5sxawaa6pi0k75c220k4ni"; }; doCheck = false; From 1461981190c048fecd62f681c10d663e3d960d52 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 14:16:30 +0100 Subject: [PATCH 1302/1749] harfbuzz: 1.3.3 -> 1.3.4 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 9ff735ec1c0a..b2edd39764c2 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.3.3"; + version = "1.3.4"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "2620987115a4122b47321610dccbcc18f7f121115fd7b88dc8a695c8b66cb3c9"; + sha256 = "0ava7y24797k5ps3ghq2ccjjds97ri1gx32v6546a6pgmpyad2ki"; }; outputs = [ "out" "dev" ]; From ff3fc6eef3fda0df482e89c2c9c035441dace538 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 14:16:41 +0100 Subject: [PATCH 1303/1749] librem: 0.4.7 -> 0.5.0 --- pkgs/development/libraries/librem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 5b7041601f72..5ad5f8d3848c 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl, libre}: stdenv.mkDerivation rec { - version = "0.4.7"; + version = "0.5.0"; name = "librem-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/rem-${version}.tar.gz"; - sha256 = "0klm6ls9w0cj66h1zxmx0ifsihlmq1bq75vbmf09d0vvw5g4y22x"; + sha256 = "1n1ajy1ccw0xw6bndad4js2pnj977s2angzs7lawadh7x5wnalbb"; }; buildInputs = [zlib openssl libre]; makeFlags = [ From 1e580945f0bc4eccd52e83094f45e8ea9c223f2f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 14:17:42 +0100 Subject: [PATCH 1304/1749] libre: 0.4.17 -> 0.5.0 --- pkgs/development/libraries/libre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index fe130c5203da..6ec6333a73d7 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.4.17"; + version = "0.5.0"; name = "libre-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "1630228xbsmasbmkx3s7g4r8mzkdlzila4j2f6m2mp0996v8kq1c"; + sha256 = "18msdi5a1ssymz00w21hg6sgacb2lzx0ns31iapvk5hv6l225pd2"; }; buildInputs = [zlib openssl]; makeFlags = [ From cbd448d00900ad7c36e5509656f4cf365538c666 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Dec 2016 14:18:07 +0100 Subject: [PATCH 1305/1749] libreoffice-still: 5.1.5.2 -> 5.1.6.2 --- .../office/libreoffice/libreoffice-srcs-still.nix | 10 +++++----- .../office/libreoffice/still-primary-src.nix | 4 ++-- pkgs/applications/office/libreoffice/still.nix | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index d2010d81a8a7..3d2514f8414b 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -595,11 +595,11 @@ md5name = "c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"; } { - name = "libpng-1.6.19.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.19.tar.gz"; - sha256 = "9f977ac8e4e3d4d5b001b32243f111eeec21bb6b59e583f2fb41fd2e48840352"; - md5 = "3121bdc77c365a87e054b9f859f421fe"; - md5name = "3121bdc77c365a87e054b9f859f421fe-libpng-1.6.19.tar.gz"; + name = "libpng-1.6.24.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz"; + sha256 = "be46e0d14ccac3800f816ae860d191a1187a40164b7552c44afeee97a9caa0a3"; + md5 = "65213080dd30a9b16193d9b83adc1ee9"; + md5name = "65213080dd30a9b16193d9b83adc1ee9-libpng-1.6.24.tar.gz"; } { name = "poppler-0.26.4.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index 33ba558ed298..078efa0227d4 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "5"; minor = "1"; - patch = "5"; + patch = "6"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1qg0dj0zwh5ifhmvv4k771nmyqddz4ifn75s9mr1p0nyix8zks8x"; + sha256 = "150xb76pc3889gfy4jrnq8sidymm1aihkm5pzy8b1fdy51zip804"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 2963eff83e7d..b3d69ef7f195 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1mzsz9pd2k1lpvwf7r5q90qmdp57160362cmlxaj6bxz52gr9f2i"; + sha256 = "0g88dscdmixhv17lzz4k00jrrvmafxzv0bakzf0v9zny2b3hb6r2"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1qqpggcanchz0qqasc5xvginrpa5rx7ahj3dw2vk7n34xaarnni6"; + sha256 = "1aqdzw4sqwfli9aah7zjir93nc1v5zdrbbgvmbn5wh1kawa8dr5g"; }; }; From ce2a9a8f9b5ef229c18abedda63739f3886625cc Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Dec 2016 10:08:29 -0500 Subject: [PATCH 1306/1749] lean2: 2016-07-05 -> 2016-11-29 Renamed from lean since upstream renamed it as well. The lean attribute in nixpkgs will now refer to the new lean 3 version. --- .../science/logic/{lean => lean2}/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/applications/science/logic/{lean => lean2}/default.nix (61%) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean2/default.nix similarity index 61% rename from pkgs/applications/science/logic/lean/default.nix rename to pkgs/applications/science/logic/lean2/default.nix index e833b4afbbd2..a938af72f587 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -2,17 +2,17 @@ , gperftools, ninja, makeWrapper }: stdenv.mkDerivation rec { - name = "lean-${version}"; - version = "2016-07-05"; + name = "lean2-${version}"; + version = "2016-11-29"; src = fetchFromGitHub { owner = "leanprover"; - repo = "lean"; - rev = "cc70845332e63a1f1be21dc1f96d17269fc85909"; - sha256 = "09qz2vjw7whiggvw0cdaa4i2f49wnch2sd4r43glq181ssln27d6"; + repo = "lean2"; + rev = "a086fb334838c427bbc8f984eb44a4cbbe013a6b"; + sha256 = "0qlvhnb37amclgcyizl8bfab33b0a3jk54br9gsrik8cq76lkwwx"; }; - buildInputs = [ gmp mpfr boost cmake python gperftools ninja makeWrapper ]; + buildInputs = [ gmp mpfr cmake python gperftools ninja makeWrapper ]; enableParallelBuilding = true; preConfigure = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Automatic and interactive theorem prover"; + description = "Automatic and interactive theorem prover (version with HoTT support)"; homepage = "http://leanprover.github.io"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecb18f8608e8..a0b9edc65352 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16747,7 +16747,7 @@ in else smlnj; }; - lean = callPackage ../applications/science/logic/lean {}; + lean2 = callPackage ../applications/science/logic/lean2 {}; leo2 = callPackage ../applications/science/logic/leo2 {}; From a2210a9efd00cee732abbeda84e795efa5bc489b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Dec 2016 10:29:33 -0500 Subject: [PATCH 1307/1749] lean: init at 2016-12-08 --- .../science/logic/lean/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/science/logic/lean/default.nix diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix new file mode 100644 index 000000000000..d1f4bc0a4145 --- /dev/null +++ b/pkgs/applications/science/logic/lean/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, gperftools }: + +stdenv.mkDerivation rec { + name = "lean-${version}"; + version = "2016-12-08"; + + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean"; + rev = "7b63d6566faaf1dc0f2c8e873c61f51dce9ab618"; + sha256 = "0xxr7dnh7pmdbpxhl3cq9clwamxjk54zcxplsrz6xirk0qy7ga4l"; + }; + + buildInputs = [ gmp mpfr cmake gperftools ]; + enableParallelBuilding = true; + + preConfigure = '' + cd src + ''; + + meta = with stdenv.lib; { + description = "Automatic and interactive theorem prover"; + homepage = "http://leanprover.github.io"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0b9edc65352..1ca0f4352088 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16747,7 +16747,9 @@ in else smlnj; }; + lean = callPackage ../applications/science/logic/lean {}; lean2 = callPackage ../applications/science/logic/lean2 {}; + lean3 = lean; leo2 = callPackage ../applications/science/logic/leo2 {}; From 29941231610f3d93c8e99adf6cae51a990057654 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Wed, 7 Dec 2016 10:46:06 +0000 Subject: [PATCH 1308/1749] boinc service: add to module list The module itself was added in 811c39c6a4156af42558f95945add2795083d1a7, but it looks like I forgot to reference it to module-list.nix. --- nixos/modules/module-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 155d7a5ef923..c89bbcc71acf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -133,6 +133,7 @@ ./services/cluster/fleet.nix ./services/cluster/kubernetes.nix ./services/cluster/panamax.nix + ./services/computing/boinc/client.nix ./services/computing/torque/server.nix ./services/computing/torque/mom.nix ./services/computing/slurm/slurm.nix From 2606994cc6cbf2392dcb556873c03d01658637c1 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Thu, 8 Dec 2016 15:50:52 +0000 Subject: [PATCH 1309/1749] boinc service: use instead of --- nixos/modules/services/computing/boinc/client.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix index 5e73638913de..91bd463732de 100644 --- a/nixos/modules/services/computing/boinc/client.nix +++ b/nixos/modules/services/computing/boinc/client.nix @@ -48,7 +48,7 @@ in only the hosts listed in dataDir/remote_hosts.cfg will be allowed to connect. - See also: + See also: ''; }; }; From ece67bfa01053f9687f1491f1fcb5617c988900c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Dec 2016 17:52:56 +0100 Subject: [PATCH 1310/1749] diffoscope: 52 -> 63 --- pkgs/tools/misc/diffoscope/default.nix | 12 +++++++--- pkgs/tools/misc/diffoscope/ignore_links.patch | 24 +++++++------------ pkgs/tools/misc/diffoscope/locale.patch | 14 +++++++++++ 3 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 pkgs/tools/misc/diffoscope/locale.patch diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index c6eb7c8b0180..22c9ea4872b5 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,24 +1,30 @@ { lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils , acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc , gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, vim, xz +, colordiff , enableBloat ? false }: pythonPackages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "52"; + version = "63"; namePrefix = ""; src = fetchgit { url = "git://anonscm.debian.org/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "18nqsd51rc0rldyxnjmzn86154asianhv415llhbxpr1a6zwqis6"; + sha256 = "018c0xcgf6pgq493dib29pfyqpj7vb93a6qfmdh790fpxa2j1zyd"; }; patches = [ # Ignore different link counts. ./ignore_links.patch + + # Our Glibc doesn't have the C.UTF-8 locale yet + # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8), so use + # en_US.UTF-8 instead. + ./locale.patch ]; postPatch = '' @@ -31,7 +37,7 @@ pythonPackages.buildPythonApplication rec { # FIXME: move xxd into a separate package so we don't have to pull in all of vim. propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh rpm ]) ++ map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext - gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz + gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]); doCheck = false; # Calls 'mknod' in squashfs tests, which needs root diff --git a/pkgs/tools/misc/diffoscope/ignore_links.patch b/pkgs/tools/misc/diffoscope/ignore_links.patch index 4e5046390fa9..ceea0dc94d4e 100644 --- a/pkgs/tools/misc/diffoscope/ignore_links.patch +++ b/pkgs/tools/misc/diffoscope/ignore_links.patch @@ -1,21 +1,15 @@ -From: Eelco Dolstra - -Nix deduplicates by hard-linking identical files, so it's normal for -the the number of links to a file to differ. ---- -diff --git a/diffoscope/comparators/directory.py b/diffoscope/comparators/directory.py -index 7d1cd75..bd91eb0 100644 ---- a/diffoscope/comparators/directory.py -+++ b/diffoscope/comparators/directory.py -@@ -47,6 +47,7 @@ class Stat(Command): +diff -ru -x '*~' diffoscope-orig/diffoscope/comparators/directory.py diffoscope/diffoscope/comparators/directory.py +--- diffoscope-orig/diffoscope/comparators/directory.py 1970-01-01 01:00:01.000000000 +0100 ++++ diffoscope/diffoscope/comparators/directory.py 2016-12-08 17:37:55.000315157 +0100 +@@ -49,6 +49,7 @@ FILE_RE = re.compile(r'^\s*File:.*$') - DEVICE_RE = re.compile(r'Device: [0-9a-f]+h/[0-9]+d') - INODE_RE = re.compile(r'Inode: [0-9]+') -+ LINKS_RE = re.compile(r'Links: [0-9]+') + DEVICE_RE = re.compile(r'Device: [0-9a-f]+h/[0-9]+d\s+') + INODE_RE = re.compile(r'Inode: [0-9]+\s+') ++ LINKS_RE = re.compile(r'Links: [0-9]+\s+') ACCESS_TIME_RE = re.compile(r'^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$') CHANGE_TIME_RE = re.compile(r'^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$') - -@@ -55,6 +56,7 @@ class Stat(Command): + +@@ -57,6 +58,7 @@ line = Stat.FILE_RE.sub('', line) line = Stat.DEVICE_RE.sub('', line) line = Stat.INODE_RE.sub('', line) diff --git a/pkgs/tools/misc/diffoscope/locale.patch b/pkgs/tools/misc/diffoscope/locale.patch new file mode 100644 index 000000000000..408d3ba2ce04 --- /dev/null +++ b/pkgs/tools/misc/diffoscope/locale.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' diffoscope-orig/diffoscope/__init__.py diffoscope/diffoscope/__init__.py +--- diffoscope-orig/diffoscope/__init__.py 1970-01-01 01:00:01.000000000 +0100 ++++ diffoscope/diffoscope/__init__.py 2016-12-08 17:48:51.732122110 +0100 +@@ -81,8 +81,8 @@ + for var in ['LANG', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MONETARY', + 'LC_MESSAGES', 'LC_PAPER', 'LC_NAME', 'LC_ADDRESS', + 'LC_TELEPHONE', 'LC_MEASUREMENT', 'LC_IDENTIFICATION']: +- os.environ[var] = 'C' +- os.environ['LC_CTYPE'] = 'C.UTF-8' ++ os.environ[var] = 'en_US' ++ os.environ['LC_CTYPE'] = 'en_US.UTF-8' + os.environ['TZ'] = 'UTC' + + From 9cca8e3f8701f0366759e54ba74ef90f031398e1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 8 Dec 2016 21:02:36 +0300 Subject: [PATCH 1311/1749] uwsgi service: fix for new pythonPackages --- nixos/modules/services/web-servers/uwsgi.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index 56f077e62a89..14596bb3add0 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -29,7 +29,6 @@ let pythonPackages = pkgs.pythonPackages.override { inherit python; - self = pythonPackages; }; penv = python.buildEnv.override { From f0b9ecfa01c5de92c18724533d4a99a0e8da5076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 8 Dec 2016 18:50:07 +0100 Subject: [PATCH 1312/1749] bind: fixup more openssl.dev references --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 8cb96d445c8a..e3f2364463ba 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { ln -sf $dnsutils/bin/{dig,nslookup,nsupdate} $bin/bin ln -sf $host/bin/host $dnsutils/bin - for f in "$out/lib/"*.la; do - sed -i $f -e 's|-L${openssl.dev}|-L${openssl.out}|g' + for f in "$lib/lib/"*.la "$dev/bin/"{isc-config.sh,bind*-config}; do + sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g' done ''; From 469e5e7768cf850ac4c5a8e6df43a52f209c3b79 Mon Sep 17 00:00:00 2001 From: Peter Marheine Date: Fri, 9 Dec 2016 05:34:25 +1100 Subject: [PATCH 1313/1749] libdwarf: version the shared object (#20996) Upstream sets the soname, so binaries compiled against libdwarf.so will link against libdwarf.so.1 at runtime. Install libdwarf.so.1 and symlink libdwarf.so to it so both linking and runtime loading work again. --- pkgs/development/libraries/libdwarf/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index eda68fc73d3f..48853b63c792 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib $out/include - cp libdwarf.so $out/lib + cp libdwarf.so.1 $out/lib + ln -s libdwarf.so.1 $out/lib/libdwarf.so cp libdwarf.h dwarf.h $out/include ''; From af1202434ada715e0b714f6da8b88b15d1406003 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 8 Dec 2016 23:09:58 +0100 Subject: [PATCH 1314/1749] ndiswrapper: mark as broken Build fails across all our kernels. There is a new version 1.60, but it, too, fails to build. Until somebody comes along to patch around it, we might as well mark this as broken. --- pkgs/os-specific/linux/ndiswrapper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index eabc2840881e..c22ffb60df85 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation { description = "Ndis driver wrapper for the Linux kernel"; homepage = http://sourceforge.net/projects/ndiswrapper; license = "GPL"; + broken = true; }; } From 76125722f0cd445cbce0fb183ae127aeb28796d0 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 8 Dec 2016 21:12:27 +0100 Subject: [PATCH 1315/1749] darwin.libunwind: fix install phase --- .../darwin/apple-source-releases/libunwind/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix index 81a45d99a86e..9fed57ed64a4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix @@ -1,15 +1,16 @@ { stdenv, appleDerivation, dyld, osx_private_sdk }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; + buildPhase = ":"; + # install headers only installPhase = '' mkdir -p $out/lib - cp -R include $out/include + make install-data-am ''; meta = with stdenv.lib; { - maintainers = with maintainers; [ copumpkin ]; + maintainers = with maintainers; [ copumpkin lnl7 ]; platforms = platforms.darwin; license = licenses.apsl20; }; From 7a9400d338a2215314ab5acd3af0e3699bce9d4d Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Tue, 15 Nov 2016 21:17:45 -0500 Subject: [PATCH 1316/1749] qt5.6: darwin compatibility - qtbase builds on darwin - Downstream qmake and cmake build configurations supported Darwin-specific changes: Prevent `qmake -project` from adding build support files in the temp directory to the project. Shrink the temp directory used for building with qmake. The issue here is that `lndir` recreates the entire directory structure of the module we are merging into the temporary build environment. On darwin, the framework directory structures mean that this shadow directory tree is 17MB even though the file contents are all symlinks into the store. To address this, we symlink the framework directories explicitly and use `lndir` for everything else. --- .../libraries/qt-5/5.6/default.nix | 5 +- .../qt-5/5.6/qtbase/cmake-paths-darwin.patch | 384 ++++++++++++++++++ .../libraries/qt-5/5.6/qtbase/default.nix | 119 ++++-- .../libraries/qt-5/5.6/qtbase/series | 1 - .../libraries/qt-5/make-qt-wrapper-darwin.sh | 38 ++ .../libraries/qt-5/qmake-hook-darwin.sh | 42 ++ .../qt-5/qtbase-setup-hook-darwin.sh | 181 +++++++++ 7 files changed, 735 insertions(+), 35 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths-darwin.patch create mode 100644 pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh create mode 100644 pkgs/development/libraries/qt-5/qmake-hook-darwin.sh create mode 100644 pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 560e0ac021d9..687708d98efa 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -112,13 +112,12 @@ let makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } - ../make-qt-wrapper.sh; + (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh); qmakeHook = makeSetupHook { deps = [ self.qtbase.dev ]; } - ../qmake-hook.sh; - + (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh); }; self = makeScope pkgs.newScope addPackages; diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths-darwin.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths-darwin.patch new file mode 100644 index 000000000000..9d42314e4cc9 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths-darwin.patch @@ -0,0 +1,384 @@ +Index: qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) + endif() + !!ENDIF + +-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ELSE +-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) +-# Use original install prefix when loaded through a +-# cross-prefix symbolic link such as /lib -> /usr/lib. +-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) +-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) +-if(_realCurr STREQUAL _realOrig) +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) +-else() +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-endif() +-unset(_realOrig) +-unset(_realCurr) +-unset(_IMPORT_PREFIX) +-!!ENDIF +-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-!!ELSE +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ENDIF +- + !!IF !equals(TEMPLATE, aux) + # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. + set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)") +@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ if(NOT EXISTS \"${imported_location}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ endif() + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF +@@ -74,45 +53,17 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta + \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" + ) + +-!!IF !isEmpty(CMAKE_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ELSE +- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ENDIF +- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) +- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") +- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} +- ) +- endif() +-!!ENDIF + endmacro() + !!ENDIF + + if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + + !!IF !no_module_headers +-!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" +- ) +-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" +- ) +-!!ELSE +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +-!!ENDIF +-!!ELSE + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") ++ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_OUT@/lib\" \"@NIX_OUT@/lib/$${MODULE_INCNAME}.framework/Headers\") + !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" ++ \"\" + ) + !!ELSE + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") + !!ENDIF + !!ENDIF +-!!ENDIF ++ + !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) + include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) + !!ENDIF +@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_DEBUG_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE +- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" ++ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ENDIF + AND EXISTS + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ++ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() + !!ENDIF // CMAKE_DEBUG_TYPE + !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD +@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + !!ENDIF // CMAKE_RELEASE_TYPE + + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +-!!ELSE + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_RELEASE_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE +- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) +-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" ++ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" + !!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" + !!ENDIF + AND EXISTS + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() + !!ENDIF // CMAKE_RELEASE_TYPE + !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD +@@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +-!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ELSE +- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ENDIF ++ set(imported_location \"${PLUGIN_LOCATION}\") + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set_target_properties(Qt5::${Plugin} PROPERTIES + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} +Index: qtbase-opensource-src-5.6.1/src/gui/Qt5GuiConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/src/gui/Qt5GuiConfigExtras.cmake.in ++++ qtbase-opensource-src-5.6.1/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -2,7 +2,7 @@ + !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) + + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") ++set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ELSE + set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ENDIF +@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert + set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ELSE + set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ENDIF +Index: qtbase-opensource-src-5.6.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ qtbase-opensource-src-5.6.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) + add_executable(Qt5::uic IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ENDIF +Index: qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) + add_executable(Qt5::qmake IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) + add_executable(Qt5::moc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) + add_executable(Qt5::rcc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain) + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +Index: qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +Index: qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ qtbase-opensource-src-5.6.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +Index: qtbase-opensource-src-5.6.1/src/dbus/Qt5DBusConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ qtbase-opensource-src-5.6.1/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) + add_executable(Qt5::qdbuscpp2xml IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) + add_executable(Qt5::qdbusxml2cpp IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ENDIF +Index: qtbase-opensource-src-5.6.1/mkspecs/features/create_cmake.prf +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/mkspecs/features/create_cmake.prf ++++ qtbase-opensource-src-5.6.1/mkspecs/features/create_cmake.prf +@@ -136,28 +136,28 @@ contains(CONFIG, plugin) { + + win32 { + isEmpty(CMAKE_STATIC_TYPE) { +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll + } else:mingw { +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a + } else { # MSVC static +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib + } + } else { + mac { + isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib + else: CMAKE_PlUGIN_EXT = .a + +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} + } else { + isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so + else: CMAKE_PlUGIN_EXT = .a + +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} + } + } + cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in +Index: qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.1.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in ++++ qtbase-opensource-src-5.6.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +@@ -2,10 +2,10 @@ + add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) + + !!IF !isEmpty(CMAKE_RELEASE_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\") + !!ENDIF + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\") + !!ENDIF + + list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) 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 b34540d87a5c..341ebe1198b7 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -9,13 +9,15 @@ , coreutils, bison, flex, gdb, gperf, lndir , patchelf, perl, pkgconfig, python2 +, darwin, libiconv # optional dependencies , cups ? null , mysql ? null, postgresql ? null # options -, mesaSupported, mesa +, mesaSupported ? (!stdenv.isDarwin) +, mesa , buildExamples ? false , buildTests ? false , developerBuild ? false @@ -35,6 +37,7 @@ stdenv.mkDerivation { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) + ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)] ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; @@ -54,11 +57,11 @@ stdenv.mkDerivation { substituteInPlace src/network/kernel/qhostinfo_unix.cpp \ --replace "@glibc@" "${stdenv.cc.libc.out}" - substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \ - --replace "@libXcursor@" "${libXcursor.out}" - substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \ --replace "@openssl@" "${openssl.out}" + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \ + --replace "@libXcursor@" "${libXcursor.out}" substituteInPlace src/dbus/qdbus_symbols.cpp \ --replace "@dbus_libs@" "${dbus.lib}" @@ -66,16 +69,30 @@ stdenv.mkDerivation { substituteInPlace \ src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ --replace "@libX11@" "${libX11.out}" - '' - + lib.optionalString mesaSupported '' + '' + lib.optionalString mesaSupported '' substituteInPlace \ src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ --replace "@mesa_lib@" "${mesa.out}" substituteInPlace mkspecs/common/linux.conf \ --replace "@mesa_lib@" "${mesa.out}" \ --replace "@mesa_inc@" "${mesa.dev or mesa}" + '' + lib.optionalString stdenv.isDarwin '' + sed -i \ + -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \ + -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \ + -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \ + -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \ + -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \ + -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \ + -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \ + ./configure + sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf + sed -i '26,$d' ./mkspecs/features/mac/default_post.prf + sed -i '1,$d' ./mkspecs/features/mac/sdk.prf + sed 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' -i ./mkspecs/common/mac.conf ''; - + # Note on the above: \x27 is a way if including a single-quote + # character in the sed string arguments. setOutputFlags = false; preConfigure = '' @@ -104,7 +121,6 @@ stdenv.mkDerivation { ${lib.optionalString developerBuild "-developer-build"} -largefile -accessibility - -rpath -optimized-qmake -strip -no-reduce-relocations @@ -118,15 +134,6 @@ stdenv.mkDerivation { -iconv -icu -pch - -glib - -xcb - -qpa xcb - -${lib.optionalString (cups == null) "no-"}cups - - -no-eglfs - -no-directfb - -no-linuxfb - -no-kms ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 @@ -142,11 +149,8 @@ stdenv.mkDerivation { -system-libpng -system-libjpeg -system-harfbuzz - -system-xcb - -system-xkbcommon -system-pcre -openssl-linked - -dbus-linked -system-sqlite -${if mysql != null then "plugin" else "no"}-sql-mysql @@ -156,6 +160,27 @@ stdenv.mkDerivation { -make tools -${lib.optionalString (buildExamples == false) "no"}make examples -${lib.optionalString (buildTests == false) "no"}make tests + '' + lib.optionalString (!stdenv.isDarwin) '' + -no-rpath + -glib + -xcb + -qpa xcb + + -${lib.optionalString (cups == null) "no-"}cups + + -no-eglfs + -no-directfb + -no-linuxfb + -no-kms + + -system-xcb + -system-xkbcommon + -dbus-linked + '' + lib.optionalString stdenv.isDarwin '' + -platform macx-clang + -no-use-gold-linker + -no-fontconfig + -qt-freetype ''; # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag @@ -164,19 +189,27 @@ stdenv.mkDerivation { PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; propagatedBuildInputs = [ - dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib + libxml2 libxslt openssl pcre16 sqlite zlib + + # Text rendering + harfbuzz icu # Image formats libjpeg libpng libtiff + ] + ++ lib.optional mesaSupported mesa + ++ lib.optionals (!stdenv.isDarwin) [ + dbus glib udev # Text rendering - fontconfig freetype harfbuzz icu - + fontconfig freetype # X11 libs xlibs.libXcomposite libX11 libxcb libXext libXrender libXi xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon - ] - ++ lib.optional mesaSupported mesa; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices CoreServices AppKit Carbon OpenGL AGL Cocoa + DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk + ]); buildInputs = [ bison flex gperf ] @@ -185,10 +218,14 @@ stdenv.mkDerivation { ++ lib.optional (mysql != null) mysql.lib ++ lib.optional (postgresql != null) postgresql; - nativeBuildInputs = [ lndir patchelf perl pkgconfig python2 ]; + nativeBuildInputs = [ lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf; # freetype-2.5.4 changed signedness of some struct fields - NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare" + + lib.optionalString stdenv.isDarwin " -D__MAC_OS_X_VERSION_MAX_ALLOWED=1090 -D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))"; + # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is + # 10.9 which necessitates the above macro definition that mentions + # 10.10 postInstall = '' find "$out" -name "*.cmake" | while read file; do @@ -210,6 +247,11 @@ stdenv.mkDerivation { moveToOutput "share/doc" "$dev" ''; + # Don't move .prl files on darwin because they end up in + # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent + # use of lndir in the qtbase setup-hook. On Linux, the .prl files + # are in lib, and so do not cause a subsequent recreation of deep + # framework directory trees. postFixup = '' # Don't retain build-time dependencies like gdb. @@ -218,17 +260,33 @@ stdenv.mkDerivation { # Move libtool archives and qmake projects if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then pushd "''${!outputLib}" - find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \ + find lib -name '*.a' -o -name '*.la'${if stdenv.isDarwin then "" else "-o -name '*.prl'"} | \ while read -r file; do mkdir -p "''${!outputDev}/$(dirname "$file")" mv "''${!outputLib}/$file" "''${!outputDev}/$file" done popd fi + '' + lib.optionalString stdenv.isDarwin '' + fixDarwinDylibNames_rpath() { + local flags=() + + for fn in "$@"; do + flags+=(-change "@rpath/$fn.framework/Versions/5/$fn" "$out/lib/$fn.framework/Versions/5/$fn") + done + + for fn in "$@"; do + echo "$fn: fixing dylib" + install_name_tool -id "$out/lib/$fn.framework/Versions/5/$fn" "''${flags[@]}" "$out/lib/$fn.framework/Versions/5/$fn" + done + } + fixDarwinDylibNames_rpath "QtConcurrent" "QtPrintSupport" "QtCore" "QtSql" "QtDBus" "QtTest" "QtGui" "QtWidgets" "QtNetwork" "QtXml" "QtOpenGL" ''; inherit lndir; - setupHook = ../../qtbase-setup-hook.sh; + setupHook = if stdenv.isDarwin + then ../../qtbase-setup-hook-darwin.sh + else ../../qtbase-setup-hook.sh; enableParallelBuilding = true; @@ -237,7 +295,6 @@ stdenv.mkDerivation { description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.linux; + platforms = platforms.unix; }; - } diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/series b/pkgs/development/libraries/qt-5/5.6/qtbase/series index 44e2d9040807..2196d8383752 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/series @@ -7,4 +7,3 @@ xdg-config-dirs.patch nix-profiles-library-paths.patch compose-search-path.patch libressl.patch -cmake-paths.patch diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh new file mode 100644 index 000000000000..cc88d2ca35d4 --- /dev/null +++ b/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh @@ -0,0 +1,38 @@ +wrapQtProgram() { + local prog="$1" + shift + wrapProgram "$prog" \ + --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ + --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ + --set DYLD_FRAMEWORK_PATH "/System/Library/Frameworks" \ + --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \ + --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \ + "$@" +} + +makeQtWrapper() { + local old="$1" + local new="$2" + shift + shift + makeWrapper "$old" "$new" \ + --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ + --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ + --set DYLD_FRAMEWORK_PATH "/System/Library/Frameworks" \ + --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \ + --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \ + "$@" +} + +_makeQtWrapperSetup() { + # cannot use addToSearchPath because these directories may not exist yet + export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins" + export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports" + export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml" + export RUNTIME_XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputBin}/share" + export RUNTIME_XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg" +} + +prePhases+=(_makeQtWrapperSetup) diff --git a/pkgs/development/libraries/qt-5/qmake-hook-darwin.sh b/pkgs/development/libraries/qt-5/qmake-hook-darwin.sh new file mode 100644 index 000000000000..c359cb4ee6a7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/qmake-hook-darwin.sh @@ -0,0 +1,42 @@ +qmakeConfigurePhase() { + runHook preConfigure + + qmake PREFIX=$out $qmakeFlags + + runHook postConfigure +} + +if [ -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then + configurePhase=qmakeConfigurePhase +fi + +_qtModuleMultioutDevsPre() { + # We cannot simply set these paths in configureFlags because libQtCore retains + # references to the paths it was built with. + moveToOutput "bin" "${!outputDev}" + moveToOutput "include" "${!outputDev}" + + # The destination directory must exist or moveToOutput will do nothing + mkdir -p "${!outputDev}/share" + moveToOutput "share/doc" "${!outputDev}" +} + +_qtModuleMultioutDevsPost() { + # Move libtool archives and qmake project files to $dev/lib + if [ "z${!outputLib}" != "z${!outputDev}" ]; then + pushd "${!outputLib}" + if [ -d "lib" ]; then + find lib \( -name '*.a' -o -name '*.la' \) -print0 | \ + while read -r -d $'\0' file; do + mkdir -p "${!outputDev}/$(dirname "$file")" + mv "${!outputLib}/$file" "${!outputDev}/$file" + done + fi + popd + fi +} + +if [ -n "$NIX_QT_SUBMODULE" ]; then + preFixupHooks+=(_qtModuleMultioutDevsPre) + postFixupHooks+=(_qtModuleMultioutDevsPost) +fi diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh new file mode 100644 index 000000000000..977c859e76d3 --- /dev/null +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh @@ -0,0 +1,181 @@ +addToSearchPathOnceWithCustomDelimiter() { + local delim="$1" + local search="$2" + local target="$3" + local dirs + local exported + IFS="$delim" read -a dirs <<< "${!search}" + local canonical + if canonical=$(readlink -e "$target"); then + for dir in ${dirs[@]}; do + if [ "z$dir" == "z$canonical" ]; then exported=1; fi + done + if [ -z $exported ]; then + eval "export ${search}=\"${!search}${!search:+$delim}$canonical\"" + fi + fi +} + +addToSearchPathOnce() { + addToSearchPathOnceWithCustomDelimiter ':' "$@" +} + +propagateOnce() { + addToSearchPathOnceWithCustomDelimiter ' ' "$@" +} + +_qtPropagate() { + for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do + if [ -d "$1/$dir" ]; then + propagateOnce propagatedBuildInputs "$1" + break + fi + done + addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" + addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" + addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" +} + +crossEnvHooks+=(_qtPropagate) + +_qtPropagateNative() { + for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do + if [ -d "$1/$dir" ]; then + propagateOnce propagatedNativeBuildInputs "$1" + break + fi + done + if [ -z "$crossConfig" ]; then + addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" + addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" + addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" + fi +} + +envHooks+=(_qtPropagateNative) + +_qtMultioutDevs() { + # This is necessary whether the package is a Qt module or not + moveToOutput "mkspecs" "${!outputDev}" +} + +preFixupHooks+=(_qtMultioutDevs) + +_qtSetCMakePrefix() { + export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}" +} + +_qtRmTmp() { + if [ -z "$NIX_QT_SUBMODULE" ]; then + rm -fr "$NIX_QT5_TMP" + else + cat "$NIX_QT5_TMP/nix-support/qt-inputs" | while read file; do + if [ ! -d "$NIX_QT5_TMP/$file" ]; then + rm -f "$NIX_QT5_TMP/$file" + fi + done + + cat "$NIX_QT5_TMP/nix-support/qt-inputs" | while read dir; do + if [ -d "$NIX_QT5_TMP/$dir" ]; then + rmdir --ignore-fail-on-non-empty -p "$NIX_QT5_TMP/$dir" + fi + done + + rm "$NIX_QT5_TMP/nix-support/qt-inputs" + fi +} + +_qtSetQmakePath() { + export PATH="$NIX_QT5_TMP/bin${PATH:+:}$PATH" +} + +if [ -z "$NIX_QT5_TMP" ]; then + if [ -z "$NIX_QT_SUBMODULE" ]; then + NIX_QT5_TMP=$(pwd)/.nix_qt5 + else + NIX_QT5_TMP=$out + fi + postInstallHooks+=(_qtRmTmp) + + mkdir -p "$NIX_QT5_TMP/nix-support" + for subdir in bin include mkspecs share; do + mkdir -p "$NIX_QT5_TMP/$subdir" + echo "$subdir/" >> "$NIX_QT5_TMP/nix-support/qt-inputs" + done + mkdir -p "$NIX_QT5_TMP/lib" + + postHooks+=(_qtSetCMakePrefix) + + ln -sf "@dev@/bin/qmake" "$NIX_QT5_TMP/bin" + echo "bin/qmake" >> "$NIX_QT5_TMP/nix-support/qt-inputs" + + cat >"$NIX_QT5_TMP/bin/qt.conf" <> "$NIX_QT5_TMP/nix-support/qt-inputs" + + export QMAKE="$NIX_QT5_TMP/bin/qmake" + + # Set PATH to find qmake first in a preConfigure hook + # It must run after all the envHooks! + preConfigureHooks+=(_qtSetQmakePath) +fi + +qt5LinkModuleDir() { + if [ -d "$1/$2" ]; then + @lndir@/bin/lndir -silent "$1/$2" "$NIX_QT5_TMP/$2" + find "$1/$2" -printf "$2/%P\n" >> "$NIX_QT5_TMP/nix-support/qt-inputs" + fi +} + +qt5LinkDarwinModuleLibDir() { + for fw in $(find "$1"/lib -maxdepth 1 -name '*.framework'); do + ln -s "$fw" "$NIX_QT5_TMP"/lib + done + for file in $(find "$1"/lib -maxdepth 1 -type f); do + ln -s "$file" "$NIX_QT5_TMP"/lib + done + for dir in $(find "$1"/lib -maxdepth 1 -mindepth 1 -type d ! -name '*.framework'); do + mkdir -p "$NIX_QT5_TMP"/lib/$(basename "$dir") + @lndir@/bin/lndir -silent "$dir" "$NIX_QT5_TMP"/lib/$(basename "$dir") + done +} + +NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@" +NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@" + +_qtLinkAllModules() { + IFS=: read -a modules <<< $NIX_QT5_MODULES + for module in ${modules[@]}; do + qt5LinkDarwinModuleLibDir "$module" + done + + IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV + for module in ${modules[@]}; do + qt5LinkModuleDir "$module" "bin" + qt5LinkModuleDir "$module" "include" + qt5LinkDarwinModuleLibDir "$module" + qt5LinkModuleDir "$module" "mkspecs" + qt5LinkModuleDir "$module" "share" + done +} + +preConfigureHooks+=(_qtLinkAllModules) + +_qtFixCMakePaths() { + find "${!outputLib}" -name "*.cmake" | while read file; do + substituteInPlace "$file" \ + --subst-var-by NIX_OUT "${!outputLib}" \ + --subst-var-by NIX_DEV "${!outputDev}" + done +} + +if [ -n "$NIX_QT_SUBMODULE" ]; then + postInstallHooks+=(_qtFixCMakePaths) +fi + From 3a1d52ff4f818aa918f429a67bee473192e9d2f1 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 1 Dec 2016 18:58:16 +0100 Subject: [PATCH 1317/1749] updateScript: initital work --- .../browsers/firefox-bin/default.nix | 49 ++++++- .../browsers/firefox-bin/generate_sources.rb | 48 ------- update.nix | 128 ++++++++++++++++++ 3 files changed, 176 insertions(+), 49 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb create mode 100755 update.nix diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 7a87b1df3861..dd767d6984f6 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -38,6 +38,11 @@ , libpulseaudio , systemd , generated ? import ./sources.nix +, writeScript +, xidel +, coreutils +, gnused +, gnugrep }: assert stdenv.isLinux; @@ -62,10 +67,12 @@ let source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; + name = "firefox-bin-unwrapped-${version}"; + in stdenv.mkDerivation { - name = "firefox-bin-unwrapped-${version}"; + inherit name; src = fetchurl { inherit (source) url sha512; }; @@ -165,6 +172,46 @@ stdenv.mkDerivation { ''; passthru.ffmpegSupport = true; + passthru.updateScript = + let + version = (builtins.parseDrvName name).version; + isBeta = builtins.stringLength version + 1 == builtins.stringLength (builtins.replaceStrings ["b"] ["bb"] version); + in + writeScript "update-firefox-bin" '' + PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin + + pushd pkgs/applications/networking/browsers/firefox-bin + + tmpfile=`mktemp` + url=http://archive.mozilla.org/pub/firefox/releases/ + version=`xidel -q $url --extract "//a" | \ + sed s"/.$//" | \ + grep "^[0-9]" | \ + sort --version-sort | \ + grep -v "funnelcake" | \ + grep -e "${if isBeta then "b" else ""}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${if isBeta then "" else "grep -v \"b\" |"} \ + tail -1` + shasums=`curl --silent $url$version/SHA512SUMS` + + echo "{" > $tmpfile + echo " version = \"$version\";" >> $tmpfile + echo " sources = [" >> $tmpfile + for arch in linux-x86_64 linux-i686; do + for line in `echo "$shasums" | grep $arch | grep "firefox-$version.tar.bz2$" | tr " " ":"`; do + echo " { url = \"$url$version/$arch/`echo $line | cut -d\":\" -f3`\";" >> $tmpfile + echo " locale = \"`echo $line | cut -d\":\" -f3 | sed \"s/$arch\///\" | sed \"s/\/.*//\"`\";" >> $tmpfile + echo " arch = \"$arch\";" >> $tmpfile + echo " sha512 = \"`echo $line | cut -d\":\" -f1`\";" >> $tmpfile + echo " }" >> $tmpfile + done + done + echo " ];" >> $tmpfile + echo "}" >> $tmpfile + + cat $tmpfile > ${if isBeta then "beta_" else ""}sources.nix + + popd + ''; meta = with stdenv.lib; { description = "Mozilla Firefox, free web browser (binary package)"; diff --git a/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb b/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb deleted file mode 100644 index d049363f2cf5..000000000000 --- a/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb +++ /dev/null @@ -1,48 +0,0 @@ -# TODO share code with thunderbird-bin/generate_sources.rb - -require "open-uri" - -version = - if ARGV.empty? - $stderr.puts("Usage: ruby generate_sources.rb > sources.nix") - exit(-1) - else - ARGV[0] - end - -base_path = "http://download-installer.cdn.mozilla.net/pub/firefox/releases" - -Source = Struct.new(:hash, :arch, :locale, :filename) - -sources = open("#{base_path}/#{version}/SHA512SUMS") do |input| - input.readlines -end.select do |line| - /\/firefox-.*\.tar\.bz2$/ === line && !(/source/ === line) -end.map do |line| - hash, name = line.chomp.split(/ +/) - Source.new(hash, *(name.split("/"))) -end.sort_by do |source| - [source.locale, source.arch] -end - -arches = ["linux-i686", "linux-x86_64"] - -puts(<<"EOH") -# This file is generated from generate_sources.rb. DO NOT EDIT. -# Execute the following command to update the file. -# -# ruby generate_sources.rb 46.0.1 > sources.nix - -{ - version = "#{version}"; - sources = [ -EOH - -sources.each do |source| - puts(%Q| { url = "#{base_path}/#{version}/#{source.arch}/#{source.locale}/firefox-#{version}.tar.bz2"; locale = "#{source.locale}"; arch = "#{source.arch}"; sha512 = "#{source.hash}"; }|) -end - -puts(<<'EOF') - ]; -} -EOF diff --git a/update.nix b/update.nix new file mode 100755 index 000000000000..e1c9886a78bd --- /dev/null +++ b/update.nix @@ -0,0 +1,128 @@ +{ package ? null +, maintainer ? null +}: + +# TODO: add assert statements + +let + + pkgs = import ./default.nix { }; + + packagesWith = cond: return: set: + pkgs.lib.flatten + (pkgs.lib.mapAttrsToList + (name: pkg: + let + result = builtins.tryEval ( + if pkgs.lib.isDerivation pkg && cond name pkg + then [(return name pkg)] + else if pkg.recurseForFerivations or false || pkg.recureseForRelease or false + then packagesWith cond return pkg + else [] + ); + in + if result.success then result.value + else [] + ) + set + ); + + packagesWithUpdateScriptAndMaintainer = maintainer': + let + maintainer = + if ! builtins.hasAttr maintainer' pkgs.lib.maintainers then + builtins.throw "Maintainer with name `${maintainer'} does not exist in `lib/maintainers.nix`." + else + builtins.getAttr maintainer' pkgs.lib.maintainers; + in + packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg && + (if builtins.hasAttr "maintainers" pkg.meta + then (if builtins.isList pkg.meta.maintainers + then builtins.elem maintainer pkg.meta.maintainers + else maintainer == pkg.meta.maintainers + ) + else false + ) + ) + (name: pkg: pkg) + pkgs; + + packageByName = name: + if ! builtins.hasAttr name pkgs then + builtins.throw "Package with an attribute name `${name}` does not exists." + else if ! builtins.hasAttr "updateScript" (builtins.getAttr name pkgs) then + builtins.throw "Package with an attribute name `${name}` does have an `passthru.updateScript` defined." + else + builtins.getAttr name pkgs; + + packages = + if package != null then + [ (packageByName package) ] + else if maintainer != null then + packagesWithUpdateScriptAndMaintainer maintainer + else + builtins.throw "No arguments provided.\n\n${helpText}"; + + helpText = '' + Please run: + + % nix-shell update.nix --argstr maintainer garbas + + to run all update scripts for all packages that lists \`garbas\` as a maintainer + and have \`updateScript\` defined, or: + + % nix-shell update.nix --argstr package garbas + + to run update script for specific package. + ''; + + runUpdateScript = package: '' + echo -ne " - ${package.name}: UPDATING ..."\\r + ${package.updateScript} &> ${(builtins.parseDrvName package.name).name}.log + CODE=$? + if [ "$CODE" != "0" ]; then + echo " - ${package.name}: ERROR " + echo "" + echo "--- SHOWING ERROR LOG FOR ${package.name} ----------------------" + echo "" + cat ${(builtins.parseDrvName package.name).name}.log + echo "" + echo "--- SHOWING ERROR LOG FOR ${package.name} ----------------------" + exit $CODE + else + rm ${(builtins.parseDrvName package.name).name}.log + fi + echo " - ${package.name}: DONE. " + ''; + +in pkgs.stdenv.mkDerivation { + name = "nixpkgs-update-script"; + buildCommand = '' + echo "" + echo "----------------------------------------------------------------" + echo "" + echo "Not possible to update packages using \`nix-build\`" + echo "" + echo "${helpText}" + echo "----------------------------------------------------------------" + exit 1 + ''; + shellHook = '' + echo "" + echo "Going to be running update for following packages:" + echo "${builtins.concatStringsSep "\n" (map (x: " - ${x.name}") packages)}" + echo "" + read -n1 -r -p "Press space to continue..." confirm + if [ "$confirm" = "" ]; then + echo "" + echo "Running update for:" + ${builtins.concatStringsSep "\n" (map runUpdateScript packages)} + echo "" + echo "Packages updated!" + exit 0 + else + echo "Aborting!" + exit 1 + fi + ''; +} From d295d6860965622d7e565d3edc2f29a234aa527c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 3 Dec 2016 17:43:38 +0100 Subject: [PATCH 1318/1749] firefox-bin: updated the updateScript with suggestions from @Mic92 also added some comments to the update script so that a new person looking at it know what is happening --- .../browsers/firefox-bin/default.nix | 50 +++++++++++++++---- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index dd767d6984f6..d828a5486fd6 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -184,6 +184,17 @@ stdenv.mkDerivation { tmpfile=`mktemp` url=http://archive.mozilla.org/pub/firefox/releases/ + + # retriving latest released version + # - extracts all links from the $url + # - removes . and .. + # - this line remove everything not starting with a number + # - this line sorts everything with semver in mind + # - we remove lines that are mentioning funnelcake + # - this line removes beta version if we are looking for final release + # versions or removes release versions if we are looking for beta + # versions + # - this line pick up latest release version=`xidel -q $url --extract "//a" | \ sed s"/.$//" | \ grep "^[0-9]" | \ @@ -191,22 +202,39 @@ stdenv.mkDerivation { grep -v "funnelcake" | \ grep -e "${if isBeta then "b" else ""}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${if isBeta then "" else "grep -v \"b\" |"} \ tail -1` + + # this is a list of sha512 and tarballs for both arches shasums=`curl --silent $url$version/SHA512SUMS` - echo "{" > $tmpfile - echo " version = \"$version\";" >> $tmpfile - echo " sources = [" >> $tmpfile + cat > $tmpfile <> $tmpfile - echo " locale = \"`echo $line | cut -d\":\" -f3 | sed \"s/$arch\///\" | sed \"s/\/.*//\"`\";" >> $tmpfile - echo " arch = \"$arch\";" >> $tmpfile - echo " sha512 = \"`echo $line | cut -d\":\" -f1`\";" >> $tmpfile - echo " }" >> $tmpfile + # retriving a list of all tarballs for each arch + # - only select tarballs for current arch + # - only select tarballs for current version + # - rename space with colon so that for loop doesnt + # - inteprets sha and path as 2 lines + for line in `echo "$shasums" | \ + grep $arch | \ + grep "firefox-$version.tar.bz2$" | \ + tr " " ":"`; do + # create an entry for every locale + cat >> $tmpfile <> $tmpfile - echo "}" >> $tmpfile + cat >> $tmpfile < ${if isBeta then "beta_" else ""}sources.nix From 18ee6b9a6d460c646334389498ddb4d3f9913e8e Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Thu, 8 Dec 2016 22:59:53 -0500 Subject: [PATCH 1319/1749] git-bz: add pycrypto dependency (#21013) --- .../version-management/git-and-tools/git-bz/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index d924437c2e13..4ed9c5c0509c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/git-bz \ + --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pycrypto}")" \ --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pysqlite}")" ''; From 0a90a534414dd0a2936e9ae4440d848fa8a8a45c Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 9 Dec 2016 07:58:31 +0000 Subject: [PATCH 1320/1749] Fix hash for p7zip patch (seems fetchurl hash was added, while fetch-patch function is used. (cherry picked from commit 38b1bd9e729485d418f20c43c275c2856837f8cf) --- pkgs/tools/archivers/p7zip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index c11c437fa37a..1af3f53ade91 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { url = "https://sources.debian.net/data/main/p/p7zip/16.02+dfsg-2/debian/patches/12-CVE-2016-9296.patch"; - sha256 = "0inblicg24gcbaq84n0mr6w4yc5ak65mh9wxml96wlhdf7ph2i3m"; + sha256 = "1i7099h27gmb9dv0lb7jnqfm504gs1c3129r6kvi94yb2gzrzk41"; }) ]; From f3fda199fd9e316690b5ffe95caad90dad447f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Fri, 9 Dec 2016 10:40:52 +0100 Subject: [PATCH 1321/1749] non: 2016-04-05 -> 2016-12-07 --- pkgs/applications/audio/non/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 9217bc285bce..a7252b9e28a3 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "non-${version}"; - version = "2016-04-05"; + version = "2016-12-07"; src = fetchFromGitHub { owner = "original-male"; repo = "non"; - rev = "16885e69fe865495dc32d869d1454ab148b0dca6"; - sha256 = "1nwzzgcdpbqh5kjvz40yy5nmzvpp8gcr9biyhhwi68s5bsg972ss"; + rev = "754d113b0e3144a145d50bde8370ff2cae98169c"; + sha256 = "04h67vy966vys6krgjsxd7dph4z46r8c6maw1hascxlasy3bhhk0"; }; buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile From c94e44b0aeca532f6662585eae9bb63c4d4ff73e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 9 Dec 2016 11:26:53 +0100 Subject: [PATCH 1322/1749] linkFarm: prefer local build --- pkgs/build-support/trivial-builders.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index d6f390ddfb1c..1529869aa331 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -108,8 +108,9 @@ rec { # Quickly create a set of symlinks to derivations. # entries is a list of attribute sets like { name = "name" ; path = "/nix/store/..."; } - linkFarm = name: entries: runCommand name {} ("mkdir -p $out; cd $out; \n" + - (lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries)); + linkFarm = name: entries: runCommand name { preferLocalBuild = true; } + ("mkdir -p $out; cd $out; \n" + + (lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries)); # Print an error message if the file with the specified name and From c94454a45a7410f9fdd84896c693c1c4df5e10f1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Dec 2016 11:18:22 +0100 Subject: [PATCH 1323/1749] nixUnstable: 1.12pre4523_3b81b26 -> 1.12pre4911_b30d1e7 --- pkgs/tools/package-management/nix/default.nix | 52 +++++++++++++------ 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 71938e37bfed..30c5fc6c4fdc 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,20 +1,31 @@ -{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null, xz -, pkgconfig, boehmgc, perlPackages, libsodium +{ lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz +, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp +, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: let - common = { name, src }: stdenv.mkDerivation rec { + common = { name, suffix ? "", src, fromGit ? false }: stdenv.mkDerivation rec { inherit name src; + version = lib.getVersion name; + + VERSION_SUFFIX = lib.optionalString fromGit suffix; outputs = [ "out" "dev" "man" "doc" ]; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = + [ perl pkgconfig ] + ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ]; buildInputs = [ curl openssl sqlite xz ] - ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium; + ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium + ++ lib.optional (stdenv.isLinux && lib.versionAtLeast version "1.12pre") + (aws-sdk-cpp.override { + apis = ["s3"]; + customMemoryManagement = false; + }); propagatedBuildInputs = [ boehmgc ]; @@ -28,14 +39,17 @@ let ''; configureFlags = - '' - --with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc - --with-dbi=${perlPackages.DBI}/${perl.libPrefix} - --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} - --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} - --disable-init-state - --enable-gc - ''; + [ "--with-store-dir=${storeDir}" + "--localstatedir=${stateDir}" + "--sysconfdir=/etc" + "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" + "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" + "--disable-init-state" + "--enable-gc" + ] + ++ lib.optional (!lib.versionAtLeast version "1.12pre") [ + "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" + ]; makeFlags = "profiledir=$(out)/etc/profile.d"; @@ -97,11 +111,15 @@ in rec { }; nixUnstable = lib.lowPrio (common rec { - name = "nix-1.12pre4523_3b81b26"; - src = fetchurl { - url = "http://hydra.nixos.org/build/33598573/download/4/${name}.tar.xz"; - sha256 = "0469zv09m85824w4vqj2ag0nciq51xvrvsys7bd5v4nrxihk9991"; + name = "nix-1.12${suffix}"; + suffix = "pre4911_b30d1e7"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "b30d1e7ada0a8fbaacc25e24e5e788d18bfe8d3c"; + sha256 = "04j6aw2bi3k7m5jyqwn1vrf78br5kdfpjsj15b5r5lvxdqhlknvm"; }; + fromGit = true; }); } From 53b5575640200a9ba716551dd5e4b879df1b06c5 Mon Sep 17 00:00:00 2001 From: Jost Novljan Date: Fri, 9 Dec 2016 12:06:07 +0100 Subject: [PATCH 1324/1749] chromedriver: 2.21 -> 2.25 --- pkgs/development/tools/selenium/chromedriver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 6a10f73cfe4f..488fefe62c41 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -8,12 +8,12 @@ assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { product = "chromedriver_linux64"; - name = "${product}-2.21"; - version = "2.21"; + name = "${product}-2.25"; + version = "2.25"; src = fetchurl { url = "http://chromedriver.storage.googleapis.com/${version}/${product}.zip"; - sha256 = "1fhwvqjwqkfm18icacvk0312ii8hf1p03icd3isfcxp7j69qf2wg"; + sha256 = "0z6c3q73pi83iidq3n85sxhc9yikkf9rf22hnn8manrhfsg784fh"; }; buildInputs = [ unzip makeWrapper ]; From e9a5680eb7175934eef8cd0046fb77083da1ef2e Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 9 Dec 2016 10:16:17 -0200 Subject: [PATCH 1325/1749] roboto: 2.134 -> 2.135 --- pkgs/data/fonts/roboto/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index 711cca5b1641..e0d2545973bb 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "roboto-${version}"; - version = "2.134"; + version = "2.135"; src = fetchurl { url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; - sha256 = "1l033xc2n4754gwakxshh5235cnrnzy7q6zsp5zghn8ib0gdp5rb"; + sha256 = "1ndlh36bcx4mhi58sxfx6ywbib586brh6s5sk3jyji78h1i7j8zr"; }; nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p $out/share/fonts/truetype - cp -a * $out/share/fonts/truetype/ + cp -a *.ttf $out/share/fonts/truetype/ ''; meta = { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { Material Design. ''; license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.romildo ]; platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.romildo ]; }; } From a2d6e8a2eb6c7ad0d64698d912c74c426d926bad Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 9 Dec 2016 07:18:35 -0500 Subject: [PATCH 1326/1749] xen: Fix patch hashes I had used nix-prefetch-url, where fetchpatch doesn't support it. --- pkgs/applications/virtualization/xen/4.5.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index e7a46a24965d..7b89fabaa1c9 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -58,17 +58,17 @@ let (fetchpatch { url = "https://bugzilla.redhat.com/attachment.cgi?id=1218547"; name = "CVE-2016-9385.patch"; - sha256 = "0l5drg862708ngy49jl65vmv6iwxlm7h8b4vabnffc2496f2gbwk"; + sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr"; }) (fetchpatch { url = "https://bugzilla.redhat.com/attachment.cgi?id=1218536"; name = "CVE-2016-9377-CVE-2016-9378-part1.patch"; - sha256 = "1dy8xvnkdvc44ywzzlswmkljjva44c0ndw7538iicr3qyf0244n4"; + sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6"; }) (fetchpatch { url = "https://bugzilla.redhat.com/attachment.cgi?id=1218537"; name = "CVE-2016-9377-CVE-2016-9378-part2.patch"; - sha256 = "0iz36s2w6bh5h9i1a9gj1c748fq1dj90kcg2yzld1m26qx21qrr5"; + sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz"; }) ]; }; From e861a5f7afe894b5f807031ba8c08a509e356640 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 9 Dec 2016 08:26:46 -0500 Subject: [PATCH 1327/1749] linux: 4.4.36 -> 4.4.37 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 6d9fc79cd9f2..184e420373a9 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.36"; + version = "4.4.37"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1gh3i7ss0wnh3irpff3j079jwyccslbzkw9zxjjp600lcc5hva9h"; + sha256 = "1pyfva1ld4yfzc0gyz3q4m7j6k88l813akp5hhszfg8m69bzn27d"; }; kernelPatches = args.kernelPatches; From bfffbb5ea65180e7fd942a468f70e7bb05fa079f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 9 Dec 2016 08:27:11 -0500 Subject: [PATCH 1328/1749] linux: 4.8.12 -> 4.8.13 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index 715af76267ca..786589ca534c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.12"; + version = "4.8.13"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03i5q36aqlxir3dy213civkaz1lnwzzv6s3vaafgkdj7fzvqcx44"; + sha256 = "06sp47ivgqfnbjk73hdk70jhjh7xv3xbj1xzarch9sbj9as6cp8d"; }; kernelPatches = args.kernelPatches; From ca7cc96ee8153b61afdfc8ebdb14ff064e3649af Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 9 Dec 2016 12:08:21 +0100 Subject: [PATCH 1329/1749] grsecurity: enable PAX_INITIFY Uses gcc plugin to detect more instances where memory used during init can be freed. --- pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix index 64722635f41c..895c0ec42ef8 100644 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix +++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix @@ -22,6 +22,10 @@ PAX_PT_PAX_FLAGS y PAX_XATTR_PAX_FLAGS y PAX_EI_PAX n +PAX_INITIFY y +# initify is a fairly recent feature, enable verbose mode to aid in debugging +PAX_INITIFY_VERBOSE y + # The bts instrumentation method is compatible with binary only modules. # # Note: if platform supports SMEP, we could do without this From 9a63779d64e71c46976c4dcfe499967a6e88108d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 9 Dec 2016 12:10:01 +0100 Subject: [PATCH 1330/1749] grsecurity: use upstream url as the primary source --- pkgs/os-specific/linux/kernel/patches.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 20e4ec1fd7e1..0e6544bd7594 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -25,10 +25,13 @@ let inherit grver kver grrev; patch = fetchurl { - # When updating versions/hashes, ALWAYS use the official version; we use - # this mirror only because upstream removes sources files immediately upon - # releasing a new version ... - url = "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${name}.patch"; + urls = [ + "https://grsecurity.net/${grbranch}/${name}.patch" + # When updating versions/hashes, ALWAYS use the official + # version; we use this mirror only because upstream removes + # source files immediately upon releasing a new version ... + "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${name}.patch" + ]; inherit sha256; }; From d1a5dc0b1ca57e3c54f9e6aed9cd1ed462516045 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 9 Dec 2016 12:10:26 +0100 Subject: [PATCH 1331/1749] grsecurity: 4.8.12-201612062306 -> 4.8.13-201612082118 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index 715af76267ca..786589ca534c 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.12"; + version = "4.8.13"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03i5q36aqlxir3dy213civkaz1lnwzzv6s3vaafgkdj7fzvqcx44"; + sha256 = "06sp47ivgqfnbjk73hdk70jhjh7xv3xbj1xzarch9sbj9as6cp8d"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 0e6544bd7594..3fab12b64a6e 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -89,9 +89,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.12"; - grrev = "201612062306"; - sha256 = "16ddiqx3sry07d7gy7y7rm8fxaa8v9lgih5l4dd2i39m35za11fq"; + { kver = "4.8.13"; + grrev = "201612082118"; + sha256 = "0cvw6sbinzlcxap8mf934ksgksgdd8w8pf8jfp82fbyiz53klfn1"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From d14586c1c1819d1b2532fb7468081380359fae1f Mon Sep 17 00:00:00 2001 From: montag451 Date: Fri, 9 Dec 2016 19:02:54 +0100 Subject: [PATCH 1332/1749] nautilus: 3.20.2 -> 3.20.3 (#20853) --- pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix index 467bb13a74ed..5592e3bd7f89 100644 --- a/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "nautilus-3.20.2"; + name = "nautilus-3.20.3"; src = fetchurl { - url = mirror://gnome/sources/nautilus/3.20/nautilus-3.20.2.tar.xz; - sha256 = "8d6e679b880dc78c0c2e2dabf6025e6da34ff279dee501f7c75f3649c1a6caae"; + url = mirror://gnome/sources/nautilus/3.20/nautilus-3.20.3.tar.xz; + sha256 = "46600a2361a022a0170304aef7167caa29c0d52232063a3556bec6a77881310e"; }; } From a859f6cabe582a449d2d4966d9842c828f71e7be Mon Sep 17 00:00:00 2001 From: montag451 Date: Fri, 9 Dec 2016 19:14:27 +0100 Subject: [PATCH 1333/1749] gnome-control-center: provides access to the tracker gsettings schemas (#20862) gnome-control-center needs access to the tracker gsettings schemas to enable the settings button in the search panel. --- .../desktops/gnome-3/3.20/core/gnome-control-center/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix index 78fc82ebaed0..726f47d0cde6 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk gnome3.vino udev libcanberra_gtk3 libgudev - networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo ]; + networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker ]; preBuild = '' substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" From e54650e92a4cd7dd578d514eca1a7300e06944d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 9 Dec 2016 19:15:41 +0100 Subject: [PATCH 1334/1749] gnome-control-center: port the parent commit to 3.22 ... and fixup duplicate grilo build input. --- .../gnome-3/3.22/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix index 78fc82ebaed0..17a4514d6f82 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile - shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo + shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk gnome3.vino udev libcanberra_gtk3 libgudev - networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo ]; + networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker ]; preBuild = '' substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" From c5b96ca8016d00794b690a451e8f946b8809aff8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Dec 2016 19:46:57 +0100 Subject: [PATCH 1335/1749] minisat: Fix build on Darwin --- .../science/logic/minisat/darwin.patch | 26 +++++++++++++++++++ .../science/logic/minisat/default.nix | 4 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/science/logic/minisat/darwin.patch diff --git a/pkgs/applications/science/logic/minisat/darwin.patch b/pkgs/applications/science/logic/minisat/darwin.patch new file mode 100644 index 000000000000..f2b618d6bb3a --- /dev/null +++ b/pkgs/applications/science/logic/minisat/darwin.patch @@ -0,0 +1,26 @@ +https://github.com/fasterthanlime/homebrew-mingw/blob/master/Library/Formula/minisat.rb + +diff --git a/utils/System.cc b/utils/System.cc +index a7cf53f..feeaf3c 100644 +--- a/utils/System.cc ++++ b/utils/System.cc +@@ -78,16 +78,17 @@ double Minisat::memUsed(void) { + struct rusage ru; + getrusage(RUSAGE_SELF, &ru); + return (double)ru.ru_maxrss / 1024; } +-double MiniSat::memUsedPeak(void) { return memUsed(); } ++double Minisat::memUsedPeak(void) { return memUsed(); } + + + #elif defined(__APPLE__) + #include + +-double Minisat::memUsed(void) { ++double Minisat::memUsed() { + malloc_statistics_t t; + malloc_zone_statistics(NULL, &t); + return (double)t.max_size_in_use / (1024*1024); } ++double Minisat::memUsedPeak() { return memUsed(); } + + #else + double Minisat::memUsed() { diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index 3ed055cc0936..d980afee7c4e 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj"; }; - patches = stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ]; + patches = + [ ./darwin.patch ] + ++ stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ]; buildInputs = [ zlib ]; From 2444bafbbbc3d3d0285f6b6f9b076e19924765b3 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 9 Dec 2016 21:19:32 +0100 Subject: [PATCH 1336/1749] include me in mention bot for darwin --- .mention-bot | 1 + 1 file changed, 1 insertion(+) diff --git a/.mention-bot b/.mention-bot index 2bbe4a40bd49..d8529bd9123e 100644 --- a/.mention-bot +++ b/.mention-bot @@ -6,6 +6,7 @@ ], "alwaysNotifyForPaths": [ { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] }, + { "name": "LnL7", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/*"] }, { "name": "copumpkin", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/apple-source-releases/*"] } ], "fileBlacklist": ["pkgs/top-level/all-packages.nix"] From 8c8abafc2de41cda33d50852379eb6d2a24fe46d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 9 Dec 2016 15:34:25 -0500 Subject: [PATCH 1337/1749] atom: 1.12.6 -> 1.12.7 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 572b7085cbc7..58eb2e568c16 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.12.6"; + version = "1.12.7"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0b85bjfxdd18i2v8py5jx4284m58zxad38c2vvqhgx7cxm9hn8k6"; + sha256 = "1kkw6wixri8iddnmscza1d4riq4m9yr78y0d9y76vdnxarma0bfq"; name = "${name}.deb"; }; From 8bdf8b7b51e8a5eef0bb1e1df6419d129fe48f76 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 9 Dec 2016 18:51:47 -0200 Subject: [PATCH 1338/1749] flat-plat-gtk-theme: eba3be5 -> 2016-12-03 --- pkgs/misc/themes/flat-plat/default.nix | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix index 342fc1277c9b..c9c0812d7a22 100644 --- a/pkgs/misc/themes/flat-plat/default.nix +++ b/pkgs/misc/themes/flat-plat/default.nix @@ -1,29 +1,33 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "flat-plat-gtk-theme-eba3be5"; + name = "flat-plat-gtk-theme-${version}"; + version = "2016-12-03"; src = fetchFromGitHub { owner = "nana-4"; repo = "Flat-Plat"; - rev = "eba3be5eafd1140e1edb8b02411edb2f6c78b0ca"; - sha256 = "0vfdnrxspdwg4jr025dwjmdcrqnblhlw666v5b7qhkxymibp5j7h"; + rev = "49a5a51ec1a5835ff04ba2c62c9bccbd3f49bbe6"; + sha256 = "1w4b16cp2yv5rpijcqywlzrs3xjkvg8ppp2rfls1kvxq12rz4jkb"; }; + nativeBuildInputs = [ gnome3.gnome_shell libxml2 ]; + + buildInputs = [ gnome3.gnome_themes_standard gtk-engine-murrine ]; + dontBuild = true; installPhase = '' - mkdir -p $out/share/themes/Flat-Plat - rm .gitignore COPYING README.md - cp -r . $out/share/themes/Flat-Plat + substituteInPlace install.sh --replace /usr "" + destdir="$out" ./install.sh + rm $out/share/themes/*/COPYING ''; meta = with stdenv.lib; { - description = "A Material Design-like flat theme for GTK3, GTK2, and GNOME Shell"; + description = "A Material Design-like theme for GTK+ based desktop environments"; homepage = https://github.com/nana-4/Flat-Plat; license = licenses.gpl2; - maintainers = [ maintainers.mounium ]; platforms = platforms.all; + maintainers = [ maintainers.mounium ]; }; } - From fc6d82cf7630a74697490a152a190b17844affae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 22 Aug 2016 17:52:23 +0200 Subject: [PATCH 1339/1749] cifs-utils: add 'talloc' to buildInputs, to build cifs.upcall Fixes this ./configure symptom: configure: WARNING: talloc.h not found, consider installing libtalloc-devel. Disabling cifs.upcall. and is needed to (eventually) fix CIFS + DFS kernel mount on NixOS. --- pkgs/os-specific/linux/cifs-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 6dcf8e11a3e1..f69319b52569 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kerberos, keyutils, pam }: +{ stdenv, fetchurl, kerberos, keyutils, pam, talloc }: stdenv.mkDerivation rec { name = "cifs-utils-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1xs9rwqfpx8qj5mcmagw6y1hzwc71zhzb5r8hv06sz16p1w6axz2"; }; - buildInputs = [ kerberos keyutils pam ]; + buildInputs = [ kerberos keyutils pam talloc ]; makeFlags = "root_sbindir=$(out)/sbin"; From d429520b1380599be900408513150c22f759e009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 5 Sep 2016 12:05:32 +0200 Subject: [PATCH 1340/1749] kernel: add CONFIG_CIFS_* like Fedora, Ubuntu The plan is to fix mounting DFS shares on NixOS (for which some of these options are needed), but I figured it might be a good idea to enable all CONFIG_CIFS_* like Fedora 24 and Ubuntu 16.04 while at it. Ubuntu even has CONFIG_CIFS_SMB311, but as Fedora do not, I left it out. Mounting DFS shares still doesn't work; need to configure cifs.upcall and /etc/request-key.conf. Until then, using GVFS as a workaround. --- pkgs/os-specific/linux/kernel/common-config.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2ae714ea089f..e0abb745f34a 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -260,6 +260,11 @@ with stdenv.lib; CIFS_XATTR y CIFS_POSIX y CIFS_FSCACHE y + CIFS_STATS y + CIFS_WEAK_PW_HASH y + CIFS_UPCALL y + CIFS_ACL y + CIFS_DFS_UPCALL y CIFS_SMB2 y ${optionalString (versionAtLeast version "3.12") '' CEPH_FSCACHE y From 20773854211f2b45af53e4a8cca7339cd47781d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 5 Sep 2016 16:15:45 +0200 Subject: [PATCH 1341/1749] kernel: enable CONFIG_DYNAMIC_DEBUG (like Fedora and Ubuntu) It was useful in tracking down CIFS + DFS issue, and it's apparently enabled by default in two major distros. --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e0abb745f34a..bd99a7979eeb 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -31,6 +31,7 @@ with stdenv.lib; # Debugging. DEBUG_KERNEL y + DYNAMIC_DEBUG y TIMER_STATS y BACKTRACE_SELF_TEST n CPU_NOTIFIER_ERROR_INJECT? n From eaadb89fedddb42705a41847177fd367c8366603 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 9 Dec 2016 21:52:36 -0200 Subject: [PATCH 1342/1749] efl: 1.18.3 -> 1.18.4 --- pkgs/desktops/enlightenment/efl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index c4b8ba8cd058..45e547f4a22a 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.18.3"; + version = "1.18.4"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "1h347sfxajyb5s931m9qga14wwiqci7aicww2imxjhzm8w4fqj07"; + sha256 = "09c0ajszjarcs6d62zlgnf1aha2f921mfr0gxg6nwza36xzc1srr"; }; nativeBuildInputs = [ pkgconfig ]; From 6a8c9ad798e19008617bc399a074f583ae3a6a01 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 9 Dec 2016 22:14:02 -0200 Subject: [PATCH 1343/1749] enlightenment: 0.21.4 -> 0.21.5 --- pkgs/desktops/enlightenment/enlightenment.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index d2091eeb8e95..b16b10952a2f 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -4,11 +4,11 @@ mesa_glu , xkeyboard_config }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.21.4"; + version = "0.21.5"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "085zn6vdy904fxa9krx7ljv61yg96b2xk56g0bx2lyq1d33sgl8f"; + sha256 = "1fslq70z4s6v9ipahnk8s5fgqnqq4njv4rlqv951r1bh1xk5lx7h"; }; nativeBuildInputs = [ pkgconfig ]; From 6bc52926fe0355255507f1cd534f87fc9dbffba5 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Fri, 9 Dec 2016 15:58:23 -0500 Subject: [PATCH 1344/1749] ignition-math: 2.3.0 -> 2.6.0 --- pkgs/development/libraries/ignition-math/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix index f71def555833..66b21b6fae6c 100644 --- a/pkgs/development/libraries/ignition-math/default.nix +++ b/pkgs/development/libraries/ignition-math/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchurl, cmake }: let - version = "2.3.0"; + version = "2.6.0"; in stdenv.mkDerivation rec { name = "ign-math2-${version}"; src = fetchurl { url = "http://gazebosim.org/distributions/ign-math/releases/ignition-math2-${version}.tar.bz2"; - sha256 = "1a2jgq6allcxg62y0r61iv4hgxkfr1whpsxy75hg7k85s7da8dpl"; + sha256 = "1d4naq0zp704c7ckj2wwmhplxmwkvcs1jib8bklnnd09lhg9j92j"; }; buildInputs = [ cmake ]; + preConfigure = '' + cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_INSTALL_LIBDIR=lib" + ''; meta = with stdenv.lib; { homepage = http://ignitionrobotics.org/libraries/math; From 500816150fb973287401bf4ca28142d1cc49857b Mon Sep 17 00:00:00 2001 From: romildo Date: Sat, 10 Dec 2016 07:11:30 -0200 Subject: [PATCH 1345/1749] flat-plat-gtk-theme: remove build dependency on gnome-shell --- pkgs/misc/themes/flat-plat/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix index c9c0812d7a22..1b8f4f2d1105 100644 --- a/pkgs/misc/themes/flat-plat/default.nix +++ b/pkgs/misc/themes/flat-plat/default.nix @@ -11,14 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1w4b16cp2yv5rpijcqywlzrs3xjkvg8ppp2rfls1kvxq12rz4jkb"; }; - nativeBuildInputs = [ gnome3.gnome_shell libxml2 ]; + nativeBuildInputs = [ gnome3.glib libxml2 ]; buildInputs = [ gnome3.gnome_themes_standard gtk-engine-murrine ]; dontBuild = true; installPhase = '' - substituteInPlace install.sh --replace /usr "" + sed -i install.sh \ + -e "s|^gnomever=.*$|gnomever=${gnome3.version}|" \ + -e "s|/usr||" destdir="$out" ./install.sh rm $out/share/themes/*/COPYING ''; From edaac2c3ff41a12383e85557746b6097bfbefccc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 10 Dec 2016 12:13:31 +0300 Subject: [PATCH 1346/1749] wesnoth: disable input frameworks --- pkgs/games/wesnoth/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index a7352f0a75c4..7e5cdae57fa6 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf , pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre -, enableTools ? false +, makeWrapper, enableTools ? false }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0kifp6g1dsr16m6ngjq2hx19h851fqg326ps3krnhpyix963h3x5"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext boost libvorbis fribidi dbus libpng pcre ]; @@ -23,6 +23,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Wesnoth doesn't support input frameworks and Unicode input breaks when they are enabled. + postInstall = '' + for i in $out/bin/*; do + wrapProgram "$i" --unset XMODIFIERS + done + ''; + meta = with stdenv.lib; { description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme"; longDescription = '' From cbcdfdb576338081efff9c920428acc2b05fc5a3 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 10 Dec 2016 19:51:55 +0900 Subject: [PATCH 1347/1749] android-sdk: 25.2.2 -> 25.2.3 --- pkgs/development/mobile/androidenv/addon.xml | 38 +- pkgs/development/mobile/androidenv/addons.nix | 4 +- .../mobile/androidenv/androidsdk.nix | 6 +- .../mobile/androidenv/build-tools.nix | 6 +- .../mobile/androidenv/platform-tools.nix | 6 +- .../mobile/androidenv/platforms-linux.nix | 12 + .../mobile/androidenv/platforms-macosx.nix | 12 + .../mobile/androidenv/repository-11.xml | 248 ++++++++----- .../mobile/androidenv/support-repository.nix | 4 +- .../development/mobile/androidenv/sys-img.xml | 334 ++++++++++-------- .../mobile/androidenv/sysimages.nix | 101 ++++-- pkgs/top-level/all-packages.nix | 4 +- 12 files changed, 479 insertions(+), 296 deletions(-) diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index aef61bb2fc22..538b7622df71 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -1,6 +1,6 @@ - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -1262,18 +1262,18 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + - 37 + 40 0 0 - - 281268000 - 2f862a5d66d5526cd5b7655c3e9678f493e485f7 - android_m2repository_r37.zip + + 305545706 + 782e7233f18c890463e8602571d304e680ce354c + android_m2repository_r40.zip @@ -1308,16 +1308,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& compatibility - + - 32 + 40 - - 113922721 - ae24bde9c8f732f4d13b72e70802be8c97dcfddf - google_m2repository_r32.zip + + 152633821 + 0f599f7f35fba49b9277ef9e1394c5c82d8bd369 + google_m2repository_gms_v8_rc42_wear_2a3.zip @@ -1392,16 +1392,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& google_play_services_froyo - + - 32 + 38 - - 11820632 - bf0e7c1848371c7e6dd7a01e237dbd916e5cb04f - google_play_services_945200_r32.zip + + 12351978 + 7a50dec81ba9c9b51d7778c19ca05002498209e8 + google_play_services_v8_rc41.zip diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index f999f603b8f9..7ddd203d4bf0 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -283,8 +283,8 @@ in google_play_services = buildGoogleApis { name = "google_play_services"; src = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_945200_r32.zip; - sha1 = "bf0e7c1848371c7e6dd7a01e237dbd916e5cb04f"; + url = https://dl.google.com/android/repository/google_play_services_v8_rc41.zip; + sha1 = "7a50dec81ba9c9b51d7778c19ca05002498209e8"; }; meta = { description = "Google Play services client library and sample code"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index a742386920bb..52a2ab8f36a0 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -11,16 +11,16 @@ with { inherit (stdenv.lib) makeLibraryPath; }; stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "25.2.2"; + version = "25.2.3"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-linux.zip"; - sha256 = "0q53yq8fjc10kr4fz3rap5vsil3297w5nn4kw1z0ms7yz1d1im8h"; + sha256 = "0q5m8lqhj07c6izhc0b0d73820ma0flvrj30ckznss4s9swvqd8v"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip"; - sha256 = "1wq7xm0rhy0h6qylv7fq9mhf8hqihrr1nzf7d322rc3g0jfrdrcl"; + sha256 = "1ihxd2a37ald3sdd04i4yk85prw81h6gnch0bmq65cbsrba48dar"; } else throw "platform not ${stdenv.system} supported!"; diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 945cc0bedd5c..c09d643146ba 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,16 +1,16 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}: stdenv.mkDerivation rec { - version = "24.0.2"; + version = "25.0.1"; name = "android-build-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip"; - sha256 = "15bxk03m1r1i74idydgqsrz1k7qczi8f9sj4kl8vvbw9l6w2jklj"; + sha256 = "0kyrazmcckikn6jiz9hwy6nlqjssf95h5iq7alswg1mryl04w6v7"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip"; - sha256 = "0h71bv8rdkssn7a17vj3r7jl5jwsxbwpg3sig0k9a7yfwyfc71s8"; + sha256 = "116i5xxbwz229m9z98n6bfkjk2xf3kbhdnqhbbnaagjsjzqdirki"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 517167b0d559..6205b98eee15 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,16 +1,16 @@ {stdenv, zlib, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "24.0.2"; + version = "25.0.1"; name = "android-platform-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha256 = "0y36mlwh4kb77d3vcpqxqwkxsadllap6g6jjylf3rb7blh5l4zw6"; + sha256 = "0r8ix3jjqpk6wyxm8f6az9r4z5a1lnb3b9hzh8ay4ayidwhn8isx"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip"; - sha256 = "1whfhdwjir2sv2pfypagva813yn0fx8idi6c2mxhddv2mlws6zk4"; + sha256 = "18pzwpr6fbxlw782j65clwz9kvdgvb04jpr2z12bbwyd8wqc4yln"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index e0c77ad294e6..4f3f45f4cc93 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -292,4 +292,16 @@ in }; }; + platform_25 = buildPlatform { + name = "android-platform-7.1.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/platform-25_r02.zip; + sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f"; + }; + meta = { + description = "Android SDK Platform 25"; + url = http://developer.android.com/sdk/; + }; + }; + } diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index 60fae208ae1a..d8619b7c0f5d 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -292,4 +292,16 @@ in }; }; + platform_25 = buildPlatform { + name = "android-platform-7.1.1"; + src = fetchurl { + url = https://dl.google.com/android/repository/platform-25_r02.zip; + sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f"; + }; + meta = { + description = "Android SDK Platform 25"; + url = http://developer.android.com/sdk/; + }; + }; + } diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml index a0ef9bc4485a..e115f6747902 100644 --- a/pkgs/development/mobile/androidenv/repository-11.xml +++ b/pkgs/development/mobile/androidenv/repository-11.xml @@ -15,7 +15,7 @@ * limitations under the License. --> - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -296,85 +296,69 @@ This is the Android SDK Preview License Agreement (the "License Agreement&q June 2014. - + NDK - 12 + 13 - - 734135279 - e257fe12f8947be9f79c10c3fffe87fb9406118a - android-ndk-r12b-darwin-x86_64.zip + + 665967997 + 71fe653a7bf5db08c3af154735b6ccbc12f0add5 + android-ndk-r13b-darwin-x86_64.zip macosx 64 - - 755551010 - 170a119bfa0f0ce5dc932405eaa3a7cc61b27694 - android-ndk-r12b-linux-x86_64.zip + + 687311866 + 0600157c4ddf50ec15b8a037cfc474143f718fd0 + android-ndk-r13b-linux-x86_64.zip linux 64 - - 706453972 - 8e6eef0091dac2f3c7a1ecbb7070d4fa22212c04 - android-ndk-r12b-windows-x86.zip + + 620461544 + 4eb1288b1d4134a9d6474eb247f0448808d52408 + android-ndk-r13b-windows-x86.zip windows 32 - - 749567353 - 337746d8579a1c65e8a69bf9cbdc9849bcacf7f5 - android-ndk-r12b-windows-x86_64.zip + + 681320123 + 649d306559435c244cec5881b880318bb3dee53a + android-ndk-r13b-windows-x86_64.zip windows 64 - - - NDK - 13 + + + 7.1.1 + 25 + Android SDK Platform 25 + 2 - - 665405792 - 0cbdb271b103a7e4237b34b73f0e56381e4632aa - android-ndk-r13-beta2-darwin-x86_64.zip - macosx - 64 - - - - 686843165 - ea1a76d9ebdc82fe742d32798aaee7c980afd2f6 - android-ndk-r13-beta2-linux-x86_64.zip - linux - 64 - - - - 619981813 - a5f6edceb3afa4ecd47071822ea32ba6bd6ac002 - android-ndk-r13-beta2-windows-x86.zip - windows - 32 - - - - 680836961 - a0b6a0ed271b0a99cdca28ce8fd405f89defc539 - android-ndk-r13-beta2-windows-x86_64.zip - windows - 64 + + 85434042 + 6057e54a04f1d141f36a2c8d20f2962b41a3183f + platform-25_r02.zip - - + + + 22 + + http://developer.android.com/sdk/ + + 16 + 2 + + 7.0 @@ -1147,6 +1131,102 @@ June 2014. + + + + 25 + 0 + 1 + + + + + 49880178 + ff063d252ab750d339f5947d06ff782836f22bac + build-tools_r25.0.1-linux.zip + linux + + + + 49667353 + 7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f + build-tools_r25.0.1-macosx.zip + macosx + + + + 50458759 + c6c61393565ccf46349e7f44511e5db7c1c6169d + build-tools_r25.0.1-windows.zip + windows + + + + + + + + 25 + 0 + 0 + + + + + 49872921 + f2bbda60403e75cabd0f238598c3b4dfca56ea44 + build-tools_r25-linux.zip + linux + + + + 49659466 + 273c5c29a65cbed00e44f3aa470bbd7dce556606 + build-tools_r25-macosx.zip + macosx + + + + 50451378 + f9258f2308ff8b62cfc4513d40cb961612d07b6a + build-tools_r25-windows.zip + windows + + + + + + + + 24 + 0 + 3 + + + + + 49779151 + 9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304 + build-tools_r24.0.3-linux.zip + linux + + + + 49568967 + a01c15f1b105c34595681075e1895d58b3fff48c + build-tools_r24.0.3-macosx.zip + macosx + + + + 50354788 + 8b960d693fd4163caeb8dc5f5f5f80b10987089c + build-tools_r24.0.3-windows.zip + windows + + + + @@ -1963,64 +2043,64 @@ June 2014. - + - 24 + 25 0 - 2 + 1 - - 3341647 - a268850d31973d32de5c1515853f81924a4068cf - platform-tools_r24.0.2-linux.zip + + 3916151 + 8e461a2c76717824d1d8e91af68216c9f230a373 + platform-tools_r25.0.1-linux.zip linux - - 3157182 - 16053da716cbc6ef31c32a0d2f1437b22089c88c - platform-tools_r24.0.2-macosx.zip + + 3732924 + 96abc8638bf9f65435bc0ab641cc4a3ff753eed5 + platform-tools_r25.0.1-macosx.zip macosx - - 2997417 - ce09a7351d5c50865691554ed56325f6e5cd733c - platform-tools_r24.0.2-windows.zip + + 3573485 + 75249224c12528329a151dfbc591509168ef6efd + platform-tools_r25.0.1-windows.zip windows - + 25 2 - 2 + 3 - - 273491448 - 99257925a3d8b46fee948a7520d7b7e3e3e1890e - tools_r25.2.2-linux.zip + + 277861433 + aafe7f28ac51549784efc2f3bdfc620be8a08213 + tools_r25.2.3-linux.zip linux - - 195856788 - bbaa3929696ce523ea62b58cc8032d7964a154c5 - tools_r25.2.2-macosx.zip + + 200496727 + 0e88c0bdb8f8ee85cce248580173e033a1bbc9cb + tools_r25.2.3-macosx.zip macosx - - 301642481 - ef898dff805c4b9e39f6e77fd9ec397fb1b1f809 - tools_r25.2.2-windows.zip + + 306745639 + b965decb234ed793eb9574bad8791c50ca574173 + tools_r25.2.3-windows.zip windows diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix index 182fdded2bd7..84ebee5a75f9 100644 --- a/pkgs/development/mobile/androidenv/support-repository.nix +++ b/pkgs/development/mobile/androidenv/support-repository.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "35"; + version = "40"; name = "android-support-repository-r${version}"; src = fetchurl { url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip"; - sha1 = "2wi1b38n3dmnikpwbwcbyy2xfws1683s"; + sha1 = "782e7233f18c890463e8602571d304e680ce354c"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml index 237f13482321..807d4976296c 100644 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ b/pkgs/development/mobile/androidenv/sys-img.xml @@ -1,6 +1,6 @@ - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -404,6 +404,23 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS 10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement. + + + 10 + ARM EABI v7a System Image + 4 + + + + 67918042 + 54680383118eb5c95a11e1cc2a14aa572c86ee69 + armv7-10_r04.zip + + + + armeabi-v7a + default + 14 @@ -422,16 +439,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 15 ARM EABI v7a System Image - 3 + 4 - - 96240395 - 0a47f586e172b1cf3db2ada857a70c2bdec24ef8 - sysimg_armv7a-15_r03.zip + + 102079727 + 363223bd62f5afc0b2bd760b54ce9d26b31eacf1 + armeabi-v7a-15_r04.zip @@ -456,16 +473,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 17 ARM EABI v7a System Image - 3 + 5 - - 118663847 - 97cfad22b51c8475e228b207dd36dbef1c18fa38 - sysimg_armv7a-17_r03.zip + + 124238679 + 7460e8110f4a87f9644f1bdb5511a66872d50fd9 + armeabi-v7a-17_r05.zip @@ -473,16 +490,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 18 ARM EABI v7a System Image - 3 + 4 - - 125503391 - 2d7d51f4d2742744766511e5d6b491bd49161c51 - sysimg_armv7a-18_r03.zip + + 130394401 + 0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642 + armeabi-v7a-18_r04.zip @@ -490,16 +507,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 19 ARM EABI v7a System Image - 3 + 5 - - 159399028 - 5daf7718e3ab03d9bd8792b492dd305f386ef12f - sysimg_armv7a-19_r03.zip + + 159871567 + d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa + armeabi-v7a-19_r05.zip @@ -507,16 +524,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 21 ARM EABI v7a System Image - 3 + 4 - - 186521381 - 0b2e21421d29f48211b5289ca4addfa7f4c7ae5a - sysimg_arm-21_r03.zip + + 187163871 + 8c606f81306564b65e41303d2603e4c42ded0d10 + armeabi-v7a-21_r04.zip @@ -524,16 +541,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 22 ARM EABI v7a System Image - 1 + 2 - - 193687339 - 2aa6a887ee75dcf3ac34627853d561997792fcb8 - sysimg_arm-22_r01.zip + + 194596267 + 2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1 + armeabi-v7a-22_r02.zip @@ -541,16 +558,17 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 23 ARM EABI v7a System Image - 3 + 6 - - 226879660 - 7bb8768ec4333500192fd9627d4234f505fa98dc - sysimg_arm-23_r03.zip + + 238333358 + 7cf2ad756e54a3acfd81064b63cb0cb9dff2798d + armeabi-v7a-23_r06.zip + windows @@ -643,16 +661,67 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 10 Intel x86 Atom System Image + 4 + + + + 75382637 + 655ffc5cc89dd45a3aca154b254009016e473aeb + x86-10_r04.zip + + + + x86 + default + + + + 15 + Intel x86 Atom System Image + 4 + + + + 115324561 + e45c728b64881c0e86529a8f7ea9c103a3cd14c1 + x86-15_r04.zip + + + + x86 + default + + + + 16 + Intel x86 Atom System Image + 5 + + + + 134339698 + 7ea16da3a8fdb880b1b290190fcc1bde2821c1e0 + x86-16_r05.zip + + + + x86 + default + + + + 17 + Intel x86 Atom System Image 3 - - 66997702 - 6b8539eaca9685d2d3289bf8e6d21d366d791326 - sysimg_x86-10_r03.zip + + 142951842 + eb30274460ff0d61f3ed37862b567811bebd8270 + x86-17_r03.zip @@ -660,67 +729,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - - 15 - Intel x86 Atom System Image - 2 - - - - 109019058 - 56b8d4b3d0f6a8876bc78d654da186f3b7b7c44f - sysimg_x86-15_r02.zip - - - - x86 - default - - - - 16 - Intel x86 Atom System Image - 2 - - - - 135252264 - 36c2a2e394bcb3290583ce09815eae7711d0b2c2 - sysimg_x86-16_r02.zip - - - - x86 - default - - - - 17 - Intel x86 Atom System Image - 2 - - - - 136075512 - bd8c7c5411431af7e051cbe961be430fc31e773d - sysimg_x86-17_r02.zip - - - - x86 - default - - - + 18 Intel x86 Atom System Image - 2 + 3 - - 143899902 - ab3de121a44fca43ac3aa83f7d68cc47fc643ee8 - sysimg_x86-18_r02.zip + + 149657535 + 03a0cb23465c3de15215934a1dbc9715b56e9458 + x86-18_r03.zip @@ -728,16 +746,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 19 Intel x86 Atom System Image 5 - - 183946064 - c9298a8eafceed3b8fa11071ba63a3d18e17fd8e - sysimg_x86-19_r05.zip + + 183968605 + 1d98426467580abfd03c724c5344450f5d0df379 + x86-19_r05.zip @@ -745,16 +763,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 21 Intel x86 Atom System Image 4 - - 206323409 - 3b78ad294aa1cdefa4be663d4af6c80d920ec49e - sysimg_x86-21_r04.zip + + 206305926 + c7732f45c931c0eaa064e57e8c054bce86c30e54 + x86-21_r04.zip @@ -762,16 +780,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 22 Intel x86 Atom System Image 5 - - 212301282 - 909e0ad91ed43381597e82f65ec93d41f049dd53 - sysimg_x86-22_r05.zip + + 212327460 + 7e2c93891ea9efec07dccccf6b9ab051a014dbdf + x86-22_r05.zip @@ -779,16 +797,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 23 Intel x86 Atom System Image 9 - - 252059065 - 0ce9229974818179833899dce93f228a895ec6a2 - sysimg_x86-23_r09.zip + + 260241399 + d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1 + x86-23_r09.zip @@ -813,16 +831,34 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + + 25 + Google APIs Intel x86 Atom System Image + 3 + + + + 703131759 + 7dd19cfee4e43a1f60e0f5f058404d92d9544b33 + x86-25_r03.zip + + + + x86 + google_apis + Google APIs + + + 21 Intel x86 Atom_64 System Image 4 - - 290590059 - eb14ba9c14615d5e5a21c854be29aa903d9bb63d - sysimg_x86_64-21_r04.zip + + 290608820 + 9b2d64a69a72fa596c386899a742a404308f2c92 + x86_64-21_r04.zip @@ -830,16 +866,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 22 Intel x86 Atom_64 System Image 5 - - 297851141 - 8a04ff4fb30f70414e6ec7b3b06285f316e93d08 - sysimg_x86_64-22_r05.zip + + 297850561 + 99d1d6c77e92284b4210640edf6c81eceb28520d + x86_64-22_r05.zip @@ -847,16 +883,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 23 Intel x86 Atom_64 System Image 9 - - 349443901 - 571f5078a3d337a9144e2af13bd23ca46845a979 - sysimg_x86_64-23_r09.zip + + 363794271 + 84cc076eacec043c8e88382c6ab391b0cd5c0695 + x86_64-23_r09.zip @@ -880,4 +916,22 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS x86_64 default + + + 25 + Google APIs Intel x86 Atom_64 System Image + 3 + + + + 912938750 + 4593ee04811df21c339f3374fc5917843db06f8d + x86_64-25_r03.zip + + + + x86_64 + google_apis + Google APIs + diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index 2c8e1b33a464..89c48e5fb59e 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -15,11 +15,19 @@ let in { + sysimg_armeabi-v7a_10 = buildSystemImage { + name = "sysimg-armeabi-v7a-10"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/armv7-10_r04.zip; + sha1 = "54680383118eb5c95a11e1cc2a14aa572c86ee69"; + }; + }; + sysimg_x86_10 = buildSystemImage { name = "sysimg-x86-10"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-10_r03.zip; - sha1 = "6b8539eaca9685d2d3289bf8e6d21d366d791326"; + url = https://dl.google.com/android/repository/sys-img/android/x86-10_r04.zip; + sha1 = "655ffc5cc89dd45a3aca154b254009016e473aeb"; }; }; @@ -34,8 +42,8 @@ in sysimg_armeabi-v7a_15 = buildSystemImage { name = "sysimg-armeabi-v7a-15"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-15_r03.zip; - sha1 = "0a47f586e172b1cf3db2ada857a70c2bdec24ef8"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r04.zip; + sha1 = "363223bd62f5afc0b2bd760b54ce9d26b31eacf1"; }; }; @@ -50,8 +58,8 @@ in sysimg_x86_15 = buildSystemImage { name = "sysimg-x86-15"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-15_r02.zip; - sha1 = "56b8d4b3d0f6a8876bc78d654da186f3b7b7c44f"; + url = https://dl.google.com/android/repository/sys-img/android/x86-15_r04.zip; + sha1 = "e45c728b64881c0e86529a8f7ea9c103a3cd14c1"; }; }; @@ -74,16 +82,16 @@ in sysimg_x86_16 = buildSystemImage { name = "sysimg-x86-16"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-16_r02.zip; - sha1 = "36c2a2e394bcb3290583ce09815eae7711d0b2c2"; + url = https://dl.google.com/android/repository/sys-img/android/x86-16_r05.zip; + sha1 = "7ea16da3a8fdb880b1b290190fcc1bde2821c1e0"; }; }; sysimg_armeabi-v7a_17 = buildSystemImage { name = "sysimg-armeabi-v7a-17"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-17_r03.zip; - sha1 = "97cfad22b51c8475e228b207dd36dbef1c18fa38"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r05.zip; + sha1 = "7460e8110f4a87f9644f1bdb5511a66872d50fd9"; }; }; @@ -98,112 +106,112 @@ in sysimg_x86_17 = buildSystemImage { name = "sysimg-x86-17"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-17_r02.zip; - sha1 = "bd8c7c5411431af7e051cbe961be430fc31e773d"; + url = https://dl.google.com/android/repository/sys-img/android/x86-17_r03.zip; + sha1 = "eb30274460ff0d61f3ed37862b567811bebd8270"; }; }; sysimg_armeabi-v7a_18 = buildSystemImage { name = "sysimg-armeabi-v7a-18"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-18_r03.zip; - sha1 = "2d7d51f4d2742744766511e5d6b491bd49161c51"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r04.zip; + sha1 = "0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642"; }; }; sysimg_x86_18 = buildSystemImage { name = "sysimg-x86-18"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-18_r02.zip; - sha1 = "ab3de121a44fca43ac3aa83f7d68cc47fc643ee8"; + url = https://dl.google.com/android/repository/sys-img/android/x86-18_r03.zip; + sha1 = "03a0cb23465c3de15215934a1dbc9715b56e9458"; }; }; sysimg_armeabi-v7a_19 = buildSystemImage { name = "sysimg-armeabi-v7a-19"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-19_r03.zip; - sha1 = "5daf7718e3ab03d9bd8792b492dd305f386ef12f"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip; + sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa"; }; }; sysimg_x86_19 = buildSystemImage { name = "sysimg-x86-19"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-19_r05.zip; - sha1 = "c9298a8eafceed3b8fa11071ba63a3d18e17fd8e"; + url = https://dl.google.com/android/repository/sys-img/android/x86-19_r05.zip; + sha1 = "1d98426467580abfd03c724c5344450f5d0df379"; }; }; sysimg_armeabi-v7a_21 = buildSystemImage { name = "sysimg-armeabi-v7a-21"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-21_r03.zip; - sha1 = "0b2e21421d29f48211b5289ca4addfa7f4c7ae5a"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip; + sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10"; }; }; sysimg_x86_21 = buildSystemImage { name = "sysimg-x86-21"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-21_r04.zip; - sha1 = "3b78ad294aa1cdefa4be663d4af6c80d920ec49e"; + url = https://dl.google.com/android/repository/sys-img/android/x86-21_r04.zip; + sha1 = "c7732f45c931c0eaa064e57e8c054bce86c30e54"; }; }; sysimg_x86_64_21 = buildSystemImage { name = "sysimg-x86_64-21"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-21_r04.zip; - sha1 = "eb14ba9c14615d5e5a21c854be29aa903d9bb63d"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r04.zip; + sha1 = "9b2d64a69a72fa596c386899a742a404308f2c92"; }; }; sysimg_armeabi-v7a_22 = buildSystemImage { name = "sysimg-armeabi-v7a-22"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-22_r01.zip; - sha1 = "2aa6a887ee75dcf3ac34627853d561997792fcb8"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip; + sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1"; }; }; sysimg_x86_22 = buildSystemImage { name = "sysimg-x86-22"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-22_r05.zip; - sha1 = "909e0ad91ed43381597e82f65ec93d41f049dd53"; + url = https://dl.google.com/android/repository/sys-img/android/x86-22_r05.zip; + sha1 = "7e2c93891ea9efec07dccccf6b9ab051a014dbdf"; }; }; sysimg_x86_64_22 = buildSystemImage { name = "sysimg-x86_64-22"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-22_r05.zip; - sha1 = "8a04ff4fb30f70414e6ec7b3b06285f316e93d08"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r05.zip; + sha1 = "99d1d6c77e92284b4210640edf6c81eceb28520d"; }; }; sysimg_armeabi-v7a_23 = buildSystemImage { name = "sysimg-armeabi-v7a-23"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-23_r03.zip; - sha1 = "7bb8768ec4333500192fd9627d4234f505fa98dc"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip; + sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d"; }; }; sysimg_x86_23 = buildSystemImage { name = "sysimg-x86-23"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-23_r09.zip; - sha1 = "0ce9229974818179833899dce93f228a895ec6a2"; + url = https://dl.google.com/android/repository/sys-img/android/x86-23_r09.zip; + sha1 = "d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1"; }; }; sysimg_x86_64_23 = buildSystemImage { name = "sysimg-x86_64-23"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-23_r09.zip; - sha1 = "571f5078a3d337a9144e2af13bd23ca46845a979"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r09.zip; + sha1 = "84cc076eacec043c8e88382c6ab391b0cd5c0695"; }; }; @@ -238,4 +246,21 @@ in sha1 = "a379932395ced0a8f572b39c396d86e08827a9ba"; }; }; + + sysimg_x86_25 = buildSystemImage { + name = "sysimg-x86-25"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-25_r03.zip; + sha1 = "7dd19cfee4e43a1f60e0f5f058404d92d9544b33"; + }; + }; + + sysimg_x86_64_25 = buildSystemImage { + name = "sysimg-x86_64-25"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86_64-25_r03.zip; + sha1 = "4593ee04811df21c339f3374fc5917843db06f8d"; + }; + }; } + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3804014a1dfe..a5a4309ce774 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -551,9 +551,9 @@ in inherit (androidenv) androidsdk_4_4 androidndk; - androidsdk = androidenv.androidsdk_6_0; + androidsdk = androidenv.androidsdk_7_0; - androidsdk_extras = self.androidenv.androidsdk_6_0_extras; + androidsdk_extras = self.androidenv.androidsdk_7_0_extras; arc-theme = callPackage ../misc/themes/arc { }; From 8b8df71b8763ca0e5fa29b3940412c48dda1bbca Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 10 Dec 2016 13:09:47 +0100 Subject: [PATCH 1348/1749] strace: 4.13 -> 4.14 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 5eafbf68fb7b..5152067efa12 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.13"; + version = "4.14"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "d48f732576c91ece36a5843d63f9be054c40ef59f1e4773986042636861625d7"; + sha256 = "0bvicjkqk3c09zyxgkakymiqr3618sa2dfpd9f3fdp23n8853vav"; }; nativeBuildInputs = [ perl ]; From a1d9d7efc0cf106462228ce397a106d3b0d36a9d Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Wed, 7 Dec 2016 19:22:26 +0100 Subject: [PATCH 1349/1749] btrbk: 0.22.2 -> 0.24.0 --- pkgs/tools/backup/btrbk/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 5faeb926c063..ff542e781a69 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchurl, coreutils, bash, btrfs-progs, perl, perlPackages, makeWrapper }: +{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { name = "btrbk-${version}"; - version = "0.22.2"; + version = "0.24.0"; src = fetchurl { url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz"; - sha256 = "1gbgi0dp62wlw7y72pgxjs6byxkrk73g35kqxzw0gjf32r5i4sb8"; + sha256 = "01jrlswly28h4q4r3qfrzadz0pf0ms6wynmqhwddj1ahj31729h3"; }; patches = [ # https://github.com/digint/btrbk/pull/74 ./btrbk-Prefix-PATH-instead-of-resetting-it.patch - # https://github.com/digint/btrbk/pull/73 - ./btrbk-mail-Use-btrbk-instead-of-unbound-variable-btr.patch ]; buildInputs = with perlPackages; [ makeWrapper perl DateCalc ]; @@ -38,7 +36,7 @@ stdenv.mkDerivation rec { wrapProgram $out/sbin/btrbk \ --set PERL5LIB $PERL5LIB \ - --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash ]}" + --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash openssh ]}" ''; meta = with stdenv.lib; { From 033525c6b85ae01bbe717a3a585126f15abf86f1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 10 Dec 2016 14:21:34 +0100 Subject: [PATCH 1350/1749] dstat: fix bad interpreter: No such file --- pkgs/os-specific/linux/dstat/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index c8e40a4c7ac8..ccedc381504f 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python2Packages }: -stdenv.mkDerivation rec { +python2Packages.mkPythonDerivation rec { name = "dstat-${version}"; version = "0.7.3"; @@ -9,21 +9,10 @@ stdenv.mkDerivation rec { sha256 = "16286z3y2lc9nsq8njzjkv6k2vyxrj9xiixj1k3gnsbvhlhkirj6"; }; - buildInputs = with python2Packages; [ python-wifi wrapPython ]; - - pythonPath = with python2Packages; [ python-wifi ]; - - patchPhase = '' - sed -i -e 's|/usr/bin/env python|${python2Packages.python.interpreter}|' \ - -e "s|/usr/share/dstat|$out/share/dstat|" dstat - ''; + propagatedBuildInputs = with python2Packages; [ python-wifi ]; makeFlags = [ "prefix=$(out)" ]; - postInstall = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - meta = with stdenv.lib; { homepage = http://dag.wieers.com/home-made/dstat/; description = "Versatile resource statistics tool"; From 9074d9859e44390ee1deec2c27cef6c9780b0c8c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 10 Dec 2016 17:08:42 +0100 Subject: [PATCH 1351/1749] linux: add patch to fix CVE-2016-8655 See https://lwn.net/Articles/708319/ for more information. --- pkgs/os-specific/linux/kernel/patches.nix | 10 ++++++++- pkgs/top-level/all-packages.nix | 26 +++++++++++++++++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 3fab12b64a6e..66f03edbdf2b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -149,6 +149,14 @@ rec { url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git" + "/patch/drivers/lguest/x86/core.c?id=cdd77e87eae52"; sha256 = "04xlx6al10cw039av6jkby7gx64zayj8m1k9iza40sw0fydcfqhc"; + }; + }; + + packet_fix_race_condition_CVE_2016_8655 = + { name = "packet_fix_race_condition_CVE_2016_8655.patch"; + patch = fetchpatch { + url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=84ac7260236a49c79eede91617700174c2c19b0c"; + sha256 = "19viqjjgq8j8jiz5yhgmzwhqvhwv175q645qdazd1k69d25nv2ki"; + }; }; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1959cbe46459..07b5f4d021a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10927,6 +10927,7 @@ in linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.packet_fix_race_condition_CVE_2016_8655 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -10936,11 +10937,18 @@ in }; linux_rpi = callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = [ kernelPatches.bridge_stp_helper ]; + kernelPatches = with kernelPatches; [ + bridge_stp_helper + packet_fix_race_condition_CVE_2016_8655 + ]; }; linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix { - kernelPatches = with kernelPatches; [ bridge_stp_helper lguest_entry-linkage ] + kernelPatches = with kernelPatches; + [ bridge_stp_helper + lguest_entry-linkage + packet_fix_race_condition_CVE_2016_8655 + ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -10949,7 +10957,11 @@ in }; linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix { - kernelPatches = with kernelPatches; [ bridge_stp_helper crc_regression ] + kernelPatches = with kernelPatches; + [ bridge_stp_helper + crc_regression + packet_fix_race_condition_CVE_2016_8655 + ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -10958,7 +10970,10 @@ in }; linux_3_18 = callPackage ../os-specific/linux/kernel/linux-3.18.nix { - kernelPatches = [ kernelPatches.bridge_stp_helper ] + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.packet_fix_race_condition_CVE_2016_8655 + ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -10969,6 +10984,7 @@ in linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.packet_fix_race_condition_CVE_2016_8655 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -10981,6 +10997,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.4" + kernelPatches.packet_fix_race_condition_CVE_2016_8655 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -10997,6 +11014,7 @@ in # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking # kernelPatches.cpu-cgroup-v2."4.7" kernelPatches.modinst_arg_list_too_long + kernelPatches.packet_fix_race_condition_CVE_2016_8655 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From 9243703c5cc9c9e48aa3f07d91b9384253c9d9ed Mon Sep 17 00:00:00 2001 From: Alexei Boronine Date: Sun, 11 Dec 2016 00:29:50 +0800 Subject: [PATCH 1352/1749] mbedtls: fix build for Darwin (#20940) mbedtls: fix build for darwin --- .../development/libraries/mbedtls/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index b7d6fb25ecc2..fab18516168d 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -10,6 +10,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace library/Makefile --replace "-soname" "-install_name" + substituteInPlace tests/scripts/run-test-suites.pl --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH" + # Necessary for install_name_tool below + echo "LOCAL_LDFLAGS += -headerpad_max_install_names" >> programs/Makefile + ''; + postPatch = '' patchShebangs . ''; @@ -22,6 +29,18 @@ stdenv.mkDerivation rec { "DESTDIR=\${out}" ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change libmbedcrypto.so.0 $out/lib/libmbedcrypto.so.0 $out/lib/libmbedtls.so.10 + install_name_tool -change libmbedcrypto.so.0 $out/lib/libmbedcrypto.so.0 $out/lib/libmbedx509.so.0 + install_name_tool -change libmbedx509.so.0 $out/lib/libmbedx509.so.0 $out/lib/libmbedtls.so.10 + + for exe in $out/bin/*; do + install_name_tool -change libmbedtls.so.10 $out/lib/libmbedtls.so.10 $exe + install_name_tool -change libmbedx509.so.0 $out/lib/libmbedx509.so.0 $exe + install_name_tool -change libmbedcrypto.so.0 $out/lib/libmbedcrypto.so.0 $exe + done + ''; + doCheck = true; meta = with stdenv.lib; { From 2698757095337426d8fd72119bebacce038e91cf Mon Sep 17 00:00:00 2001 From: Marti Serra Date: Sat, 10 Dec 2016 17:50:24 +0100 Subject: [PATCH 1353/1749] steam: added documentation to nixpkgs manual --- doc/package-notes.xml | 137 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index f0015a7f9ace..de148ec5739f 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -382,4 +382,141 @@ it. Place the resulting package.nix file into +
+ +Steam + +
+ +Steam in Nix + + + Steam is distributed as a .deb file, for now only + as an i686 package (the amd64 package only has documentation). + When unpacked, it has a script called steam that + in ubuntu (their target distro) would go to /usr/bin + . When run for the first time, this script copies some + files to the user's home, which include another script that is the + ultimate responsible for launching the steam binary, which is also + in $HOME. + + + Nix problems and constraints: + + We don't have /bin/bash and many + scripts point there. Similarly for /usr/bin/python + . + We don't have the dynamic loader in /lib + . + The steam.sh script in $HOME can + not be patched, as it is checked and rewritten by steam. + The steam binary cannot be patched, it's also checked. + + + + The current approach to deploy Steam in NixOS is composing a FHS-compatible + chroot environment, as documented + here. + This allows us to have binaries in the expected paths without disrupting the system, + and to avoid patching them. + + +
+ +
+ +How to play + + + For 64-bit systems it's important to have + hardware.opengl.driSupport32Bit = true; + in your /etc/nixos/configuration.nix. You'll also need + hardware.pulseaudio.support32Bit = true; + if you are using PulseAudio - this will enable 32bit ALSA apps integration. + To use the Steam controller, you need to add + services.udev.extraRules = '' + SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", MODE="0666" + KERNEL=="uinput", MODE="0660", GROUP="users", OPTIONS+="static_node=uinput" + ''; + to your configuration. + + +
+ +
+ +Troubleshooting + + + + + + Steam fails to start. What do I do? + Try to run + strace steam + to see what is causing steam to fail. + + + + Game X fails to start + Games may fail to start because they lack + dependencies (this should be added to the script, for now), + or because they cannot be patched.The steps to launch a game + directly are: + + Patch the script/binary if you can. + Add a file named steam_appid.txt in + the binary folder, with the appid as contents (it can be found in the + stdout from steam). + Using the LD_LIBRARY_PATH from the nix/store steam script, + with some additions, launch the game binary: + LD_LIBRARY_PATH=~/.steam/bin32:$LD_LIBRARY_PATH:/nix/store/pfsa... blabla ...curl-7.29.0/lib:. ./Osmos.bin3 + (if you could not patchelf the game, call ld.so directly + with the binary as param). With this technique, I can play many games + directly from steam. Others, like Team Fortress, cannot be patched + so I only managed to run them from the cmd line. + + + + + + + + Using the FOSS Radeon drivers + + The open source radeon drivers need a newer libc++ than is provided + by the default runtime, which leads to a crash on launch. Use + environment.systemPackages = [(pkgs.steam.override { newStdcpp = true; })]; + in your config if you get an error like + +libGL error: unable to load driver: radeonsi_dri.so +libGL error: driver pointer missing +libGL error: failed to load driver: radeonsi +libGL error: unable to load driver: swrast_dri.so +libGL error: failed to load driver: swrast + + Steam ships statically linked with a version of libcrypto that + conflics with the one dynamically loaded by radeonsi_dri.so. + If you get the error + steam.sh: line 713: 7842 Segmentation fault (core dumped) + have a look at this pull request. + + + + + Known issues + + + No java in steam chrootenv. Games affected: Towns: + /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found + + + + + + +
+ +
+ From e942ed29b3c6778dc4d31d328b15aa8d63116dbe Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Sat, 10 Dec 2016 09:30:39 -0800 Subject: [PATCH 1354/1749] rubygems: 2.6.6 -> 2.6.8 (#21028) --- pkgs/development/interpreters/ruby/rubygems-src.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/rubygems-src.nix b/pkgs/development/interpreters/ruby/rubygems-src.nix index 59b2becdc6e3..7ea52185d77b 100644 --- a/pkgs/development/interpreters/ruby/rubygems-src.nix +++ b/pkgs/development/interpreters/ruby/rubygems-src.nix @@ -1,6 +1,6 @@ { fetchurl -, version ? "2.6.6" -, sha256 ? "0x0ldlwr627d0brw96jdbscib6d2nk19izvnh8lzsasszi1k5rkq" +, version ? "2.6.8" +, sha256 ? "1v6n6s8cq5l0xyf1fbm1w4752b9vdk3p130ar59ig72p9vqvkbl1" }: fetchurl { url = "http://production.cf.rubygems.org/rubygems/rubygems-${version}.tgz"; From ec7cdd95a7f0b323c11ad3ae054f812607e6d784 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 10 Dec 2016 17:42:52 +0000 Subject: [PATCH 1355/1749] direnv: 2.9.0 -> 2.10.0 --- pkgs/tools/misc/direnv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index d8b5a1e95918..596df4167438 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "direnv-${version}"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "1zi4i2ds8xkbhfcpi52hca4lcwan9gf93bdmd2vwdsry16kn3f6k"; + sha256 = "04b098i8dlr6frks67ik0kbc281c6j8lkb6v0y33iwqv45n233q3"; }; buildInputs = [ go ]; From bdab6fe5a16680adafdda6ab728065a740de177b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 10 Dec 2016 20:19:35 +0200 Subject: [PATCH 1356/1749] kernel: Use built-in dtbs_install target instead of rolling our own In particular, on aarch64 all the .dtb files will be in subdirectories and *.dtb won't match anything. --- pkgs/os-specific/linux/kernel/manual-config.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 4ab688c26af3..5f890b9b9fe6 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -129,9 +129,7 @@ let '' + (optionalString installsFirmware '' mkdir -p $out/lib/firmware '') + (if (platform ? kernelDTB && platform.kernelDTB) then '' - make $makeFlags "''${makeFlagsArray[@]}" dtbs - mkdir -p $out/dtbs - cp $buildRoot/arch/$karch/boot/dts/*.dtb $out/dtbs + make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs '' else "") + (if isModular then '' if [ -z "$dontStrip" ]; then installFlagsArray+=("INSTALL_MOD_STRIP=1") From 19b96176b46a0c5a6ef0bc4ad56e5233ca32e1c9 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Dec 2016 13:11:36 +0100 Subject: [PATCH 1357/1749] couchdb service: fix test in preStart Otherwise you'd get errors like "-f no such command". --- nixos/modules/services/databases/couchdb.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index ae0589b399e0..d4d231456c52 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -162,7 +162,7 @@ in { if [ "$(id -u)" = 0 ]; then chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}`; - (-f ${cfg.uriFile} && chown ${cfg.user}:${cfg.group} ${cfg.uriFile}) || true + (test -f ${cfg.uriFile} && chown ${cfg.user}:${cfg.group} ${cfg.uriFile}) || true chown ${cfg.user}:${cfg.group} ${cfg.databaseDir} chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir} chown ${cfg.user}:${cfg.group} ${cfg.configFile} From fafb6657c138d725948412481b4720aff0e13863 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Dec 2016 13:12:20 +0100 Subject: [PATCH 1358/1749] syslogd service: assert conflict with rsyslogd Enabling both these at the same time fails because they implement the same interface. --- nixos/modules/services/logging/syslogd.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/logging/syslogd.nix b/nixos/modules/services/logging/syslogd.nix index a0f8e89fa691..fe0b0490811d 100644 --- a/nixos/modules/services/logging/syslogd.nix +++ b/nixos/modules/services/logging/syslogd.nix @@ -100,6 +100,12 @@ in config = mkIf cfg.enable { + assertions = + [ { assertion = !config.services.rsyslogd.enable; + message = "rsyslogd conflicts with syslogd"; + } + ]; + environment.systemPackages = [ pkgs.sysklogd ]; services.syslogd.extraParams = optional cfg.enableNetworkInput "-r"; From 2a4902dd802fee13c662d4b801f4e76fd353811c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Dec 2016 15:32:17 +0100 Subject: [PATCH 1359/1749] dante service: fix config option type The type was simply str but the default is null, thus resulting in a conversion error if the user fails to declare a value. --- nixos/modules/services/networking/dante.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix index 8f4e15223ab0..a9a77f3412af 100644 --- a/nixos/modules/services/networking/dante.nix +++ b/nixos/modules/services/networking/dante.nix @@ -22,7 +22,7 @@ in config = mkOption { default = null; - type = types.str; + type = types.nullOr types.str; description = '' Contents of Dante's configuration file NOTE: user.privileged/user.unprivileged are set by the service From 4697f83984f0f1e3b58267fcef3b15b7ce60901b Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Dec 2016 15:39:25 +0100 Subject: [PATCH 1360/1749] openfire service: more informative assertion failure message Explain why the assertion fails; the user already knows that it *has* failed. --- nixos/modules/services/networking/openfire.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/openfire.nix b/nixos/modules/services/networking/openfire.nix index 454b504eda21..4059eb3db83d 100644 --- a/nixos/modules/services/networking/openfire.nix +++ b/nixos/modules/services/networking/openfire.nix @@ -34,7 +34,7 @@ with lib; assertions = singleton { assertion = !(config.services.openfire.usePostgreSQL -> config.services.postgresql.enable); - message = "OpenFire assertion failed."; + message = "OpenFire configured to use PostgreSQL but services.postgresql.enable is not enabled."; }; systemd.services.openfire = { From 230994a30a33ff131d3e39c8f2deccb1919119f9 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Dec 2016 16:38:33 +0100 Subject: [PATCH 1361/1749] psd service: assert that at least one user must be configured Using the default config, a user will experience a run-time failure. This is poor UX, assert the requirement up-front. --- nixos/modules/services/desktops/profile-sync-daemon.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix index d66ecef2385a..e3f74df3e573 100644 --- a/nixos/modules/services/desktops/profile-sync-daemon.nix +++ b/nixos/modules/services/desktops/profile-sync-daemon.nix @@ -86,6 +86,12 @@ in { }; config = mkIf cfg.enable { + assertions = [ + { assertion = cfg.users != []; + message = "services.psd.users must contain at least one user"; + } + ]; + systemd = { services = { psd = { From b69822c505e58110d3c5325776e30a1500d734e4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 10 Dec 2016 15:15:44 -0500 Subject: [PATCH 1362/1749] linux: 4.8.13 -> 4.8.14 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index 786589ca534c..b6121fbd1b41 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.13"; + version = "4.8.14"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "06sp47ivgqfnbjk73hdk70jhjh7xv3xbj1xzarch9sbj9as6cp8d"; + sha256 = "1ksszmlgb6cwqx90rn0cavg1n6xvhwn9nragwl7sha11hpbl9qw1"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07b5f4d021a0..68740ede4645 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11014,7 +11014,6 @@ in # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking # kernelPatches.cpu-cgroup-v2."4.7" kernelPatches.modinst_arg_list_too_long - kernelPatches.packet_fix_race_condition_CVE_2016_8655 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From f576c490e369b0cc785e789f15523267d98667d2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 10 Dec 2016 15:18:52 -0500 Subject: [PATCH 1363/1749] linux: 4.4.37 -> 4.4.38 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 184e420373a9..baf011a1b8e3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.37"; + version = "4.4.38"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pyfva1ld4yfzc0gyz3q4m7j6k88l813akp5hhszfg8m69bzn27d"; + sha256 = "19hn51cpyvq3igilm0xw4ivbmdah5ryah6rpkwgqly351djrxvbp"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68740ede4645..4667c90de096 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10997,7 +10997,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.4" - kernelPatches.packet_fix_race_condition_CVE_2016_8655 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From e8cd9ce8da6582b6a5ad9f527f85d1e2766d8fc1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 10 Dec 2016 15:51:06 -0500 Subject: [PATCH 1364/1749] ammonite-repl: 0.8.0 -> 0.8.1 --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index f9d3b3bfb200..74c15adc4834 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ammonite-repl-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${version}"; - sha256 = "1427p90nyizds8799nih527vixnw8qrwdih60bnd1aywz703yr7v"; + sha256 = "0xwy05yfqr1dfypka9wnm60wm0q60kmckzxfp5x79aib94f5ds51"; }; propagatedBuildInputs = [ jre ] ; From bed668c051bbaba083e4c57a14fd7c2a45cda949 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Dec 2016 16:49:45 -0600 Subject: [PATCH 1365/1749] openblas: refactor and set TARGET always --- .../science/math/openblas/default.nix | 91 +++++++++++++------ 1 file changed, 61 insertions(+), 30 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index e0e8c2686296..fbe11db165f2 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, gfortran, perl, which, config, coreutils -# Most packages depending on openblas expect integer width to match pointer width, -# but some expect to use 32-bit integers always (for compatibility with reference BLAS). +# Most packages depending on openblas expect integer width to match +# pointer width, but some expect to use 32-bit integers always +# (for compatibility with reference BLAS). , blas64 ? null }: @@ -8,22 +9,59 @@ with stdenv.lib; let blas64_ = blas64; in -let local = config.openblas.preferLocalBuild or false; - binary = - { i686-linux = "32"; - armv7l-linux = "32"; - x86_64-linux = "64"; - x86_64-darwin = "64"; - }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); - genericFlags = - [ "DYNAMIC_ARCH=${if stdenv.system == "armv7l-linux" then "0" else "1"}" - "NUM_THREADS=64" - ]; - localFlags = config.openblas.flags or - optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ]; - blas64 = if blas64_ != null then blas64_ else hasPrefix "x86_64" stdenv.system; +let + # To add support for a new platform, add an element to this set. + configs = { + armv7l-linux = { + BINARY = "32"; + TARGET = "ARMV7"; + DYNAMIC_ARCH = "0"; + CC = "gcc"; + USE_OPENMP = "1"; + }; - version = "0.2.19"; + i686-linux = { + BINARY = "32"; + TARGET = "P2"; + DYNAMIC_ARCH = "1"; + CC = "gcc"; + USE_OPENMP = "1"; + }; + + x86_64-darwin = { + BINARY = "64"; + TARGET = "ATHLON"; + DYNAMIC_ARCH = "1"; + # Note that clang is available through the stdenv on OSX and + # thus is not an explicit dependency. + CC = "clang"; + USE_OPENMP = "0"; + MACOSX_DEPLOYMENT_TARGET = "10.7"; + }; + + x86_64-linux = { + BINARY = "64"; + TARGET = "ATHLON"; + DYNAMIC_ARCH = "1"; + CC = "gcc"; + USE_OPENMP = "1"; + }; + }; +in + +let + config = + configs.${stdenv.system} + or (throw "unsupported system: ${stdenv.system}"); +in + +let + blas64 = + if blas64_ != null + then blas64_ + else hasPrefix "x86_64" stdenv.system; + + version = "0.2.19"; in stdenv.mkDerivation { name = "openblas-${version}"; @@ -46,29 +84,22 @@ stdenv.mkDerivation { "stackprotector" "pic" # don't alter index arithmetic "strictoverflow" - # don't interfere with dynamic target detection. + # don't interfere with dynamic target detection "relro" "bindnow" ]; - nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl which]; + nativeBuildInputs = + [gfortran perl which] + ++ optionals stdenv.isDarwin [coreutils]; makeFlags = - (if local then localFlags else genericFlags) - ++ - optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.7"] - ++ [ "FC=gfortran" - # Note that clang is available through the stdenv on OSX and - # thus is not an explicit dependency. - "CC=${if stdenv.isDarwin then "clang" else "gcc"}" ''PREFIX="''$(out)"'' - "BINARY=${binary}" - "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}" + "NUM_THREADS=64" "INTERFACE64=${if blas64 then "1" else "0"}" ] - ++ - optionals (stdenv.system == "armv7l-linux") ["TARGET=ARMV7"]; + ++ mapAttrsToList (var: val: var + "=" + val) config; doCheck = true; checkTarget = "tests"; From f9281609aef096cac905cd1081aacc9193ad273f Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 11 Dec 2016 00:22:25 +0000 Subject: [PATCH 1366/1749] afl: 2.23b -> 2.35b --- pkgs/tools/security/afl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index eac593e00767..d07396319d8d 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "afl-${version}"; - version = "2.23b"; + version = "2.35b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "152pqrc0py6jk1i3pwn2k928bsgax0d4yavpa3ca29bmrbzpnadh"; + sha256 = "1smwc3j0mrpnhqq7li2ry42fxcmq3q2kl568dpq9r9npg996fqar"; }; # Note: libcgroup isn't needed for building, just for the afl-cgroup From 63dbcdbdb9e0d6826bc54757867e1e957023c3e7 Mon Sep 17 00:00:00 2001 From: Alexei Boronine Date: Fri, 9 Dec 2016 17:12:03 +0800 Subject: [PATCH 1367/1749] mbedtls: 2.3.0 -> 2.4.0 --- pkgs/development/libraries/mbedtls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index fab18516168d..ebab4850be46 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.3.0"; + name = "mbedtls-2.4.0"; src = fetchurl { url = "https://tls.mbed.org/download/${name}-gpl.tgz"; - sha256 = "0jfb20crlcp67shp9p8cy6vmwdjkxb0rqfbi5l5yggbrywa708r1"; + sha256 = "0gwyxsz7av8fyzrz4zxhcy9jmszlvg9zskz3srar75lg0bhg1vw0"; }; nativeBuildInputs = [ perl ]; From 9aca55e79d62468ef230350026b41947d0472309 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 9 Dec 2016 00:02:44 +0000 Subject: [PATCH 1368/1749] endless sky: init at 0.9.4 --- lib/maintainers.nix | 1 + pkgs/games/endless-sky/default.nix | 46 ++++++++++++++++++++++++++++++ pkgs/games/endless-sky/fixes.patch | 45 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 4 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 pkgs/games/endless-sky/default.nix create mode 100644 pkgs/games/endless-sky/fixes.patch diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b56dce798201..8a3584b0b8d0 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -242,6 +242,7 @@ leonardoce = "Leonardo Cecchi "; lethalman = "Luca Bruno "; lewo = "Antoine Eiche "; + lheckemann = "Linus Heckemann "; lhvwb = "Nathaniel Baxter "; lihop = "Leroy Hopson "; linquize = "Linquize "; diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix new file mode 100644 index 000000000000..f993ad1b8e09 --- /dev/null +++ b/pkgs/games/endless-sky/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub +, SDL2, libpng, libjpeg, glew, openal, scons +}: + +let + version = "0.9.4"; + +in +stdenv.mkDerivation rec { + name = "endless-sky-${version}"; + + src = fetchFromGitHub { + owner = "endless-sky"; + repo = "endless-sky"; + rev = "v${version}"; + sha256 = "1mirdcpap0a280j472lhmhqg605b7glvdr4l93qcapk8an8d46m7"; + }; + + enableParallelBuilding = true; + + buildInputs = [ + SDL2 libpng libjpeg glew openal scons + ]; + + patches = [ + ./fixes.patch + ]; + + buildPhase = '' + scons -j$NIX_BUILD_CORES PREFIX="$out" + ''; + + installPhase = '' + scons -j$NIX_BUILD_CORES install PREFIX="$out" + ''; + + meta = with stdenv.lib; { + description = "A sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control"; + homepage = "https://endless-sky.github.io/"; + license = with licenses; [ + gpl3Plus cc-by-sa-30 cc-by-sa-40 publicDomain + ]; + maintainers = with maintainers; [ lheckemann ]; + platforms = with platforms; allBut darwin; + }; +} diff --git a/pkgs/games/endless-sky/fixes.patch b/pkgs/games/endless-sky/fixes.patch new file mode 100644 index 000000000000..cad7a6acaed0 --- /dev/null +++ b/pkgs/games/endless-sky/fixes.patch @@ -0,0 +1,45 @@ +diff --git a/SConstruct b/SConstruct +index 48fd080..419b40d 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1,7 +1,7 @@ + import os + + # Load any environment variables that alter the build. +-env = Environment() ++env = Environment(ENV = os.environ) + if 'CCFLAGS' in os.environ: + env.Append(CCFLAGS = os.environ['CCFLAGS']) + if 'CXXFLAGS' in os.environ: +@@ -55,7 +55,7 @@ sky = env.Program("endless-sky", Glob("build/" + env["mode"] + "/*.cpp")) + + + # Install the binary: +-env.Install("$DESTDIR$PREFIX/games", sky) ++env.Install("$DESTDIR$PREFIX/bin", sky) + + # Install the desktop file: + env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") +diff --git a/source/Files.cpp b/source/Files.cpp +index c8c8957..d196459 100644 +--- a/source/Files.cpp ++++ b/source/Files.cpp +@@ -114,15 +114,9 @@ void Files::Init(const char * const *argv) + if(resources.back() != '/') + resources += '/'; + #if defined __linux__ || defined __FreeBSD__ || defined __DragonFly__ +- // Special case, for Linux: the resource files are not in the same place as +- // the executable, but are under the same prefix (/usr or /usr/local). +- static const string LOCAL_PATH = "/usr/local/"; +- static const string STANDARD_PATH = "/usr/"; +- static const string RESOURCE_PATH = "share/games/endless-sky/"; +- if(!resources.compare(0, LOCAL_PATH.length(), LOCAL_PATH)) +- resources = LOCAL_PATH + RESOURCE_PATH; +- else if(!resources.compare(0, STANDARD_PATH.length(), STANDARD_PATH)) +- resources = STANDARD_PATH + RESOURCE_PATH; ++ // Workaround for NixOS. Not sure how to proceed with other OSes, feedback ++ // is welcome. ++ resources += "../share/games/endless-sky/"; + #elif defined __APPLE__ + // Special case for Mac OS X: the resources are in ../Resources relative to + // the folder the binary is in. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 910df7d74af7..1aab12d22887 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1550,7 +1550,6 @@ in emscriptenStdenv = stdenv // { mkDerivation = buildEmscriptenPackage; }; - efibootmgr = callPackage ../tools/system/efibootmgr { }; efivar = callPackage ../tools/system/efivar { }; @@ -15662,6 +15661,8 @@ in egoboo = callPackage ../games/egoboo { }; + endless-sky = callPackage ../games/endless-sky { }; + eternity = callPackage ../games/eternity-engine { }; extremetuxracer = callPackage ../games/extremetuxracer { From 21449c23cbbaadfcc0066d5dc320b4bd3f06bc14 Mon Sep 17 00:00:00 2001 From: Marti Serra Date: Sun, 11 Dec 2016 12:47:48 +0100 Subject: [PATCH 1369/1749] steam: added java and steam-run to documentation, removed patchelf info --- doc/package-notes.xml | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index de148ec5739f..0a4c746c3715 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -418,7 +418,7 @@ it. Place the resulting package.nix file into chroot environment, as documented here. This allows us to have binaries in the expected paths without disrupting the system, - and to avoid patching them. + and to avoid patching them to work in a non FHS environment. @@ -464,7 +464,6 @@ it. Place the resulting package.nix file into or because they cannot be patched.The steps to launch a game directly are: - Patch the script/binary if you can. Add a file named steam_appid.txt in the binary folder, with the appid as contents (it can be found in the stdout from steam). @@ -501,14 +500,18 @@ libGL error: failed to load driver: swrast steam.sh: line 713: 7842 Segmentation fault (core dumped) have a look at this pull request. + - Known issues + Java - No java in steam chrootenv. Games affected: Towns: + There is no java in steam chrootenv by default. If you get a message like /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found + You need to add + steam.override { withJava = true; }; + to your configuration. @@ -517,6 +520,23 @@ libGL error: failed to load driver: swrast +
+ +steam-run + +The FHS-compatible chroot used for steam can also be used to run +other linux games that expect a FHS environment. +To do it, add +pkgs.(steam.override { + nativeOnly = true; + newStdcpp = true; + }).run +to your configuration, rebuild, and run the game with +steam-run ./foo + + +
+ From 915c93c69e8fa15daf9731bcde9e8534b50d7fdf Mon Sep 17 00:00:00 2001 From: schneefux Date: Sat, 10 Dec 2016 19:33:19 +0100 Subject: [PATCH 1370/1749] nextcloud: 10.0.1 -> 10.0.2 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index bcbda0d5c09e..91ecda2e8c7b 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "10.0.1"; + version = "10.0.2"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "09cbjxsr6sdjrq37rmwmg6r1x3625bqcrd37ja6cmmrgy0l2lh9r"; + sha256 = "0g0h6yyy712mpyqzxa9azqlkgiw9hplv88xv0r7lh4w4fwcai1x6"; }; installPhase = '' From a3e503fe0f3baa0d8cb935cac9e1c6e50aefbbef Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 11 Dec 2016 21:07:18 +0900 Subject: [PATCH 1371/1749] firefox-bin: fix updateScript --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index d828a5486fd6..b768bfd61115 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -223,7 +223,7 @@ stdenv.mkDerivation { tr " " ":"`; do # create an entry for every locale cat >> $tmpfile < Date: Sun, 11 Dec 2016 13:17:49 +0100 Subject: [PATCH 1372/1749] httpie: 0.9.6 -> 0.9.8 --- pkgs/tools/networking/httpie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index a5c7353905b4..fe30fd949675 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "httpie-0.9.6"; + name = "httpie-0.9.8"; namePrefix = ""; src = fetchurl { url = "mirror://pypi/h/httpie/${name}.tar.gz"; - sha256 = "1cch5y0hr9qpfn9m4nw5796c2x7v3m1ni4psjm26ajsl8pw90jx6"; + sha256 = "1qgn1mpkk8wxxhvgxw3fnscqg3klh42ijr11zrb0ylriaaqp0n2i"; }; propagatedBuildInputs = with pythonPackages; [ pygments requests2 ]; @@ -17,6 +17,6 @@ pythonPackages.buildPythonApplication rec { description = "A command line HTTP client whose goal is to make CLI human-friendly"; homepage = http://httpie.org/; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ antono relrod ]; + maintainers = with stdenv.lib.maintainers; [ antono relrod schneefux ]; }; } From db36c44f1b198dc971d08e91dd899c08741b899c Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sun, 11 Dec 2016 14:03:28 +0100 Subject: [PATCH 1373/1749] gsl: 2.2 -> 2.3 (#21058) See https://lists.gnu.org/archive/html/info-gnu/2016-12/msg00005.html for release announcement --- pkgs/development/libraries/gsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 82e41329e001..d130a328dbaf 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,11 @@ { fetchurl, fetchpatch, stdenv }: stdenv.mkDerivation rec { - name = "gsl-2.2"; + name = "gsl-2.3"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "1pyq2c0j91z955746myn29c89jwkd435s2cbj8ks2hpag6d0mr2d"; + sha256 = "1yxdzqjwmi2aid650fa9zyr8llw069x7lm489wx9nnfdi6vh09an"; }; patches = [ From 2fb4874453ca83f0fa50f932885e82329ef198df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Deest?= Date: Sun, 11 Dec 2016 13:59:44 +0100 Subject: [PATCH 1374/1749] isl: 0.15 -> 0.17.1 Oups. --- pkgs/development/libraries/isl/0.17.1.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/isl/0.17.1.nix diff --git a/pkgs/development/libraries/isl/0.17.1.nix b/pkgs/development/libraries/isl/0.17.1.nix new file mode 100644 index 000000000000..2136969c0752 --- /dev/null +++ b/pkgs/development/libraries/isl/0.17.1.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, gmp }: + +stdenv.mkDerivation rec { + name = "isl-0.17.1"; + + src = fetchurl { + url = "http://isl.gforge.inria.fr/${name}.tar.xz"; + sha256 = "be152e5c816b477594f4c6194b5666d8129f3a27702756ae9ff60346a8731647"; + }; + + buildInputs = [ gmp ]; + + enableParallelBuilding = true; + + meta = { + homepage = http://www.kotnet.org/~skimo/isl/; + license = stdenv.lib.licenses.lgpl21; + description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1aab12d22887..0e55316829fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2271,11 +2271,12 @@ in ised = callPackage ../tools/misc/ised {}; - isl = isl_0_15; + isl = isl_0_17; isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { }; isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { }; isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { }; isl_0_15 = callPackage ../development/libraries/isl/0.15.0.nix { }; + isl_0_17 = callPackage ../development/libraries/isl/0.17.1.nix { }; ispike = callPackage ../development/libraries/science/robotics/ispike { }; From 873e81833973d9ec4e1e54a29a7155e516268704 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Dec 2016 14:54:23 +0100 Subject: [PATCH 1375/1749] docker-machine: add bash completion --- .../networking/cluster/docker-machine/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index 62dbbcf21495..d714033e4125 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -14,6 +14,11 @@ buildGoPackage rec { sha256 = "0l4a5bqfw8i8wrl5yzkqy848r7vdx6hw8p5m3z3vzabvsmsjjwy7"; }; + postInstall = '' + mkdir -p $bin/share/bash-completion/completions/ + cp go/src/github.com/docker/machine/contrib/completion/bash/* $bin/share/bash-completion/completions/ + ''; + postFixup = '' mv $bin/bin/cmd $bin/bin/docker-machine ''; From ef24c93f729c1d39b037ede858e00f9052293315 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Dec 2016 14:56:25 +0100 Subject: [PATCH 1376/1749] kubernetes: add bash completions --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 46f5d7fa50ac..38458a574d59 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -40,11 +40,13 @@ stdenv.mkDerivation rec { postBuild = "(cd build/pause && gcc pause.c -o pause)"; installPhase = '' - mkdir -p "$out/bin" "$man/share/man" "$pause/bin" + mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$man/share/man" "$pause/bin" cp _output/local/go/bin/* "$out/bin/" cp build/pause/pause "$pause/bin/pause" cp -R docs/man/man1 "$man/share/man" + + $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl ''; preFixup = '' From c316dd1cc7386a6eb8fa8dcdaf4e592214519561 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Dec 2016 14:57:02 +0100 Subject: [PATCH 1377/1749] minikube: add bash completions --- pkgs/applications/networking/cluster/minikube/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 857e8e72d12b..2fe9db267655 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -30,6 +30,9 @@ stdenv.mkDerivation rec { installPhase = '' cp $src $out/bin/${pname} chmod +x $out/bin/${pname} + + mkdir -p $out/share/bash-completion/completions/ + HOME=$(pwd) $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube ''; meta = with stdenv.lib; { From 6d15619729b4024fba39276c5046829c79fc4dcf Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Dec 2016 15:04:00 +0100 Subject: [PATCH 1378/1749] kubernetes: generate docs, fix empty man files --- .../networking/cluster/kubernetes/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 46f5d7fa50ac..964e41b70c81 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -28,16 +28,23 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper which go rsync go-bindata ]; - outputs = ["out" "man""pause"]; + outputs = ["out" "man" "pause"]; postPatch = '' substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" + substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" + substituteInPlace "hack/update-munge-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" + substituteInPlace "hack/update-munge-docs.sh" --replace "kube::util::git_upstream_remote_name" "echo origin" + patchShebangs ./hack ''; WHAT="--use_go_build ${concatStringsSep " " components}"; - postBuild = "(cd build/pause && gcc pause.c -o pause)"; + postBuild = '' + ./hack/generate-docs.sh + (cd build/pause && gcc pause.c -o pause) + ''; installPhase = '' mkdir -p "$out/bin" "$man/share/man" "$pause/bin" From 3097782fff24aa97992a37d37645b1197ba57809 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Dec 2016 15:05:37 +0100 Subject: [PATCH 1379/1749] vault: 0.6.1 -> 0.6.3 --- pkgs/tools/security/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 9118bd3c18fb..acd71017a4ee 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "vault-${version}"; - version = "0.6.1"; + version = "0.6.3"; goPackagePath = "github.com/hashicorp/vault"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "06xf2dpn0q398qb6wbh9j1wjl5smqq9nrrn2039g48haqm8853jx"; + sha256 = "0cbaws106v5dxqjii1s9rmk55pm6y34jls35iggpx0pp1dd433xy"; }; buildFlagsArray = '' From fe89c5490395797700ebc4af599340c00b06e0d0 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Dec 2016 15:06:04 +0100 Subject: [PATCH 1380/1749] vault: add offline as maintainer --- pkgs/tools/security/vault/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index acd71017a4ee..85c3625ad468 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -22,6 +22,6 @@ buildGoPackage rec { homepage = https://www.vaultproject.io; description = "A tool for managing secrets"; license = licenses.mpl20; - maintainers = [ maintainers.rushmorem ]; + maintainers = with maintainers; [ rushmorem offline ]; }; } From a50fc480c3204c367049ba137f55ab5cb9029e3f Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Dec 2016 14:57:49 +0100 Subject: [PATCH 1381/1749] nodejs: add bash completions for npm --- pkgs/development/web/nodejs/nodejs.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index eccdffab4c6e..0b6ec87f00aa 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -58,6 +58,11 @@ in postInstall = '' paxmark m $out/bin/node PATH=$out/bin:$PATH patchShebangs $out + + ${optionalString enableNpm '' + mkdir -p $out/share/bash-completion/completions/ + $out/bin/npm completion > $out/share/bash-completion/completions/npm + ''} ''; meta = { From a979297a9634fe05eba817fa13456ed74f56169e Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Dec 2016 14:59:14 +0100 Subject: [PATCH 1382/1749] valut: add bash completions --- pkgs/tools/security/vault/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 9118bd3c18fb..fedd3ebab2c8 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,6 +1,13 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +let + vaultBashCompletions = fetchFromGitHub { + owner = "iljaweis"; + repo = "vault-bash-completion"; + rev = "62c142e20929f930c893ebe3366350d735e81fbd"; + sha256 = "0nfv10ykjq9751ijdyq728gjlgldm1lxvrar8kf6nz6rdfnnl2n5"; + }; +in buildGoPackage rec { name = "vault-${version}"; version = "0.6.1"; @@ -18,6 +25,11 @@ buildGoPackage rec { -X github.com/hashicorp/vault/version.GitCommit=${version} ''; + postInstall = '' + mkdir -p $bin/share/bash-completion/completions/ + cp ${vaultBashCompletions}/vault-bash-completion.sh $bin/share/bash-completion/completions/vault + ''; + meta = with stdenv.lib; { homepage = https://www.vaultproject.io; description = "A tool for managing secrets"; From f70e385fb601a236e33c394f6f6ec2c1f8e08cc9 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Dec 2016 15:00:16 +0100 Subject: [PATCH 1383/1749] pythonPackages.docker-compose: add bash completions --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 31745e5380ac..5956b144b0a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10948,6 +10948,11 @@ in { sed -i "s/'requests >= 2.6.1, < 2.8'/'requests'/" setup.py ''; + postInstall = '' + mkdir -p $out/share/bash-completion/completions/ + cp contrib/completion/bash/docker-compose $out/share/bash-completion/completions/docker-compose + ''; + meta = { homepage = "https://docs.docker.com/compose/"; description = "Multi-container orchestration for Docker"; From 00befaff7e08069df13f949aa7c0210e55e607f5 Mon Sep 17 00:00:00 2001 From: Alexei Boronine Date: Fri, 9 Dec 2016 17:16:27 +0800 Subject: [PATCH 1384/1749] neko: 2.0.0 -> 2.1.0 --- pkgs/development/compilers/neko/default.nix | 57 +++++++++------------ 1 file changed, 23 insertions(+), 34 deletions(-) diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index a036e7e6939f..198557f6fcc1 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,50 +1,39 @@ -{ stdenv, fetchurl, fetchpatch, boehmgc, zlib, sqlite, pcre }: +{ stdenv, fetchurl, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig +, git, apacheHttpd, apr, aprutil, mariadb, mbedtls, openssl, pkgs, gtk2 +}: stdenv.mkDerivation rec { name = "neko-${version}"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "http://nekovm.org/_media/neko-${version}.tar.gz"; - sha256 = "1lcm1ahbklfpd5lnqjwmvyj2vr85jbq57hszk5jgq0x6yx6p3927"; + url = "http://nekovm.org/media/neko-${version}-src.tar.gz"; + sha256 = "15ng9ad0jspnhj38csli1pvsv3nxm75f0nlps7i10194jvzdb4qc"; }; - patches = stdenv.lib.singleton (fetchpatch { - url = "https://github.com/HaxeFoundation/neko/commit/" - + "ccc78c29deab7971e1369f4fe3dedd14cf9f3128.patch"; - sha256 = "1nya50rzai15hmpq2azganjxzgrfydf30glfwirgw6q8z7z3wpkq"; - }); + buildInputs = + [ boehmgc zlib sqlite pcre cmake pkgconfig git apacheHttpd apr aprutil + mariadb.client mbedtls openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security + pkgs.darwin.apple_sdk.frameworks.Carbon] + ++ stdenv.lib.optional stdenv.isLinux gtk2; - prePatch = with stdenv.lib; let - libs = concatStringsSep "," (map (lib: "\"${lib.dev}/include\"") buildInputs); - in '' - sed -i -e '/^search_includes/,/^}/c \ - search_includes = function(_) { return $array(${libs}) } - ' src/tools/install.neko - sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' \ - vm/load.c - # temporarily, fixed in 1.8.3 - sed -i -e 's/^#if defined(_64BITS)/& || defined(__x86_64__)/' vm/neko.h - - for disabled_mod in mod_neko{,2} mod_tora{,2} mysql ui; do - sed -i -e '/^libs/,/^}/{/^\s*'"$disabled_mod"'\s*=>/,/^\s*}/d}' \ - src/tools/install.neko - done + prePatch = '' + sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' vm/load.c + ''; + + checkPhase = '' + bin/neko bin/test.n ''; - makeFlags = "INSTALL_PREFIX=$(out)"; - buildInputs = [ boehmgc zlib sqlite pcre ]; dontStrip = true; - preInstall = '' - install -vd "$out/lib" "$out/bin" - ''; - - meta = { + meta = with stdenv.lib; { description = "A high-level dynamically typed programming language"; homepage = http://nekovm.org; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl21; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux ++ platforms.darwin; }; } + From b8984954ff0e9bc7ea92891dcb0e44757004d70d Mon Sep 17 00:00:00 2001 From: Marti Serra Date: Sun, 11 Dec 2016 16:57:28 +0100 Subject: [PATCH 1385/1749] steam: removed unuseful section from documentation --- doc/package-notes.xml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 0a4c746c3715..0ba7ec4c44d4 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -457,29 +457,6 @@ it. Place the resulting package.nix file into to see what is causing steam to fail. - - Game X fails to start - Games may fail to start because they lack - dependencies (this should be added to the script, for now), - or because they cannot be patched.The steps to launch a game - directly are: - - Add a file named steam_appid.txt in - the binary folder, with the appid as contents (it can be found in the - stdout from steam). - Using the LD_LIBRARY_PATH from the nix/store steam script, - with some additions, launch the game binary: - LD_LIBRARY_PATH=~/.steam/bin32:$LD_LIBRARY_PATH:/nix/store/pfsa... blabla ...curl-7.29.0/lib:. ./Osmos.bin3 - (if you could not patchelf the game, call ld.so directly - with the binary as param). With this technique, I can play many games - directly from steam. Others, like Team Fortress, cannot be patched - so I only managed to run them from the cmd line. - - - - - - Using the FOSS Radeon drivers From b2278ae3c8a7b8ef6dd976df9c0c0600b1baa038 Mon Sep 17 00:00:00 2001 From: Richard Lupton Date: Sun, 11 Dec 2016 15:19:20 +0000 Subject: [PATCH 1386/1749] helm (kubernetes): init at v2.0.2 Added a nix expression to download and install helm; added it to top level packages as kubernetes_helm. --- .../networking/cluster/helm/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/networking/cluster/helm/default.nix diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix new file mode 100644 index 000000000000..6cd751f970d8 --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, kubernetes }: +let + arch = if stdenv.isLinux + then "linux-amd64" + else "darwin-amd64"; + checksum = if stdenv.isLinux + then "dad3791fb07e6cf34f4cf611728cb8ae109a75234498a888529a68ac6923f200" + else "d27bd7e40e12c0a5f08782a8a883166008565b28e0b82126d2089300ff3f8465"; +in +stdenv.mkDerivation rec { + pname = "helm"; + version = "2.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://kubernetes-helm.storage.googleapis.com/helm-v${version}-${arch}.tar.gz"; + sha256 = "${checksum}"; + }; + + buildInputs = [ ]; + + propagatedBuildInputs = [ kubernetes ]; + + phases = [ "buildPhase" "installPhase" ]; + + buildPhase = '' + mkdir -p $out/bin + ''; + + installPhase = '' + tar -xvzf $src + cp ${arch}/helm $out/bin/${pname} + chmod +x $out/bin/${pname} + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/kubernetes/helm; + description = "A package manager for kubernetes"; + license = licenses.asl20; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1aab12d22887..ea0457d9cb0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13341,6 +13341,8 @@ in hello = callPackage ../applications/misc/hello { }; + kubernetes_helm = callPackage ../applications/networking/cluster/helm { }; + helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; heme = callPackage ../applications/editors/heme { }; From 484e5f5152109f8e8f8d5bdfd997d4364952dfbd Mon Sep 17 00:00:00 2001 From: montag451 Date: Sun, 11 Dec 2016 16:58:13 +0100 Subject: [PATCH 1387/1749] pytun: init at 2.2.1 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 31745e5380ac..7a8a9cc1cfde 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9114,6 +9114,29 @@ in { }; + pytun = buildPythonPackage rec { + name = "pytun-${version}"; + version = "2.2.1"; + rev = "v${version}"; + + src = pkgs.fetchFromGitHub { + inherit rev; + owner = "montag451"; + repo = "pytun"; + sha256 = "1bxk0z0v8m0b01xg94f039j3bsclkshb7girvjqfzk5whbd2nryh"; + }; + + doCheck = false; + + meta = { + homepage = https://github.com/montag451/pytun; + description = "Linux TUN/TAP wrapper for Python"; + license = licenses.mit; + maintainers = with maintainers; [ montag451 ]; + platforms = platforms.linux; + }; + }; + raven = buildPythonPackage rec { name = "raven-3.4.1"; From 23064168ee1e0f24e9383f3df30661180ec31b9c Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Dec 2016 15:05:37 +0100 Subject: [PATCH 1388/1749] vault: 0.6.1 -> 0.6.3 --- pkgs/tools/security/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 9118bd3c18fb..acd71017a4ee 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "vault-${version}"; - version = "0.6.1"; + version = "0.6.3"; goPackagePath = "github.com/hashicorp/vault"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "06xf2dpn0q398qb6wbh9j1wjl5smqq9nrrn2039g48haqm8853jx"; + sha256 = "0cbaws106v5dxqjii1s9rmk55pm6y34jls35iggpx0pp1dd433xy"; }; buildFlagsArray = '' From af5be37ed5bcbf47deb7577895db9fd1b09173aa Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Dec 2016 15:06:04 +0100 Subject: [PATCH 1389/1749] vault: add offline as maintainer --- pkgs/tools/security/vault/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index acd71017a4ee..85c3625ad468 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -22,6 +22,6 @@ buildGoPackage rec { homepage = https://www.vaultproject.io; description = "A tool for managing secrets"; license = licenses.mpl20; - maintainers = [ maintainers.rushmorem ]; + maintainers = with maintainers; [ rushmorem offline ]; }; } From 6107b8932117b722eeb52c6c715f27d7132f388f Mon Sep 17 00:00:00 2001 From: montag451 Date: Sun, 11 Dec 2016 16:58:13 +0100 Subject: [PATCH 1390/1749] pytun: init at 2.2.1 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 31745e5380ac..7a8a9cc1cfde 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9114,6 +9114,29 @@ in { }; + pytun = buildPythonPackage rec { + name = "pytun-${version}"; + version = "2.2.1"; + rev = "v${version}"; + + src = pkgs.fetchFromGitHub { + inherit rev; + owner = "montag451"; + repo = "pytun"; + sha256 = "1bxk0z0v8m0b01xg94f039j3bsclkshb7girvjqfzk5whbd2nryh"; + }; + + doCheck = false; + + meta = { + homepage = https://github.com/montag451/pytun; + description = "Linux TUN/TAP wrapper for Python"; + license = licenses.mit; + maintainers = with maintainers; [ montag451 ]; + platforms = platforms.linux; + }; + }; + raven = buildPythonPackage rec { name = "raven-3.4.1"; From 0783a7d262a929cc1e00ae9049095a17cb1dc662 Mon Sep 17 00:00:00 2001 From: Richard Lupton Date: Sun, 11 Dec 2016 16:08:24 +0000 Subject: [PATCH 1391/1749] helm (kubernetes): init at v2.0.2 Added self as package maintainer. Set preferLocalBuild. --- lib/maintainers.nix | 1 + pkgs/applications/networking/cluster/helm/default.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8a3584b0b8d0..282588569170 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -384,6 +384,7 @@ retrry = "Tadas Barzdžius "; rick68 = "Wei-Ming Yang "; rickynils = "Rickard Nilsson "; + rlupton20 = "Richard Lupton "; rnhmjoj = "Michele Guerini Rocco "; rob = "Rob Vermaas "; robberer = "Longrin Wischnewski "; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 6cd751f970d8..58ac31ce49f5 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "${checksum}"; }; + preferLocalBuild = true; + buildInputs = [ ]; propagatedBuildInputs = [ kubernetes ]; @@ -37,6 +39,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/kubernetes/helm; description = "A package manager for kubernetes"; license = licenses.asl20; + maintainers = [ maintainers.rlupton20 ]; platforms = platforms.linux ++ platforms.darwin; }; } From 0a8409855558a895699dcd076604ec5e33ad578c Mon Sep 17 00:00:00 2001 From: Richard Lupton Date: Sun, 11 Dec 2016 16:20:51 +0000 Subject: [PATCH 1392/1749] helm (kubernetes): init at v2.0.2 Changed package name to kubernetes-helm. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea0457d9cb0f..be30875f1377 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13341,7 +13341,7 @@ in hello = callPackage ../applications/misc/hello { }; - kubernetes_helm = callPackage ../applications/networking/cluster/helm { }; + kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; From 2d4637f96f11cd77a89275aac23c12cbb7e09fec Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 11 Dec 2016 17:55:09 +0100 Subject: [PATCH 1393/1749] intel-gpu-tools: 1.16 -> 1.17 --- .../tools/misc/intel-gpu-tools/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 5ecc0421c361..e7520091d1d9 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev -, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3 }: +, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod +, procps }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.16"; + name = "intel-gpu-tools-1.17"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "1q9sfb15081zm1rq4z67sfj13ryvbdha4fa6pdzdsfd9261nvgn6"; + sha256 = "06pvmbsbff4bsi67n6x3jjngzy2llf8bplc75447ra1fwphc9jx6"; }; - buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 - libXext libXv libXrandr glib bison libunwind python3 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod + libXext libXv libXrandr glib bison libunwind python3 procps ]; preBuild = '' patchShebangs debugger/system_routine/pre_cpp.py From 729b21adbbcef5672dbffe9eef885211dd945697 Mon Sep 17 00:00:00 2001 From: Alexei Boronine Date: Mon, 12 Dec 2016 01:11:24 +0800 Subject: [PATCH 1394/1749] neko: set cmake flag -DRUN_LDCONFIG=OFF --- pkgs/development/compilers/neko/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 198557f6fcc1..e028436263dc 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { buildInputs = [ boehmgc zlib sqlite pcre cmake pkgconfig git apacheHttpd apr aprutil mariadb.client mbedtls openssl ] + ++ stdenv.lib.optional stdenv.isLinux gtk2 ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security - pkgs.darwin.apple_sdk.frameworks.Carbon] - ++ stdenv.lib.optional stdenv.isLinux gtk2; - + pkgs.darwin.apple_sdk.frameworks.Carbon]; + cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ]; prePatch = '' sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' vm/load.c ''; From 87f0ad66bf395cffaa87094e7ca0fb3e776efc5e Mon Sep 17 00:00:00 2001 From: Alexei Boronine Date: Mon, 12 Dec 2016 01:33:01 +0800 Subject: [PATCH 1395/1749] Add patches referenced in neko issue 131 --- pkgs/development/compilers/neko/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index e028436263dc..493748d369b7 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -11,6 +11,21 @@ stdenv.mkDerivation rec { sha256 = "15ng9ad0jspnhj38csli1pvsv3nxm75f0nlps7i10194jvzdb4qc"; }; + # Patches backported with reference to https://github.com/HaxeFoundation/neko/issues/131 + # They can probably be removed when bumping to next version + patches = [ + (fetchpatch { + url = "https://github.com/HaxeFoundation/neko/commit/" + + "a8c71ad97faaccff6c6e9e09eba2d5efd022f8dc.patch"; + sha256 = "0mnx15cdjs8mnl01mhc9z2gpzh4d1q0ygqnjackrqxz6x235ydyp"; + }) + (fetchpatch { + url = "https://github.com/HaxeFoundation/neko/commit/" + + "fe87462d9c7a6ee27e28f5be5e4fc0ac87b34574.patch"; + sha256 = "1jbmq6j32vg3qv20dbh82cp54886lgrh7gkcqins8a2y4l4dl3sc"; + }) + ]; + buildInputs = [ boehmgc zlib sqlite pcre cmake pkgconfig git apacheHttpd apr aprutil mariadb.client mbedtls openssl ] From b871a208e57c8131b79059d4eb29413c3e14f31d Mon Sep 17 00:00:00 2001 From: montag451 Date: Sat, 10 Dec 2016 17:27:55 +0100 Subject: [PATCH 1396/1749] aptly: add bash completion --- pkgs/tools/misc/aptly/default.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index a39b4247109b..ccb13f2e42ca 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -1,17 +1,31 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg1compat, bzip2, xz, graphviz }: -buildGoPackage rec { - name = "aptly-${version}"; +let + version = "0.9.7"; rev = "v${version}"; - src = fetchFromGitHub { + aptlySrc = fetchFromGitHub { inherit rev; owner = "smira"; repo = "aptly"; sha256 = "0j1bmqdah4i83r2cf8zcq87aif1qg90yasgf82yygk3hj0gw1h00"; }; + aptlyCompletionSrc = fetchFromGitHub { + rev = version; + owner = "aptly-dev"; + repo = "aptly-bash-completion"; + sha256 = "1yz3pr2jfczqv81as2q3cizwywj5ksw76vi15xlbx5njkjp4rbm4"; + }; + +in + +buildGoPackage { + name = "aptly-${version}"; + + src = aptlySrc; + goPackagePath = "github.com/smira/aptly"; goDeps = ./deps.nix; @@ -19,6 +33,8 @@ buildGoPackage rec { postInstall = '' rm $bin/bin/man + mkdir -p $bin/share/bash-completion/completions + ln -s ${aptlyCompletionSrc}/aptly $bin/share/bash-completion/completions wrapProgram "$bin/bin/aptly" \ --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat bzip2 xz graphviz ]}" ''; From 374f833dab7655b670697b3764319bf0a053d31a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 11 Dec 2016 12:53:51 -0500 Subject: [PATCH 1397/1749] google-chrome: Add new dep on libxcb --- .../networking/browsers/google-chrome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 531c5a7cf3d0..2863a5950175 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -2,7 +2,7 @@ # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr -, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite +, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups , dbus_libs, gtk2, gdk_pixbuf, gcc @@ -42,7 +42,7 @@ let deps = [ stdenv.cc.cc glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr - libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite + libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb alsaLib libXdamage libXtst libXrandr expat cups dbus_libs gtk2 gdk_pixbuf gcc systemd From 601058e0e23322995e0ca05813247dfd8514f060 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 11 Dec 2016 19:07:26 +0100 Subject: [PATCH 1398/1749] grsecurity: 4.8.13-201612082118 -> 4.8.14-201612110933 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index 786589ca534c..b6121fbd1b41 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.13"; + version = "4.8.14"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "06sp47ivgqfnbjk73hdk70jhjh7xv3xbj1xzarch9sbj9as6cp8d"; + sha256 = "1ksszmlgb6cwqx90rn0cavg1n6xvhwn9nragwl7sha11hpbl9qw1"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 66f03edbdf2b..7e49cf17090c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -89,9 +89,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.13"; - grrev = "201612082118"; - sha256 = "0cvw6sbinzlcxap8mf934ksgksgdd8w8pf8jfp82fbyiz53klfn1"; + { kver = "4.8.14"; + grrev = "201612110933"; + sha256 = "1sm4nr9g5vpwlhm6a567arrjyrfr77bzjspbafg5nfjlbj7apkym"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 50d63e1e3f01451c34923e6ea9d67ae1a1d183c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 11 Dec 2016 18:06:40 +0100 Subject: [PATCH 1399/1749] libxslt: add option to enable crypto support --- pkgs/development/libraries/libxslt/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index ebad3fd3eb16..7798c806982b 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs -, python2, pythonSupport ? (! stdenv ? cross) +{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2 +, cryptoSupport ? false +, pythonSupport ? (! stdenv ? cross) }: assert pythonSupport -> python2 != null; assert pythonSupport -> libxml2.pythonSupport; +with stdenv.lib; + stdenv.mkDerivation rec { name = "libxslt-1.1.29"; @@ -21,18 +24,18 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ findXMLCatalogs ]; - configureFlags = [ - "--without-crypto" + # TODO move cryptoSupport as last flag, when upgrading libxslt + configureFlags = optional (!cryptoSupport) "--without-crypto" ++ [ "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ stdenv.lib.optional pythonSupport "--with-python=${python2}"; + ] ++ optional pythonSupport "--with-python=${python2}"; postFixup = '' moveToOutput bin/xslt-config "$dev" moveToOutput lib/xsltConf.sh "$dev" moveToOutput share/man/man1 "$bin" - '' + stdenv.lib.optionalString pythonSupport '' + '' + optionalString pythonSupport '' mkdir -p $py/nix-support echo ${libxml2.py} >> $py/nix-support/propagated-native-build-inputs moveToOutput lib/python2.7 "$py" From d568cb971be3c1a9f732e2d254baf74dff84fa2a Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 11 Dec 2016 18:30:17 +0000 Subject: [PATCH 1400/1749] google-apputils: enable for py3k (#21079) No apparent reason for it being disabled per #21061. I guess we'll find out if there was a reason. --- pkgs/top-level/python-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a8a9cc1cfde..8715824bde48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12194,7 +12194,6 @@ in { google_apputils = buildPythonPackage rec { name = "google-apputils-0.4.1"; - disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/g/google-apputils/${name}.tar.gz"; From d6aff31f357cec658540363b93b31a5c958f9601 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 11 Dec 2016 19:45:48 +0100 Subject: [PATCH 1401/1749] gopher: init at 3.0.11 (#21080) --- .../networking/gopher/gopher/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/networking/gopher/gopher/default.nix diff --git a/pkgs/applications/networking/gopher/gopher/default.nix b/pkgs/applications/networking/gopher/gopher/default.nix new file mode 100644 index 000000000000..9057fda2e600 --- /dev/null +++ b/pkgs/applications/networking/gopher/gopher/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, ncurses}: + +stdenv.mkDerivation rec { + name = "gopher-${version}"; + version = "3.0.11"; + + src = fetchurl { + url = "http://gopher.quux.org:70/devel/gopher/Downloads/gopher_${version}.tar.gz"; + sha256 = "15r7x518wlpfqpd6z0hbdwm8rw8ll8hbpskdqgxxhrmy00aa7w9c"; + }; + + buildInputs = [ ncurses ]; + + preConfigure = "export LIBS=-lncurses"; + + meta = { + homepage = http://gopher.quux.org:70/devel/gopher; + description = "A ncurses gopher client"; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1aab12d22887..67df4163562b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12966,6 +12966,8 @@ in google-musicmanager = callPackage ../applications/audio/google-musicmanager { }; + gopher = callPackage ../applications/networking/gopher/gopher { }; + gpa = callPackage ../applications/misc/gpa { }; gpicview = callPackage ../applications/graphics/gpicview { }; From 4f2e2ce9715a6586aa9e0e75176e755853fd3ab2 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 11 Dec 2016 19:50:37 +0100 Subject: [PATCH 1402/1749] moc: 2.5.1 -> 2.5.2 --- pkgs/applications/audio/moc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 50996b71c643..ea83a1012ebb 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "moc-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { url = "http://ftp.daper.net/pub/soft/moc/stable/moc-${version}.tar.bz2"; - sha256 = "1wn4za08z64bhsgfhr9c0crfyvy8c3b6a337wx7gz19am5srqh8v"; + sha256 = "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk"; }; nativeBuildInputs = [ pkgconfig ]; From 073cb330cacfc1a01a7224765fd1bdeab463f320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 11 Dec 2016 19:51:18 +0100 Subject: [PATCH 1403/1749] doc: remove last mention of --- nixos/doc/manual/configuration/modularity.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index d95091bd1628..59a4e3b33ba1 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -129,7 +129,7 @@ default; run nix-env -i nix-repl to get it. A typical use: -$ nix-repl '<nixos>' +$ nix-repl '<nixpkgs/nixos>' nix-repl> config.networking.hostName "mandark" From 7a538938a040a0fb05c673b058359e756ba680fd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 11 Dec 2016 20:05:40 +0100 Subject: [PATCH 1404/1749] pythonPackages.yarl: init at 0.8.1 --- .../python-modules/yarl/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/yarl/default.nix diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix new file mode 100644 index 000000000000..246b761fa538 --- /dev/null +++ b/pkgs/development/python-modules/yarl/default.nix @@ -0,0 +1,28 @@ +{ lib +, fetchurl +, buildPythonPackage +, multidict +, pytestrunner +, pytest +}: + +let + pname = "yarl"; + version = "0.8.1"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "9f0397ae540124bf16a8a5b89bc3ea1c07f8ae70c3e44231a40a9edd254d5712"; + }; + + buildInputs = [ pytest pytestrunner ]; + propagatedBuildInputs = [ multidict ]; + + + meta = { + description = "Yet another URL library"; + homepage = https://github.com/aio-libs/yarl/; + license = lib.licenses.asl20; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8715824bde48..928ee522e11c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31438,6 +31438,8 @@ in { }; }; + yarl = callPackage ../development/python-modules/yarl { }; + stripe = buildPythonPackage rec { name = "${pname}-${version}"; pname = "stripe"; From 826649ddf459e35e6fa6e57ae333637977f6b235 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 11 Dec 2016 20:05:52 +0100 Subject: [PATCH 1405/1749] pythonPackages.multidict: init at 2.1.4 --- .../python-modules/multidict/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/multidict/default.nix diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix new file mode 100644 index 000000000000..9a2e13f0c598 --- /dev/null +++ b/pkgs/development/python-modules/multidict/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchurl +, buildPythonPackage +, pytest +, isPy3k +}: + +let + pname = "multidict"; + version = "2.1.4"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "a77aa8c9f68846c3b5db43ff8ed2a7a884dbe845d01f55113a3fba78518c4cd7"; + }; + + buildInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + disabled = !isPy3k; + + meta = { + description = "Multidict implementation"; + homepage = https://github.com/aio-libs/multidict/; + license = lib.licenses.asl20; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 928ee522e11c..ba944b668229 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14377,6 +14377,8 @@ in { }; }; + multidict = callPackage ../development/python-modules/multidict { }; + munch = buildPythonPackage rec { name = "munch-${version}"; version = "2.0.4"; From c4104539e0db99e371a6b7f317d931d785c6ace8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 11 Dec 2016 20:06:12 +0100 Subject: [PATCH 1406/1749] pythonPackages.async_timeout: init at 1.1.0 --- .../python-modules/async_timeout/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/async_timeout/default.nix diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix new file mode 100644 index 000000000000..d5009e9bccb0 --- /dev/null +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchurl +, buildPythonPackage +, pytestrunner +, pythonOlder +}: + +let + pname = "async-timeout"; + version = "1.1.0"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "b88bd1fe001b800ec23c7bf27a81b32819e2a56668e9fba5646a7f3618143081"; + }; + + buildInputs = [ pytestrunner ]; + # Circular dependency on aiohttp + doCheck = false; + + disabled = pythonOlder "3.4"; + + meta = { + description = "Timeout context manager for asyncio programs"; + homepage = https://github.com/aio-libs/async_timeout/; + license = lib.licenses.asl20; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba944b668229..071e171dc63f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1210,6 +1210,8 @@ in { }; }; + async-timeout = callPackage ../development/python-modules/async_timeout { }; + asn1ate = buildPythonPackage rec { pname = "asn1ate"; date = "20160810"; From d9f494abbc5c2e27676f8f8bf25d3cf350cbd73b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 11 Dec 2016 20:06:42 +0100 Subject: [PATCH 1407/1749] pythonPackages.aiohttp: 0.21.5 -> 1.1.6 --- 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 071e171dc63f..776a8716fa1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -589,11 +589,11 @@ in { aiohttp = buildPythonPackage rec { name = "aiohttp-${version}"; - version = "0.21.5"; + version = "1.1.6"; src = pkgs.fetchurl { url = "mirror://pypi/a/aiohttp/${name}.tar.gz"; - sha256 = "0n8517wc8b6yc925f7zhgl4wqf4ay1w2fzar0pj1h20yfa1wiids"; + sha256 = "0742feb9759a5832aa4a30abf64e53055e139ed41e26f79b9558d08e05c74d60"; }; disabled = pythonOlder "3.4"; @@ -601,7 +601,7 @@ in { doCheck = false; # Too many tests fail. buildInputs = with self; [ pytest gunicorn pytest-raisesregexp ]; - propagatedBuildInputs = with self; [ chardet ]; + propagatedBuildInputs = with self; [ async-timeout chardet multidict yarl ]; meta = { description = "http client/server for asyncio"; From e5c525b5a274cf94dde329794999b9166a6352df Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 11 Dec 2016 20:07:42 +0100 Subject: [PATCH 1408/1749] homebank: 5.1.1 -> 5.1.2 simplify and add myself as maintainer --- pkgs/applications/office/homebank/default.nix | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 5ee14c81e948..50c80f659492 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,29 +1,21 @@ { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook -, hicolor_icon_theme, libsoup}: - -let - download_root = "http://homebank.free.fr/public/"; - name = "homebank-5.1.1"; - lastrelease = download_root + name + ".tar.gz"; - oldrelease = download_root + "old/" + name + ".tar.gz"; -in - -stdenv.mkDerivation { - inherit name; +, hicolor_icon_theme, libsoup }: +stdenv.mkDerivation rec { + name = "homebank-5.1.2"; src = fetchurl { - urls = [ lastrelease oldrelease ]; - sha256 = "1gd4b8fsq89w486mfrclw4r1nrgh7lxp4sncbgprbz9id7f6vlww"; + url = "http://homebank.free.fr/public/${name}.tar.gz"; + sha256 = "09zsq5l3s8cg4slhsyybsq8v1arnhh07i0rzka3j6ahysky15pfh"; }; - buildInputs = [ pkgconfig gtk libofx intltool hicolor_icon_theme - wrapGAppsHook libsoup ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup ]; - meta = { + meta = with stdenv.lib; { description = "Free, easy, personal accounting for everyone"; homepage = http://homebank.free.fr/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric pSub ]; + platforms = platforms.linux; }; } From daaf497c5ce917566351b6fb4d109b4a3fd1656c Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 11 Dec 2016 20:09:06 +0100 Subject: [PATCH 1409/1749] homebank: fix icons --- pkgs/applications/office/homebank/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 50c80f659492..5f1c721e4c41 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook -, hicolor_icon_theme, libsoup }: +, hicolor_icon_theme, libsoup, gnome3 }: stdenv.mkDerivation rec { name = "homebank-5.1.2"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup ]; + buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { description = "Free, easy, personal accounting for everyone"; From a4bbf4cad5202d19bb8a0ae44d1f0b11005b5f6f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 11 Dec 2016 20:21:15 +0100 Subject: [PATCH 1410/1749] pythonPackages.scikitlearn: 0.18 -> 0.18.1 --- 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 776a8716fa1b..89971bdf05b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22952,12 +22952,12 @@ in { scikitlearn = buildPythonPackage rec { name = "scikit-learn-${version}"; - version = "0.18"; + version = "0.18.1"; disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = pkgs.fetchurl { url = "mirror://pypi/s/scikit-learn/${name}.tar.gz"; - sha256 = "240009789d6495240b332e059cbd2499f4d2981c93873983c9e1d5189f90315f"; + sha256 = "1eddfc27bb37597a5d514de1299981758e660e0af56981c0bfdf462c9568a60c"; }; buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; From 7ac33a2cd2e3e68a8b7ff3132810a85ffc316804 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Dec 2016 20:40:28 +0100 Subject: [PATCH 1411/1749] pachyderm: init at 1.3.0 --- .../networking/cluster/pachyderm/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/networking/cluster/pachyderm/default.nix diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix new file mode 100644 index 000000000000..a0df23e6f623 --- /dev/null +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "pachyderm-${version}"; + version = "1.3.0"; + rev = "v${version}"; + + goPackagePath = "github.com/pachyderm/pachyderm"; + subPackages = [ "src/server/cmd/pachctl" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "pachyderm"; + repo = "pachyderm"; + sha256 = "0y25xh6h7p8hg0bzrjlschmz62r6dwh5mrvbnni1hb1pm0w9jb6g"; + }; + + meta = with lib; { + description = "Containerized Data Analytics"; + homepage = https://github.com/pachyderm/pachyderm; + license = licenses.asl20; + maintainers = with maintainers; [offline]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1aab12d22887..fff3f93c45a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5601,6 +5601,8 @@ in inherit (callPackages ../development/interpreters/perl {}) perl perl520 perl522; + pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; + php = php70; phpPackages = php70Packages; From 0c9e7151ac4bcf2fe1c8d2a505e16dc2dd7a3bc8 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sun, 11 Dec 2016 23:08:37 +0300 Subject: [PATCH 1412/1749] qtstyleplugins: init at 2016-12-01 --- .../libraries/qtstyleplugins/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/qtstyleplugins/default.nix diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix new file mode 100644 index 000000000000..addc13a8c968 --- /dev/null +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, qmakeHook, pkgconfig, gtk2 }: + +stdenv.mkDerivation rec { + name = "qtstyleplugins-2016-12-01"; + + src = fetchFromGitHub { + owner = "qt"; + repo = "qtstyleplugins"; + rev = "7aa47640c202cc4a9c16aa7df98191236743c8ba"; + sha256 = "0pysgn5yhbh85rv7syvf2w9g1gj1z1nwspjri39dc95vj108lin5"; + }; + + buildInputs = [ qmakeHook pkgconfig gtk2 ]; + + installPhase = '' + make INSTALL_ROOT=$NIX_QT5_TMP install + mv $NIX_QT5_TMP/$NIX_QT5_TMP $out + ''; + + meta = with stdenv.lib; { + description = "Additional style plugins for Qt5, including BB10, GTK+, Cleanlooks, Motif, Plastique"; + homepage = http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/; + license = licenses.lgpl21; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4667c90de096..a505e4eef2cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9062,6 +9062,8 @@ in withQt5 = true; }; + qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { }; + quazip = callPackage ../development/libraries/quazip { qt = qtbase; }; From cf1ec8ed3348d0fd7777c450d67c288baa242559 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 11 Dec 2016 21:15:14 +0100 Subject: [PATCH 1413/1749] pugixml: 1.7 -> 1.8.1 --- pkgs/development/libraries/pugixml/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index ebb62459091e..8c40ff2be20b 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -2,22 +2,20 @@ stdenv.mkDerivation rec { name = "pugixml-${version}"; - version = "1.7"; + version = "1.8.1"; src = fetchurl { url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1jpml475kbhs1aqwa48g2cbfxlrb9qp115m2j9yryxhxyr30vqgv"; + sha256 = "0fcgggry5x5bn0zhb09ij9hb0p45nb0sv0d9fw3cm1cf62hp9n80"; }; nativeBuildInputs = [ cmake ]; - sourceRoot = "${name}/scripts"; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; preConfigure = '' # Enable long long support (required for filezilla) - sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' ../src/pugiconfig.hpp + sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp ''; patches = [] From d5ec2a2c9dc7410d02c138e0f618717fe326be3e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 27 Oct 2016 19:35:02 +0200 Subject: [PATCH 1414/1749] postsrsd: additional configuration fixes #19933 --- nixos/modules/services/mail/postsrsd.nix | 36 ++++++++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix index 68a4c1012064..a1af16ec9ac1 100644 --- a/nixos/modules/services/mail/postsrsd.nix +++ b/nixos/modules/services/mail/postsrsd.nix @@ -20,17 +20,29 @@ in { description = "Whether to enable the postsrsd SRS server for Postfix."; }; - domain = mkOption { - type = types.str; - description = "Domain name for rewrite"; - }; - secretsFile = mkOption { type = types.path; default = "/var/lib/postsrsd/postsrsd.secret"; description = "Secret keys used for signing and verification"; }; + domain = mkOption { + type = types.str; + description = "Domain name for rewrite"; + }; + + separator = mkOption { + type = types.enum ["-" "=" "+"]; + default = "="; + description = "First separator character in generated addresses"; + }; + + # bindAddress = mkOption { # uncomment once 1.5 is released + # type = types.str; + # default = "127.0.0.1"; + # description = "Socket listen address"; + # }; + forwardPort = mkOption { type = types.int; default = 10001; @@ -43,6 +55,18 @@ in { description = "Port for the reverse SRS lookup"; }; + timeout = mkOption { + type = types.int; + default = 1800; + description = "Timeout for idle client connections in seconds"; + }; + + excludeDomains = mkOption { + type = types.listOf types.str; + default = []; + description = "Origin domains to exclude from rewriting in addition to primary domain"; + }; + user = mkOption { type = types.str; default = "postsrsd"; @@ -86,7 +110,7 @@ in { path = [ pkgs.coreutils ]; serviceConfig = { - ExecStart = ''${pkgs.postsrsd}/sbin/postsrsd "-s${cfg.secretsFile}" "-d${cfg.domain}" -f${toString cfg.forwardPort} -r${toString cfg.reversePort}''; + ExecStart = ''${pkgs.postsrsd}/sbin/postsrsd "-s${cfg.secretsFile}" "-d${cfg.domain}" -a${cfg.separator} -f${toString cfg.forwardPort} -r${toString cfg.reversePort} -t${toString cfg.timeout} "-X${concatStringsSep "," cfg.excludeDomains}"''; User = cfg.user; Group = cfg.group; PermissionsStartOnly = true; From 7bcc6e9c45afd9a7f69caa2ad6e75fb0051eab41 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 11 Dec 2016 23:32:39 +0100 Subject: [PATCH 1415/1749] riemann: provide executable and config fixes #20821 --- pkgs/servers/monitoring/riemann/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 132275a56e09..5d6534749619 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -12,8 +12,12 @@ stdenv.mkDerivation rec { phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - mkdir -p $out/share/java + sed -i 's#lib/riemann.jar#$out/share/java/riemann.jar#' bin/riemann + + mkdir -p $out/share/java $out/bin $out/etc mv lib/riemann.jar $out/share/java/ + mv bin/riemann $out/bin/ + mv etc/riemann.config $out/etc/ ''; meta = with stdenv.lib; { From 2867f88781c160b2264f20a4d9af6f6f72184c36 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 12 Dec 2016 01:24:34 +0100 Subject: [PATCH 1416/1749] kubernetes module: fix default dns ip --- nixos/modules/services/cluster/kubernetes.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 4bdfa6d1ff58..fbf7412a6cd9 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -484,7 +484,7 @@ in { clusterDns = mkOption { description = "Use alternative dns."; - default = "10.10.1.1"; + default = "10.10.0.1"; type = types.str; }; From f6daae391f170a10a7f83df12a98a462c139eb94 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 11 Dec 2016 19:33:05 -0500 Subject: [PATCH 1417/1749] linux: add 4.9 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 19 ++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-4.9.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix new file mode 100644 index 000000000000..f154e143e03a --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.9"; + modDirVersion = "4.9.0"; + extraMeta.branch = "4.9"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a"; + }; + + kernelPatches = args.kernelPatches; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67df4163562b..0b94668c5542 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11020,6 +11020,22 @@ in ]; }; + linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking + # kernelPatches.cpu-cgroup-v2."4.7" + kernelPatches.modinst_arg_list_too_long + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11181,7 +11197,7 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_8; + linuxPackages_latest = linuxPackages_4_9; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -11193,6 +11209,7 @@ in linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_8); + linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. From 4f0592680cf8845f180669fe3ee3ee2f1d29a79a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 11 Dec 2016 21:10:28 -0500 Subject: [PATCH 1418/1749] rkt: 1.20.0 -> 1.21.0 --- pkgs/applications/virtualization/rkt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index d4a10080aee8..f3f5a88c0af1 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.20.0"; + version = "1.21.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "0cypksr13k0qp6qvbd6y8my1dg82s44k6qkiqkpn1vs2ynjg3i52"; + sha256 = "0zd7f3yrnzik96a634m2qyrz25f5mi28caadghqdl9q2apxfb896"; }; stage1BaseImage = fetchurl { From 77050a83816e11f2af2cd2115c5cd1937caa8068 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 4 Dec 2016 11:49:22 +0000 Subject: [PATCH 1419/1749] findlib: 1.6.1 -> 1.7.1 --- pkgs/development/tools/ocaml/findlib/default.nix | 4 ++-- pkgs/development/tools/ocaml/findlib/install_topfind.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 1391bc6eb8ab..71da6dd6d32f 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ocaml-findlib-${version}"; - version = "1.6.1"; + version = "1.7.1"; src = fetchurl { url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; - sha256 = "02abg1lsnwvjg3igdyb8qjgr5kv1nbwl4gaf8mdinzfii5p82721"; + sha256 = "1vsys5gpahi36nxv5yx29zhwn8b2d7sqqswza05vxy5bx5wrljsx"; }; buildInputs = [m4 ncurses ocaml]; diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch index 7c9f8e1a6cce..096330a31ae1 100644 --- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -6,7 +6,7 @@ mkdir -p "$(prefix)$(OCAMLFIND_BIN)" - test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" + test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)" - files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ - cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" - f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ + files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ + cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" + f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ From 42a0fc438755b84fc2bb09fe5733238dccebe0fe Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 4 Dec 2016 11:25:37 +0000 Subject: [PATCH 1420/1749] ocamlbuild: 0.9.2 -> 0.9.3 --- .../tools/ocaml/ocamlbuild/default.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 6feab7645f17..df6c66cb98f0 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,17 +1,17 @@ {stdenv, fetchFromGitHub, ocaml, findlib, buildOcaml, type_conv, camlp4, ocamlmod, ocamlify, ounit, expect}: let - version = "0.9.2"; + version = "0.9.3"; in stdenv.mkDerivation { - name = "ocamlbuild"; + name = "ocamlbuild-${version}"; inherit version; src = fetchFromGitHub { owner = "ocaml"; repo = "ocamlbuild"; rev = version; - sha256 = "0q4bvik08v444g1pill9zgwal48xs50jf424lbryfvqghhw5xjjc"; + sha256 = "1ikm51lx4jz5vmbvrdwsm5p59bwbz3pi22vqkyz5lmqcciyn69i3"; }; createFindlibDestdir = true; @@ -25,18 +25,12 @@ stdenv.mkDerivation { "OCAMLBUILD_LIBDIR=$OCAMLFIND_DESTDIR" ''; - # configurePhase = "ocaml setup.ml -configure --prefix $out"; - # buildPhase = "ocaml setup.ml -build"; - # installPhase = "ocaml setup.ml -install"; - - # meta = with stdenv.lib; { - # homepage = http://oasis.forge.ocamlcore.org/; - # description = "Configure, build and install system for OCaml projects"; - # license = licenses.lgpl21; - # platforms = ocaml.meta.platforms or []; - # maintainers = with maintainers; [ - # vbgl z77z - # ]; - # }; + meta = with stdenv.lib; { + homepage = https://github.com/ocaml/ocamlbuild/; + description = "A build system with builtin rules to easily build most OCaml projects"; + license = licenses.lgpl2; + inherit (ocaml.meta) platforms; + maintainers = with maintainers; [ vbgl ]; + }; } From 4889c271cacf72a47dc2f081e6e718980fb80d60 Mon Sep 17 00:00:00 2001 From: montag451 Date: Tue, 6 Dec 2016 00:11:49 +0100 Subject: [PATCH 1421/1749] Add macvlan support for declarative containers --- nixos/modules/virtualisation/containers.nix | 12 +++ nixos/tests/containers-macvlans.nix | 82 +++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 nixos/tests/containers-macvlans.nix diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index a532696d03ae..637a87139045 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -476,6 +476,17 @@ in ''; }; + macvlans = mkOption { + type = types.listOf types.str; + default = []; + example = [ "eth1" "eth2" ]; + description = '' + The list of host interfaces from which macvlans will be + created. For each interface specified, a macvlan interface + will be created and moved to the container. + ''; + }; + extraVeths = mkOption { type = with types; attrsOf (submodule { options = networkOptions; }); default = {}; @@ -654,6 +665,7 @@ in ''} ''} INTERFACES="${toString cfg.interfaces}" + MACVLANS="${toString cfg.macvlans}" ${optionalString cfg.autoStart '' AUTO_START=1 ''} diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix new file mode 100644 index 000000000000..721f98481497 --- /dev/null +++ b/nixos/tests/containers-macvlans.nix @@ -0,0 +1,82 @@ +# Test for NixOS' container support. + +let + # containers IP on VLAN 1 + containerIp1 = "192.168.1.253"; + containerIp2 = "192.168.1.254"; +in + +import ./make-test.nix ({ pkgs, ...} : { + name = "containers-macvlans"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ montag451 ]; + }; + + nodes = { + + machine1 = + { config, pkgs, lib, ... }: + { + virtualisation.memorySize = 256; + virtualisation.vlans = [ 1 ]; + + # To be able to ping containers from the host, it is necessary + # to create a macvlan on the host on the VLAN 1 network. + networking.macvlans.mv-eth1-host = { + interface = "eth1"; + mode = "bridge"; + }; + networking.interfaces.eth1.ip4 = lib.mkForce []; + networking.interfaces.mv-eth1-host = { + ip4 = [ { address = "192.168.1.1"; prefixLength = 24; } ]; + }; + + containers.test1 = { + autoStart = true; + macvlans = [ "eth1" ]; + + config = { + networking.interfaces.mv-eth1 = { + ip4 = [ { address = containerIp1; prefixLength = 24; } ]; + }; + }; + }; + + containers.test2 = { + autoStart = true; + macvlans = [ "eth1" ]; + + config = { + networking.interfaces.mv-eth1 = { + ip4 = [ { address = containerIp2; prefixLength = 24; } ]; + }; + }; + }; + }; + + machine2 = + { config, pkgs, ... }: + { + virtualisation.memorySize = 256; + virtualisation.vlans = [ 1 ]; + }; + + }; + + testScript = '' + startAll; + $machine1->waitForUnit("default.target"); + $machine2->waitForUnit("default.target"); + + # Ping between containers to check that macvlans are created in bridge mode + $machine1->succeed("nixos-container run test1 -- ping -n -c 1 ${containerIp2}"); + + # Ping containers from the host (machine1) + $machine1->succeed("ping -n -c 1 ${containerIp1}"); + $machine1->succeed("ping -n -c 1 ${containerIp2}"); + + # Ping containers from the second machine to check that containers are reachable from the outside + $machine2->succeed("ping -n -c 1 ${containerIp1}"); + $machine2->succeed("ping -n -c 1 ${containerIp2}"); + ''; +}) From ea5551b551d0d7f462b7f8e00e2bf86b2412a365 Mon Sep 17 00:00:00 2001 From: montag451 Date: Tue, 6 Dec 2016 23:32:17 +0100 Subject: [PATCH 1422/1749] containers: fix broken /etc/hosts entries when localAddress contains a netmask --- nixos/modules/virtualisation/containers.nix | 2 +- nixos/tests/containers-hosts.nix | 52 +++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/containers-hosts.nix diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 637a87139045..7d445fa0951e 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -676,7 +676,7 @@ in # Generate /etc/hosts entries for the containers. networking.extraHosts = concatStrings (mapAttrsToList (name: cfg: optionalString (cfg.localAddress != null) '' - ${cfg.localAddress} ${name}.containers + ${head (splitString "/" cfg.localAddress)} ${name}.containers '') config.containers); networking.dhcpcd.denyInterfaces = [ "ve-*" "vb-*" ]; diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix new file mode 100644 index 000000000000..c7a85f190a5d --- /dev/null +++ b/nixos/tests/containers-hosts.nix @@ -0,0 +1,52 @@ +# Test for NixOS' container support. + +import ./make-test.nix ({ pkgs, ...} : { + name = "containers-hosts"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ montag451 ]; + }; + + machine = + { config, pkgs, lib, ... }: + { + virtualisation.memorySize = 256; + virtualisation.vlans = []; + + networking.bridges.br0.interfaces = []; + networking.interfaces.br0 = { + ip4 = [ { address = "10.11.0.254"; prefixLength = 24; } ]; + }; + + # Force /etc/hosts to be the only source for host name resolution + environment.etc."nsswitch.conf".text = lib.mkForce '' + hosts: files + ''; + + containers.simple = { + autoStart = true; + privateNetwork = true; + localAddress = "10.10.0.1"; + hostAddress = "10.10.0.254"; + + config = {}; + }; + + containers.netmask = { + autoStart = true; + privateNetwork = true; + hostBridge = "br0"; + localAddress = "10.11.0.1/24"; + + config = {}; + }; + }; + + testScript = '' + startAll; + $machine->waitForUnit("default.target"); + + # Ping the containers using the entries added in /etc/hosts + $machine->succeed("ping -n -c 1 simple.containers"); + $machine->succeed("ping -n -c 1 netmask.containers"); + ''; +}) From 7c8b1e7b24382b198a1f29bfaada0936c1e99280 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 12 Dec 2016 09:31:02 +0100 Subject: [PATCH 1423/1749] python36: 3.6.0b2 -> 3.6.0rc1 --- pkgs/development/interpreters/python/cpython/3.6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index f65989f5bb57..4654a6e1cb61 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -25,7 +25,7 @@ with stdenv.lib; let majorVersion = "3.6"; minorVersion = "0"; - minorVersionSuffix = "b2"; + minorVersionSuffix = "rc1"; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; @@ -45,7 +45,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "1sk990n2xm5vhn3ys2cp427dx0z14cx3sz1za5f2fcwrp524bz9s"; + sha256 = "01sqzz5iq7law93zgdxkb8sv98a493a2wzslynz64cl3hhdqr1pw"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; From 98fce78cb3461afa83ac5a11be91bbe32fb97a24 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Mon, 12 Dec 2016 10:53:10 +0100 Subject: [PATCH 1424/1749] r-modules: Fix `png` package The package requires the `dev` output of `libpng`. --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 5c05973095fd..f168e115de13 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -288,7 +288,7 @@ let pbdNCDF4 = [ pkgs.netcdf ]; pbdPROF = [ pkgs.openmpi ]; PKI = [ pkgs.openssl ]; - png = [ pkgs.libpng ]; + png = [ pkgs.libpng.dev ]; PopGenome = [ pkgs.zlib ]; proj4 = [ pkgs.proj ]; qtbase = [ pkgs.qt4 ]; From aa1364affd8ff61dd5b3c10b012fb1298de18cdb Mon Sep 17 00:00:00 2001 From: montag451 Date: Mon, 12 Dec 2016 14:25:28 +0100 Subject: [PATCH 1425/1749] containers: add tests for hosts and macvlans --- nixos/release.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/release.nix b/nixos/release.nix index 4fd48bc2477f..683e09f431f1 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -229,6 +229,8 @@ in rec { tests.containers-extra_veth = callTest tests/containers-extra_veth.nix {}; tests.containers-physical_interfaces = callTest tests/containers-physical_interfaces.nix {}; tests.containers-tmpfs = callTest tests/containers-tmpfs.nix {}; + tests.containers-hosts = callTest tests/containers-hosts.nix {}; + tests.containers-macvlans = callTest tests/containers-macvlans.nix {}; tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; }; tests.ecryptfs = callTest tests/ecryptfs.nix {}; From 570708183b74972932425ac1786f4fcd757ad99f Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 8 Dec 2016 17:32:27 +0100 Subject: [PATCH 1426/1749] haskellPackages: add hoogleLocal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The docs in `hoogle.nix` intend for it to be in the packageset as `hoogleLocal` and that also makes a lot of sense from a user perspective. `packages` is not a function `HaskellPackages -> [Package]`, but rather an arbitrary set of packages. That is good, because that way it can be used e.g. to merge package databases from other versions of the packageset. It’s done as function with default argument, because otherwise the user has to use `overrideCabal` to override `packages` in `hoogle.nix`. --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6fb76bcfbee7..700f9d0dbb2d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -18,6 +18,11 @@ self: super: { # Apply NixOS-specific patches. ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch; + # enable using a local hoogle with extra packagages in the database + # nix-shell -p "haskellPackages.hoogleLocal (with haskellPackages; [ mtl lens ])" + # $ hoogle server + hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; }; + # Break infinite recursions. clock = dontCheck super.clock; Dust-crypto = dontCheck super.Dust-crypto; From 7c8d4cd9a9ab721c6bf7909315a9130b6d7a9f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 10 Dec 2016 21:45:03 +0100 Subject: [PATCH 1427/1749] wireguard: 0.0.20161116.1 -> 0.0.20161129 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 9a378988608a..2e2bb82d1331 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1"; let name = "wireguard-experimental-${version}"; - version = "0.0.20161116.1"; + version = "0.0.20161129"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-${version}.tar.xz"; - sha256 = "1393p1fllxvl4j0c8qz35k39crmcwrp8rjwxwn1wyhhrks8rs3bk"; + sha256 = "1dyik704aixq38n71alpr4r8dxh7ipy7mgwbbccipsdadbjy7p3v"; }; meta = with stdenv.lib; { From a86d6f404c451f6dca88f48f005eaf6e67441978 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 12 Dec 2016 14:17:06 +0000 Subject: [PATCH 1428/1749] firefox-bin: tweak updateScript --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index b768bfd61115..219f208af71e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -236,7 +236,7 @@ stdenv.mkDerivation { } EOF - cat $tmpfile > ${if isBeta then "beta_" else ""}sources.nix + mv $tmpfile ${if isBeta then "beta_" else ""}sources.nix popd ''; From c8c6ff4a96f1216fdb9c1fae6002b12d1b8deacf Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 12 Dec 2016 16:19:19 +0100 Subject: [PATCH 1429/1749] simp_le: bump acme dependency to newer version acme_0_5_0 is no longer working and removed in another commit --- pkgs/tools/admin/simp_le/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 24bfe043b9d7..b4ed398541f0 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -15,9 +15,13 @@ pythonPackages.buildPythonApplication rec { url = "https://github.com/kuba/simp_le/commit/4bc788fdd611c4118c3f86b5f546779723aca5a7.patch"; sha256 = "0036p11qn3plydv5s5z6i28r6ihy1ipjl0y8la0izpkiq273byfc"; }) + (fetchpatch { + url = "https://github.com/kuba/simp_le/commit/9ec7efe593cadb46348dc6924c1e6a31f0f9e636.patch"; + sha256 = "0n3m94n14y9c42185ly47d061g6awc8vb8xs9abffaigxv59k06j"; + }) ]; - propagatedBuildInputs = with pythonPackages; [ acme_0_5_0 ]; + propagatedBuildInputs = with pythonPackages; [ acme ]; meta = with stdenv.lib; { inherit (src.meta) homepage; From ee4b59c5219146f36c4c25cf7b73521aa15bafcd Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 12 Dec 2016 16:17:01 +0100 Subject: [PATCH 1430/1749] acme_0_5_0: remove as it is no longer required --- pkgs/top-level/python-packages.nix | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 89971bdf05b5..87cd2970fabe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -412,26 +412,6 @@ in { maintainers = with maintainers; [ teh ]; }; }; - acme_0_5_0 = buildPythonPackage rec { - version = "0.5.0"; - name = "acme-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "letsencrypt"; - repo = "letsencrypt"; - rev = "v${version}"; - sha256 = "0x098cdyfgqvh7x5d3sz56qjpjyg5b4fl82086sm43d8mbz0h5rm"; - }; - - propagatedBuildInputs = with self; [ - cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock - ndg-httpsclient - ]; - - buildInputs = with self; [ nose ]; - - sourceRoot = "letsencrypt-v${version}-src/acme"; - }; acme = buildPythonPackage rec { inherit (pkgs.certbot) src version; From 1f811a67274e340d9e13987801fe726308e748ab Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Mon, 12 Dec 2016 18:59:10 +0100 Subject: [PATCH 1431/1749] rustcNightlyBin.rustc: revision bump 2016-11-26 to 2016-12-05 with fix to contain components as libcore --- pkgs/development/compilers/rust/nightlyBin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix index 47d918ddf3e6..a60d17fb7cbe 100644 --- a/pkgs/development/compilers/rust/nightlyBin.nix +++ b/pkgs/development/compilers/rust/nightlyBin.nix @@ -9,17 +9,17 @@ let bootstrapHash = if stdenv.system == "x86_64-linux" - then "1hsvf1vj18fqxkqw8jhnwahhk2q5xcl5396czr034fphmp5n4haw" + then "1afsqaavhwiaxm38zr08cbq0985c7lrb1jzdcmq0jh6y8rb8ikff" else throw "missing boostrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; src = fetchurl { - url = "https://static.rust-lang.org/dist/${version}/rustc-nightly-${platform}.tar.gz"; + url = "https://static.rust-lang.org/dist/${version}/rust-nightly-${platform}.tar.gz"; sha256 = bootstrapHash; }; - version = "2016-11-26"; + version = "2016-12-05"; in rec { @@ -41,7 +41,7 @@ rec { installPhase = '' ./install.sh --prefix=$out \ - --components=rustc + --components=rustc,rust-std-x86_64-unknown-linux-gnu ${optionalString needsPatchelf '' patchelf \ From 7a25ceade189f1aaa19b44c25bc35e60b02d7258 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 12 Dec 2016 13:00:02 -0500 Subject: [PATCH 1432/1749] elpa-packages: 2016-12-12 --- .../editors/emacs-modes/elpa-generated.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index eb25a64b7095..4d9d903c7d6e 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -967,6 +967,19 @@ license = lib.licenses.free; }; }) {}; + json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + pname = "json-mode"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/json-mode-0.1.el"; + sha256 = "025bwpx7nc1qhdyf2yaqjdr6x1qr6q45776yvy427xdh4nbk054l"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/json-mode.html"; + license = lib.licenses.free; + }; + }) {}; jumpc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "jumpc"; version = "3.0"; From a448d478c0e6e8ef42e36f2a38c9e99b1d5e03b2 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 12 Dec 2016 13:00:17 -0500 Subject: [PATCH 1433/1749] melpa-packages: 2016-12-12 Removals: - bitly - github repo no longer exists - gitty - github repo no longer exists - gplusify - github repo no longer exists --- .../editors/emacs-modes/melpa-generated.nix | 1039 ++++++++++------- 1 file changed, 597 insertions(+), 442 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 8ac53e85728f..4f027897c2cc 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -737,8 +737,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "7f82b4f1dbe0992a1b939e9ce359f12f1eb6482a"; - sha256 = "0gfhg7rji735j31xibvimx7v7w337zvrlxzj18qxzymnimhx1843"; + rev = "c6d330c9ea574e659e3e40698db85b59dd154bcf"; + sha256 = "0n3wz9jpn2nyb35dykfyqaphkya63l06a9prnmaba4yydic3n6d0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -754,12 +754,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20160819.2147"; + version = "20161210.1838"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "7f82b4f1dbe0992a1b939e9ce359f12f1eb6482a"; - sha256 = "0gfhg7rji735j31xibvimx7v7w337zvrlxzj18qxzymnimhx1843"; + rev = "c6d330c9ea574e659e3e40698db85b59dd154bcf"; + sha256 = "0n3wz9jpn2nyb35dykfyqaphkya63l06a9prnmaba4yydic3n6d0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -1642,12 +1642,12 @@ ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ample-theme"; - version = "20161002.1640"; + version = "20161207.614"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "ample-theme"; - rev = "7546ab41c4c106be7b781a8c351abfb59fe95078"; - sha256 = "124kxhp7q4ddlj4nhjn8y2w3s08ln8am49cwjvwsvrfliz87n9kq"; + rev = "ab3bdaa99dda8ac86a8be44162ac0f2374392950"; + sha256 = "1ncwzjh46df89zsh8y0nprdv2wb06aq6swfc7byi0ghcbd8x3jv7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme"; @@ -2365,6 +2365,27 @@ license = lib.licenses.free; }; }) {}; + apib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: + melpaBuild { + pname = "apib-mode"; + version = "20161201.817"; + src = fetchFromGitHub { + owner = "w-vi"; + repo = "apib-mode"; + rev = "940fb1faecb4b0a460ed36de5551a59ebd1edf58"; + sha256 = "0sny3jv4amfc3lx45j1di2snp42xfl907q3l7frqhhsal57lkvd1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ebb04f975d8226a76260895399c937d6a1940/recipes/apib-mode"; + sha256 = "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb"; + name = "apib-mode"; + }; + packageRequires = [ emacs markdown-mode ]; + meta = { + homepage = "https://melpa.org/#/apib-mode"; + license = lib.licenses.free; + }; + }) {}; apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apples-mode"; @@ -2450,12 +2471,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20161120.943"; + version = "20161207.1248"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "a84e23eebf26b4f0f5fe9926d8feaf01e7d6c304"; - sha256 = "12lrnv4aqwpvr40351n0qvh2d6p378qffh8fqw9x8dyzcxjyjhpr"; + rev = "5a5bbbb1f6a82efb19b0a75deea4c6b1d52347a1"; + sha256 = "0nfpvb20jy9h8g1i7agz153cdvw45sxifsryngfxnnmxd6s6pdmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2470,10 +2491,10 @@ }) {}; apu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "apu"; - version = "20151231.1208"; + version = "20161210.842"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/apu.el"; - sha256 = "1xbvky0mspmbi8ghqhqhgbjn70acipwf0qwn6s5zdarwch10nljj"; + sha256 = "0knmp8kryndpag0hy3mjbhmw9spvi6kzmx0s215m0lbiqzzibgwz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad04078221946c9d6b758809ec03ff88efce7322/recipes/apu"; @@ -4841,12 +4862,12 @@ bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bind-map"; - version = "20160606.1343"; + version = "20161207.711"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-bind-map"; - rev = "6e1ba6edbd5a29991698806e775288fb3de2b186"; - sha256 = "1d3nknz6ibxlcm1989lv2b4d4r0d67kpgm03aamcisnxq9d1g9r2"; + rev = "bf4181e3a41463684adfffc6c5c305b30480e30f"; + sha256 = "0vrk17yg3jbww92p433p64ijmjf7cjg2wmzi9w418235w1xdfzz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58800af5965a6e7c9314aa00e971196ea0d036e/recipes/bind-map"; @@ -4964,27 +4985,6 @@ license = lib.licenses.free; }; }) {}; - bitly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "bitly"; - version = "20151125.848"; - src = fetchFromGitHub { - owner = "jorgenschaefer"; - repo = "bitly-el"; - rev = "fca9d8da070402fa62d9289e56f7f1c5ce40f664"; - sha256 = "09blh9cbcbqr3pdaiwm9fmh5kzqm1v9mffy623z3jn87g5wadrmb"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e6b1161d39ba66577ad57d76e4f4ea84e604002f/recipes/bitly"; - sha256 = "032s7ax8qp3qzcj1njbyyxiyadjirphswqdlr45zj6hzajfsr247"; - name = "bitly"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/bitly"; - license = lib.licenses.free; - }; - }) {}; blackboard-bold-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "blackboard-bold-mode"; @@ -5066,6 +5066,27 @@ license = lib.licenses.free; }; }) {}; + bln-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bln-mode"; + version = "20161210.610"; + src = fetchFromGitHub { + owner = "mgrachten"; + repo = "bln-mode"; + rev = "74563279cb98e42d8649bff53229d5f89a5fb5e0"; + sha256 = "0mjlbih1dnfmqy41jgs37b8yi39mqwppw7yn5pgdyh8lzr1qh9vw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ee12ef97df241b7405feee69c1e66b3c1a67204b/recipes/bln-mode"; + sha256 = "0w4abaqx9gz04ls1hn1qz8qg9jpvi80b9jb597ddjcbnwqq9z83r"; + name = "bln-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/bln-mode"; + license = lib.licenses.free; + }; + }) {}; blockdiag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "blockdiag-mode"; @@ -5236,7 +5257,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20161127.1727"; + version = "20161211.1601"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "05jf7rbaxfxrlmk2vq09p10mj80p529raqfy3ajsk8adgqsxw1lr"; @@ -5465,12 +5486,12 @@ browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "browse-at-remote"; - version = "20161018.858"; + version = "20161207.2252"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "browse-at-remote"; - rev = "f55bb2abdc139b8da0cb5c9764388bb5ad24e9d8"; - sha256 = "04sv02mfjn3gvqpln0x7z5wa8w0dd2khv277jb84ifvy8bmchd2g"; + rev = "396f6ca23e3a6d12cd3af4651d8130a5baf10e2b"; + sha256 = "0d4lhaqwralv790ry6g84q0nk243dkaybf1nynr8kp0njhdif6k1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203e177f09eac4ebb8c7e3532bd82f749f8e2607/recipes/browse-at-remote"; @@ -5982,12 +6003,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20160514.34"; + version = "20161209.154"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "794afbfa4c5a004fe8e0c5373be98671ee24c413"; - sha256 = "1jhfpcz9k2kkg19gn3v4imahaf0w01gj04yw451x8dx1m7q1jaqc"; + rev = "07c525eaf9c1a9f1b48928b64e1802b1f1b25be3"; + sha256 = "1l4hjb21283mrb9v67k2xl83plq18ri7pqcp2kgs2ygbfnbwwqcs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6820,7 +6841,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11909"; + rev = "11919"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -7525,12 +7546,12 @@ ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ciel"; - version = "20161110.2236"; + version = "20161211.1946"; src = fetchFromGitHub { owner = "cs14095"; repo = "ciel.el"; - rev = "1a19d08b14cd0f5a76b5681b2f80d65f06af3df4"; - sha256 = "01l5rswqh9dk626ykmdvs2imaqli9f5pkyzl9j41nhx49c3j1q6z"; + rev = "d8bf0d2829485886daddf8d4b11322a1ed7a0fc5"; + sha256 = "1glswbpnvvngzahcn9jdy0jamr72xfcqaman6iqkgzxwj2kf84bn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel"; @@ -7675,8 +7696,8 @@ version = "20161004.253"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "288906"; - sha256 = "0m24mss1ra1k46vn473qlnjbm0zzw4s154gnhf0lpk4f80b9wy11"; + rev = "289430"; + sha256 = "1vbngm8xf7i8f3140y0dk704vagcws6is9waj9qsy6yg0vxmqp0y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7881,12 +7902,12 @@ clj-refactor = callPackage ({ cider, clojure-mode, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }: melpaBuild { pname = "clj-refactor"; - version = "20161127.1306"; + version = "20161211.1451"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "0be07c6ca67a9ef52022286342c22eb4e0f3133c"; - sha256 = "0g113b4mm5ggb67vmj57zy6p1q61pzff9hq06y2sm5lx8r5a3rk3"; + rev = "1b49cddfff0420aa5f1ca7b6d1753b4e1d35cb7d"; + sha256 = "0ywvww3r3lb90hi41ngkxgxxw2y7kigr2a31nbbg2b6h508r44qr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8229,12 +8250,12 @@ clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clues-theme"; - version = "20140922.2056"; + version = "20161210.1752"; src = fetchFromGitHub { owner = "jasonm23"; repo = "emacs-clues-theme"; - rev = "69d873c90fbf24590c765309b7fb55cd14bb6bda"; - sha256 = "0fnl3b62clg9llcs2l511sxp4yishan4pqk45sqp8ih4rdzvy7ar"; + rev = "16c05f6dbe7125358f8456110f237d68263e987a"; + sha256 = "1lxd6wgg0d7nwg0rsj5fz0c3wwap567vwd7bfa2xj22z0b6cn49c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf43125306df445ac829c2edb98dd608bc1407de/recipes/clues-theme"; @@ -8317,8 +8338,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "b620772b11fe396194148ec4768bd59ad89fb91f"; - sha256 = "1n057g3fmycy6j0yw8a0avn1iblp0ymn24x2dv3b3pff26w7xfhb"; + rev = "3874843f0f5be9d53001517b3697e0d092f0e845"; + sha256 = "1qnnba479wb065yq1xg6jaddvmix1cdy39d2wg4n704dks9pyp8f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9060,12 +9081,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20161126.1629"; + version = "20161211.1850"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "ec7a8608853f41d42c357f214de069ae06c9d576"; - sha256 = "13bdf1h09v6vn5947pl9hg90wp0ch6ng713fnwglca6lk5rf5fqd"; + rev = "21357f6d6274420d0f4fda07841daf0853b4749c"; + sha256 = "0nywpm89vw2qsplwndijxzl8bga7i69j3aspf9qbypnhlbmkvm0z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9173,12 +9194,12 @@ company-bibtex = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, regexp-opt }: melpaBuild { pname = "company-bibtex"; - version = "20161023.1605"; + version = "20161210.1223"; src = fetchFromGitHub { owner = "gbgar"; repo = "company-bibtex"; - rev = "223002a6ff83ff3851d07155b470d5941ba09455"; - sha256 = "17y4i37a1j9crdl8bpbbs71l1mnkif8s42a3p7rgvp3mn6z8qsdi"; + rev = "9b236cb9527ec69d73101193e6b53ad6080ea333"; + sha256 = "19f6npkd4im9dp48h2kp2kw6d6pvw4i4qn404ca949z77v87ibjj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c366ac2949eae48766fce70a7b01bbada6fcc27/recipes/company-bibtex"; @@ -9688,8 +9709,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "7f82b4f1dbe0992a1b939e9ce359f12f1eb6482a"; - sha256 = "0gfhg7rji735j31xibvimx7v7w337zvrlxzj18qxzymnimhx1843"; + rev = "c6d330c9ea574e659e3e40698db85b59dd154bcf"; + sha256 = "0n3wz9jpn2nyb35dykfyqaphkya63l06a9prnmaba4yydic3n6d0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -9855,6 +9876,27 @@ license = lib.licenses.free; }; }) {}; + company-statistics = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-statistics"; + version = "20151126.1246"; + src = fetchFromGitHub { + owner = "company-mode"; + repo = "company-statistics"; + rev = "906d8137224c1a5bd1dc913940e0d32ffecf5523"; + sha256 = "0c98kfg7gimjx9cf8dmbk9mdsrybhphshrdl8dhif3zqvn6gxyd7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2/recipes/company-statistics"; + sha256 = "1fl4ldj17m3xhi6xbw3bp9c2jir34xv3jh9daiw8g912fv2l5dcj"; + name = "company-statistics"; + }; + packageRequires = [ company emacs ]; + meta = { + homepage = "https://melpa.org/#/company-statistics"; + license = lib.licenses.free; + }; + }) {}; company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }: melpaBuild { pname = "company-tern"; @@ -10190,6 +10232,27 @@ license = lib.licenses.free; }; }) {}; + copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "copy-as-format"; + version = "20161208.2152"; + src = fetchFromGitHub { + owner = "sshaw"; + repo = "copy-as-format"; + rev = "a7f468f8d809ae1d2d9a3c74e8ab0b4fb6728380"; + sha256 = "1ndksvs1f2xg5gkxzpf06a4wzkx49kjl7lmzf118fijd2cxx92d6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; + sha256 = "1yij5mqm0dg6326yms0a2w8gs42kdxq0ih8dhkpdar54r0bk3m8k"; + name = "copy-as-format"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/copy-as-format"; + license = lib.licenses.free; + }; + }) {}; copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "copyit"; @@ -10277,12 +10340,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20161207.331"; + version = "20161211.1126"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3b15585257c083706c32d0988f1982018fb17e9b"; - sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh"; + rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991"; + sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10382,12 +10445,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20161204.1156"; + version = "20161212.146"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "86ddf43616f2560f2b60b3f154783af25cd2e03b"; - sha256 = "1plr44jaznk1kdphjb7wm1mnxxg75fm6s0pnqmxmi6830gfviylh"; + rev = "5728486a2852cda5b6b12890de917326ce3bd75c"; + sha256 = "1kbzsk2c2lhz78fynrghwd94j3da92jz59ypcysgyrpqv9cvhzb5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -10797,6 +10860,27 @@ license = lib.licenses.free; }; }) {}; + csgo-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "csgo-conf-mode"; + version = "20161209.819"; + src = fetchFromGitHub { + owner = "wynro"; + repo = "emacs-csgo-conf-mode"; + rev = "57e7224f87a3ccc76b5564cc95fa0ff43bb6807c"; + sha256 = "14wzh3rlq7xb8djncbjkfiq9hl5frp7gp42sz2ic7aky4qajbcdv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2298e3f840da549707ec3270c8303f4f63a674dc/recipes/csgo-conf-mode"; + sha256 = "0djx6jraqlh9da2jqagj72vjnc8n3px2jp23jdy9rk40z10m5sbr"; + name = "csgo-conf-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/csgo-conf-mode"; + license = lib.licenses.free; + }; + }) {}; csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; @@ -11315,8 +11399,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "1b61bc346a8233f6ef7576bbbba0cb8a19c46efb"; - sha256 = "1czd04vvl7gzaj1fmzkmd36cpsg22d3gg7sqyfh742ycw1ggkpzz"; + rev = "c9bcf1bed3acf367d6deb0c273cf22db0f18dab2"; + sha256 = "16yd296n0nh96pnkjpdbdz4i7ga4j961pkzm3cbnika26xwndx03"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11626,12 +11710,12 @@ darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20161022.713"; + version = "20161210.2038"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "c9a3a985ca1dec84557c45129798cfa7a3da4638"; - sha256 = "11rhwddxw64xwhghlchrmm30dsg1bs7v2l14v9lf66ck8n3xzfpk"; + rev = "9b349813bee4e0b0f1c89e6e9796f43de3930fc5"; + sha256 = "1iivrz48h8f7rqbihxk2m2ffxlqfikd4bmf57d4z428d6yp31sr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -12979,12 +13063,12 @@ dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "dired-quick-sort"; - version = "20161025.1322"; + version = "20161208.1312"; src = fetchFromGitLab { owner = "xuhdev"; repo = "dired-quick-sort"; - rev = "192a2535025d4644729b65f38474eaf54c999f18"; - sha256 = "01n2ldsgfxnrdqdcfw1r0vrp1x1q5f6ikjzxx56qqp9f4kmfvs50"; + rev = "1845f978d313f750a5b70b832457ed803c4ffbdb"; + sha256 = "014frvpszixn8cx7rdx704glmjbslv3py3kw0pb0xqf50k4scynf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d278178128deb03a7b1d2e586dc38da2c7af857/recipes/dired-quick-sort"; @@ -13960,12 +14044,12 @@ dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dockerfile-mode"; - version = "20160128.951"; + version = "20161209.631"; src = fetchFromGitHub { owner = "spotify"; repo = "dockerfile-mode"; - rev = "53434afa3b56eb9284d5e2c21956e43046cae1fa"; - sha256 = "0vx7lv54v4bznn4mik4i6idb9dl7fpp3gw7nyhymbkr6hx884haw"; + rev = "bebfa1b73e7e006d574a0e4fbae225dc1db214ff"; + sha256 = "129kang099mw6lfi4616d47axm3q81hr8jhqwymc3ar9ramggyg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode"; @@ -14492,7 +14576,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1773071"; + rev = "1773793"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -14970,12 +15054,12 @@ easy-escape = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-escape"; - version = "20150718.1933"; + version = "20161209.744"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "easy-escape"; - rev = "c87d76e5001f36fbbf975e9ce7e776acd2dd7776"; - sha256 = "1qn0givyh07w41sv5xayfzlwbpbq7p39wbhmwsgffgfqzzz5r2ys"; + rev = "63fa5fcf9a53b7d3c1e872081e65afad5a722ba8"; + sha256 = "11v5pzpyrzada07laa3jh6c1hafwrpx1pxvp7r1azqy9fpi3slnz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39e3b867fa3143e9dc7c2fefa57b5755f70b433/recipes/easy-escape"; @@ -15117,12 +15201,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20161206.1633"; + version = "20161209.1546"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "87546fbf0202ca4f476b77f8afaaa532f38dd2d9"; - sha256 = "0wwk3xv0qv9fl7crdfbldsnwxwnhqqsq0kgyp4vfwjqyrj78cb66"; + rev = "87abf50dcb8cc1a68620691dbf78ccae4707ec7c"; + sha256 = "07ndy86ld8cz627iwh76spj296z7f8ivcimcv3dhna788q6v46xd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15576,12 +15660,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20161205.1743"; + version = "20161211.2144"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "627588cdecba03faad831fae380f1540551b893f"; - sha256 = "0yivg6caiqhflijj8m24nl2s3klazy3sbd2bli145hrddfjhzn8z"; + rev = "19e81d24f33da40cd414142e44a55957ac9be83d"; + sha256 = "1xcfyqnannnm6myv7pn2gjwnlq7rq4zciiykj5fs9kziaf4qggnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15736,8 +15820,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "60c403e10a530ac503367bc538d9d0f48478089e"; - sha256 = "0y3g5n77qph41d07zblj962g247j9bzcp28mdp80k229w1j8x90i"; + rev = "87b279f0e1ea1754215eceef007c8736d4bd9dfd"; + sha256 = "1zjy8zmsh6n535cazmkrr081rmjaigkqxx134sam474dzbmcybdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -15923,8 +16007,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "840c4b1c8aecde69e79c5ec944a62fb8e9e82f74"; - sha256 = "1nvd2jlb3qaharij3hqcp98vzawyf4p0f72fwd61ld13bmxlxyvi"; + rev = "ce9dc5ec48dae139338c69a53f9779876038bb54"; + sha256 = "0wknmkv38zf8q4qd2iasng08mia1x7l813qzvysw8lv1x45gspsy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16228,12 +16312,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20161023.241"; + version = "20161211.1122"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "cbb27a753bb3ff69c2fbe31e5d9df77f764f5472"; - sha256 = "1wb00qms1rpz729zkdnk1j2mh2lnx6cfh5g9i7la4pnfdvsgpy4j"; + rev = "86d5ae04c35642cbccfa75a12008f7b65d63312b"; + sha256 = "189vxvhp018bs42qb6z9nfw51nsmjfb5q66w3hr5zgkapxwgjpsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -16249,12 +16333,12 @@ electric-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "electric-spacing"; - version = "20161127.720"; + version = "20161209.1157"; src = fetchFromGitHub { owner = "xwl"; repo = "electric-spacing"; - rev = "b9a4bb5e9a5867d089779e62e1e51072ffc3c8f8"; - sha256 = "0a7ikd46xwjpc8ya2cb75xabrihn58ihk4r1wpsqj6dkhifch47p"; + rev = "9d0f8a213133f2619a4e9dfbba3b00d4348c07b0"; + sha256 = "1wzf8q2k2iwnm9b5kj16bwif7g0qc7ll3cjs20gbmcnq5xmhwx9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a78c0044f8b7a0df1af1aba407be4d7865c98c59/recipes/electric-spacing"; @@ -16312,12 +16396,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20161122.1713"; + version = "20161211.1108"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "d1855fb7d6d07addbf69bf3a8b4800406c711bee"; - sha256 = "08i4n6rbmykkl448ddzxn1y0pk0vblzbql30iyyykjixdc21y1fm"; + rev = "4f7699913ee1e9c815276760ced3393e88e506f4"; + sha256 = "11fsfki4cz2q3xnrm1mrb94sf2achl3g2bwmi21d1xn68z4zg79x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -16386,8 +16470,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "d1855fb7d6d07addbf69bf3a8b4800406c711bee"; - sha256 = "08i4n6rbmykkl448ddzxn1y0pk0vblzbql30iyyykjixdc21y1fm"; + rev = "4f7699913ee1e9c815276760ced3393e88e506f4"; + sha256 = "11fsfki4cz2q3xnrm1mrb94sf2achl3g2bwmi21d1xn68z4zg79x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -16592,12 +16676,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20161123.33"; + version = "20161210.49"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "529c20acb9efda756b69e267d73d33c66fa08293"; - sha256 = "08zl1v0k3dnn8g06l3xf1lp31fp60jpk6f3lkczi1l6ns36g11jx"; + rev = "29f50a940113d793a21998f3bb414fdd9b0c5daa"; + sha256 = "02c7xl9w81140l7p9kywr5qwsdyv92nxdhzqcxjk0r09x7s0cvsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -16820,19 +16904,19 @@ license = lib.licenses.free; }; }) {}; - elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }: + elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20161125.56"; + version = "20161211.1045"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "1332a08d5895acc5d14f23dea927fb8e715bd415"; - sha256 = "1alsygm1n24y4asf0l0bgg3l0i628m7xpva8xfw1vw69r06dvypp"; + rev = "6b139ed3f28cfe255288aa07f14c49f1f15132bf"; + sha256 = "0hmk1pi9mv74ry3mff854qz07rpiirn275wkd6s4vqpy7m8za4rv"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy"; - sha256 = "0n802bh7jj9zgz84xjrxvy33jl6s3hj5dqxafyfr87fank97hb6d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; + sha256 = "1ri3dwnkw005plj1g5grmmq9np41sqk4s2v18pwsvr18ysnq6nnr"; name = "elpy"; }; packageRequires = [ @@ -16840,6 +16924,7 @@ find-file-in-project highlight-indentation pyvenv + s yasnippet ]; meta = { @@ -17232,8 +17317,8 @@ src = fetchFromGitHub { owner = "syohex"; repo = "emacs-emamux"; - rev = "573dd1cf18584a1fd240efb16c7726b6fd790b73"; - sha256 = "19y69qw79miim9cz5ji54gwspjkcp9g2c1xr5s7jj2fiabnxax6b"; + rev = "e4611a4049d3180e35da6419cf01f15c8fe2575f"; + sha256 = "1gskns6fqgp575hvk3jxl8wjlrh3i6wq1s4lwbgx0m5qybgqa62q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6de1ed3dfccb9f7e7b8586e8334af472a4988840/recipes/emamux"; @@ -17709,12 +17794,12 @@ emr = callPackage ({ cl-lib ? null, clang-format, dash, emacs, fetchFromGitHub, fetchurl, iedit, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }: melpaBuild { pname = "emr"; - version = "20161206.1325"; + version = "20161207.1229"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "emacs-refactor"; - rev = "d1b2db7b4aa60379528c68753e0fb7952c803830"; - sha256 = "0y01flz5q3q9kdxgw9n4bxagygvy73y6x5k83kyxrjiz4m3xz21p"; + rev = "483877f912944ff0e4a51362548c3528c4df068c"; + sha256 = "0i426ri2fk2wijk4k95yiqbky4as9w4gpw264rrh14y43fx0ncyj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr"; @@ -17893,8 +17978,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "8a0e14c292814c072633681bc8d06a8b821be052"; - sha256 = "1xfnj7khfqx6m1121jlym35bfw3dgw1p5kx6qs0g15s8bnjbp3bj"; + rev = "5156f9b1b748c3e2246730d3234121b36e6d7553"; + sha256 = "08m5ps972fbjwz97s6bs92icf7x32kh2invjdypy59zj2q0pdixv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18530,8 +18615,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "a0d365fc3c41464e77d24942aa3255788c5959a5"; - sha256 = "0sikbfbh8im6lrgylbnidgz7jzz3prip5xxmj1vx077jsbs263al"; + rev = "b47d104994c6f11301f23b0675ed5f06f3e25922"; + sha256 = "06498ydjw27wvyaxrc6fxf1z3ymw5cgy553ij2p1s9d4b78czlm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19569,8 +19654,8 @@ src = fetchFromGitHub { owner = "linktohack"; repo = "evil-commentary"; - rev = "5fe309effae89fa60a3b9dc47383fa54fce2bc7e"; - sha256 = "0nsragb714xycmq35kl29ngmchwapvm2hdk0fc29iv75mrmflnr1"; + rev = "a5f2543cb2b90d73b86776f02b25ef16c505832e"; + sha256 = "1nslk5j55yqaczpbz7w8jirl6gbccb32w8g6bm7higvv8cjv7qsg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary"; @@ -19968,8 +20053,8 @@ src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "5db7d1cb39d3193089407deee4a2b21a5b1ef782"; - sha256 = "1lghqmdlbz56a9g0p5r4wgw24zj8ymqjarx03zxqqmjigy9792h4"; + rev = "124ac33859cb5f0d7928b5de62e5b40159f84478"; + sha256 = "1lhgxb2fsl66c0a2afn56h4rqs2x2v7ijskzv95ag7i0zmjgrfds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20090,12 +20175,12 @@ evil-opener = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, opener }: melpaBuild { pname = "evil-opener"; - version = "20161017.235"; + version = "20161207.1010"; src = fetchFromGitHub { owner = "0robustus1"; repo = "opener.el"; - rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a"; - sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p"; + rev = "c384f67278046fdcd220275fdd212ab85672cbeb"; + sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da8d4e5bf23985632f993336b9183fe9f480addc/recipes/evil-opener"; @@ -22081,12 +22166,12 @@ flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flim"; - version = "20161029.1930"; + version = "20161210.1728"; src = fetchFromGitHub { owner = "wanderlust"; repo = "flim"; - rev = "62c5fee3a0b9a0a8b122940ea5cd536adfac0ef0"; - sha256 = "0iwamgidr4i7jpqfd1mrja4id0app87w6llmpbpj7sxy1pbjv1qk"; + rev = "3510d32e5820b2c22b4e9c9f29177beea42c5bfb"; + sha256 = "0ggr8fkzwa6k0i7gl41qxkvkvnzpqzbhnd6klbk6j6j0rw1pmgn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim"; @@ -24490,16 +24575,16 @@ forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forth-mode"; - version = "20161201.113"; + version = "20161207.1442"; src = fetchFromGitHub { owner = "larsbrinkhoff"; repo = "forth-mode"; - rev = "0d22cedbaf2530386eeb5faff8feef6a7a25ee82"; - sha256 = "1y3kr2k7h7w7d8k2ivj06fy4cqhw7gin39id2m3zfidq1cln02aw"; + rev = "0bbf7992d618a84f823b21de5eb36a7cb081e35f"; + sha256 = "0566l9zrz8hsmjcywn7851rgrrjq2qfhnlkbcwgn0n0q98x95hq0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d1c8b5b9fe8f17905de801f5d7dea28ca73daa4e/recipes/forth-mode"; - sha256 = "09arqyzsfiqblpxb6kv1nwcdr1ify96814jvxrqwkd20rxx1d79j"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode"; + sha256 = "0j60abi5qyy94f4as90zhmkb12jdirysdbq4ajs5h91vi6gb1g3i"; name = "forth-mode"; }; packageRequires = []; @@ -24805,12 +24890,12 @@ fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fstar-mode"; - version = "20161017.739"; + version = "20161211.2200"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "52b4f97c0852fde10fd8de40c1ace626923f77fc"; - sha256 = "18b2sifxvwb8biq3d4vksad093mxmbvlzfbba22fi784fainvvvq"; + rev = "b633674651d324a2aa09a53134e5a617d7ee5f87"; + sha256 = "0vhd8wpshgcgpq836d7048vxrr7wzy0z473kz6xn7ql10sxiz4i2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode"; @@ -24829,8 +24914,8 @@ version = "20161123.2000"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "4e3fe96d3db816da1a1e252eb3a9c1d6424fa786"; - sha256 = "0fm2wxll3y5ypjqp324znzi94dpxpkbn9s0zf2klgjzd8mb97x5v"; + rev = "aa5334420c42399d929cc6506a6b71c724c47df1"; + sha256 = "19i5c5v0d1h12jkwbbg47p1n8a99ic7hl5avi8xndsm958aghcdl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -25279,12 +25364,12 @@ general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general-close"; - version = "20161207.434"; + version = "20161208.1021"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "general-close"; - rev = "ee920766ed53b29dc87f4ec400b8212c9a8c1198"; - sha256 = "0krc3lp5k8nm67623v6lr41sj1fnyvp4axbs2pgh0biiq7yaff2i"; + rev = "aab9b0bdb147ccae2b8b49a8bd2f1ad05f435909"; + sha256 = "122lm7yh5nf6s6pf64fmsqvr4aqidbjx7vsizxpwjk1i47hj48q3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close"; @@ -25409,8 +25494,8 @@ src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "a30668ac60e54199025d96a59a9f718dfe0130bb"; - sha256 = "17j66iqqnwlbaalcy45l0vy37rll59z7rd5vkckgfwlnzxn8k1pg"; + rev = "6a76836a2ed1ebc3380dcfbe2b46786abf905fab"; + sha256 = "0anlavmfhm0ax6566sl9ih0j4v80s313n32d4yfp9lh4f1drp62k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; @@ -25745,8 +25830,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "b7ccae8b3d516693e5c77d1b64538d18eecf12e9"; - sha256 = "1zxfl2bdkizf3836z4k9250vs6mlm2anr22p7ajzxkz5pk132wbk"; + rev = "6a4bb25b621b69b0ae564a572b89ed31e22f780d"; + sha256 = "19va83m1b80fy4naq1kl03jm0h2s1ym6d3y86nr4swly676pd2dw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -26284,27 +26369,6 @@ license = lib.licenses.free; }; }) {}; - gitty = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "gitty"; - version = "20151120.2348"; - src = fetchFromGitHub { - owner = "jorgenschaefer"; - repo = "gitty"; - rev = "c7c3d622d59531d023b9184d2479316c28045ca2"; - sha256 = "0y8msn22lzfwh7d417abay9by2zhs9zswhcj8a0l7ln2ksljl500"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/01d314eac1da048fe67eb907c42734f495462c20/recipes/gitty"; - sha256 = "1z6w4vbn0aaajyqanc7h1m5ali7dbrnh4ngw87a2x2pkxarx6x16"; - name = "gitty"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/gitty"; - license = lib.licenses.free; - }; - }) {}; glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "glab"; @@ -27268,22 +27332,22 @@ license = lib.licenses.free; }; }) {}; - google-maps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + google-maps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-maps"; - version = "20161120.1342"; + version = "20161210.458"; src = fetchFromGitHub { owner = "jd"; repo = "google-maps.el"; - rev = "8b5f6012e28de0ae96d3162b21004308f5105c5f"; - sha256 = "18vmcda7p1ch7bvvq7abczarfz52nymc4j3ykd9d79vrxkzfzq98"; + rev = "956e6ad42bc3819bcaf4cc66a640f5079b385ed7"; + sha256 = "0dqcs9dl3170zddh4npsqm1ql0n0a0378gyqxk0vi0ibzch537vk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-maps"; sha256 = "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx"; name = "google-maps"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/google-maps"; license = lib.licenses.free; @@ -27482,8 +27546,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "5b4d52150638665b6378a65b3d579c74718c5bff"; - sha256 = "1x46axy950x8japxiabrf293x7jn146jrdimznmckkapfszxrpdg"; + rev = "b5c807e3033ca8173cb48e8ef22f6cafc55244ba"; + sha256 = "1i53iqcnq4bk29n7yj90n9m4g7qzdxp51c5mdgyvkdlwy3mry3i9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -27517,27 +27581,6 @@ license = lib.licenses.free; }; }) {}; - gplusify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "gplusify"; - version = "20150312.1244"; - src = fetchFromGitHub { - owner = "jorgenschaefer"; - repo = "gplusify"; - rev = "bd6237ae671db2fbf406dcc6225839dcbd2475b2"; - sha256 = "1l43h008l7n6waclb2km32dy8aj7m5yavm1pkq38p9ppzayfxqq1"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2d7d6cf6cca5e6abd1e7b0835bd6aba4f156369d/recipes/gplusify"; - sha256 = "0fgkcvppkq6pba1giddkfxp9z4c8v2cid9nb8a190b3g85wcwycr"; - name = "gplusify"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/gplusify"; - license = lib.licenses.free; - }; - }) {}; grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-mac-link"; @@ -28597,12 +28640,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20161110.316"; + version = "20161212.116"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "023989e46d6449532f3ab7581ac56b31f87a9448"; - sha256 = "0wx5dlq9l0r79adfg8sadclk1i2ab3vs4925nwxdx11ccyxph55l"; + rev = "319020de4a79a005eb0fe651222430ceedcd332d"; + sha256 = "1slagi6f0mkzsjhy0cldlp5g1aqgiazkdb1mrzafw5cr12pdi9zw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -28865,12 +28908,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20161207.428"; + version = "20161209.753"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "097ce9e789e91f5ed1461e4379f3e785738a6cfe"; - sha256 = "0qm7piplx7i6bf5mq9ncxzm57fs0api9sy83impqvh980ilwkv43"; + rev = "98f97e06d7754d1451a5764db3b0e19b71ec3ca2"; + sha256 = "11a62n30204d7mqirl5gzzw4rigrf5c8v6j88rs3i5x3x4zn342a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -29432,12 +29475,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20161206.2324"; + version = "20161212.408"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "097ce9e789e91f5ed1461e4379f3e785738a6cfe"; - sha256 = "0qm7piplx7i6bf5mq9ncxzm57fs0api9sy83impqvh980ilwkv43"; + rev = "98f97e06d7754d1451a5764db3b0e19b71ec3ca2"; + sha256 = "11a62n30204d7mqirl5gzzw4rigrf5c8v6j88rs3i5x3x4zn342a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -29516,12 +29559,12 @@ helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dash"; - version = "20160802.1147"; + version = "20161207.1232"; src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "414e2a19664c21010622e41da49ef90cfc8075c7"; - sha256 = "02dgbprhvrij4k5wgvfgx8wpi36wwk5rsyfsya13mz6navx5nqgs"; + rev = "b649ca44481e874146df8b88cc8750589dbdc232"; + sha256 = "0wchzxfd16g7idlvfa1idqivv7m2nvnil94b2fx39q9zcs0qzw4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c3ea21430473ef22d5ea9c8b2cf7ec9689883a/recipes/helm-dash"; @@ -32146,12 +32189,12 @@ highlight-stages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-stages"; - version = "20150421.2057"; + version = "20161212.241"; src = fetchFromGitHub { owner = "zk-phi"; repo = "highlight-stages"; - rev = "c5a01b29cf79cebd09da863d45f9f35f6ad3bd06"; - sha256 = "0gnr1dqkcmc9gfzqjaixh76g1kq7xp20mg1h6vl3c4na7nk6a3fg"; + rev = "d2c4f78ca9fc696da05fa05e3731c9a130a578da"; + sha256 = "1sl419f957q9c04lm10i4jawqz28mymyaiwvk4dwh1x1iqa37qsw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46884aa6588f55d6f688477a5e9f528f57673131/recipes/highlight-stages"; @@ -32951,12 +32994,12 @@ htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "htmlize"; - version = "20161206.1142"; + version = "20161211.1019"; src = fetchFromGitHub { owner = "hniksic"; repo = "emacs-htmlize"; - rev = "f74ea313ad364ffd648e330b2e6ddabb89f6e797"; - sha256 = "16jxd5nfpqlg46zzp0yvvn5aynprd5xv655fcql8cvxkkg111d5z"; + rev = "88e2cb6588827893d7bc619529393887c264d15a"; + sha256 = "09xpv8dsc39a7w9s6xnilc5kh1krs2jw8cklizxzz4gp36hrsj2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; @@ -33572,12 +33615,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20160623.815"; + version = "20161211.910"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6"; - sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965"; + rev = "a1c2965e31ebc6bf6f86fba0184415da32a8214d"; + sha256 = "0fvsi6hll1x0nvx1axsmsfv93pydkpmzq36hjw4kkp07nrf2byrz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; @@ -33870,8 +33913,8 @@ src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6"; - sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965"; + rev = "a1c2965e31ebc6bf6f86fba0184415da32a8214d"; + sha256 = "0fvsi6hll1x0nvx1axsmsfv93pydkpmzq36hjw4kkp07nrf2byrz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; @@ -34442,15 +34485,36 @@ license = lib.licenses.free; }; }) {}; + importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "importmagic"; + version = "20161208.108"; + src = fetchFromGitHub { + owner = "anachronic"; + repo = "importmagic.el"; + rev = "e536d96fdf4bfcbe44eb22827dec0955551f537e"; + sha256 = "05ayg63v3a57d0x6lzkb25z7gwf4dwa4j56q25fk0p6y5ynrhfwr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/695534126f0caa52f66bb90b0277d08d524daa21/recipes/importmagic"; + sha256 = "1d85sg8wsm03v8zmv5w0znkgnr4q33x0d3frkr16dcmgqh2z9lgp"; + name = "importmagic"; + }; + packageRequires = [ emacs epc f ]; + meta = { + homepage = "https://melpa.org/#/importmagic"; + license = lib.licenses.free; + }; + }) {}; indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indent-guide"; - version = "20160913.1754"; + version = "20161207.1714"; src = fetchFromGitHub { owner = "zk-phi"; repo = "indent-guide"; - rev = "2f764164d0ceb5dceddd8642447b74939d98d583"; - sha256 = "0g4ddx741liazyc16qh65phs8ic00gmxv768yhyhrns7f6hfrq5b"; + rev = "38cc1c64d6f897230125c3590157f25c09703044"; + sha256 = "10ymf5fwkxcs94pxvv754krqnvzz9hjv44ma7bakz0r1rfgn1jhc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide"; @@ -34463,22 +34527,22 @@ license = lib.licenses.free; }; }) {}; - indicators = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + indicators = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indicators"; - version = "20161203.349"; + version = "20161211.326"; src = fetchFromGitHub { owner = "Fuco1"; repo = "indicators.el"; - rev = "d80155197d4a5691ca038c2f3cc14cf4b2a4a3d0"; - sha256 = "1xrc3q7nnfcfycklrj7r6w36sipc7am1izx9kjqzalarkajlcsfl"; + rev = "f62a1201f21453e3aca93f48483e65ae8251432e"; + sha256 = "0n933jigp0awba2hxg3kwscmfmmqn3jwbrxcw3vw9aj0a5rg5bq6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72c96bad0d0b5a4f738fd1b2afe5d302eded440d/recipes/indicators"; sha256 = "1rhmz8sfi2gnv72sbw6kgyzidk43mnp05wnscw9vjvz9v0vwirss"; name = "indicators"; }; - packageRequires = []; + packageRequires = [ cl-lib dash ]; meta = { homepage = "https://melpa.org/#/indicators"; license = lib.licenses.free; @@ -34633,10 +34697,10 @@ }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20161127.1748"; + version = "20161210.837"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "0mz8vq55r3n89187q2qc60n0s5iigv0i19pzb3zxbca8769vlbdc"; + sha256 = "1d2n5yyrm904f22s8d4wqk66p646c7yx4rpsymp9cfgjvwlbar96"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+"; @@ -35298,10 +35362,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20161205.1445"; + version = "20161210.1812"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "02k88x6gn9sk7w352q2vgzgfmmv0p2gv4k7wm9k5pyymy0j9skna"; + sha256 = "01y1r0drfhjq87ip1mai4p47ivhc0gvfman8p9g6fqbywskdnnxm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -35524,12 +35588,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20161204.48"; + version = "20161210.333"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3b15585257c083706c32d0988f1982018fb17e9b"; - sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh"; + rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991"; + sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -35612,8 +35676,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3b15585257c083706c32d0988f1982018fb17e9b"; - sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh"; + rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991"; + sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -35816,12 +35880,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "20161124.500"; + version = "20161210.804"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "fc0c467db0549cfa3d96ff6e0f56d0c84c493ba6"; - sha256 = "17iq0dn862xaak898lc7fmfbzxl9pyycwlmm5wn9kbbq8p6y7nrd"; + rev = "2bacd4da0b190547d2d767adfea1b3c4501710c0"; + sha256 = "18r8rkcqrcizg884axf3d2zi9a6d5nlh1syn68l17yf2fi4mkkzw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -36152,12 +36216,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }: melpaBuild { pname = "jdee"; - version = "20161206.1410"; + version = "20161207.1325"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "e903628a0260787e4fd0834b314cba63cee53f63"; - sha256 = "1444yzxxfmwq5igcxlzd9yknghqbzinimsc23zbsk21in31rrnlj"; + rev = "c4ee9b3fefe42e00475af452d7c664c62dbe067b"; + sha256 = "11sz08a59hqcyynmd2zyllbvqnh7ll0ql22vj4gxrvkv18sb79za"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -36608,22 +36672,22 @@ license = lib.licenses.free; }; }) {}; - js2-highlight-vars = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: + js2-highlight-vars = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "js2-highlight-vars"; - version = "20150914.108"; + version = "20161209.128"; src = fetchFromGitHub { owner = "unhammer"; repo = "js2-highlight-vars.el"; - rev = "5857999e6a376810816a0bee71f6d235ffe8911d"; - sha256 = "1gad5a18m3jfhnklsj0ka3p2wbihh1yvpcn7mwlmm7cjjxcaly9g"; + rev = "15dbc583d8c2b7385f677d7ea563065fe6bfdb56"; + sha256 = "0da32ky9fg5rilb3h3s6s7v8swvnyqfwv51f55y3dhyya3n1lclm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f4a7c90be2e032277ae87b8de36d2e3f6146f09/recipes/js2-highlight-vars"; sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475"; name = "js2-highlight-vars"; }; - packageRequires = [ js2-mode ]; + packageRequires = [ emacs js2-mode ]; meta = { homepage = "https://melpa.org/#/js2-highlight-vars"; license = lib.licenses.free; @@ -36632,12 +36696,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20161205.1446"; + version = "20161208.1415"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "3106e3c47dde930fdd4867e8583fd7e9bb418996"; - sha256 = "06wvjbxn6dbrwi26flqbs6y8c4dw7nr0bdsplwzw2ikwpdsgjsrv"; + rev = "6f2d51bd723126f82b491b5e2515356018a48849"; + sha256 = "0bnbfbii0gq6rai4r62c9yaw6q1hlkiw038x0g2skmhnwm24ciiq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -37465,12 +37529,12 @@ keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keymap-utils"; - version = "20160902.513"; + version = "20161211.1015"; src = fetchFromGitHub { owner = "tarsius"; repo = "keymap-utils"; - rev = "14c86914b708081299cf6a290570ff8e11853cab"; - sha256 = "15zsx296cqzmwivrkkknr8lmdsr6dkggxbwp2yggr20278vsvbhv"; + rev = "8c88aa025201d4d890ab4eb51ce20d3c1ad20454"; + sha256 = "19pjxhi4vp1xb7q9wrknvypylrnx052c9r3s0kl65wqasiqmrans"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; @@ -37700,8 +37764,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "0ebcdb7e4eb5dcab919779111374191bcf0f03a6"; - sha256 = "16g5s7s3rdd8jvm9g3bhdq3xwgx5gf4nxdjw2pbqhiparnkkqsz2"; + rev = "a58a88c506472302eee373b689cc297f64e42476"; + sha256 = "0sgfl1d7dc7xppz6y9jchyl0dsx6jinjza7r1ak0ij5m32070zm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -37717,12 +37781,12 @@ kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kiwix"; - version = "20160902.759"; + version = "20161211.513"; src = fetchFromGitHub { owner = "stardiviner"; repo = "kiwix.el"; - rev = "686bac60f942665ddf695e761a1a37900c30885f"; - sha256 = "1salimr0295hqk14g0s3lw8a7znkkfw2mdk6g1ij07lc4cahhfx6"; + rev = "34851315ae9df84107f99236a0312ca4408838b6"; + sha256 = "19jlrhrm1aciw20a52ljjzx3g17izkznxhg6j9q920v72dwm2z0m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix"; @@ -38011,12 +38075,12 @@ labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "labburn-theme"; - version = "20161108.139"; + version = "20161212.313"; src = fetchFromGitHub { owner = "ksjogo"; repo = "labburn-theme"; - rev = "3d180e556e20520081cbd05ec51aeb527bb48846"; - sha256 = "11p86v1qmgrxsv4zr14ygs43s9vdn4kscxr3gbjxz31ikbxf9w3g"; + rev = "ed5481c4fe2cc7ffab8ff066e3cae5118c582484"; + sha256 = "0wza7rn34y0p7drgrl9w10ij9w4z03vvy775zkp4qifryv78rzk2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; @@ -38574,12 +38638,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20161202.46"; + version = "20161211.1055"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "a8c6fc562043f1f4821d44e097713db2c67526ce"; - sha256 = "0l55k47szdhk4hhkddpfq6lrya9gc5n0ayslzjvz8g07g3m6p1y3"; + rev = "10585a4333b409ee8b6e1a329de912464b69351d"; + sha256 = "18id5zhf4kk8ws22zp3cfzxcrpc3cj5k9a1m51xrfqg3ykqbg8g1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -38951,12 +39015,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20161129.743"; + version = "20161211.1128"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "806b7dd5deb620751afc88480888e9bcc9f38e88"; - sha256 = "1c0zxjkq25a5aqxmbmnjih44as21g6yva05h9srxzbwn0w45mv4f"; + rev = "b50c07af1ee414c73b4dd53d6ca19ca4e473763a"; + sha256 = "0i5zgrym9bh1b584qwh3npw4383s9arbs71xckp28di9w249sm4v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -39351,8 +39415,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "1517e2ed72820d41a169f195c500d7adf2ff65ea"; - sha256 = "1bi1pk6yl31fg8yv6c7dkkb57ahs9cig2dy0lw137n4bgrd4l3jd"; + rev = "f00c869d13d6af87f02ebf0bc5b682d5260436c6"; + sha256 = "0667v43kd1ld764550s0qjki71iv4bp02nmdywbwfv60l76f5swl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -39928,12 +39992,12 @@ magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "magic-filetype"; - version = "20160522.729"; + version = "20161209.1826"; src = fetchFromGitHub { owner = "zonuexe"; repo = "magic-filetype.el"; - rev = "3f58122429ea24c54fca79a91605eb660ee5bc3e"; - sha256 = "109j4czb71qg9jlnflzph0qmbxyfajddmg0yqwhl368pa29alvrk"; + rev = "3a5b86370cd495622be0200220405f48ea2aadc1"; + sha256 = "1dw4r21c45l51l49n6jddn479kx2rmf27xm69cg1fp9xvadxqcd6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6027c5a66386f7140305a4cde12d66da4dfa09/recipes/magic-filetype"; @@ -39970,12 +40034,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20161206.2039"; + version = "20161210.737"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "b7ccae8b3d516693e5c77d1b64538d18eecf12e9"; - sha256 = "1zxfl2bdkizf3836z4k9250vs6mlm2anr22p7ajzxkz5pk132wbk"; + rev = "6a4bb25b621b69b0ae564a572b89ed31e22f780d"; + sha256 = "19va83m1b80fy4naq1kl03jm0h2s1ym6d3y86nr4swly676pd2dw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -40145,12 +40209,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20161206.1703"; + version = "20161207.613"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "b7ccae8b3d516693e5c77d1b64538d18eecf12e9"; - sha256 = "1zxfl2bdkizf3836z4k9250vs6mlm2anr22p7ajzxkz5pk132wbk"; + rev = "6a4bb25b621b69b0ae564a572b89ed31e22f780d"; + sha256 = "19va83m1b80fy4naq1kl03jm0h2s1ym6d3y86nr4swly676pd2dw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -40520,6 +40584,27 @@ license = lib.licenses.free; }; }) {}; + malyon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "malyon"; + version = "20161208.1325"; + src = fetchFromGitHub { + owner = "speedenator"; + repo = "malyon"; + rev = "0d9882650720b4a791556f5e2d917388965d6fc0"; + sha256 = "0an1yvp0p624rxd8n5phiwvznw35ripqhlwzwyv2bw7lc1rscllr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/54b3785cfcdb3b54307f60ee634a101e8bcd9989/recipes/malyon"; + sha256 = "050kj4c1vp9f3fiskf8hld7w46092n4jipdga226x97igx575g3r"; + name = "malyon"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/malyon"; + license = lib.licenses.free; + }; + }) {}; man-commands = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "man-commands"; @@ -40565,12 +40650,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20161202.2205"; + version = "20161211.2253"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "2282848c1ab80f606390824711ca4a80548e6dac"; - sha256 = "0ckm7a0x367k3vv8ighl2ah2h8nwsgzqn30makrr7gqid6fas92s"; + rev = "04f1aaf687ad1d3bf6bf032b817032b82a6cd6bb"; + sha256 = "0pf6hcbd13gfjb58z2cgc4ql2m08kx0inxz1x7sfrpg1cvh8nb8f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -40751,22 +40836,29 @@ license = lib.licenses.free; }; }) {}; - markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, web-server, websocket }: + markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }: melpaBuild { pname = "markdown-preview-mode"; - version = "20161207.59"; + version = "20161211.1443"; src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; - rev = "e1fce78ad3b96799675765140e0fa6936467be62"; - sha256 = "0dwrb0b0ninasf538lsv41gq4v3pw15i6mc90cs3nqi50i5l64c6"; + rev = "b55c8ddba2f9c4e87f0dd9bed586f4d94890350f"; + sha256 = "18x7mk4xysiihr707xl4s52a73mpj9bwlh53gli37wmpjfgdlp1y"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode"; - sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode"; + sha256 = "1cam5wfxca91q3i1kl0qbdvnfy62hr5ksargi4430kgaz34bcbyn"; name = "markdown-preview-mode"; }; - packageRequires = [ cl-lib markdown-mode web-server websocket ]; + packageRequires = [ + cl-lib + emacs + markdown-mode + uuidgen + web-server + websocket + ]; meta = { homepage = "https://melpa.org/#/markdown-preview-mode"; license = lib.licenses.free; @@ -41400,12 +41492,12 @@ mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "mentor"; - version = "20140904.1710"; + version = "20161211.1946"; src = fetchFromGitHub { owner = "skangas"; repo = "mentor"; - rev = "f5d653348140cdab1d8ee9143b14a50ea88ed3fb"; - sha256 = "11hyydc13jdai6lkxx8nqf8xljh0gx7fcmywhik4f1hf3pdv7i2q"; + rev = "f53dac51a29f67e31f1fb82702b19d158cc6fa22"; + sha256 = "0qqapsp4gpkrj3faii7qbfssddl3vqfmwqcy259s7f896kzwaaky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor"; @@ -41420,10 +41512,10 @@ }) {}; menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "menu-bar-plus"; - version = "20160918.1025"; + version = "20161209.734"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/menu-bar+.el"; - sha256 = "1kzmdanaf167qvmybf6hfbgia628xpqycnnl4a9qms6vfjzmqznk"; + sha256 = "18i4isl86ldmbxkyiqiawby1izhdhpa8x7zyvzbfhzrny15dp32p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+"; @@ -42348,10 +42440,10 @@ }) {}; modeline-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "modeline-char"; - version = "20160523.1520"; + version = "20161210.852"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/modeline-char.el"; - sha256 = "0qikw44mj209xycchxqifbn9vwyd4zd2d25w8m134cnkhbbjmf5q"; + sha256 = "06n97a196rqc88py7jnydv8a4q1vd0bb2ich2mx25sl3pylmd6lq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9655505f56fc90ea8ef61e7595af0de7427b273b/recipes/modeline-char"; @@ -42699,10 +42791,10 @@ }) {}; mouse-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "mouse-plus"; - version = "20151231.1525"; + version = "20161209.737"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/mouse+.el"; - sha256 = "0rakxcpqdx175hic3ykwbd5if53dvvf0sxhq0gplpsybpqvkimyv"; + sha256 = "1jr6m5cm6j6bfdk2f2n632aybjna4pcpyqm6j9flcr537fciwvap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01cbe9b5bb88f8c02fab67a269ac53c8aa4d8326/recipes/mouse+"; @@ -42866,8 +42958,8 @@ src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "b2a74bb1bab6cc3de8611b7679b4c79f45d8ddb3"; - sha256 = "08ygyinb5p9xiszmvdscnmmbiznxdz96v3rl0pw1vjmghl5v7j8w"; + rev = "fdfe0d73b72682022c76dd7dfe04b0d63d524779"; + sha256 = "108cicmggkzrvrjkja1f0n2gnqfnisiq7wsakgscfpxjsmyszhsg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc"; @@ -43093,12 +43185,12 @@ mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mu4e-maildirs-extension"; - version = "20161205.2"; + version = "20161209.635"; src = fetchFromGitHub { owner = "agpchil"; repo = "mu4e-maildirs-extension"; - rev = "0b7908280c97c1fe29de0d10ac2715344e36b1e4"; - sha256 = "0ifwf5skadck4x11v6s12pdfraxcmdj335jmhvgn3r4gzg55qgl8"; + rev = "19ff86e117f33a5e3319f19c6d84cf46854ba874"; + sha256 = "02pmnvq3crrivrv5l1x40y2ab0x2mmg7zkxl7q08bpglxzc8i4k0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension"; @@ -44529,8 +44621,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "ceeedb58d23950f0ae3944484bca331e5cbb8053"; - sha256 = "1pnh32h2ga5ny6b4snzlsv4fbp30dzmkhs58aajp5zx05bngvgkr"; + rev = "05f907787fdc1903af0366d72cf6c30e9835182d"; + sha256 = "1mb9kbd1qdqmfljjqgam3ivd5iap315fmw8hihl6afrnw42281rv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -44651,12 +44743,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20161130.519"; + version = "20161210.929"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "12a4cc1155b938da947cce5b3dff7ffb91f2203c"; - sha256 = "1x7xmqvmna5h5dg352v6pzm9ijdivaz7wcc2nhnshxc5pywpc1cg"; + rev = "403e62a1f434664c9e9477d574f18ced258359fa"; + sha256 = "0p0xz6vj3qv3wx9bwg6syi6alw223zc0l2h95bgcx2pi40da94w0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -45336,12 +45428,12 @@ ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; - version = "20160709.224"; + version = "20161208.222"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-http"; - rev = "47a7b367314f6051715882e46a0e40477bda20a2"; - sha256 = "1y5izm9yxa556536mnpc8dp0nzm8wzr778qycpk4l9xfyp4xybaw"; + rev = "9155a413e41d918042e9839399e3940aa0f8499c"; + sha256 = "1b39g0nifw0000s0x8ir0cfr716jypq6b5n2l1i4mrby6aw3bw1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http"; @@ -46350,12 +46442,12 @@ open-junk-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "open-junk-file"; - version = "20160912.1859"; + version = "20161210.314"; src = fetchFromGitHub { owner = "rubikitch"; repo = "open-junk-file"; - rev = "31b6a88001d66cda95eabb444df188a61bde6346"; - sha256 = "0xqpwf1sc36r465wi1d3vk18grpcb32fyyxy62xdxfvlw5nlnphp"; + rev = "558bec7372b0fed4c4cb6074ab906535fae615bd"; + sha256 = "0kcgkxn5v9bsbkcvpjxjqhj1w3c29bfb33bmiw32gzbfphmrvhh1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/open-junk-file"; @@ -46392,12 +46484,12 @@ opener = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "opener"; - version = "20161017.236"; + version = "20161207.1010"; src = fetchFromGitHub { owner = "0robustus1"; repo = "opener.el"; - rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a"; - sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p"; + rev = "c384f67278046fdcd220275fdd212ab85672cbeb"; + sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a448f1936f46176bc2462eb03955a0c19efb9e/recipes/opener"; @@ -47292,12 +47384,12 @@ org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "20161126.1955"; + version = "20161209.2253"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "28b460821c6227402ed2cb3222ea45bb99f7d43e"; - sha256 = "1x3y5jlcvqzzxi1rvhj9hbirgbav82m7kqmc49cjcdga5zs4x458"; + rev = "370c05876f151e7aba9c63562d41d9b7cade30ed"; + sha256 = "0scslv9il8i6yz2akrz88q7dig1lf2sz34c7hn2adbkl0ykj4wh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -47379,8 +47471,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "47ca6c129c4c7557eb8ae4cd3c656fb8b3c4b0b6"; - sha256 = "0406jas337gkx1m81560anck7bznxbb9v0kylcm99j7z10nrmizc"; + rev = "93b43e4bb486bc1b1d2e432ac74299e06a8d3526"; + sha256 = "16wmgjsr8wvic8dkfr0qbnwhm0h5zhkqpl79qi3q21wam58f263v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -47399,8 +47491,8 @@ version = "20161126.239"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "47ca6c129c4c7557eb8ae4cd3c656fb8b3c4b0b6"; - sha256 = "0406jas337gkx1m81560anck7bznxbb9v0kylcm99j7z10nrmizc"; + rev = "93b43e4bb486bc1b1d2e432ac74299e06a8d3526"; + sha256 = "16wmgjsr8wvic8dkfr0qbnwhm0h5zhkqpl79qi3q21wam58f263v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -47745,12 +47837,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20161129.417"; + version = "20161208.1825"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "d3319a7a3d724ee51a9b97328bf778324e4ab9e7"; - sha256 = "0s3h1yji4z42nd2pc50mddpvpkgi7066c3l1kb6jaywaj3yw2bi1"; + rev = "f5a5e5e20e5f99d069d3fd8c89ee5b186a02f1de"; + sha256 = "0szn5rg3xwlfgkq26fadkdsxdx2a1srshwcri9j0rlj4111c2fp4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -48476,12 +48568,12 @@ osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-dictionary"; - version = "20161115.2350"; + version = "20161207.810"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "osx-dictionary.el"; - rev = "8bbe1c700830e004f34974900b840ec2be7c589c"; - sha256 = "0pv9j3nza71kd2i9a78w1y10r965b2wrnywjk1zgvab8q9rzwxdn"; + rev = "0e5e5f1b0077a62673855889d529dd4f0cc8f665"; + sha256 = "1zpr50q7i4wg1x7vsj69rh1b8xvk9r0591y4fvvs3a2l1llca2mq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary"; @@ -51013,8 +51105,8 @@ src = fetchFromGitHub { owner = "j0ni"; repo = "phoenix-dark-pink"; - rev = "bd4962562a3d9f7330b9fbe8684ac6ba76feaab5"; - sha256 = "0mm8gyw6qzn6bkghrdsar0gbyv6sz5x2m3dii0frablgw9zac4nj"; + rev = "024a1dae5e12d9c62c67c6ba0bc56d2f8a109c15"; + sha256 = "1sfsf4ds6qvdj5hzzla31s1pvp5acbyxqqpncim2kvgim6sxyrac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme"; @@ -51639,12 +51731,12 @@ platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "platformio-mode"; - version = "20161206.636"; + version = "20161210.539"; src = fetchFromGitHub { owner = "ZachMassia"; repo = "PlatformIO-Mode"; - rev = "9cd77621fb1aa64c6d2b346cef99373d659e4999"; - sha256 = "1myq0k8hnd8niwwskbfyy17lhgislzx9gshgsfhr8xg6b4id3p1k"; + rev = "1466aed132a77f48fcb31938d64abb1a1e58ec42"; + sha256 = "1lfkp7df8as9gspynkyhz4dbm95kbngyba1ymg6ql67adyv79v1i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/platformio-mode"; @@ -51825,8 +51917,8 @@ version = "20160827.857"; src = fetchgit { url = "git://git.savannah.gnu.org/gettext.git"; - rev = "7eb592d6a7071a4d8d33f15668c33da79ec42780"; - sha256 = "0d3vqx0khw46g9692cd7nf5xpgbmsw9r79s4jmm11wsz552fp7d1"; + rev = "94737a1be1a1d68f7e032ceac9cc2ed770f36196"; + sha256 = "0f87ghm106c1f8jngcjzxg0fmdp087p4dh2yhdhaln7rd8x4zl6y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; @@ -53259,8 +53351,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "607b92149948393311d66329b9851f5971662f19"; - sha256 = "1pdszacywqkk2p5f9jigbm0brz0i5a1n9lijl1kcx4lblzyq755d"; + rev = "277a8b65805aceeefc1764947616430994e05bdf"; + sha256 = "0ykx4wgi58hgndpn5ifrn6kgmm57gx8h7np1b31mml4n7si2bsfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -53402,12 +53494,12 @@ pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20161206.1934"; + version = "20161208.2016"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "cd4cc093c62735c3947f4f7ff458a2a0a153645f"; - sha256 = "1bbqm704cfm76qd6fh9x4lij72hchciy60hjp2wxv2n5j51xqlq7"; + rev = "e8099627829aef2d382d9a5df4a24881086879dd"; + sha256 = "1w9lb3r92l0rcflkivd0k9gz2gy33xpmyxd1ikjbsr2mf7h0r1i7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -53947,12 +54039,12 @@ pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pyimport"; - version = "20160705.1444"; + version = "20161209.557"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pyimport"; - rev = "f5e56b683eed07bfbcc2fe7256b59a8e8c09a492"; - sha256 = "08b0bmky35wfzy2ax7llvw19clkh5gb5if5k46s1js5a193l2qd1"; + rev = "c0c12b64a189f99d3b1477d2dea35528a856c860"; + sha256 = "1kn38j9fgn0ja2xhvj69jdw5h6j5dqnnqk0zzd6ypk5zbwhxncp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport"; @@ -53993,8 +54085,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "dcebae55d3b3246078658cd3a2f100f80a8cff32"; - sha256 = "0gmia3yd9rvvriy04m91zrgx2sd1if141317741vv250ji4lql7w"; + rev = "3a94b38b26b5f4191ffe8c67e1db272a2570489c"; + sha256 = "001c068s56qr1vkmli0mxc985drb5vwcln7fzs605kjlvfh0mwjr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -54493,12 +54585,12 @@ racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: melpaBuild { pname = "racer"; - version = "20161112.1728"; + version = "20161209.1533"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "ca5b2f2922d9ab642ee353771091f4f8dd5add83"; - sha256 = "0j9yrb3xhx4wkk2hyk9ayzh4l1mrcvmwrg52a0dm9zpq4pr8p61s"; + rev = "485b827cfaca5e4e204e5529912d7999bc29bde7"; + sha256 = "0xjv8pi8rc0dbmllkv8gchp05j1k20pgqdi97h7s0xwjkwcpbqym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -55186,12 +55278,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20160829.1821"; + version = "20161209.1829"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "809658d30038e4fab186d47730a3790abf7cd2a1"; - sha256 = "0r1xz8l2513xhzc0dv97g4r6pxnyk5kwcih4jfribhxil0xjd5g0"; + rev = "7689f4910ce081dcecdcc8a7c534af037c65295e"; + sha256 = "1aq8r2yqwspil9l4jxprkknnj2cl9x9srx4qd8fw07ad7razcf99"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -55317,10 +55409,10 @@ }) {}; recentf-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "recentf-ext"; - version = "20130130.1350"; + version = "20161210.840"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/recentf-ext.el"; - sha256 = "15kwkphrlxq6nbmqm95sxv4rykl1d35sjm59ncy07ncqm706h33l"; + sha256 = "0pzimhqkrdg2s9zw7ysir740cmaycf6fjs08bmlfjads7vdbjfpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a36ac5e0fc3599d50d7926cacf16b7a315f0e76/recipes/recentf-ext"; @@ -55505,8 +55597,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "40f94f3c63087c05ff989dd3dc27db0ef9a638e5"; - sha256 = "1fjr85b5k8zfcdsa4si602r12x0pa7xb208y3j5ld35gwmwr493x"; + rev = "8cf6e816720cd7a8fe147a6f412d0300be015a76"; + sha256 = "1ic32q9dcrfpn8zb5bmf21iklhrr3va54kmdpy3iyyvkxs8ipcyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -55918,10 +56010,10 @@ }) {}; replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-plus"; - version = "20160508.843"; + version = "20161209.738"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/replace+.el"; - sha256 = "1a59nqrs62xzdpi7as00byf3jamr1zsz8jmf0w4mqag4bp79cd40"; + sha256 = "1898bwn0slhvkqcriwipa8d25554npj9b1hkz7rxz1pw7s8hgmck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/replace+"; @@ -56733,8 +56825,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "cc36a69e4190ed2b071c136b332ec4bca10e967b"; - sha256 = "11h8r79v79fhhbjyxlazzqrqxw8abf6xy6a9bh4gp0j7l4kmch98"; + rev = "9063198b8c19995b3d1fce8c441e1244ada0b987"; + sha256 = "03b8ajpx7vjkyn6amgrfx90v4pp3020fhq6qvb4h6s3hqsmgfzmz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -56795,7 +56887,7 @@ version = "20161115.2259"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57016"; + rev = "57064"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -56875,7 +56967,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57016"; + rev = "57064"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -58021,10 +58113,10 @@ }) {}; second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "second-sel"; - version = "20160918.1024"; + version = "20161210.820"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/second-sel.el"; - sha256 = "0kc3fmg92blqbx85ykxrd4n0rcjfjhxxig4xjw3ah3cpp39zcsxx"; + sha256 = "0c9j1lbharzyvhvb6whcymra76y0nyqfnaw1s5qzd3xdq5c9sf7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/second-sel"; @@ -58413,12 +58505,12 @@ seti-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seti-theme"; - version = "20161028.816"; + version = "20161208.836"; src = fetchFromGitHub { owner = "caisah"; repo = "seti-theme"; - rev = "8d9031db5cf357b4ce920dd77ad9aeb97e037ad8"; - sha256 = "18c8k0g30392ly7nlzfz2pzgszmxi7cyrxmxcff9qvzpxxpl9q4h"; + rev = "cbfef2fc15d19ce4c8326e65fafdd61737077132"; + sha256 = "191mvz6d6j764q1sj2496i6lq0q42b5qh5zfdvf0yl39pzbwx8jx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/088924b78575359996cf30745497b287cfb11f37/recipes/seti-theme"; @@ -59365,12 +59457,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "20161130.609"; + version = "20161212.642"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "070aa311b0a08b530394c53d0c52c6438efbc20c"; - sha256 = "0zx49kd3wrqx6f52nk8rzqx3ay3qbcygibcidw6w7drvxnxjgd04"; + rev = "d005d6567cc484b61f2d233f4bf828a2365223c2"; + sha256 = "1fp1pz6qsb3yg7wdp680i12909bv00m64102cq4pwl29cz9cgpv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -59533,12 +59625,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20161202.2316"; + version = "20161212.300"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "d0924e13fe88bd8f920d55bea7317d714f6992d9"; - sha256 = "1ij55zldz90ima8q9ay6957rzki9gcqfdfq70lgy41bgcafqp3qv"; + rev = "6eb6b336dd65ecac2b07553fdab8b190b1fcdaf0"; + sha256 = "1xcvhhcl58g3prl7dxhg69dm005fwnn0bp9knp281xi73fpfrqly"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -61131,12 +61223,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20161115.613"; + version = "20161209.1140"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "a0fbf0873d113c3f42a16c560329e43b7840f47e"; - sha256 = "0gsy0i6q4csnkdyv3hjqcap7xqjalzl167ccfligc28h07pw5zcp"; + rev = "d40f4b972e307a043963f2262e66d43b6eaf7803"; + sha256 = "0k51sm7qrhvda3gbj35gx3svvlvdvpcch76d20lnvh6y035ymmkg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -61754,12 +61846,12 @@ sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; - version = "20160911.1911"; + version = "20161207.2044"; src = fetchFromGitHub { owner = "Trevoke"; repo = "sqlup-mode.el"; - rev = "da9273d9da8f84827b840776f398d24ea4c46b76"; - sha256 = "17pw9275disv1cgcila3r9fshh0ca7mcszri709v0gk0p7f8z70z"; + rev = "81ad4ec3ca58172a3c261acf4973ec767693d0ef"; + sha256 = "02438pr144952ragf1ph4qd43kpzalbp6c5qpl725rwqxjh7bf8s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode"; @@ -62271,12 +62363,12 @@ string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-inflection"; - version = "20150805.256"; + version = "20161211.649"; src = fetchFromGitHub { owner = "akicho8"; repo = "string-inflection"; - rev = "147990de9d07d8e603ade92a23ef27a71e52b850"; - sha256 = "06qs8v2pai3pyg0spmarssmrq06xg9q60wjj46s5xxichlw9pgcf"; + rev = "0a26739a513f16bc368e0cf86ed7f4352b493fe8"; + sha256 = "12wg1zlw1l850csxi74aqycnsjxzniigd2a8gm6dy5bi2dwb7kjs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection"; @@ -63034,12 +63126,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20161206.155"; + version = "20161208.857"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3b15585257c083706c32d0988f1982018fb17e9b"; - sha256 = "0j707d1gba88gric7gpk2miifi8q4c95arv78arpbqw4bhri2kbh"; + rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991"; + sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -63950,6 +64042,27 @@ license = lib.licenses.free; }; }) {}; + temporary-persistent = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }: + melpaBuild { + pname = "temporary-persistent"; + version = "20161210.333"; + src = fetchFromGitHub { + owner = "kostafey"; + repo = "temporary-persistent"; + rev = "ac66f3054fc701d53f11ada9d2d9ab18ea481dc0"; + sha256 = "15mjcr9gwf1ijppvcxwddnxj84y9idwz7s3lcqr910xb4d3ai8nb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0f89e65ce7b302a0330f0110564320c724acc254/recipes/temporary-persistent"; + sha256 = "1q141cdnwchfra6gp6fs0nlkxv6fdf8rx5ry04kcpr9a1y56z362"; + name = "temporary-persistent"; + }; + packageRequires = [ dash emacs names s ]; + meta = { + homepage = "https://melpa.org/#/temporary-persistent"; + license = lib.licenses.free; + }; + }) {}; ten-hundred-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ten-hundred-mode"; @@ -64412,6 +64525,27 @@ license = lib.licenses.free; }; }) {}; + tf2-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "tf2-conf-mode"; + version = "20161209.820"; + src = fetchFromGitHub { + owner = "wynro"; + repo = "emacs-tf2-conf-mode"; + rev = "536950f64c071ffd8495fb2c7ac7c63a11e25f93"; + sha256 = "0vga7kgzp9wiiji1w47llbb3gp9qgwk8v0f6s8b6jng2gmdg25bk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c43c53dca64cf0c7d59ffd0b17e9fe60f4aa90d3/recipes/tf2-conf-mode"; + sha256 = "09kvb3ya1dx5pc146a6r9386fg9n9nfpcxm5mmhmyf75h9c6a25g"; + name = "tf2-conf-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/tf2-conf-mode"; + license = lib.licenses.free; + }; + }) {}; tfs = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "tfs"; version = "20120508.1120"; @@ -64618,8 +64752,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "7ab125a253e5aebbf2a0ed9a0a1602a4b879eca7"; - sha256 = "11wsdxjjw4l7h79achnw6kq5qs3dwyinkfn4r26bijapmk60626s"; + rev = "60611917cf309d2a25b9cd8f8b5631784b07323d"; + sha256 = "11y20g86s2n0lhkjw38lvv4kki2kq6ywgy4qm3na9m2sbw2p6khw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -65815,12 +65949,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20161129.1516"; + version = "20161207.1239"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "f2c75b3dce0760a84d2558d9e8ef43d5f4559c47"; - sha256 = "1nsj9iqinmnw10b0ij636nikdfhz946rd97751pzk4irwsbycxyk"; + rev = "18596179aa3da630e544ecb3ad02bcfde8c3a845"; + sha256 = "1clx74wpb3bp5njy95clvz14zcipf8mcldnp6xsv39x8xwsvgi26"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -68010,12 +68144,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20161114.1527"; + version = "20161209.1521"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "68f000149a82a4c4ef46989e261c7541ce8bf778"; - sha256 = "0k5dcaswpr0pdps3hls14hn91r2nw6024npdn599gj67naajccfr"; + rev = "5e7e812e0ef025b72dfb9adbcb751695e777873e"; + sha256 = "0c9x0w7hc3h1x1p0m3vzb3gq16vdlsswc3qxxslfxmnykzbqc4hv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -68241,12 +68375,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20161203.834"; + version = "20161210.243"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "f0aec22fd9cbefb8246f8ae533716b7cce016077"; - sha256 = "0zmn8jyvs164kim3avvdaw66rmdh6nqbm5qi6bpz5i0zb3w36jzn"; + rev = "98be3285362a512d28a96ce4220c6dc295d5fee8"; + sha256 = "1mylmz3xl4yj80i1n8xv8jiszrqywhiavd7db0qxx04lrl71n02b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -68388,12 +68522,12 @@ weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }: melpaBuild { pname = "weechat"; - version = "20161003.1201"; + version = "20161211.259"; src = fetchFromGitHub { owner = "the-kenny"; repo = "weechat.el"; - rev = "9efd3468bca81d74adfe5f63a17c64b9a7df2f0f"; - sha256 = "15r2gv0d0nyyrww9nvvh1mvsy1gdn0cm92bgrg6izmvs32fm8q85"; + rev = "a0d81074088d313dd596af6602e51d4253a55ca5"; + sha256 = "08ibyabvdlmp74xa950al3axmzsqpcal30313ab5wgb746sh3dvm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat"; @@ -68577,12 +68711,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20161205.1129"; + version = "20161207.714"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "786d800f61e25a1892c44f68a3e21c0507d03a1d"; - sha256 = "0whh6srdw1byr3zq84q3z847jlfsiqvmz2pybkvvdc4j5bfbr7hx"; + rev = "f0eb183af6ce87344af40813a20fbe81bf98c80a"; + sha256 = "0p1hzhcqy17cb90hsii1xiy9bw5129q847wpdbz8i58345svzm83"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -68867,10 +69001,10 @@ }) {}; wimpy-del = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "wimpy-del"; - version = "20151231.1623"; + version = "20161209.736"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/wimpy-del.el"; - sha256 = "142ql6886h418f73h3wjblhnd16qvbap7mfr4g2yv4xybh88d4x2"; + sha256 = "19dsmchrgmrqnn0v81k3q6z0h3vnxx0wjyqzz27wc7ll1qrvjfyg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wimpy-del"; @@ -69135,8 +69269,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "c8c2934f6674"; - sha256 = "0wsnmwfkiyic40v8dl65ccxv3n3hazmlxlbqr8v6ggr8kcx4ydyy"; + rev = "a67adbf5fc75"; + sha256 = "1av071s0s6x0idbklfnps8j7vgjqxapk9y23prk6jrdbbwhfzb8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -69677,12 +69811,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20161025.341"; + version = "20161210.2152"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "0dc80c428cc48dfbb411b77588db7030903705b6"; - sha256 = "0rmyd6wa540k41zidzp0wi773ycn6kj1wiwbb3kxfam38ds705y3"; + rev = "c2ca5a4422e8c05ff1428c76b3b9c20d38bcfcb7"; + sha256 = "1wkibjznxg1khvgnabgh8808hp31i2zrkzq9crjc37xv65vkb3v1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; @@ -69698,12 +69832,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20161202.1016"; + version = "20161210.2135"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "de18e02b5fbbc82de463727d519ccf8aa45fe997"; - sha256 = "1n40lp273zjjd82ggzvibzxcp8szyxdqpz8c61mdfq8hyk174nmm"; + rev = "d541d7940a078c7cec64578bf51fa1023df7d931"; + sha256 = "0l3jadf5zlkva7lcrd7z7gfhb71p8dccsbn5mwwwhcfv449z0a5x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -69740,12 +69874,12 @@ xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20161122.358"; + version = "20161210.2112"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "cff6ab06055d59d858f85946ada505eec854b1aa"; - sha256 = "01d4lag4jcfvaafkk18ijcq91nbc1r7gdpn95gficjy0l6kf9dbg"; + rev = "a6c454132d00f7140f8130b55981c343b4c1b7a6"; + sha256 = "07h9x74g66z3nw6d07sa0pkjsb1ddnyrs2pmka9ly9n35irix2ms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -69761,12 +69895,12 @@ xah-get-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-get-thing"; - version = "20161019.2018"; + version = "20161210.2058"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-get-thing-or-selection"; - rev = "4a831ad9e5d1c96a045ba505424c041fb4361413"; - sha256 = "12bgj8b3haldc6ixpm86cq6xwb75gbq81dfpy1xyid6x29a7rail"; + rev = "1604ebb340b31eae31596716489b99043c237ccc"; + sha256 = "19wjiwdlmpj9yax0zv401ah0zp80dvr2mhxwyhqsnfd802yp1n00"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing"; @@ -69824,12 +69958,12 @@ xah-replace-pairs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-replace-pairs"; - version = "20161005.1847"; + version = "20161210.2059"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-replace-pairs"; - rev = "9b518378fe204737301a8c206d915ce19f2b9b5d"; - sha256 = "1289ylz3dmyjv4z6yssb9c84a3wa794kd10xf5gwqlpmdlp7x1yc"; + rev = "2cf602c6d8136a44799e8799f17c3b12e2bec5c8"; + sha256 = "09bb516srdjkdibv5p2gsmwhqahwnlka0wbpcx4064w54afgh5a6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs"; @@ -70181,12 +70315,12 @@ xterm-frobs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-frobs"; - version = "20091211.1555"; + version = "20161207.1609"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "xterm-frobs"; - rev = "58fb0de21e4d1963d1398a38e1b803446fb41320"; - sha256 = "10dsf2lgjjqvjzzyc5kwggfk511v8ypmx173bixry3djcc15dsf3"; + rev = "0832d588598dbf6bd8aa8e05c611d7c098c3f9d8"; + sha256 = "0snrylgv2d6r3d6nv05vqs6ng3sgrxkvqpx7m4ga2y7a1m5lmxkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7bb3be63b798967f5525cf118579a1cc756ee1a/recipes/xterm-frobs"; @@ -70451,6 +70585,27 @@ license = lib.licenses.free; }; }) {}; + yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "yang-mode"; + version = "20161212.213"; + src = fetchFromGitHub { + owner = "mbj4668"; + repo = "yang-mode"; + rev = "f37745cda52d161761fcfe2fed792faa909b6fce"; + sha256 = "1c6l8kbd01mlzkjwri0ma81ldz68fjgn1rb5ibi67r8kcisfzb50"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; + sha256 = "0rl90xbcf3383ls95g1dixh2dr02kc4g60d324cqbb4h59wffp40"; + name = "yang-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/yang-mode"; + license = lib.licenses.free; + }; + }) {}; yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; @@ -70598,12 +70753,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20161201.1520"; + version = "20161211.1918"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "7b013dbbdbaa692199616e5ef727b5d4e3149e63"; - sha256 = "1l8n4ab0ls5zmdn6l8836qc220s4lh05q99bzad716h42p5va4gd"; + rev = "e878afb8832ecf05d654d99cd7ecb3406f7a425e"; + sha256 = "0nlw4c9cfcg04zfjfv1z097yn8cqv1l6dsbdcmf34ccgmncr076y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -70639,11 +70794,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20161001.518"; + version = "20161008.2359"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "0c098405a3c9"; - sha256 = "0vk5wk7b05lyr1724wnwxlwfcw7myghpcis0ya1v11pwlad1vwha"; + rev = "564510b9caca"; + sha256 = "1k5q65di0b4mlhmjxi7vfn369lh02vybm0dmb5sir7j3vg8c5347"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -70878,12 +71033,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20161018.437"; + version = "20161208.2137"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "8715e379b00a788bfb6a1025e7ebc69e3aeca0d6"; - sha256 = "02hkrisv2lk0ncq84rciq4l6az9yvk9wpd2617nvfijws4avgh02"; + rev = "eb0bafac9d3208daba5a3f744514a463ffd0e131"; + sha256 = "1h4y7lxdcss3c219lr6wd30af32n850w77q6xlys8qrb9l71f1vk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -70940,12 +71095,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20161202.731"; + version = "20161209.632"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "5ebe8195d77b0c35baccd4279d6e0b92731c35fa"; - sha256 = "1mdihfra7p7hvqsif1zlwnw46kvqp70r67f7qkwnlwhywgggvkvg"; + rev = "af231794425255d436690c9c31bceb2052251210"; + sha256 = "1xnhcxf5d0gn8lhapjg7b289bqpf8w0d2mp76ksb8rsvx4r0bdbw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; From 5df4ed710a0ca3fc015c9f528f2dafad2d291e5b Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 12 Dec 2016 13:06:59 -0500 Subject: [PATCH 1434/1749] melpa-stable-packages: 2016-12-12 --- .../emacs-modes/melpa-stable-generated.nix | 191 ++++++++++++++---- 1 file changed, 148 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 38ab70fd4f99..2d33ce39736e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1456,6 +1456,27 @@ license = lib.licenses.free; }; }) {}; + apib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: + melpaBuild { + pname = "apib-mode"; + version = "0.6"; + src = fetchFromGitHub { + owner = "w-vi"; + repo = "apib-mode"; + rev = "18aebab7cd61b9d296b7d5d2de0c828e2058c906"; + sha256 = "0sj948j4s26sxxandjzjjzmjqma7vf86msyyi23gsljy1q28vwlf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ebb04f975d8226a76260895399c937d6a1940/recipes/apib-mode"; + sha256 = "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb"; + name = "apib-mode"; + }; + packageRequires = [ emacs markdown-mode ]; + meta = { + homepage = "https://melpa.org/#/apib-mode"; + license = lib.licenses.free; + }; + }) {}; apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apples-mode"; @@ -2452,12 +2473,12 @@ bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bind-map"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-bind-map"; - rev = "ffe5e636178ab9878fa8213fd1a1d4862ccb3d5f"; - sha256 = "1h07s8g4vpq6c8sl5m6vxvd598iks160bksv0wn51680gh05f0pa"; + rev = "bf4181e3a41463684adfffc6c5c305b30480e30f"; + sha256 = "0vrk17yg3jbww92p433p64ijmjf7cjg2wmzi9w418235w1xdfzz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58800af5965a6e7c9314aa00e971196ea0d036e/recipes/bind-map"; @@ -3909,6 +3930,27 @@ license = lib.licenses.free; }; }) {}; + clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "clues-theme"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "jasonm23"; + repo = "emacs-clues-theme"; + rev = "16c05f6dbe7125358f8456110f237d68263e987a"; + sha256 = "1lxd6wgg0d7nwg0rsj5fz0c3wwap567vwd7bfa2xj22z0b6cn49c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bf43125306df445ac829c2edb98dd608bc1407de/recipes/clues-theme"; + sha256 = "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy"; + name = "clues-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/clues-theme"; + license = lib.licenses.free; + }; + }) {}; cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; @@ -4650,6 +4692,27 @@ license = lib.licenses.free; }; }) {}; + company-statistics = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-statistics"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "company-mode"; + repo = "company-statistics"; + rev = "906d8137224c1a5bd1dc913940e0d32ffecf5523"; + sha256 = "0c98kfg7gimjx9cf8dmbk9mdsrybhphshrdl8dhif3zqvn6gxyd7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2/recipes/company-statistics"; + sha256 = "1fl4ldj17m3xhi6xbw3bp9c2jir34xv3jh9daiw8g912fv2l5dcj"; + name = "company-statistics"; + }; + packageRequires = [ company emacs ]; + meta = { + homepage = "https://melpa.org/#/company-statistics"; + license = lib.licenses.free; + }; + }) {}; company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }: melpaBuild { pname = "company-tern"; @@ -4860,6 +4923,27 @@ license = lib.licenses.free; }; }) {}; + copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "copy-as-format"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "sshaw"; + repo = "copy-as-format"; + rev = "e3e130a34d70deaa1ff81fe1e3b3898c1121c107"; + sha256 = "1llkzvbw7ci4x20pqaacri82qplsfzxb20xw7v373i5jc83wjv9z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; + sha256 = "1yij5mqm0dg6326yms0a2w8gs42kdxq0ih8dhkpdar54r0bk3m8k"; + name = "copy-as-format"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/copy-as-format"; + license = lib.licenses.free; + }; + }) {}; copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copyit"; @@ -5386,12 +5470,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.25.2pre0"; + version = "0.25.2"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "1b61bc346a8233f6ef7576bbbba0cb8a19c46efb"; - sha256 = "1czd04vvl7gzaj1fmzkmd36cpsg22d3gg7sqyfh742ycw1ggkpzz"; + rev = "c9bcf1bed3acf367d6deb0c273cf22db0f18dab2"; + sha256 = "16yd296n0nh96pnkjpdbdz4i7ga4j961pkzm3cbnika26xwndx03"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -7719,12 +7803,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "529c20acb9efda756b69e267d73d33c66fa08293"; - sha256 = "08zl1v0k3dnn8g06l3xf1lp31fp60jpk6f3lkczi1l6ns36g11jx"; + rev = "29f50a940113d793a21998f3bb414fdd9b0c5daa"; + sha256 = "02c7xl9w81140l7p9kywr5qwsdyv92nxdhzqcxjk0r09x7s0cvsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -7853,8 +7937,8 @@ sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy"; - sha256 = "0n802bh7jj9zgz84xjrxvy33jl6s3hj5dqxafyfr87fank97hb6d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; + sha256 = "1ri3dwnkw005plj1g5grmmq9np41sqk4s2v18pwsvr18ysnq6nnr"; name = "elpy"; }; packageRequires = [ @@ -9628,12 +9712,12 @@ evil-opener = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, opener }: melpaBuild { pname = "evil-opener"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "0robustus1"; repo = "opener.el"; - rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a"; - sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p"; + rev = "c384f67278046fdcd220275fdd212ab85672cbeb"; + sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da8d4e5bf23985632f993336b9183fe9f480addc/recipes/evil-opener"; @@ -19292,12 +19376,12 @@ magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "magic-filetype"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "zonuexe"; repo = "magic-filetype.el"; - rev = "bccd17a8d152e4a2692c2bd71999f1d53c00262a"; - sha256 = "1rw5lvcj2v4b21akmsinkz24fbmp19s3jdqsd8jgmk3qqv0z81fc"; + rev = "9a2f069e9b3dfff8e9a5fe3cbd4bc8abe1dc86a0"; + sha256 = "1dzrj4xyrr5d9kisq8khzr2yvrhwff0l676g237sc3v4hg3ch8sr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6027c5a66386f7140305a4cde12d66da4dfa09/recipes/magic-filetype"; @@ -19832,8 +19916,8 @@ sha256 = "0grljxihip0xyfm47ljwz6hy4kn30vw69bv4w5dw8kr33d51y5ym"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode"; - sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode"; + sha256 = "1cam5wfxca91q3i1kl0qbdvnfy62hr5ksargi4430kgaz34bcbyn"; name = "markdown-preview-mode"; }; packageRequires = [ cl-lib markdown-mode websocket ]; @@ -20115,22 +20199,22 @@ license = lib.licenses.free; }; }) {}; - mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "mentor"; - version = "0.1"; + version = "0.1.1"; src = fetchFromGitHub { owner = "skangas"; repo = "mentor"; - rev = "bd8e4b89341686bbaf4c44680bbae778b96fb8f0"; - sha256 = "1y4ra5z3ayw3w7dszzlkk3qz3nv2jg1vvx8cf0y5j1pqpx8vy3jf"; + rev = "f53dac51a29f67e31f1fb82702b19d158cc6fa22"; + sha256 = "0qqapsp4gpkrj3faii7qbfssddl3vqfmwqcy259s7f896kzwaaky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor"; sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s"; name = "mentor"; }; - packageRequires = []; + packageRequires = [ xml-rpc ]; meta = { homepage = "https://melpa.org/#/mentor"; license = lib.licenses.free; @@ -22159,12 +22243,12 @@ opener = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "opener"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "0robustus1"; repo = "opener.el"; - rev = "ad3c65a5a748230bf07c18f56b1998ac03e3807a"; - sha256 = "178h7sbpgsn0xl93j7375f2ahmqcszmbl3f7mfb6vgjmm791q03p"; + rev = "c384f67278046fdcd220275fdd212ab85672cbeb"; + sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a448f1936f46176bc2462eb03955a0c19efb9e/recipes/opener"; @@ -22516,12 +22600,12 @@ org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "1.0.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "3fc4dd52a5235fa97b0fca06b08ae443ccc43242"; - sha256 = "017k8hw2wy4fzdrkjniaqyz4mfsm60qqxrxhd1s49dfs54kch0hq"; + rev = "d2db2827ff030a8c11b52402adcd3a4b3050f3c1"; + sha256 = "16wzrq2syk03710iklrayf4s9ap4brvlzyd4b0rya0rxy2q2rck7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -23267,12 +23351,12 @@ osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-dictionary"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "osx-dictionary.el"; - rev = "8bbe1c700830e004f34974900b840ec2be7c589c"; - sha256 = "0pv9j3nza71kd2i9a78w1y10r965b2wrnywjk1zgvab8q9rzwxdn"; + rev = "0e5e5f1b0077a62673855889d529dd4f0cc8f665"; + sha256 = "1zpr50q7i4wg1x7vsj69rh1b8xvk9r0591y4fvvs3a2l1llca2mq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary"; @@ -29054,12 +29138,12 @@ sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "Trevoke"; repo = "sqlup-mode.el"; - rev = "4bf563b0b95f5a1e627e55d52d1c2fd0dd3af95f"; - sha256 = "0hxkkpylnf5phavcd2y3bxzikcnr7cdk3rbqgp3nw74sxz0223w2"; + rev = "65e75ebc7d85a63e4e27900ba746623a8e4bfa95"; + sha256 = "1yiz1k2dg010dypql5l9ahcl33nvqxl731wghv4jvp6bdxcf90g3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode"; @@ -32250,8 +32334,8 @@ version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "c8c2934f6674"; - sha256 = "0wsnmwfkiyic40v8dl65ccxv3n3hazmlxlbqr8v6ggr8kcx4ydyy"; + rev = "a67adbf5fc75"; + sha256 = "1av071s0s6x0idbklfnps8j7vgjqxapk9y23prk6jrdbbwhfzb8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -32789,6 +32873,27 @@ license = lib.licenses.free; }; }) {}; + yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "yang-mode"; + version = "0.9.1"; + src = fetchFromGitHub { + owner = "mbj4668"; + repo = "yang-mode"; + rev = "f37745cda52d161761fcfe2fed792faa909b6fce"; + sha256 = "1c6l8kbd01mlzkjwri0ma81ldz68fjgn1rb5ibi67r8kcisfzb50"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; + sha256 = "0rl90xbcf3383ls95g1dixh2dr02kc4g60d324cqbb4h59wffp40"; + name = "yang-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/yang-mode"; + license = lib.licenses.free; + }; + }) {}; yascroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yascroll"; @@ -32857,8 +32962,8 @@ version = "1.78"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "0c098405a3c9"; - sha256 = "0vk5wk7b05lyr1724wnwxlwfcw7myghpcis0ya1v11pwlad1vwha"; + rev = "564510b9caca"; + sha256 = "1k5q65di0b4mlhmjxi7vfn369lh02vybm0dmb5sir7j3vg8c5347"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -33010,12 +33115,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "63df2ae09a9e1d670f0694f7c15f19f9170e2407"; - sha256 = "18a0g33z70yqr066cxm9d17jwvrx8hpgp0v2c6swk05h9b4h3pb2"; + rev = "af231794425255d436690c9c31bceb2052251210"; + sha256 = "1xnhcxf5d0gn8lhapjg7b289bqpf8w0d2mp76ksb8rsvx4r0bdbw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; From 788417e607027bef1980915f4f2183bb76d9dd60 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 12 Dec 2016 17:48:18 -0500 Subject: [PATCH 1435/1749] zsh: 5.2 -> 5.3 --- pkgs/shells/zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 261dbf12f8e5..537df67d4478 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.2"; + version = "5.3"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "1r9r91gmrrflzl0yq10bib9gxbqyhycb09hcx28m2g3vv9skmccj"; + sha256 = "0cvkdw7x6i4m2brc9aakw8d3bmp6baziv72amlq9jd65r421bq88"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "0dsr450v8nydvpk8ry276fvbznlrjgddgp7zvhcw4cv69i9lr4ps"; + sha256 = "0vcsgc1ymqhq0acklhlq5skgj27z597x2a7nx5g3j6q4jvx778hx"; }; buildInputs = [ ncurses pcre ]; From e955e64fd81be6849d5ab7d62d9f3c61007a433d Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 13 Dec 2016 00:35:53 +0100 Subject: [PATCH 1436/1749] Revert "helm (kubernetes): init at v2.0.2" --- lib/maintainers.nix | 1 - .../networking/cluster/helm/default.nix | 45 ------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 48 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/helm/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 282588569170..8a3584b0b8d0 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -384,7 +384,6 @@ retrry = "Tadas Barzdžius "; rick68 = "Wei-Ming Yang "; rickynils = "Rickard Nilsson "; - rlupton20 = "Richard Lupton "; rnhmjoj = "Michele Guerini Rocco "; rob = "Rob Vermaas "; robberer = "Longrin Wischnewski "; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix deleted file mode 100644 index 58ac31ce49f5..000000000000 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, kubernetes }: -let - arch = if stdenv.isLinux - then "linux-amd64" - else "darwin-amd64"; - checksum = if stdenv.isLinux - then "dad3791fb07e6cf34f4cf611728cb8ae109a75234498a888529a68ac6923f200" - else "d27bd7e40e12c0a5f08782a8a883166008565b28e0b82126d2089300ff3f8465"; -in -stdenv.mkDerivation rec { - pname = "helm"; - version = "2.0.2"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://kubernetes-helm.storage.googleapis.com/helm-v${version}-${arch}.tar.gz"; - sha256 = "${checksum}"; - }; - - preferLocalBuild = true; - - buildInputs = [ ]; - - propagatedBuildInputs = [ kubernetes ]; - - phases = [ "buildPhase" "installPhase" ]; - - buildPhase = '' - mkdir -p $out/bin - ''; - - installPhase = '' - tar -xvzf $src - cp ${arch}/helm $out/bin/${pname} - chmod +x $out/bin/${pname} - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/kubernetes/helm; - description = "A package manager for kubernetes"; - license = licenses.asl20; - maintainers = [ maintainers.rlupton20 ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb6c118d1f9b..0b94668c5542 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13360,8 +13360,6 @@ in hello = callPackage ../applications/misc/hello { }; - kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; - helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; heme = callPackage ../applications/editors/heme { }; From 5bd136acd4c683b30470b5dfbb6f0b15dcea42a5 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 13 Dec 2016 00:43:24 +0100 Subject: [PATCH 1437/1749] Revert "Revert "helm (kubernetes): init at v2.0.2"" --- lib/maintainers.nix | 1 + .../networking/cluster/helm/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 48 insertions(+) create mode 100644 pkgs/applications/networking/cluster/helm/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8a3584b0b8d0..282588569170 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -384,6 +384,7 @@ retrry = "Tadas Barzdžius "; rick68 = "Wei-Ming Yang "; rickynils = "Rickard Nilsson "; + rlupton20 = "Richard Lupton "; rnhmjoj = "Michele Guerini Rocco "; rob = "Rob Vermaas "; robberer = "Longrin Wischnewski "; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix new file mode 100644 index 000000000000..58ac31ce49f5 --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, kubernetes }: +let + arch = if stdenv.isLinux + then "linux-amd64" + else "darwin-amd64"; + checksum = if stdenv.isLinux + then "dad3791fb07e6cf34f4cf611728cb8ae109a75234498a888529a68ac6923f200" + else "d27bd7e40e12c0a5f08782a8a883166008565b28e0b82126d2089300ff3f8465"; +in +stdenv.mkDerivation rec { + pname = "helm"; + version = "2.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://kubernetes-helm.storage.googleapis.com/helm-v${version}-${arch}.tar.gz"; + sha256 = "${checksum}"; + }; + + preferLocalBuild = true; + + buildInputs = [ ]; + + propagatedBuildInputs = [ kubernetes ]; + + phases = [ "buildPhase" "installPhase" ]; + + buildPhase = '' + mkdir -p $out/bin + ''; + + installPhase = '' + tar -xvzf $src + cp ${arch}/helm $out/bin/${pname} + chmod +x $out/bin/${pname} + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/kubernetes/helm; + description = "A package manager for kubernetes"; + license = licenses.asl20; + maintainers = [ maintainers.rlupton20 ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b94668c5542..bb6c118d1f9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13360,6 +13360,8 @@ in hello = callPackage ../applications/misc/hello { }; + kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; + helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; heme = callPackage ../applications/editors/heme { }; From fa613c7dddff41c1f588c65e891e766a127ee732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 13 Dec 2016 09:16:16 +0100 Subject: [PATCH 1438/1749] gnome3*.devhelp: add missing gschemas Otherwise it would crash when starting; fixes #21094. --- pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix | 3 ++- pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix index 1cfae754cfec..f6e67be8d53a 100644 --- a/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, webkitgtk, intltool }: +, webkitgtk, intltool, gsettings_desktop_schemas }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = [ pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme + gsettings_desktop_schemas ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix index 1cfae754cfec..f6e67be8d53a 100644 --- a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, webkitgtk, intltool }: +, webkitgtk, intltool, gsettings_desktop_schemas }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = [ pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme + gsettings_desktop_schemas ]; meta = with stdenv.lib; { From fd2cf186b0012c0d7a941d1984b987ddb87cf95d Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Tue, 13 Dec 2016 02:47:50 -0600 Subject: [PATCH 1439/1749] openjdk-darwin: Fix libfreetype path (#21089) The freetype path was not working. This fixes it to use the nix freetype version with install_name_tool. --- pkgs/development/compilers/openjdk-darwin/8.nix | 6 ++++-- pkgs/development/compilers/openjdk-darwin/default.nix | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix index bcafca16022e..1d12d59998a1 100644 --- a/pkgs/development/compilers/openjdk-darwin/8.nix +++ b/pkgs/development/compilers/openjdk-darwin/8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, setJavaClassPath }: +{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: let jdk = stdenv.mkDerivation { name = "zulu1.8.0_66-8.11.0.1"; @@ -9,7 +9,7 @@ let curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/"; }; - buildInputs = [ unzip ]; + buildInputs = [ unzip freetype ]; installPhase = '' mkdir -p $out @@ -26,6 +26,8 @@ let mkdir -p $out/nix-support echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib + # Set JAVA_HOME automatically. cat <> $out/nix-support/setup-hook if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix index e43563fd60d9..10a9eb2b3666 100644 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ b/pkgs/development/compilers/openjdk-darwin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, setJavaClassPath }: +{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: let jdk = stdenv.mkDerivation { name = "openjdk-7u60b30"; @@ -9,7 +9,7 @@ let sha256 = "af510a4d566712d82c17054bb39f91d98c69a85586e244c6123669a0bd4b7401"; }; - buildInputs = [ unzip ]; + buildInputs = [ unzip freetype ]; installPhase = '' mv */Contents/Home $out @@ -25,6 +25,8 @@ let mkdir -p $out/nix-support echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib + # Set JAVA_HOME automatically. cat <> $out/nix-support/setup-hook if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi From 9eac665cd2d219194c9f5a5f9ec46822dd168d3b Mon Sep 17 00:00:00 2001 From: Alexander Kahl Date: Tue, 13 Dec 2016 10:44:09 +0100 Subject: [PATCH 1440/1749] sisco.lv2: init at 0.7.0 (#20868) * sisco.lv2: init at 0.7.0 Also added maintainer `e-user` * Use fetchFromGitHub and adapt accordingly * Use `version` instead of `src.rev` in name --- lib/maintainers.nix | 1 + pkgs/applications/audio/sisco.lv2/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 46 insertions(+) create mode 100644 pkgs/applications/audio/sisco.lv2/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 282588569170..ea75059b54b4 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -132,6 +132,7 @@ drets = "Dmytro Rets "; drewkett = "Andrew Burkett "; dtzWill = "Will Dietz "; + e-user = "Alexander Kahl "; ebzzry = "Rommel Martinez "; ederoyd46 = "Matthew Brown "; eduarrrd = "Eduard Bachmakov "; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix new file mode 100644 index 000000000000..d429d5452345 --- /dev/null +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, lv2, pkgconfig, mesa, cairo, pango, libjack2 }: + +let + name = "sisco.lv2-${version}"; + version = "0.7.0"; + + robtkVersion = "80a2585253a861c81f0bfb7e4579c75f5c73af89"; + robtkName = "robtk-${robtkVersion}"; + + src = fetchFromGitHub { + owner = "x42"; + repo = "sisco.lv2"; + rev = "v${version}"; + sha256 = "1r6g29yqbdqgkh01x6d3nvmvc58rk2dp94fd0qyyizq37a1qplj1"; + }; + + robtkSrc = fetchFromGitHub { + owner = "x42"; + repo = "robtk"; + rev = robtkVersion; + sha256 = "0gk16nrvnrffqqw0yd015kja9wkgbzvb648bl1pagriabhznhfxl"; + }; +in +stdenv.mkDerivation rec { + inherit name; + + srcs = [ src robtkSrc ]; + sourceRoot = "sisco.lv2-${src.rev}-src"; + + buildInputs = [ pkgconfig lv2 pango cairo libjack2 mesa ]; + + postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk"; + sisco_VERSION = version; + preConfigure = "makeFlagsArray=(PREFIX=$out)"; + + meta = with stdenv.lib; { + description = "Simple audio oscilloscope with variable time scale, triggering, cursors and numeric readout in LV2 plugin format"; + homepage = http://x42.github.io/sisco.lv2/; + license = licenses.gpl2; + maintainers = [ maintainers.e-user ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb6c118d1f9b..3992f2382964 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3696,6 +3696,8 @@ in sipsak = callPackage ../tools/networking/sipsak { }; + sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { }; + skippy-xd = callPackage ../tools/X11/skippy-xd {}; sks = callPackage ../servers/sks { }; From 50466c2d4feca9eee52815eebb30ab6c62dc4deb Mon Sep 17 00:00:00 2001 From: Fernando J Pando Date: Fri, 21 Oct 2016 17:04:48 -0400 Subject: [PATCH 1441/1749] buildbot: 0.9.0rc4 -> 0.9.0.post1 - updates buildbot to version 9 release - adds nixos configuration module - fixes buildbot-www package deps - re-hardcode path to tail - builbot configuration via module vars fixes #19759 --- nixos/modules/module-list.nix | 1 + .../buildbot/master.nix | 250 ++++++++++++++++++ .../tools/build-managers/buildbot/default.nix | 24 +- .../tools/build-managers/buildbot/plugins.nix | 21 +- .../tools/build-managers/buildbot/worker.nix | 4 +- pkgs/top-level/all-packages.nix | 1 + 6 files changed, 281 insertions(+), 20 deletions(-) create mode 100644 nixos/modules/services/continuous-integration/buildbot/master.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c89bbcc71acf..4032df9fb91a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -137,6 +137,7 @@ ./services/computing/torque/server.nix ./services/computing/torque/mom.nix ./services/computing/slurm/slurm.nix + ./services/continuous-integration/buildbot/master.nix ./services/continuous-integration/buildkite-agent.nix ./services/continuous-integration/hydra/default.nix ./services/continuous-integration/gitlab-runner.nix diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix new file mode 100644 index 000000000000..a40be4f546ea --- /dev/null +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -0,0 +1,250 @@ +# NixOS module for Buildbot continous integration server. + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.buildbot-master; + escapeStr = s: escape ["'"] s; + masterCfg = pkgs.writeText "master.cfg" '' + from buildbot.plugins import * + factory = util.BuildFactory() + c = BuildmasterConfig = dict( + workers = [${concatStringsSep "," cfg.workers}], + protocols = { 'pb': {'port': ${cfg.bpPort} } }, + title = '${escapeStr cfg.title}', + titleURL = '${escapeStr cfg.titleUrl}', + buildbotURL = '${escapeStr cfg.buildbotUrl}', + db = dict(db_url='${escapeStr cfg.dbUrl}'), + www = dict(port=${toString cfg.port}), + change_source = [ ${concatStringsSep "," cfg.changeSource} ], + schedulers = [ ${concatStringsSep "," cfg.schedulers} ], + builders = [ ${concatStringsSep "," cfg.builders} ], + status = [ ${concatStringsSep "," cfg.status} ], + ) + for step in [ ${concatStringsSep "," cfg.factorySteps} ]: + factory.addStep(step) + + ${cfg.extraConfig} + ''; + + configFile = if cfg.masterCfg == null then masterCfg else cfg.masterCfg; + +in { + options = { + services.buildbot-master = { + + factorySteps = mkOption { + type = types.listOf types.str; + description = "Factory Steps"; + default = []; + example = [ + "steps.Git(repourl='git://github.com/buildbot/pyflakes.git', mode='incremental')" + "steps.ShellCommand(command=['trial', 'pyflakes'])" + ]; + }; + + changeSource = mkOption { + type = types.listOf types.str; + description = "List of Change Sources."; + default = []; + example = [ + "changes.GitPoller('git://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)" + ]; + }; + + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the Buildbot continuous integration server."; + }; + + extraConfig = mkOption { + type = types.str; + description = "Extra configuration to append to master.cfg"; + default = ""; + }; + + masterCfg = mkOption { + type = with types; nullOr path; + description = '' + Optionally pass path to raw master.cfg file. + Other options in this configuration will be ignored. + ''; + default = null; + example = literalExample '' + pkgs.writeText "master.cfg" "BuildmasterConfig = c = {}" + ''; + }; + + schedulers = mkOption { + type = types.listOf types.str; + description = "List of Schedulers."; + default = [ + "schedulers.SingleBranchScheduler(name='all', change_filter=util.ChangeFilter(branch='master'), treeStableTimer=None, builderNames=['runtests'])" + "schedulers.ForceScheduler(name='force',builderNames=['runtests'])" + ]; + }; + + builders = mkOption { + type = types.listOf types.str; + description = "List of Builders."; + default = [ + "util.BuilderConfig(name='runtests',workernames=['default-worker'],factory=factory)" + ]; + }; + + workers = mkOption { + type = types.listOf types.str; + description = "List of Workers."; + default = [ + "worker.Worker('default-worker', 'password')" + ]; + example = [ "worker.LocalWorker('default-worker')" ]; + }; + + status = mkOption { + default = []; + type = types.listOf types.str; + description = "List of status notification endpoints."; + }; + + user = mkOption { + default = "buildbot"; + type = types.str; + description = "User the buildbot server should execute under."; + }; + + group = mkOption { + default = "buildbot"; + type = types.str; + description = "Primary group of buildbot user."; + }; + + extraGroups = mkOption { + type = types.listOf types.str; + default = [ "nixbld" ]; + description = "List of extra groups that the buildbot user should be a part of."; + }; + + home = mkOption { + default = "/home/buildbot"; + type = types.path; + description = "Buildbot home directory."; + }; + + buildbotDir = mkOption { + default = "${cfg.home}/master"; + type = types.path; + description = "Specifies the Buildbot directory."; + }; + + bpPort = mkOption { + default = "9989"; + type = types.string; + example = "tcp:10000:interface=127.0.0.1"; + description = "Port where the master will listen to Buildbot Worker."; + }; + + listenAddress = mkOption { + default = "0.0.0.0"; + type = types.str; + description = "Specifies the bind address on which the buildbot HTTP interface listens."; + }; + + buildbotUrl = mkOption { + default = "http://localhost:8010/"; + type = types.str; + description = "Specifies the Buildbot URL."; + }; + + title = mkOption { + default = "Buildbot"; + type = types.str; + description = "Specifies the Buildbot Title."; + }; + + titleUrl = mkOption { + default = "Buildbot"; + type = types.str; + description = "Specifies the Buildbot TitleURL."; + }; + + dbUrl = mkOption { + default = "sqlite:///state.sqlite"; + type = types.str; + description = "Specifies the database connection string."; + }; + + port = mkOption { + default = 8010; + type = types.int; + description = "Specifies port number on which the buildbot HTTP interface listens."; + }; + + package = mkOption { + type = types.package; + default = pkgs.buildbot-ui; + description = '' + Package to use for buildbot. + buildbot-full is required in order to use local workers. + ''; + example = pkgs.buildbot-full; + }; + + packages = mkOption { + default = [ ]; + example = [ pkgs.git ]; + type = types.listOf types.package; + description = "Packages to add to PATH for the buildbot process."; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraGroups = optional (cfg.group == "buildbot") { + name = "buildbot"; + }; + + users.extraUsers = optional (cfg.user == "buildbot") { + name = "buildbot"; + description = "buildbot user"; + isNormalUser = true; + createHome = true; + home = cfg.home; + group = cfg.group; + extraGroups = cfg.extraGroups; + useDefaultShell = true; + }; + + systemd.services.buildbot-master = { + description = "Buildbot Continuous Integration Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = cfg.packages; + + serviceConfig = { + Type = "forking"; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.home; + ExecStart = "${cfg.package}/bin/buildbot start ${cfg.buildbotDir}"; + }; + + preStart = '' + mkdir -vp ${cfg.buildbotDir} + chown -c ${cfg.user}:${cfg.group} ${cfg.buildbotDir} + ln -sf ${configFile} ${cfg.buildbotDir}/master.cfg + ${cfg.package}/bin/buildbot create-master ${cfg.buildbotDir} + ''; + + postStart = '' + until [[ $(${pkgs.curl}/bin/curl -s --head -w '\n%{http_code}' http://localhost:${toString cfg.port} | tail -n1) =~ ^(200|403)$ ]]; do + sleep 1 + done + ''; + }; + }; + +} diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index d16b83a2831c..8e85c645e2e0 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,12 +1,21 @@ -{ stdenv, pythonPackages, fetchurl, coreutils, plugins ? [] }: +{ stdenv, + lib, + pythonPackages, + fetchurl, + coreutils, + openssh, + buildbot-worker, + plugins ? [], + enableLocalWorker ? false +}: pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.0rc4"; + version = "0.9.0.post1"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "16bnrr5qkfpnby9sw9azcagnw0ybi7d8bpdlga2a4c61jg2d5dnc"; + sha256 = "18rnsp691cnmbymlch6czx3mrcmifmf6dk97h9nslgfkkyf25n5g"; }; buildInputs = with pythonPackages; [ @@ -22,7 +31,7 @@ pythonPackages.buildPythonApplication (rec { pylint astroid pyflakes - ]; + ] ++ lib.optionals (enableLocalWorker) [openssh]; propagatedBuildInputs = with pythonPackages; [ @@ -52,14 +61,17 @@ pythonPackages.buildPythonApplication (rec { ramlfications sphinx-jinja - ] ++ plugins; + ] ++ plugins ++ + lib.optionals (enableLocalWorker) [buildbot-worker]; preInstall = '' # writes out a file that can't be read properly sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py + ''; + postPatch = '' # re-hardcode path to tail - sed -i.bak 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py + sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py ''; postFixup = '' diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 09f8b1e750a5..2875f6942a9e 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -4,11 +4,11 @@ let buildbot-pkg = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "0.9.0rc4"; + version = "0.9.0.post1"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0dfdyc3x0926dynzdl9w7z0p84w287l362mxdl3r6wl87gkisr10"; + sha256 = "0frmnc73dsyc9mjnrnpm4vdrwb7c63gc6maq6xvlp486v7sdhjbi"; }; propagatedBuildInputs = with pythonPackages; [ setuptools ]; @@ -23,22 +23,19 @@ let }; in { - www = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot_www"; - version = "0.9.0rc4"; + version = "0.9.0.post1"; # NOTE: wheel is used due to buildbot circular dependency format = "wheel"; src = fetchurl { - url = "https://pypi.python.org/packages/78/45/b43bd85695cd0178f8bac9c3b394062e9eb46f489b655c11e950e54278a2/${name}-py2-none-any.whl"; - sha256 = "0ixi0y0jhbql55swsvy0jin1v6xf4q4mw9p5n9sll2h10lyp9h0p"; + url = "https://pypi.python.org/packages/02/d0/fc56ee27a09498638a47dcc5637ee5412ab7a67bfb4b3ff47e041f3d7b66/${name}-py2-none-any.whl"; + sha256 = "14ghch67k6090736n89l401swz7r9hnk2zlmdb59niq8lg7dyg9q"; }; - propagatedBuildInputs = [ buildbot-pkg ]; - meta = with stdenv.lib; { homepage = http://buildbot.net/; description = "Buildbot UI"; @@ -51,11 +48,11 @@ in { console-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-console-view"; - version = "0.9.0rc4"; + version = "0.9.0.post1"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "1fig635yg5dgn239g9wzfpw9wc3p91lcl9nnig9k7fijz85pwrva"; + sha256 = "0dc7rb7mrpva5gj7l57i96a78d6yj28pkkj9hfim1955z9dgn58l"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -72,11 +69,11 @@ in { waterfall-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-waterfall-view"; - version = "0.9.0rc4"; + version = "0.9.0.post1"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "08kh966grj9b4mif337vv7bqy5ixz8xz31ml63wysjb65djnjbk8"; + sha256 = "0x9vvw15zzgj4w3qcxh8r10rb36ni0qh1215y7wbawh5lggnjm0g"; }; propagatedBuildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 01b2051aaa6d..7d7ecc1c52d3 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "0.9.0rc4"; + version = "0.9.0.post1"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "1fv40pki1awv5f2z9vd7phjk7dlsy1cp4blsy2vdhqwbc7112a8c"; + sha256 = "1f8ij3y62r9z7qv92x21rg9h9whhakkwv59rgniq09j64ggjz8lx"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3992f2382964..9b6f913e1ac0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5952,6 +5952,7 @@ in }; buildbot-full = self.buildbot.override { plugins = with self.buildbot-plugins; [ www console-view waterfall-view ]; + enableLocalWorker = true; }; buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; From d6f1081314e0ea341bd237e9064e94a1b5ce874a Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Tue, 13 Dec 2016 11:26:56 +0100 Subject: [PATCH 1442/1749] opencv3: pull patches only if necessary --- pkgs/development/libraries/opencv/3.x.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index d86a2671cded..388167319c12 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -42,16 +42,17 @@ stdenv.mkDerivation rec { sha256 = "1l0w12czavgs0wzw1c594g358ilvfg2fn32cn8z7pv84zxj4g429"; }; - patches = [ - (fetchpatch { # Patch for CUDA 8 compatibility - url = "https://github.com/opencv/opencv/commit/10896129b39655e19e4e7c529153cb5c2191a1db.patch"; - sha256 = "0jka3kxxywgs3prqqgym5kav6p73rrblwj50k1nf3fvfpk194ah1"; - }) - (fetchpatch { # Patch to add CUDA Compute Capability compilation targets up to 6.0 - url = "https://github.com/opencv/opencv/commit/d76f258aebdf63f979a205cabe6d3e81700a7cd8.patch"; - sha256 = "00b3msfgrcw7laij6qafn4b18c1dl96xxpzwx05wxzrjldqb6kqg"; - }) - ]; + patches = + lib.optionals enableCuda [ + (fetchpatch { # Patch for CUDA 8 compatibility + url = "https://github.com/opencv/opencv/commit/10896129b39655e19e4e7c529153cb5c2191a1db.patch"; + sha256 = "0jka3kxxywgs3prqqgym5kav6p73rrblwj50k1nf3fvfpk194ah1"; + }) + (fetchpatch { # Patch to add CUDA Compute Capability compilation targets up to 6.0 + url = "https://github.com/opencv/opencv/commit/d76f258aebdf63f979a205cabe6d3e81700a7cd8.patch"; + sha256 = "00b3msfgrcw7laij6qafn4b18c1dl96xxpzwx05wxzrjldqb6kqg"; + }) + ]; preConfigure = let ippicvVersion = "20151201"; From cbdc94f2b7798ac4b2c0f1b564607e64a03996d2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 13 Dec 2016 11:35:15 +0000 Subject: [PATCH 1443/1749] buildGoPackage: remove go version from name (#21111) As a user installing the program it's not interesting what go version it was compiled against. Not more interesting than any other potential dependencies. It also makes it harder to install or update the package. --- pkgs/development/go-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index e076c6ca90ed..d3a31f321892 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -69,7 +69,7 @@ in go.stdenv.mkDerivation ( (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // { - name = "go${go.meta.branch}-${name}"; + inherit name; nativeBuildInputs = [ go parallel ] ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; buildInputs = [ go ] ++ buildInputs; From 7a813d3f6d3b983b67683234fe1fe77afb3d97e5 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 13 Dec 2016 07:25:46 -0500 Subject: [PATCH 1444/1749] linux_{4_8,grsec_nixos}: patch to fix build failure crypto/rsa_helper.c:18:28: fatal error: rsapubkey-asn1.h: No such file or directory --- .../kernel/multithreaded-rsapubkey-asn1.patch | 45 +++++++++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 6 +++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 53 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch diff --git a/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch b/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch new file mode 100644 index 000000000000..9f5790862b65 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch @@ -0,0 +1,45 @@ + +From Yang Shi <> +Subject [PATCH] crypto: rsa - fix a potential race condition in build +Date Fri, 2 Dec 2016 15:41:04 -0800 + + +When building kernel with RSA enabled with multithreaded, the below +compile failure might be caught: + +| /buildarea/kernel-source/crypto/rsa_helper.c:18:28: fatal error: rsapubkey-asn1.h: No such file or directory +| #include "rsapubkey-asn1.h" +| ^ +| compilation terminated. +| CC crypto/rsa-pkcs1pad.o +| CC crypto/algboss.o +| CC crypto/testmgr.o +| make[3]: *** [/buildarea/kernel-source/scripts/Makefile.build:289: crypto/rsa_helper.o] Error 1 +| make[3]: *** Waiting for unfinished jobs.... +| make[2]: *** [/buildarea/kernel-source/Makefile:969: crypto] Error 2 +| make[1]: *** [Makefile:150: sub-make] Error 2 +| make: *** [Makefile:24: __sub-make] Error 2 + +The header file is not generated before rsa_helper is compiled, so +adding dependency to avoid such issue. + +Signed-off-by: Yang Shi + +--- + crypto/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/crypto/Makefile b/crypto/Makefile +index 99cc64a..8db39f9 100644 +--- a/crypto/Makefile ++++ b/crypto/Makefile +@@ -40,6 +40,7 @@ obj-$(CONFIG_CRYPTO_ECDH) += ecdh_generic.o + + $(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h + $(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h ++$(obj)/rsa_helper.o: $(obj)/rsa_helper.c $(obj)/rsaprivkey-asn1.h + clean-files += rsapubkey-asn1.c rsapubkey-asn1.h + clean-files += rsaprivkey-asn1.c rsaprivkey-asn1.h + +-- +2.0.2 diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 124518c36b21..06d6f88299fe 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -38,6 +38,12 @@ in rec { + multithreaded_rsapubkey = + { + name = "multithreaded-rsapubkey-asn1.patch"; + patch = ./multithreaded-rsapubkey-asn1.patch; + }; + bridge_stp_helper = { name = "bridge-stp-helper"; patch = ./bridge-stp-helper.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 922af73fd200..5b33e6aa7ad0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10985,6 +10985,7 @@ in linux_4_8 = callPackage ../os-specific/linux/kernel/linux-4.8.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.multithreaded_rsapubkey # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md # when adding a new linux version # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking @@ -11191,6 +11192,7 @@ in inherit (lib) overrideDerivation; kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix { kernelPatches = with self.kernelPatches; [ + kernelPatches.multithreaded_rsapubkey bridge_stp_helper modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") From 2bcd41b9ffc629c7c9df402b7a39700340fdf52e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 13 Dec 2016 14:31:47 +0100 Subject: [PATCH 1445/1749] buildPythonPackage: install builds reproducibly Without --build a temporary directory is created to unpack the wheel in. We now set a directory instead. --- .../interpreters/python/build-python-package-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/build-python-package-common.nix b/pkgs/development/interpreters/python/build-python-package-common.nix index 381606acd8b6..2b383fe985d1 100644 --- a/pkgs/development/interpreters/python/build-python-package-common.nix +++ b/pkgs/development/interpreters/python/build-python-package-common.nix @@ -24,7 +24,7 @@ attrs // { export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" pushd dist - ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags} + ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags} --build tmpbuild popd runHook postInstall From c1d60d8c1e23dc5ad1bc85df561e615bcb2bb0cf Mon Sep 17 00:00:00 2001 From: Stefan Goetz Date: Tue, 13 Dec 2016 14:59:49 +0100 Subject: [PATCH 1446/1749] youtube-dl: 2016.12.01 -> 2016.12.12 (#21122) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 9dff0c8214f8..db11875afa08 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.12.01"; + version = "2016.12.12"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "ddff281a251c7a40bf8c28afa1df63e9a64ff61b6b8097535fbbe587e8ccaef7"; + sha256 = "643efa7755ac4aa03a241f106d8923dfd5dbaf8d3c14e56b696048c4f2fab430"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From 64a64c6b14d6556b46266c25fa9acb11c99fc033 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Dec 2016 13:38:26 +0100 Subject: [PATCH 1447/1749] grsecurity test: refactoring --- nixos/tests/grsecurity.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nixos/tests/grsecurity.nix b/nixos/tests/grsecurity.nix index e585a7402d34..ee9e0709e5e7 100644 --- a/nixos/tests/grsecurity.nix +++ b/nixos/tests/grsecurity.nix @@ -8,7 +8,9 @@ import ./make-test.nix ({ pkgs, ...} : { machine = { config, pkgs, ... }: { security.grsecurity.enable = true; + boot.kernel.sysctl."kernel.grsecurity.audit_mount" = 0; boot.kernel.sysctl."kernel.grsecurity.deter_bruteforce" = 0; + networking.useDHCP = false; }; testScript = '' @@ -20,16 +22,14 @@ import ./make-test.nix ({ pkgs, ...} : { subtest "paxtest", sub { # TODO: running paxtest blackhat hangs the vm - $machine->succeed("${pkgs.paxtest}/lib/paxtest/anonmap") =~ /Killed/ or die; - $machine->succeed("${pkgs.paxtest}/lib/paxtest/execbss") =~ /Killed/ or die; - $machine->succeed("${pkgs.paxtest}/lib/paxtest/execdata") =~ /Killed/ or die; - $machine->succeed("${pkgs.paxtest}/lib/paxtest/execheap") =~ /Killed/ or die; - $machine->succeed("${pkgs.paxtest}/lib/paxtest/execstack") =~ /Killed/ or die; - $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotanon") =~ /Killed/ or die; - $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotbss") =~ /Killed/ or die; - $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotdata") =~ /Killed/ or die; - $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotheap") =~ /Killed/ or die; - $machine->succeed("${pkgs.paxtest}/lib/paxtest/mprotstack") =~ /Killed/ or die; + my @pax_mustkill = ( + "anonmap", "execbss", "execdata", "execheap", "execstack", + "mprotanon", "mprotbss", "mprotdata", "mprotheap", "mprotstack", + ); + foreach my $name (@pax_mustkill) { + my $paxtest = "${pkgs.paxtest}/lib/paxtest/" . $name; + $machine->succeed($paxtest) =~ /Killed/ or die + } }; # tcc -run executes run-time generated code and so allows us to test whether From 33088accc814a139cdcb2f44018da6dba2ac056f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 11 Dec 2016 14:56:40 +0100 Subject: [PATCH 1448/1749] terraria service: fix tmux output tmux.bin was removed in 5535d9439415454abe00589bd7575b61e7fbb8db Use `lib.getBin` to be more robust to future changes. --- nixos/modules/services/games/terraria.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix index 57ac37bb1bd3..93377dedbd4b 100644 --- a/nixos/modules/services/games/terraria.nix +++ b/nixos/modules/services/games/terraria.nix @@ -126,8 +126,8 @@ in User = "terraria"; Type = "oneshot"; RemainAfterExit = true; - ExecStart = "${pkgs.tmux.bin}/bin/tmux -S /var/lib/terraria/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}"; - ExecStop = "${pkgs.tmux.bin}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter \"exit\" Enter"; + ExecStart = "${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}"; + ExecStop = "${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter \"exit\" Enter"; }; postStart = '' From d893c86b34680fc4de04b8df05c84dc91c401ab0 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 11 Dec 2016 14:59:41 +0100 Subject: [PATCH 1449/1749] terraria service: fixup worldPath option type Otherwise, using the defaults results in a type error. --- nixos/modules/services/games/terraria.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix index 93377dedbd4b..21aff780b672 100644 --- a/nixos/modules/services/games/terraria.nix +++ b/nixos/modules/services/games/terraria.nix @@ -64,7 +64,7 @@ in }; worldPath = mkOption { - type = types.path; + type = types.nullOr types.path; default = null; description = '' The path to the world file (.wld) which should be loaded. From d918c80e133d00693973fb15ae12b6fd0b2d7a5c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 13 Dec 2016 15:09:00 +0100 Subject: [PATCH 1450/1749] grsecurity: disable verbose initify Not as useful/informative as I had hoped. --- pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix index 895c0ec42ef8..ed8942b10669 100644 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix +++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix @@ -23,8 +23,6 @@ PAX_XATTR_PAX_FLAGS y PAX_EI_PAX n PAX_INITIFY y -# initify is a fairly recent feature, enable verbose mode to aid in debugging -PAX_INITIFY_VERBOSE y # The bts instrumentation method is compatible with binary only modules. # From df07922e3e26ead710bbcabec53f290feb12dd04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 1 Jul 2016 13:44:07 +0200 Subject: [PATCH 1451/1749] knot-dns: init at 2.3.3 Only .lib is tested ATM. --- pkgs/servers/dns/knot-dns/default.nix | 39 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/servers/dns/knot-dns/default.nix diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix new file mode 100644 index 000000000000..62343666729c --- /dev/null +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn +, systemd, nettle, libedit }: + +# Note: ATM only the libraries have been tested in nixpkgs. +stdenv.mkDerivation rec { + name = "knot-dns-${version}"; + version = "2.3.3"; + + src = fetchurl { + url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; + sha256 = "a929bce3b957a81776b1db7b43b0e4473339bf16be8dbba5abb4b0593bf43c94"; + }; + + outputs = [ "bin" "out" "dev" ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + gnutls jansson liburcu lmdb libcap_ng libidn + systemd nettle libedit + # without sphinx &al. for developer documentation + ]; + + enableParallelBuilding = true; + + CFLAGS = [ "-DNDEBUG" ]; + + #doCheck = true; problems in combination with dynamic linking + + postInstall = ''rm -r "$out"/var''; + + meta = with stdenv.lib; { + description = "Authoritative-only DNS server from .cz domain registry"; + homepage = https://knot-dns.cz; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = [ maintainers.vcunat ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7dc9d7e07899..dea35b0640c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10119,6 +10119,8 @@ in jetty = callPackage ../servers/http/jetty { }; + knot-dns = callPackage ../servers/dns/knot-dns { }; + rdkafka = callPackage ../development/libraries/rdkafka { }; leafnode = callPackage ../servers/news/leafnode { }; From dcee4214b9fb29f42e69da27a4c6069f75c9e6f1 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Tue, 13 Dec 2016 15:39:33 +0100 Subject: [PATCH 1452/1749] ponyc: 0.9.0 -> 0.10.0 --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 2bce01551ee5..2c785d2a721d 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "1g2i3x9k36h5rx7ifx0i6hn78xlj42i86x8apwzvkh0y84y88adi"; + sha256 = "1v314abmhlqsj8iyab61cf8nb4kbddv1ycnw29z53mpbmivk4gn0"; }; buildInputs = [ llvm makeWrapper which ]; From 8c0f4755bd086a8a07c2ff3799273e5b4f7e3699 Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Tue, 13 Dec 2016 15:43:02 +0100 Subject: [PATCH 1453/1749] urbit: 2016-06-02 -> 0.4 (#20922) --- pkgs/misc/urbit/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index cbe9416ee8ae..e3d6d40bdac7 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -1,21 +1,20 @@ { stdenv, fetchFromGitHub, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel, - cmake, re2c, libtool, ncurses, perl, zlib, python2 }: + cmake, re2c, libtool, ncurses, perl, zlib, python2, curl }: stdenv.mkDerivation rec { - name = "urbit-${version}"; - version = "2016-06-02"; + version = "0.4"; src = fetchFromGitHub { owner = "urbit"; repo = "urbit"; - rev = "8c113559872e4a97bce3f3ee5b370ad9545c7459"; - sha256 = "055qdpp4gm0v04pddq4380pdsi0gp2ybgv1d2lchkhwsnjyl46jl"; + rev = "v${version}"; + sha256 = "1ndy58ypilabf9pfkqzzl7wf6x1vr4gpvsbn30sygp2ip908q0xz"; }; buildInputs = with stdenv.lib; [ gcc gmp libsigsegv openssl automake autoconf ragel cmake re2c libtool - ncurses perl zlib python2 + ncurses perl zlib python2 curl ]; # uses 'readdir_r' deprecated by glibc 2.24 From 140643be451fa8c5d9c47eac2ca7a3a193ee6efa Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 13 Dec 2016 15:50:58 +0100 Subject: [PATCH 1454/1749] jid: init at 0.6.1 (#20923) --- pkgs/development/tools/jid/default.nix | 25 +++++++++++++++++ pkgs/development/tools/jid/deps.nix | 39 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 66 insertions(+) create mode 100644 pkgs/development/tools/jid/default.nix create mode 100644 pkgs/development/tools/jid/deps.nix diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix new file mode 100644 index 000000000000..e77921c5437c --- /dev/null +++ b/pkgs/development/tools/jid/default.nix @@ -0,0 +1,25 @@ +# This file was generated by go2nix. +{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "jid-${version}"; + version = "0.6.1"; + rev = "0.6.1"; + + goPackagePath = "github.com/simeji/jid"; + + src = fetchFromGitHub { + owner = "simeji"; + repo = "jid"; + inherit rev; + sha256 = "0hnda2nqgirwbqbzq38kbl83cr0kn7hxsh4wim4fwwla0hs2nwjg"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Incremental JSON digger"; + license = licenses.mit; + maintainers = [ maintainers.profpatsch ]; + }; +} diff --git a/pkgs/development/tools/jid/deps.nix b/pkgs/development/tools/jid/deps.nix new file mode 100644 index 000000000000..4bc32247c08f --- /dev/null +++ b/pkgs/development/tools/jid/deps.nix @@ -0,0 +1,39 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/bitly/go-simplejson"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-simplejson"; + rev = "aabad6e819789e569bd6aabf444c935aa9ba1e44"; + sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "737072b4e32b7a5018b4a7125da8d12de90e8045"; + sha256 = "09ni8bmj6p2b774bdh6mfcxl03bh5sqk860z03xpb6hv6yfxqkjm"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "0b413bfa31e8c6843db20dce4454566b1951709e"; + sha256 = "1n45cq3p7z5533bmsqj3a0xvp7c8ncb52k3l8zqvd37f34zpsyxb"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "248dadf4e9068a0b3e79f02ed0a610d935de5302"; + sha256 = "03l80r0i9bxl0vz363w62k4a8apzglgbrz6viwym3044sxkl1qks"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0b11d62033e..e1794bbf401b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2296,6 +2296,8 @@ in jhead = callPackage ../tools/graphics/jhead { }; + jid = callPackage ../development/tools/jid { }; + jing = self.jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { }; From 1d0fb40af004a760996780548e6872941fe61d54 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 13 Dec 2016 16:25:04 +0100 Subject: [PATCH 1455/1749] abcl: init at 1.4.0 --- pkgs/development/compilers/abcl/default.nix | 40 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/compilers/abcl/default.nix diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix new file mode 100644 index 000000000000..c296f690fa52 --- /dev/null +++ b/pkgs/development/compilers/abcl/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, ant, jre, jdk}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "abcl"; + version = "1.4.0"; + # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + src = fetchurl { + url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz"; + sha256 = "1y4nixm1459ch6226ikdilcsf91c2rg1d82cqqmcn24kfjl1m62i"; + }; + configurePhase = '' + mkdir nix-tools + export PATH="$PWD/nix-tools:$PATH" + echo "echo nix-builder.localdomain" > nix-tools/hostname + chmod a+x nix-tools/* + + hostname + ''; + buildPhase = '' + ant + ''; + installPhase = '' + mkdir -p "$out"/{bin,share/doc/abcl,lib/abcl} + cp -r README COPYING CHANGES examples/ "$out/share/doc/abcl/" + cp -r dist/*.jar contrib/ "$out/lib/abcl/" + + echo "#! ${stdenv.shell}" >> "$out/bin/abcl" + echo "${jre}/bin/java -cp \"$out/lib/abcl/abcl.jar:$out/lib/abcl/abcl-contrib.jar:\$CLASSPATH\" org.armedbear.lisp.Main \"\$@\"" >> "$out/bin/abcl" + chmod a+x "$out"/bin/* + ''; + buildInputs = [jre ant jdk jre]; + meta = { + inherit version; + description = ''A JVM-based Common Lisp implementation''; + license = stdenv.lib.licenses.gpl3 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://common-lisp.net/project/armedbear/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1794bbf401b..1f16ceeddb8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4533,6 +4533,8 @@ in ### DEVELOPMENT / COMPILERS + abcl = callPackage ../development/compilers/abcl {}; + aldor = callPackage ../development/compilers/aldor { }; aliceml = callPackage ../development/compilers/aliceml { }; From 6c226b1e7ac4f699dfc46a1fd38d59af6efb2c2a Mon Sep 17 00:00:00 2001 From: Mike Sperber Date: Tue, 13 Dec 2016 16:25:44 +0100 Subject: [PATCH 1456/1749] rPackages.DescTools: unbreak build outside of Linux. (#20787) DescTools does not require X during build, so remove it from that list. --- pkgs/development/r-modules/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f168e115de13..2ef3fbdd0763 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -472,7 +472,6 @@ let "DeducerSurvival" "DeducerText" "Demerelate" - "DescTools" "detrendeR" "dgmb" "DivMelt" From 360234dab6b22d9f05821369a43c10b5faea3b79 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 13 Dec 2016 07:14:22 -0800 Subject: [PATCH 1457/1749] coq_8_6: new package, based on Coq 8.6rc1 --- pkgs/applications/science/logic/coq/8.6.nix | 89 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 26 ++++++ 2 files changed, 115 insertions(+) create mode 100644 pkgs/applications/science/logic/coq/8.6.nix diff --git a/pkgs/applications/science/logic/coq/8.6.nix b/pkgs/applications/science/logic/coq/8.6.nix new file mode 100644 index 000000000000..659034e0586e --- /dev/null +++ b/pkgs/applications/science/logic/coq/8.6.nix @@ -0,0 +1,89 @@ +# - coqide compilation can be disabled by setting lablgtk to null; +# - The csdp program used for the Micromega tactic is statically referenced. +# However, coq can build without csdp by setting it to null. +# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. +# - The patch-level version can be specified through the `pl` argument to +# the derivation; it defaults to the greatest. + +{ stdenv, fetchurl, writeText, pkgconfig +, ocaml, findlib, camlp5, ncurses +, lablgtk ? null, csdp ? null +, pl ? "1" +}: + +let + version = "8.6rc${pl}"; + sha256 = { + "1" = "0wral36h39q7g2sa2z8jvjc8ggqmqsjrbs0k299n0nykmmrq1pr8"; + }."${pl}"; + coq-version = "8.6"; + buildIde = lablgtk != null; + ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; + csdpPatch = if csdp != null then '' + substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" + substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" + '' else ""; +in + +stdenv.mkDerivation { + name = "coq-${version}"; + + inherit coq-version; + inherit ocaml camlp5; + + src = fetchurl { + url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; + inherit sha256; + }; + + buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; + + postPatch = '' + UNAME=$(type -tp uname) + RM=$(type -tp rm) + substituteInPlace configure --replace "/bin/uname" "$UNAME" + substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" + substituteInPlace configure.ml --replace '"md5 -q"' '"md5sum"' + ${csdpPatch} + ''; + + setupHook = writeText "setupHook.sh" '' + addCoqPath () { + if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then + export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/" + fi + } + + envHooks=(''${envHooks[@]} addCoqPath) + ''; + + preConfigure = '' + configureFlagsArray=( + -opt + ${ideFlags} + ) + ''; + + prefixKey = "-prefix "; + + buildFlags = "revision coq coqide bin/votour"; + + postInstall = '' + cp bin/votour $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Coq proof assistant"; + longDescription = '' + Coq is a formal proof management system. It provides a formal language + to write mathematical definitions, executable algorithms and theorems + together with an environment for semi-interactive development of + machine-checked proofs. + ''; + homepage = "http://coq.inria.fr"; + license = licenses.lgpl21; + branch = coq-version; + maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f16ceeddb8e..23f904f450a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16682,6 +16682,11 @@ in camlp5 = ocamlPackages.camlp5_transitional; }; + coq_8_6 = callPackage ../applications/science/logic/coq/8.6.nix { + inherit (ocamlPackages) ocaml findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; + }; + coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix { inherit (ocamlPackages) ocaml findlib lablgtk; camlp5 = ocamlPackages.camlp5_transitional; @@ -16765,8 +16770,29 @@ in }; + mkCoqPackages_8_6 = self: let callPackage = newScope self; in rec { + + inherit callPackage; + + coq = coq_8_6; + + coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; + + coquelicot = callPackage ../development/coq-modules/coquelicot {}; + + dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; + + flocq = callPackage ../development/coq-modules/flocq {}; + + interval = callPackage ../development/coq-modules/interval {}; + + fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; + + }; + coqPackages = mkCoqPackages_8_4 coqPackages; coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5; + coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6; cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; From 69ce9a9edde33db668c602dbb25df598cc6b09c1 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 13 Dec 2016 10:27:21 -0500 Subject: [PATCH 1458/1749] watchman: 4.5.0 -> 4.7.0 --- pkgs/development/tools/watchman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 9c09277deb78..379f87b4cf4f 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "watchman-${version}"; - version = "4.5.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; rev = "v${version}"; - sha256 = "0hyj7nbsm5mv8zq2fldd06f92a3wamavha20311518qv7q5jj72v"; + sha256 = "0xnd7jvrmyxhlw2ggd37swv1mk6vw9j91fdxps6njgvnlfg9zs5n"; }; buildInputs = [ autoconf automake pcre ]; From 62934023c3ece9c6339816dd0d8e7cfe0995e0a9 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 13 Dec 2016 08:06:48 -0800 Subject: [PATCH 1459/1749] coq_HEAD: Update to the latest commit as of 2016-12-13 --- pkgs/applications/science/logic/coq/HEAD.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index 86935b178d99..f6837397e21a 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -6,8 +6,8 @@ {stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}: let - version = "8.5pre-0c999f02"; - coq-version = "8.5"; + version = "8.6pre-0c999f02"; + coq-version = "8.6"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; csdpPatch = if csdp != null then '' @@ -24,20 +24,18 @@ stdenv.mkDerivation { src = fetchgit { url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "0c999f02ffcd61fcace0cc2d045056a82992a100"; - sha256 = "08z9z4bv4a8ha1jrn18vxad6d7y7h92ggr00rx8jfvvi290n9344"; + rev = "ad768e435a736ca51ac79a575967b388b34918c7"; + sha256 = "05s7sk1l3mvdjag3idnhkpj707y4bv56da7kpffw862f2qgfr77j"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; - patches = [ ./no-codesign.patch ]; - postPatch = '' UNAME=$(type -tp uname) RM=$(type -tp rm) substituteInPlace configure --replace "/bin/uname" "$UNAME" substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)" + substituteInPlace configure.ml --replace "\"Darwin\"; \"FreeBSD\"; \"OpenBSD\"" "\"Darwinx\"; \"FreeBSD\"; \"OpenBSD\"" ${csdpPatch} ''; From 8aecafcf5e53c1511a567b4d6e3a11b573d6b9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 13 Dec 2016 17:27:23 +0100 Subject: [PATCH 1460/1749] tigervnc: fix missing Xvnc (xauth) (#21110) the xorg patch was not applied. Also a different root for `make install` is needed. In addition more unnessary option are disabled. --- pkgs/tools/admin/tigervnc/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index d0eb9e8fb15a..901ec06ea658 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -39,9 +39,20 @@ stdenv.mkDerivation rec { tar xf ${xorg.xorgserver.src} cp -R xorg*/* unix/xserver pushd unix/xserver + version=$(echo ${xorg.xorgserver.name} | sed 's/.*-\([0-9]\+\).\([0-9]\+\).*/\1\2/g') + patch -p1 < ${src}/unix/xserver$version.patch autoreconf -vfi - ./configure $configureFlags --disable-devel-docs --disable-docs --disable-xinerama --disable-xvfb --disable-xnest \ - --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx \ + ./configure $configureFlags --disable-devel-docs --disable-docs \ + --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ + --disable-xwin --disable-xephyr --disable-kdrive --with-pic \ + --disable-xorgcfg --disable-xprint --disable-static \ + --disable-composite --disable-xtrap --enable-xcsecurity \ + --disable-{a,c,m}fb \ + --disable-xwayland \ + --disable-config-dbus --disable-config-udev --disable-config-hal \ + --disable-xevie \ + --disable-dri --disable-dri2 --disable-dri3 --enable-glx \ + --enable-install-libxf86config \ --prefix="$out" --disable-unit-tests \ --with-xkb-path=${xkeyboard_config}/share/X11/xkb \ --with-xkb-bin-directory=${xorg.xkbcomp}/bin \ @@ -49,9 +60,9 @@ stdenv.mkDerivation rec { make TIGERVNC_SRCDIR=`pwd`/../.. popd ''; - + postInstall = '' - pushd unix/xserver + pushd unix/xserver/hw/vnc make TIGERVNC_SRCDIR=`pwd`/../.. install popd rm -f $out/lib/xorg/protocol.txt From 1beb9e6d1e3bbafa3c953903813b1526fb81c622 Mon Sep 17 00:00:00 2001 From: Alexei Boronine Date: Wed, 14 Dec 2016 02:22:31 +0800 Subject: [PATCH 1461/1749] haxe: enable darwin platform (#21127) --- pkgs/development/compilers/haxe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index f70fbcf583c2..a2afcc773802 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation { homepage = http://haxe.org; license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt maintainers = [ maintainers.marcweber ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From 78ffee7f063f568b0b8338c6d2ae21cb47380ec9 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 13 Dec 2016 20:57:35 +0100 Subject: [PATCH 1462/1749] kakoune: update 2016-07-26 -> 2016-12-10 --- pkgs/applications/editors/kakoune/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index d45fdc8e12d6..73ee7ed64cd5 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kakoune-nightly-${version}"; - version = "2016-07-26"; + version = "2016-12-10"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "0d2c5072b083a893843e4fa87f9f702979069e14"; - sha256 = "01qqs5yr9xvvklg3gg45lgnyh6gji28m854mi1snzvjd7fksf50n"; + rev = "e44129577a010ebb4dc609b806104d3175659074"; + sha256 = "1jkpbk6wa9x5nlv002y1whv6ddhqawxzbp3jcbzcb51cg8bz0b1l"; }; buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ]; From d3be9a50e0a3d87d76b74133a9afc40ea2fb0f08 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 13 Dec 2016 21:39:31 +0100 Subject: [PATCH 1463/1749] nginxMainline: 1.11.6 -> 1.11.7 --- 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 00a5ac2563a3..c00cc3f4e5d1 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.6"; - sha256 = "1gc5phrzm2hbpvryaya6rlvasa00vjips4hv5q1rqbcfa6xsnlri"; + version = "1.11.7"; + sha256 = "03ihv5v8qasifh4wlql0ggbqkyvak29g0h5fqzka69i15fsvwm8d"; }) From 762d902b1d9a6eb2eba065d7d3eee60a59cecd14 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 13 Dec 2016 21:55:05 +0100 Subject: [PATCH 1464/1749] php71: init at 7.1.0 --- pkgs/development/interpreters/php/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3b1b288fd5d5..d588b6a7ad5b 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -310,4 +310,9 @@ in { version = "7.0.13"; sha256 = "1hc8zry3mrggfh1yxvm255xal5h6bxf0p3wdq307w48j719bp46h"; }; + + php71 = generic { + version = "7.1.0"; + sha256 = "0qcf4aahkiwypidw42pd5dz34n10296zgjfyh56lgcymxryzvg38"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23f904f450a1..f1882397933b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5621,9 +5621,14 @@ in php = php70; }); + php71Packages = recurseIntoAttrs (callPackage ./php-packages.nix { + php = php71; + }); + inherit (callPackages ../development/interpreters/php { }) php56 - php70; + php70 + php71; picoc = callPackage ../development/interpreters/picoc {}; From 2ec19900aba3178c29acc17a72e5251e769f063a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 13 Dec 2016 21:56:10 +0100 Subject: [PATCH 1465/1749] php56: 5.6.28 -> 5.6.29 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index d588b6a7ad5b..fc0e6a312420 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -302,8 +302,8 @@ let in { php56 = generic { - version = "5.6.28"; - sha256 = "13sl8z5inwyzmi1d5z4g42nq3n8gjdl4876h65bbd86mmbsa6pn5"; + version = "5.6.29"; + sha256 = "1fr530x1hxpaf0gb1ayrs9a4xa9v14dfb4hn2560dgm7i96896s9"; }; php70 = generic { From 60dfc245c7f7cc41eb1b6f515625a644af9c2164 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 13 Dec 2016 21:56:47 +0100 Subject: [PATCH 1466/1749] php70: 7.0.13 -> 7.0.14 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index fc0e6a312420..1a5bed6d20b9 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -307,8 +307,8 @@ in { }; php70 = generic { - version = "7.0.13"; - sha256 = "1hc8zry3mrggfh1yxvm255xal5h6bxf0p3wdq307w48j719bp46h"; + version = "7.0.14"; + sha256 = "0d0596vzpyw86a77smk799sxl4mh2wylzsvmrv8mzda21nd3di7v"; }; php71 = generic { From 00f5ed6e4c7627b99a260ca068003a1f61764b98 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 13 Dec 2016 21:58:37 +0100 Subject: [PATCH 1467/1749] libfilezilla: 0.8.0 -> 0.9.0 --- pkgs/development/libraries/libfilezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 61fb8f2ffd86..4df326e278cc 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.8.0"; + version = "0.9.0"; src = fetchurl { url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; - sha256 = "0pq143f2j0g6ghl9vk1d3xw4ws2cddc8li8lm69v7lv8inz1dvhb"; + sha256 = "0340v5xs48f28q2d16ldb9359dkzlhl4l449mgyv3qabnlz2pl21"; }; meta = with stdenv.lib; { From 1bb96c202dada87398cc88ec64f15fbee0d1477a Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 13 Dec 2016 22:21:21 +0100 Subject: [PATCH 1468/1749] filezilla: 3.22.2.2 -> 3.23.0.2 --- pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index d49eaad4d33d..c0951d979904 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.22.2.2"; in +let version = "3.23.0.2"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "1h02k13x88f04gkf433cxx1xvbr7kkl2aygb4i6581gzhzjifwdv"; + sha256 = "0bq22nq2g1b0x5msm9if74ync2qk13n2782mwj2r1r7hsmx4liiz"; }; configureFlags = [ From d65ef03677ab395e8dfb312c32ef379046ac3472 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 13 Dec 2016 22:34:25 +0100 Subject: [PATCH 1469/1749] stunnel: 5.37 -> 5.38 --- pkgs/tools/networking/stunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 6bcf2b80a136..e9c82a798ed2 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.37"; + version = "5.38"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "0hfjs3f2crdvqsalismrsf5nnz4ksj8igiwjqzg4zipz7q757qyh"; + sha256 = "1mag0gd52f5q1jj3ds1pcn3s09si63cbxmri3zyv2fk8l6ds5b89"; }; buildInputs = [ openssl ]; From b23b7a81748f8d1ae9c746de41090f2bd0448e0d Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 13 Dec 2016 22:35:16 +0100 Subject: [PATCH 1470/1749] ecl: add threadSupport option --- pkgs/development/compilers/ecl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index cfaf8184c690..60293fa2ec18 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -3,6 +3,7 @@ , gmp, mpfr, libffi, makeWrapper , noUnicode ? false , gcc +, threadSupport ? true }: let s = # Generated upstream information @@ -30,7 +31,7 @@ stdenv.mkDerivation { }; configureFlags = [ - "--enable-threads" + (if threadSupport then "--enable-threads" else "--disable-threads") "--with-gmp-prefix=${gmp.dev}" "--with-libffi-prefix=${libffi.dev}" ] From e4db40ad2374aa28b59cd15027f5d7248e84bd1e Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 13 Dec 2016 22:36:12 +0100 Subject: [PATCH 1471/1749] toxic: fix arm build --- .../networking/instant-messengers/toxic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 414b36b05e39..be72895b430a 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libconfig ]; buildInputs = [ - libtoxcore-dev libsodium ncurses libqrencode curl + libtoxcore-dev libsodium ncurses curl ] ++ stdenv.lib.optionals (!stdenv.isArm) [ - openal libvpx freealut + openal libvpx freealut libqrencode ]; meta = with stdenv.lib; { From 20f138c3d7fb30340092e0569796b2b68840d9ac Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 13 Dec 2016 22:37:06 +0100 Subject: [PATCH 1472/1749] ffmpeg: respect sdlSupport option --- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index f6c40fa5dd00..0ac82f98a24b 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora - libvdpau libvorbis lzma SDL soxr x264 x265 xvidcore zlib libopus + libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus ] ++ optional openglSupport mesa ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isArm) libva From 6d1180cf023f309438de77afd38c6de3c3eda3f9 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 13 Dec 2016 23:11:30 +0100 Subject: [PATCH 1473/1749] perl-Sub-Quote: init at 2.003001 --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 485c0a95dc35..48c76ca6d69d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11832,6 +11832,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [SubUplevel TestException]; }; + SubQuote = buildPerlPackage rec { + name = "Sub-Quote-2.003001"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; + sha256 = "9d471d8e13e7ce4793d5a5ec04a60fface14dd53be78dd94d228871915cfd1f9"; + }; + buildInputs = [ TestFatal ]; + meta = { + description = "Efficient generation of subroutines via string eval"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SubUplevel = buildPerlPackage { name = "Sub-Uplevel-0.24"; src = fetchurl { From 586dd2a3bb8d825fa2479a2f3b816cc6d38e7686 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 13 Dec 2016 23:11:51 +0100 Subject: [PATCH 1474/1749] perl-Moo: 2.002005 -> 2.003000 Also remove myself as maintainer since I'm not really using this package. --- pkgs/top-level/perl-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 48c76ca6d69d..3199f65f9559 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8515,17 +8515,16 @@ let self = _self // overrides; _self = with self; { }; Moo = buildPerlPackage rec { - name = "Moo-2.002005"; + name = "Moo-2.003000"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "8147f98a43f7beb808773202b05d3fba25d5fca018ad939d7e529f4d36d6dc68"; + sha256 = "ccab84b1377e52922026b24b2ed51d83c439757f2b0783fffa73ac22b4fb3dd2"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny ]; + propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny SubQuote ]; meta = { description = "Minimalist Object Orientation (with Moose compatibility)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; From 10ca00a9a2ba913fa93dd0eb8bbb021410c1665c Mon Sep 17 00:00:00 2001 From: schneefux Date: Tue, 13 Dec 2016 21:56:14 +0100 Subject: [PATCH 1475/1749] shaarli: 0.8.0 -> 0.8.1 --- pkgs/servers/web-apps/shaarli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 83c0a6c10348..32eae53420a2 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://github.com/shaarli/Shaarli/releases/download/v0.8.0/shaarli-v0.8.0-full.tar.gz"; - sha256 = "04151fl62rs8vxsmdyq4qm8fi7fr7i6x0zhrg1zgssv8w8lfx1ww"; + url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; + sha256 = "17p8bmkgmlan6vbvh955idddckr5kyf00gp8apjfcnm4b2awma8x"; }; outputs = [ "out" "doc" ]; From a26acf99adc64de533740456b64b77966a4f94f1 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 13 Dec 2016 23:46:29 +0100 Subject: [PATCH 1476/1749] torbrowser: 6.0.7 -> 6.0.8 --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 13f2b145663a..d0484b251a49 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "6.0.7"; + version = "6.0.8"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "1llgqvxmn572wyxk7r1hf3j6ldi9hkgahm7918rsmsvk66i187h4" else - "16z8qfmcgxbvmv5hriv1gq4lpz54fy04mhhwdd6s72y52dfcvfy3"; + "1s2yv72kj4zxba0850fi1jv41c69vcw3inhj9kqhy1d45ql7iw0w" else + "0zvqf444h35ikv1f3nwkh2jx51zj5k9w4zdxx32zcrnxpk5nhn97"; }; desktopItem = makeDesktopItem { From 8a7cf06b54986dc4d21aaefeedf8d0b4c5cc97fa Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 14 Dec 2016 08:48:35 +0900 Subject: [PATCH 1477/1749] firefox-bin: 50.0.2 -> 50.1.0 --- .../browsers/firefox-bin/sources.nix | 1101 ++++++++++++++--- 1 file changed, 912 insertions(+), 189 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index cb85d83065f2..c37404d881ba 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -1,192 +1,915 @@ -# This file is generated from generate_sources.rb. DO NOT EDIT. -# Execute the following command to update the file. -# -# ruby generate_sources.rb 46.0.1 > sources.nix - { - version = "50.0.2"; + version = "50.1.0"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ach/firefox-50.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "21cb43e55ff902380463a2ac896d64625d2e65bb824b49063675c80049d0230cae089736445910d84d0123e474d6e8455ef310593beda8b1bfe950e5b0fcb6c5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ach/firefox-50.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "0e1e297d8efd180c8312311854b54c9f64367e5fc3fd96cdae55d47001807eda48c8e2bc9568219dab453e2324b2b5c6c51b72e38c15d4e2c2a5a5fd881527a0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/af/firefox-50.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "c3a35b53d04472c58714a6fcc775283754df51055e2afdb1765a8879d5b1af20ce37e6100535cb0687712a96b02ae41875c9fddf85b6322ccd3725824a1d804d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/af/firefox-50.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "efca6bdc66cb175e4fa6c263099c3aa6407dca7a9cbb0cda9f00ca4ad2944745c0ae576848e0d58b4af59d66b5f9ed8a426d9674d2cd24b8e4d04874763b4324"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/an/firefox-50.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "565f18d139594b5cef133bdb2f873f6eea41d0b6345393bb825847dd59b60da8798ecd3be71bccf7cbb95829b668a0950caa5129d912ce534850ca76aebb52e8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/an/firefox-50.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "a1ba2af26f386ed8cf2263e32867fbb162df85f6992109926d5cd102026aa554f246ef3770f3a81effc9019cdd3efe9e7c4713e43c778714394ea981b53f9c30"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ar/firefox-50.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "0698e8f4c618ffa6db6d2675ad2752cfd8187373c43f815d20ad92bd1d534ea4f4ff3fc97c0a9c5774a58c63dc5faf024158ff91e402a2f1ba5d1c06550970c5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ar/firefox-50.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "b94f265ac682bd5c879b13f02189afe1aafb6a8e668b39bd3ed5fe145aecc54b1ca62004ba7d770fccad6abf0e259a1b1e41a4e6558a03b856dcebfbb8f21c2f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/as/firefox-50.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "e2644b2613f1c36549cdadca6cc9339b1b2f60eb83cdbe5400663bfc681b6c096ea610279f66969272f2e766ad7829da06716eaac13606ba21e3351521846b68"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/as/firefox-50.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "46cf0673b2776526920030a9698077ad375af2eaba80e153ffe56e34b7066e7c1731d9ded70530df9db37f3b99c658dfad9451f32f8344a37acef38444baf6f3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ast/firefox-50.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "3995e32ed9acdc2a481599adb2d6ed608e1820aa914da2b6da3cebf0d229f89b19f1355de7953d74de6815cf0eac5381a4d99db5a5b76c3874076ee800a88ca9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ast/firefox-50.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "dbe3807aed7ba5717197ae2f7c8c59b5aec752ab32093a0a103ab6f6f34c298fdc7718bf1f367aff1539871077857ddbec53068fea27c4c716eea0bab6f4eeab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/az/firefox-50.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "311be32d836f56d49d6d7cacab0208702870063d1569a83f30006b641586ac2beee32583cad31a75638745e196a6d2d309eee731dda5acbcaef865380c3940a0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/az/firefox-50.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "37d165529b6b8a34f35065d2d5971892c95c9537b24f20125242a8ddbf250efd5049c82299c70694fb5e591fa8acfeb68e3cc6222c6d60544448331c199d3f8a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/be/firefox-50.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "23737d6c1bdd91c9bb0256ef9ff9708a8b082461e62198bbb90fac31e4a6d077b059e8da7d0b4ba63d52e0a6cd6b244eab8b0c038fc65cd3da66a0cdd5fe6bd5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/be/firefox-50.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "fdfa30d26dc561f829c56acadaaa7dbb53def9c6213efe493d26954a621291d609d1e1400d13081621efe5a949ac33cb89655f1715430ee74c6d43518c35f95c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bg/firefox-50.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "b0b7e7b790183c949418d67716326b0ae13597ae21f45ce15d0d9bf62f09f5f9e66908b236f5d5e8d81362d193e1c19da7307dd2528cdedff50ece1310f8cb13"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bg/firefox-50.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "cc7690fe45edf2173f1a681e5a0507e31fd2b4a347da5fabf4272355001d9f09058666671356cf76ddcf9c98344921bf36a8b1f94eac6ebd484348d73a64506a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bn-BD/firefox-50.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "b599c718fc82cafafea71db2122cbf5f99c7e64029956f475ff5ef40959de07bb8b9b880459e5462c49283a9d94763457e6a9199cd4c88117a66d7732357a507"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bn-BD/firefox-50.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "7b974ea9526d431edd2663dfa14852a517546ce222834d7b50ca132abd787a86dbe4b4bd0b347ad016bf458551ed275517a45fd4322783f78de4e82a6ae88365"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bn-IN/firefox-50.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "1d6f4256ac05bdf62397e243ccd2057d9a0920bb9aa9edd0f91aef1bff4f3cd1302acd8ad212e9508b903a97815ad9488730c7795538daf42d4521e7bd47f57c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bn-IN/firefox-50.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "a7bd4c547335e3e54cf035219410ffb60a5f8e621c4b8459a2e01f3956168d8677e7d1892f509d7f1c2b823dccbcca71e21d47a83b189846a2dedebe9caa345c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/br/firefox-50.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "b539ffd5a34956580f884505245ccc64d3b15192b27aea72191a923065a671c1a24077fe7092405dac05b081b98016b096145fd096847abc3b3144f0e927ea75"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/br/firefox-50.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "0befd224443852cbbc861e72405326f957637554e66041376799ce0f498877a14bf63d892b3e779a182f7f4cdeb5e8d8b688625a7d5f7529ae6fc680cf35a01f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/bs/firefox-50.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "016957d9cb2208da775061c40a0baf66fa348d5426d6ac5801d9c07cb984f6faf85013fe9508c41281a5f66011ee75b28d4c02ac5d37a1fa4d030e9ac640990a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/bs/firefox-50.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "0192f63869f98f0ea09aef814f2f52f7d07d6e42e2d4d31ce020a9670df04808e3a2baba0865ec8f685a9a5156c7648282acd16b4227d461496e6d76c6ab2247"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ca/firefox-50.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "d9aa202a12bbb81e2e17f6252261ec22c570f03a2b178b73ccd316c05da2c50fb590ba3ef78b067f681342b596fe887d33f3977dd9fa54b9fa5f78c0a36d9931"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ca/firefox-50.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "d39aeaa7cc01181914445d5e3cfc55288373a05e6987e4c8e3be37743fc99df6c85c47337560f9faa38b826a041c52f6314ffbb3fa4e2593d126dff4b0bc55ba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/cak/firefox-50.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "05d043e48522191a959da5276add9ff88fd009c64b705397abf546567c677f874f640addb206e35c762b5ad614c9b4dddb0162beb9668ad28b4620aa5a2395d4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/cak/firefox-50.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "7c2e513d00c092d205e0b9360dd907454b87f705b2db6b0cb88226ea3456aa1a0d7d45bf7560861b27fade669c226c48bf08d24b28459c0eadb4baf3fe947433"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/cs/firefox-50.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "cd37b2be51aa96a3848c1058fa523062d79422e120a74eee2cf0b032002a80db2c07fd8b43fe374e0aeaf2425a72db75fe77d3e5928d1f8c4798a763d33c13cf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/cs/firefox-50.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "4132edd33d3b1195e5774cb4add6b121ade7dbc3592dea69c5f45fb74da5b3b2e851e38df05173b11a011c1366fd2ab000ed4ce1d9eb7a1b6d0deb0f1d8296d1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/cy/firefox-50.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "b2e00d3f5eaf76862270efc672f50043cb928abefa02b299ce519d420ef6ee5c65ce8710a5a49b4ff6c72762c7df0386c2d4f155ac88f3853206c6d7e0d0e36c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/cy/firefox-50.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "a8ab381099673212aa9370365aa26099f418560c12bec5b1094cb7228cf2828ed396da60fa7d45b6bb3c2126b69d03a2fa76124d7df345673b86ad5434c59ab8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/da/firefox-50.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "c61e353e30656039adba5264e32d2f95d0d2f2195e21250134b3408a62f936fff3d26caed1122964f6cf4b1120dddd6b17631323d21c93d7c18402559a0e40f8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/da/firefox-50.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "f3dd25ce556793bbebb5e23ae0b380bbac13ac75a4a3e7c23103a8e6aaada84173f67153dba2bcdc40e2f73b9f6faca40ed1932fe5e3e5e3dd9edff67b7eda53"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/de/firefox-50.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "11ac4020f61a185ea24c3ab3ee3361c11275e44908cc4be1650b523bfd356dfb3b8b065ffa69d32ad7b1d4f54d0d2369b1a18779e27871971bdd9be680aeb140"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/de/firefox-50.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "5e338e90d23326d7d81289ef44d688d8d45d26ccc57a8888be64a1fba85277527c05a7bce0395852a15a1b4707e146503d881e0a718303cba37213c8ad85189f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/dsb/firefox-50.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "7157d02ac19602acfdf67df8ec4696d13cdb433beab2be997d0996b45d89778fa435c2f92bbb7374503d1241d8a9c62a5f3cbcd278df5dd9279cce8f75481c21"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/dsb/firefox-50.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "8d70071d127efbb5b7591966e615ad8c49a01166c654d601520b72b04170523f8b5e63bdffc92e8a34b28d214d0a683bdc3a9655c4295c3c98f87f510b0de7ee"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/el/firefox-50.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f1323f32618bb81dc0cf566a9341311050364b68c51d51531a17133b7b039853d94b80eec21f1ea9f76607d9cbda46ad15b4eb378016e753f3900bb060b66a35"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/el/firefox-50.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "6ee87d5d96419749638ab4adcae63f3d9e6e397ef9f8cc30ad93d51adb5ee08e2381f48153a785f5e4694686dbb7d43bef3bf8a5ad161f02f3ef9f2f18324592"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/en-GB/firefox-50.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "6b9bb4aed532011ec4a66d7a19be6d68b7efc699e56388141d0a2895d52936b2c5037e44978a67cbb82e5d0098270e4615315ed2162a6f4f112ec0bbc5c773b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/en-GB/firefox-50.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "2f1dd9d6c43fc8a49262b3ed3899a1ad1933ffe3491f5af7e3c3071b68fc8f1926efe2d0c159d8e614eafdc365e0dcb572b01b6d874c404fa17024c38ad7950e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/en-US/firefox-50.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "ccd6e9e49c5c784da30e47cbdb275318b857d8da1cbba6df1210890f6a3e027d791e176eab60964904c0c27ab33fbaa29001119f7ed928e2978a8bc6f9b6e309"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/en-US/firefox-50.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "388e7cd5c6914d889c44a1246b056d6a2f4b9c1f38d08db34209b3d0e76a3caea0269d137ea66890dfd3f53f404ca101bfdb27666484936e49a73be01af5e677"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/en-ZA/firefox-50.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "ad41de1ffe0b2358f9ddca8a0e161119933e966380cbea6648216938371b2cb49c9d4f9646b4d8c194830c0f20b95c3f5d74d674316fe684bab1668bdcc88f17"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/en-ZA/firefox-50.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "0ea2b935a8bef6e75b1ffe0ad783217dbbe1511480aa8824f3b1cadc1bf67327b45d77c1fff7d27cc2e4d1def0e49a8dd4638781631774dcb6d08a56d06aa96c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/eo/firefox-50.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "ad48892743f3a804776be094d06ce69187e1fdfb625def2aa33cacb5353521ce5ffb3eb142b96d08a4700264e9a6d47f70fafbba1d851b44f7e90f52143f4334"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/eo/firefox-50.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "7a1b83a505bc6af3c856bcf33652925cb3450a5dbbf3eceaf06ee82236cf359bbb1ead70d97a4338df56bdaf07e668d8fc82dcb9335c51f4ea2fee4d51bff711"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-AR/firefox-50.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "e7b53e5c35b63cc46626896d69b01a30630d4a4bb700cd824d96221cd3f20d51edc298149842a8b23d069d2e02ff7905722e93fa9267c72dfa82ffb8f711d930"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-AR/firefox-50.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "536bf789f33ad59d890cede2583af3952c5ec18a159e5f8385b7acc50149d398da91bb8259cf8ccbba2740d0cce497cbc9d354d75dcccc4998ca04e1f2c51ede"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-CL/firefox-50.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "9c13de853952915cbfde787bd8e66c5e1f331069f3fc462f3944228fc552fb5016a908eb28c8bc30f8ff298e0f188f07e2ff8b1141d5cb575f8ee9e0e38e3bef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-CL/firefox-50.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "0bdf31dc9eef5ee0d8ccb5da3001c0fb0dfa4613311bb3a389cc12c4cf370180ac8b0917980cbf2df3ab9205eaae35edbec60dca88624ef13437795c174e8c2f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-ES/firefox-50.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "18d8012a9e9d55b93aebda9abacfcdcd2935d9019f77d6978fb8b02b5c16c07197eb7f08bcefa86813fba195df87d22d5007f6c1d208c37381204e6c03175b68"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-ES/firefox-50.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "77b547dd21e645aaed68e1a263bcf91b2101f05c96cb051b787707911ea9b047f73256b26b28efb790d0abadc46c44f304cc3f2f80472778b5a1e45d294d9b23"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/es-MX/firefox-50.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "60507ea94627f172cbed941ed084e803ff5ae814f838f9b0b55993878acc78fc9bf73e53de2f0314fb59572109da57860a5df9b7f7815273a8db73d70c400d59"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/es-MX/firefox-50.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "d920f13bc0bcdef484194a6b3a48195f5d3e7686a828b963a8d7b22b43b024b53eb284cab548b55de81c97831b6d3ccb2e88eb79cf715c94ef4680a4b12a5b7d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/et/firefox-50.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "1b9cd4182f45785b927da9e78e52ee6966194ec4482fe6547d7b0e1d6bf3bc66d1a67c683c1f716199db354a373d425f32861d3fbc4ad2ab38aa1b9c21b847df"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/et/firefox-50.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "9da2ad5723dc8d5c0570afb906b0e5808110702ca634a631454b082dc70c8fd97a9977a7c2e656d5e259db7d584dba3ed3cba9b2f45183fa63c03b2a3605c0db"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/eu/firefox-50.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "c05a6ec69e1cdb8493adda32ff9ddda4fbe03d1c23fb6007b67ec693a13bd50bb18f6f821c4789ae40746f4753c39eedb514c7581ad51323e8f9ae2c284766e4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/eu/firefox-50.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "2ebb5e755115c19961a25b9ad4598a03b3263f1fdc096b873577c2b5846d4c11b94cc002e2305729d96be146f13db5daacbf0575f7931594f4e49adfa597faa3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fa/firefox-50.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "26e1674500b1b15c79fb87a103d742fdef100dc6a2895d4884626d27c94a1c897335263dfe583878ed92bf4e66e9a3f194b2985bb487560317bd340bf8c1ba69"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fa/firefox-50.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "e6b94b200294d7fc6b8be442dbce0424cebd039ae840453bee17ffa8ef14a2785636f548b7e79e25ecafae202fcb53211b4fa37c29cd3b2a24383a1c54d78462"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ff/firefox-50.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "166e20eaf5250e307dd2878156f325cdde93b10f947e7fee461ee5fce4be61519ee07260231e99024167cbf509c88828dfad072cdb38749669cca2438699e29a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ff/firefox-50.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "dbbca6eba73d6d5ee158b08dcef536563ff6a9f537126858786e6a39ac161469268c26c92b6c1e89a546e1fd68e14759253100459e66352b263cee5cfa6ddde2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fi/firefox-50.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "ad006b74b3891a7bb6b59b4ea4bd70575c670b6acbc337bf6da14c0e464b47c55ce63aef05a2a68f915a9d32e455b2c0a27927135c809f2ef3035e75a3c60f5f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fi/firefox-50.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "8d4a273f5e9e0a6d43260d11914b8e52b62cf0aefb45fb6da8705ded079c6db0af5d7a7ee70cf908459cb76dbcdaed2be2a09e8f8b3f0c7b689ce910a35ddbd6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fr/firefox-50.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "8339683787463649ea6dbc0f761e658fa92b6fd8c8a9160f95686a37d10170adba6cb64ca550ba5cfe774e3700ac8bb95b33737aec9887eeee86f4323365c0a0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fr/firefox-50.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "893358e845b50f024b61444ba608314a574e91943440a40a214d69a233b3ff5f4854d86e5a2b90813ab50fc7ca01a009bbb22d69b1b5b5d3b3603a45e30dc512"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/fy-NL/firefox-50.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "a1c88e244c73de9922487f00336215c79dab047cf2c57fa4a8188e434489163bbb7da586daf0ad051510278bf0af703a26a76d65d265d0dba23d524a53e4c11f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/fy-NL/firefox-50.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "1c400ef2dcad7680b65fb50560929c73d9395fc10300c1aab13e4a1c4381514f0fbaf9b192952a5320c6e39db002629f0d27b3b1f4d10ea41324dd4c97fc40ff"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ga-IE/firefox-50.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "eb6fc7526c9aec0a9a2634d83ea7a086890a61112b2a66747e7bc6b94cb0ce07b48e362cad7873d409a893dec712bee5ad210fa10806354d6dce60dc7daaec2e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ga-IE/firefox-50.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "6d06c32a47d7def8017e933b6e03cc01fc35ca7dc32eb6931ec6c749b6b65d59a6dcff119b9a51fa949d893d0f30fac45bb0b52be3ccf1c519ee1c469cff1e24"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gd/firefox-50.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "b768ccd8724854a810f0a9b53c5bcfc1db6373575e0a7c9d9143b674e1aadc5dec614528340732630fc26a227007a0aafc99223c4e377bd1b9d16ba78f6a699a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gd/firefox-50.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "0445c45bc17a57022f09df0e9b3545c27fe55a69a431ed6feac4523b632617895c48f2b68c8d0c9a92b0f86a345bbe8821f5be6ae072e76af5d7829d59d5dd9b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gl/firefox-50.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "1bddebdc108787ad9d07d3b782a1ff6188e88108a508eae890d3588cb89bd03dd8c84a099f5aed8696cf15acc2573f112ffd352247470a5f04bdc439ed8a8e69"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gl/firefox-50.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "7aaac17918fa6e595820828049952da22be67cc6cd248acfe89c47d8f92af35983d79128d980e889ffff809b1af385086e71d3d637cbb672df36209a1bda90a2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gn/firefox-50.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "09cd1a3961a2636f257eb0edc073960368d784ba4f5b456339b213044898526ace726406a47430f75b7f4950f5e721c5f5eb59fcda65133dcefb5157b3e4c258"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gn/firefox-50.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "8cc67393779a6062799dd89c656790a0bf63d3354423298156bba87357f94e0421853795bb1af95bae932ce2541abff620918ab5ef3711e48ef1687af9dff2a3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/gu-IN/firefox-50.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "5dc4ab917fd86cbfad7734ebfe57b21a0546c7c5b5eaedf55424165b88d5e847c512c27fa94f6be45825c198dd2d625c18b6f536aa03b686e33b8920cc71105b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/gu-IN/firefox-50.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "81a6d8df939702ec5c02c4474a1a4122c6f622c09a53da83abef08993e10aefaca3f3e0837919b7c5dd198c524a5fc53567ae41010c9194739d18c7d7ccdcc09"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/he/firefox-50.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "884f9effac55f297f40725a480b388eaf28e15deb4e462ab615c2c97e44827492cd52f5ec9c6b0eb0f8adb0c8b5e41385f2f6125d5a9ba00d6ae7beb044f0d62"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/he/firefox-50.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "629138d559596bb7c9791b33ee3a5c81fd0805ec033d7e6f125cee4eecdfb3cc9337b5069f143c1f56433a6c663bef28c70f08b422ee37ace80888add3747d3c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hi-IN/firefox-50.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "ff94c3b07a985bd184d6b17144284eaf60604845a7854c7aaa4cea552682b4340dabc24f1b65641f45b17253eb9239cb0c4468d282f2715ebeb24b993f17d96e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hi-IN/firefox-50.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "638325ace5de570b0d31b72caf54a82c406146d13328ad0c9d1bafcb19331e181f53f1db55ad406ae50f1aac8390df1b3f8f51381897b5a226359d7188cb1eb7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hr/firefox-50.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "4bba9232f6a55f28403a66e7a72decb2a212a716ff80a14daae6798939e0e2593d926e25c55262d43e35844442480dd358149dc674f62314b6ff858d917e9fa2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hr/firefox-50.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "aad773e41b35978d00f991011276c70773fa78760f40de4b2f2ddd6216f6bbd503dc5a9e834a21466379499a8af06707ce4b44ee27f624a68fbcef808e2f87a6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hsb/firefox-50.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "d642de8c388a27f59f3f7b54d3d497d9eb1444d5c6af69bdd761f9e1e92ff381e7ff8f0005b5d9a2ad796acfd9adf64d2620a48ac654c161529fa88a9ce97495"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hsb/firefox-50.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "b8d8f2fd30350b759b05a8485f98645a91ead02389e93dfaa6eeaa63f65b6d75a58bdb8e462d96fa79b61a161f82f1b31bbbaefdff99e703294ae407c60aeec4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hu/firefox-50.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "acfd42a744185b84018869d278b1139c9d72edf23a5529acbc35cb57253f897caae2b3c296b32131897d8072e8bdba4beb1e5134b7a740f40697b0a78fb95073"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hu/firefox-50.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "62c000fbbade7c1f5dddaadfd0d718faa6150fe6deb759e76cc0e02d05827f5669b1c5e3f3dedb6e70e4d5f900951af644729edc3e34b665679c42667dc3085f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/hy-AM/firefox-50.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "433cb00cc5ae251c7b9668217835cb7bd359641a7e25089d9bfbc8f2621624359b0b2a2590c08068a8700d32c94547492c12fe89678d64df376a182020adc382"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/hy-AM/firefox-50.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "53d4dbb289a4615aca4583edf503cbbd5439a8a89567029f3aa894ad4d7a2f8ea3db42982574aba21b91fb14af6615dc145ab99237d612370b2db93016066927"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/id/firefox-50.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "dc23b6ea54d06f35e81146f562a18e9d83fe50ae7d52d98425ce1c313e44f7e45b09546c3542ee025dd4348c17ed20383ba7204a9ecb6af2345db196a14e6df3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/id/firefox-50.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "6226010373c387143794ae1e7ac0816405d62e648d3466677c3ed0a6ff42de78ae76d7cfbacb94caeefccaad38b6c3df921dcd4d6358b9764b3dfc124b8008dd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/is/firefox-50.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "bec1ceedb067b1e3ffa168205c3badb4ae9bb1d9829bb9ea848e7d0e70db91fe3e6d814c24149bf16862dcf24cc66b529323f438aca181b1e6636c69faaac510"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/is/firefox-50.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "0e6b15139883ca0d58d05b065c79c7fb6b6c2eff404061f329d9086d63e9e7c9b693fd16fb3a356fa0ecce43d640039b1e92a020fe0569b8ad8eec3d92ae16f1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/it/firefox-50.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "317cbbd21ad133ea44818429d5b3e7c8053395d69c5528a14b44e823b24deeab1acf66eeeafbc61a9bc502eca0790ac2bd18a8e6bd24bf2a19b6f9b7eb74eee6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/it/firefox-50.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "d9b518614de4247694d62871cae1f7e4e66af848bb7e0f4b1c0cbf77806e06a9d3d8062a6baa8b518f824d4f0759bdd76551525e55676870d3b18731eda2ec45"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ja/firefox-50.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "33064b1626d1f91781b85227142f912c93454582f0d220c09ca9cf5abbb3d31d3481d342ac91a7b79845b9f86755464cd717008084da56c05fc6f78215366b2d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ja/firefox-50.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "eaa227e027416aa7fa8f654d3067284ab7b7afee042d69af1f0a5d873257cff50e73b13744118cef0b0426e1e5f4884b7bb43adfc1c03cd317eb50d4131e05be"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/kk/firefox-50.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "0c8f3381e15495c57a5ddb66d01a73d5923905a02ae58d0a11b9f983291ae6b254defc40e285e1b0c3e154ba2ec3e3342231601b43f12d705fdf5b500108cd5f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/kk/firefox-50.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "55e0e3ddc0491ebb0c95278fdfe69c7a807d6e06544120398685f7856ba9a5fc45f491aca364049a2994641ae1d28fae856086dd0bc32a0f50e9919fff585002"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/km/firefox-50.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "4f563ef8581404f24fd7bccb4860df6f7175a5992bd432a1a39f4984f67d33642255dea8bda3f319b505a0750c91b0bace18f674d1dfc6d85b5671e5069fa5c6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/km/firefox-50.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "8b3ffe3626f6520cf421a4b41f4852fd09043d917b586677af9781154fef96c721a2d799e11179d867c38cba5cf1826a4e17569d0165fa99f2e2e006ae5ad371"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/kn/firefox-50.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "a543b8ade4ccfe8d1ff0d107d9b9f86715c9dc2dd633025f82d47f9aab260415f2117f15f7481c6313d3f71ce455c9adc1607ed38a12bd90717e67aa987290bf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/kn/firefox-50.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "4c56c4804b9296766413c503cbfb4db42c2237dbc87cccdbf991ce7cd57553e08b4c67dd77cdeb34695d34145dcec71a61107af3687203bb21ec773d322a03ee"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ko/firefox-50.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "76a41e342280307d732ce4f6b4f35834367f3585568fbb0c36e70f64b3f274eca94392a0f46e8a646acfb900b1c6005117d508a258a4989758c89ad08f34bcf8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ko/firefox-50.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "bd5e0abed8992cba6532d32e84919e77de01691845045f98c3c9d4f312e48d83ea1bbff27567aa9f4f9f486dc3a0e7254bc5fa75606f1880de085adcc1d08285"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/lij/firefox-50.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "880f88cdda17b0eaaeefa35640b09690b5410a4111d02e7260c3d57bc4bc4389731707f183abd34365af5a4937b34c58d31db210370146855827463307e2bd54"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/lij/firefox-50.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "8c1ae96efafc8edda4b23e8393011daa7c801376dd67a49cfb2d509d8fb3029ca75942dd5d275ebb0f29997462381068c09fb3fddd93556de3b5acb1fb6b8561"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/lt/firefox-50.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "c5382bb928d5ee83aa5e122df3723126eb1151d3a26ab2c364c32c05e3f5345ef420825c67c4da32467aac123f8e245dbd0675bd16e9638ac29f0508bbb7f2d3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/lt/firefox-50.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "8d889c17ef408f7095c451f896d5b1e5f73fd5db42ae1a3fe9a0eae12580c6c96e0ae61e3b78de99460efb2f02dc035c71c96f137b16661e310b8d7635914303"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/lv/firefox-50.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "f30d33f57481d68632830804e1b75f730368954e23ec7ebb1e907abfe5d9eb9059e3288dae0d27a6298fd6a658412b66706d81843537967f92c04b11abdcfe59"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/lv/firefox-50.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "6b743281af9c2bfb40d02b92a4d4b0d2abb23942032590f55cb86515c71e42868eb680ca8ab44c46a0610b7fd877cc95efe28047bb95523cc2d13538e9de68c6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/mai/firefox-50.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "70822ebeb495fbfc7cba878e379ffeb3395ad90381d21472f242f12607ea95fa6a6bcd2d8a9b87e2eb42156d2cbc7fd90abd144ea47baf9d445249a78d3eb6bc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/mai/firefox-50.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "c2f20a9bbf1f8781ac11a396bd5580f171c025f1f4abec85ee4b96314ffdfe14cc8b4abf4de8a3907065f5b1bca55b39590a5d58c06cb77e22d636604f9a7ed8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/mk/firefox-50.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "ed6c3b7f023e479a7c5bbf89ee1769534d697b8b5da3f1ee9f37c2b112adc44cf4c61861eea4de5889ee07aa2c26aa078572afa60facfdf9bfc9245339657d29"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/mk/firefox-50.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "b826a6780d39b036c5ca9a34f3192dba8f0503f046bb20e96e9f71dd0d43b5a34f8f3998a83f3eef43b8fdace8d3ba87ccd740983b093c6007bed00b9a4e3292"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ml/firefox-50.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "f7f9a2a255465f99ee6870e5a92f11315dbbad0bef26f1f1a1c406bd3c17a52a1304fdf174fa50f80c22fe014f025c28a8b061395cc71ff4552718af45cfa48a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ml/firefox-50.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "5960f783f95b5abb5321dcb0dee13a678f82c1e5bd314e1964b34cb9bd2f982149764cbe388aae4f0f727207874feb71749322e0dbc517d5195760d524650cee"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/mr/firefox-50.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "5f67df3d948ba0b4f8a77df006d6810497984863abd3f63dcbd46d4794be333a3cf7e19b22cdf70ade8b3cf64561c71faea6da34787aea5f750c588604778156"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/mr/firefox-50.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "242ac952a3709580f355313751d17a5194d059851c243ec0cef702984ccf131985ac0ddaad7bcba8d3e8ef4faac56c660dd2ada65555ba199c9b5b0c38d1ea68"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ms/firefox-50.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "3058646c2b1933036118e4cefb5fd2325c41ecce7a03f2516c041cb1a09b12988c2301b97ec1ab359bc351800865e3a652bcd0b78ce5858738e81366ef62fa29"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ms/firefox-50.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "cd1700ef9ba9b0554ceb404674ff19cd48d54ab811edac3112984029b96ecd2da34c4f7f691d2e2559e4d6c9a3f312eeb4df20c58203c1345d7eac9fd3880856"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/nb-NO/firefox-50.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "1c827b5805c84c14dcf6a0ccb30601aacbf67cdd546560a53451daa223bc4d903d3165ec4dcc20d8a6d5f8679a9cf5fd325a8ae3f463711311702ecf2e5665ec"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/nb-NO/firefox-50.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "aa4d58092339a8506cd3c07ed15bce36f56975320e53b480d84f1c3130ad895cff1d1b9cd02bd405f09e4d8f9e0d37f9e29dc6fc3102f58a75fc2c69f2673210"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/nl/firefox-50.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "2b673ca58695ba9a7fcaa2570521529d380e725be60091191a373dce6f1e0986714b22827054580aaec7b756b4a5ab7bf88957ff7b473b0b775cf3e32ef1a67c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/nl/firefox-50.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "5a3fc957a8abfb7343f78a61e68ed31513b3c25e8211203ad78719bc8c1bb42b4a1740ec8557da77340558844bce07a1daa3d95333331c0e39839cc6733096f8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/nn-NO/firefox-50.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "fa455a9c2bc429c09aed09fc307c1aa9c5cf285c62bd01348d733c82af840d851d3568dbe5c5d3b543d999e61508f19f2ab744a5dc34350d31471ea1b0179c9a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/nn-NO/firefox-50.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "2b07ce2526bde8dea2ffc7afb9a0c6b97f9ad8a3203588419be84ef2b5bbd9064339782cf00007b3c520e61207ceeac37841008a057f663f2e19d03ce22bbadd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/or/firefox-50.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "88a70b7eac8987782fb63821d4ad9513a493b0f75e51b04cb8ceaf3034a4d1148bfa75bb588c128862706b009cba24f2e0091f511d542958672d6417e252ddca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/or/firefox-50.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "b924191e6358f23da98f55dcfd2a282598db723d2b2fcb0864e91e77e220e9c6a2b9c7ac37db11230ff206d383e87ae8bb6df4d799e6bca87f8ee006fd2cffd6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pa-IN/firefox-50.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "fc7606d53076e1972c09cbf3ec300a596732e301ec3a847030fc9286e87385fb017672210dfed4a5c3f0acd0e3243abe11b845632c89cc082d2118aaf69daa68"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pa-IN/firefox-50.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "821ce0d7c4983793da61fdd1c056072c7ab2548d75eadf511a1bb1fa7d155b2908874e4d6420d803069e47af8f6271df38bb572f6eb181224800546d82fd6c4c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pl/firefox-50.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "19bcaa93dcc165a274826e8d646abc91913f586ffebae5283e608955bc0ad7ffff0ce94cd497544134863368b9761aa0c9f29403c176064381b45d108ad8b80e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pl/firefox-50.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "0e5a248810ed4300ea8d6f07ccf2192edfe1c4465bd192ccaaffbaa64e9a1d0128bc63d7aadb2977c05bc4d99654abb7f30d2ebadac6e164d0f77c058d20df6a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pt-BR/firefox-50.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "7b9b805324da5492ae85a0a8776d13f342c2222dd2c905af162fdcaa74d634891cc6ac2efbc79d39dbae333a6d8e0c49a2315b326323ebd6ddf724ce3067996d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pt-BR/firefox-50.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "08078f738b76f32d1658a26f8ad0d16bf74c397d35ca57631281eb0d651a1f3cb04f7a3e428eea143520126fcd5ed7786f2c8d89c5863795ac807eb9d214d5fe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/pt-PT/firefox-50.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "908419fe59a3a1186fa79aa8a2f6ffc7f55c0bfa32c4d9ef2ef29e921e0acaa23f85071eb7657716c602b2368f7b28b775ff772b26d8ac46ad630258488b01cd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/pt-PT/firefox-50.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "15bd2c20f3d04f0ff4d1f47391114fdbefa46013928f825daccba8915b97bbc99d03b3c8fd80ed147ccb00cf1338a9220bb6eb4d09ea2ca7f16d97571d36baa2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/rm/firefox-50.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "44126c01c9033b8a8f260940710774285dfa6ff35493b35b735d83858827b94bae0323148f0c95e87976156ecf0cc9a833ec52d882571a13784f74b12067d557"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/rm/firefox-50.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "a167029d21205c7b452b569aeabb75a05f6f6f498a7b861fd5b0bc803d411b0522137de86feb618a247e33556964da3645bb91d45f1cca020b6453eedcf238a0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ro/firefox-50.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "56636b9a33a5f681cbd2ec6d4fde8decf1ebe6477108bfbe54c13c29c15a2b5ab91875b407c8fcd7f272328dbddf10b36f2cfe6148b3a77f93acf22de0f29481"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ro/firefox-50.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "f9d79d3901821c6813d4f204a6760abe219448e0fdf568953d7ac04d4d87113daccb69eadf9503f842bbd13f7ce6a83e4fbdeb31d1a6c70051050bfba56ed025"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ru/firefox-50.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "2ca3b158a45b6b3943adc21d56cddf451a3ab7521af3934ea0759ade5136290afa8ff2c7ebe7bee04537c869d665cc0843ce471a2a8582d998d32f38680bc587"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ru/firefox-50.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "306a01f372b1ba8c59cbb1d67834d2e1d9a255ac0bc784c180c1da67857b439cbee253642e30fcf400dc8d988886403fdeb432fadee5dbe297bce6ddfb9fbf74"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/si/firefox-50.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "55fb61f100fbdfd77e716f11aa603b27e992037fce2d4555389ab4a40edb537621741a8b18fcdf150625a7daad4395d806f4348a364db37c708e199768e91488"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/si/firefox-50.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "5096ad17de32e339a3bf4556ccfdd50f8f8e738c49a0da1cdd35f04af4e33c0fafffc48f71bb97b6fdd72f420ae3c5853b3be5c79ea48b5e75d85170c6565a4c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sk/firefox-50.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "b9a993e9a84b93030e86e2a89b8b93d4c4544e4f1aff0d5c9be31369e9a5176cb256567b5032ab93e959ebd4ab3ed25db21fe890fa75112730ff4dd814029e02"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sk/firefox-50.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "2ed8b33ff8bd34d546ac7b0dd63d7ba01e39be07f5f5a23098eab5016d487f28b1b0563afa2101d1575a3a1c7abb1e61b8d8e46ed75d8c2b8f3c55e750cb2455"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sl/firefox-50.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "310e913b6bb487c78969d5d5cf9318a6c347f70e914d87747a2ec03a6db643a1b3816d4258b1d258fd15842850af48dee96a231e998434834d8999b8461de784"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sl/firefox-50.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "42273338e5f38824555acfa9372e9651ed2037fd9fb5bdfb9d09ef7f87aceacd3e802b3ca058282ee82c59a4d26e5f7fbab7756b7bb681371d498b82d9970186"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/son/firefox-50.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "25b81dad69c1665116f2de6801c7acb3353e25d4d72a2edebb766119482038bb378c3e15cc9d24d7b3719912067dc4646ba814b75da2f5a702902ffa73fca32a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/son/firefox-50.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "043aa96de8257c490c7837250de922934ea465c6b7cc0a313da21c2b4a0fea337e3b3b1d76e027fd3174f66781a9c7503b5e8e36912673fd822615da1da7720c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sq/firefox-50.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "ad136f59248c3496c5790e721433d743b5d7b52c6b83f89b7adba0bee2c70a2569e39afc2f32d2be0305c3f44ceb8c75b8fb2da980a98eec201a23297abb4ec4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sq/firefox-50.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "38f41c7b2aad097bd8eb6542793382c039ea84d0c6eb8835b9f26f3dd6f71b0d9b35ae2e56beecbbe52e9f3908727f66138beae020f6dd2b5b3ae1aa026bbb6f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sr/firefox-50.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "b8ac56113b49e063898f22e164f0408501ff6836fac7e2319c1dfb9714e0ee409c403a30fdf33a530a53ab5150f54c4a759134238865e92d15208a7f0eea47a9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sr/firefox-50.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "e2be4dfce210c00f61bd4f84f0500e7f5288e35c9683c5320777dafe6120009acd9018f4cc9071cda7261ca3e2a9008c3ee5f77278a874caf2545b5fedb85d47"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/sv-SE/firefox-50.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "e183da3b542bbc848518df674f53f8023055299f47a4b5c6519431a2ad2db12deb156d239f8feb48603f39fbd7964aed8d5eac7ae74f08b8915625a187c11d3d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/sv-SE/firefox-50.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "e3a98a8f0e1191cefa214161c2365066b82bd77d205206d7284d63572f54a2d60980de1054a3f4cd53be138e2237eae3ffe313dde5c8bfb2b1a24c4753416593"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/ta/firefox-50.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "11211f37217e1a531786240258676207b061c0ae5569e548dfff185aeda10646954bd3af5ad18795e7c90c640b9a7159130d8ca52bce6b83c4b2333984bc7ccb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/ta/firefox-50.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "790d6cad2823ee3bdf977854013510e45f738c3fe08ed468caabf2a9b523a8678b35c69d4cfab081e38cc9bf3068a2db800d3c475bb9fc590e357bf62db8096d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/te/firefox-50.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "6a75467766b47156d767068890254e4c14652fe9cf0c70165828162d9d8aba7080694467b6c0bf2cbbe8bd625f89404f5c56ffb3558d894230fbee62d17b7040"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/te/firefox-50.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "9180a50aab3df40cba5706acb9630aec80fa54a7ba4326ba690cf8d6a84783fb233525477fe59e373f336f79b10289dadd14166cb1c6274b3655265aef2d3f9e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/th/firefox-50.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "694f7f12b9de658e449b08112c2afb1695926957170394d722c4c44a1b4e1e3e909ac936e1223f0913c1fe88d500adc88fad785bd8954afbe9b5903073666c1c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/th/firefox-50.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "36548e75ed1a538eb84dc6878bcc5c3d04a6303c48fb419159539560b2c35abaa2fcb7c77630afb02416076dc32246aef5c4366c4711148e06f6fe09471be353"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/tr/firefox-50.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "2b5eb631d823ff0a61e0662d50413adaa92dd4aa08aef86f8c3581397565f5305b4055aeeea9398d12be40ebe5ad16098c64392733f5c0cef3cc242129afb6c3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/tr/firefox-50.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "9f0e88b63156fe961a7d2a1ab8ffa88f35243231ac4e812fa5949ac3e8ed4341a41a9891c21cb225a72ffed86824ee925510b13bb3873c019bdf25f972cb7625"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/uk/firefox-50.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "2dfc608eebe30a740c4550ce9a467d4aabf358e0aef23fc01a19d8b2638531f5736879e317ac09e19926d708c67a584ab5507c6eb503fd0b8833f51da9a630f3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/uk/firefox-50.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "a7537d803fa199e49501b0fae17a6461e71452eb0244780166de59a7991e21ea2c09a68b53d338e507bbf7031b460c9ba5d051733ba5b8c6c01db9168916e7ee"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/uz/firefox-50.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "75fb452b696aaa68bd541042dfb5c5a4b360478dc4d5d0a3ee938825b0ba1eae0e99d1a42a2dc558a4425a9c5ae9add92e96fc71de1a3a41d6390e7d06050fed"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/uz/firefox-50.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "c4868931765948352117bb50e685f3694209eb04b6ebddf20528777caff57a4145e19e649e9220d590c2f9b1fec3664a5dbde5f0ba3ea063cea0902f49c7c3b0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/vi/firefox-50.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "942e8fc6f19c307cd3d403cd545dec8355f045b3a83d469632af7f2150d76bf2b33d61027c34166a86bcce0bab35a1d5b431b96e18c951307dbe947ba95e902c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/vi/firefox-50.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "7e8b2872b63d25a6ec8789fea550ff86e607e1d01c44c9ae20ac05fb4d305e497491d27a35478b975daa034a631b87b11c510ff5216ffb0a3999cb0feff07b0c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/xh/firefox-50.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "0f53d538665e46f89a3bf3c480f6ba8b74e648c3539680d0a033a21e9d5cdfee578dbeffcb5e445e36511928e31c5c9419e3843db5a02afdcb365c116d467986"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/xh/firefox-50.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "c464681fa140659fb6dc071074279fdde8156bacde02d0a5f91570feeba6b504163b6551f2f4930b1b8be5fdd89b81956f720f80cb98aba6a9db5d47e287855e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/zh-CN/firefox-50.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "deb26dc8560aa7cbfae2d23bc2fe8a7fe9ab417a7c6eb90bfe8229fa0231edf22c5ecebc8d63eac0fd183b4a17e5403998bc44c4ef78632f89e38b49b908f438"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/zh-CN/firefox-50.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "418d5e1f87cae02f2155a5f97b17242b8f7589b146475bfdccd5ab5a6d5d37719f008550357b289e353e4ae940cfb2c61229df3aa8f91c318497b668bde0e069"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-i686/zh-TW/firefox-50.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "cd65efea75a85ac5e30103335a747449c23b5bfa8e1b476540c6cf4bf46596565c74c1e86b3494f0d9e197ba284cb813df63d7809f7edaf709ad9dce7c272b25"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0.2/linux-x86_64/zh-TW/firefox-50.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "daddb4ab22650b3c69b09eff9634bd90a0b8e623309b944daced02eae82459405cd47ac5fc0d00a03dd84ef9953efd9aeac21a73a72a5441ad85444c1e1cf93c"; } - ]; + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ach/firefox-50.1.0.tar.bz2"; + locale = "ach"; + arch = "linux-x86_64"; + sha512 = "fb941dda8a38f2e8474b4c1b235b4d3b2364a3e4b70f929cb40a6bc96a8859a830b072a0b3bb03bf7d551bec6eb0c46e41a93f7ebf4fb73a21949b824ab09084"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/af/firefox-50.1.0.tar.bz2"; + locale = "af"; + arch = "linux-x86_64"; + sha512 = "9ca21be569db94f528dd74ae269e9a0929f9a73b399ad619066c45f38fdd04b511fd8126bcbdca7ad0d6aeb7ec82d597287ef168c04fe1c7a47d9dd4fec3674c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/an/firefox-50.1.0.tar.bz2"; + locale = "an"; + arch = "linux-x86_64"; + sha512 = "1899bd8140e847c6458b23bb0652bcfbc3cc1a6a9520ea10546d6b2f6719715f18ef5e79af07b68fe2cb5f50bb7f7c85376f17081478990a7ba907c45a31cc95"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ar/firefox-50.1.0.tar.bz2"; + locale = "ar"; + arch = "linux-x86_64"; + sha512 = "d3c5e6c263ed1a0cbd535279d03a446ed6e59471c7949d381265056e7dc6bcb7df4abbdc13601b7b681185f66219676a6662e217510a13136d89dbdd6f8460a2"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/as/firefox-50.1.0.tar.bz2"; + locale = "as"; + arch = "linux-x86_64"; + sha512 = "3b0112c8830fd9e90301efaff5d8414cc3edac9382947520ab1c283ebc4dd897ccc3102d12d35eee60fefbdd13329a02f056375fced5bf45a51895a7abeb48b6"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ast/firefox-50.1.0.tar.bz2"; + locale = "ast"; + arch = "linux-x86_64"; + sha512 = "b036544990cc08fc0588730780fefe9bda82fa1ffe53b0d7cc0cce60f5fbaba261fbeb6117ecc4b18985751572a5c08f8cc30e9b35291841694a180e0d5e75c5"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/az/firefox-50.1.0.tar.bz2"; + locale = "az"; + arch = "linux-x86_64"; + sha512 = "4beacaf3cf371bf7226095916f3e0c8f4941e32dc2ee6b25368cee6569dd102131cff4fef53f9ce88706172e838dc0a916bc741ae22bbf3eabe293fde3350e67"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/be/firefox-50.1.0.tar.bz2"; + locale = "be"; + arch = "linux-x86_64"; + sha512 = "e249554f4ed1f1434b3c0b51736c9739817f39db8afd70cf60a7e3ce5a78dc6a23ae903b991f342bdb93b4324c5c5309bec4e84313beb5af94d887249619fa79"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bg/firefox-50.1.0.tar.bz2"; + locale = "bg"; + arch = "linux-x86_64"; + sha512 = "cc4ecea41635b921a652684d7bf10f2e200aacb0c18e50a95f0412c049db26042c0cfbf6d40fabd3db5aedd7ffdca4633827b5f17a27b56766b372420536b593"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bn-BD/firefox-50.1.0.tar.bz2"; + locale = "bn-BD"; + arch = "linux-x86_64"; + sha512 = "75483d1f7a5bf3fe54de817222f78aecd4621cd1a53c330cda74348ca6569bfe3bac6b60d628abe4632c0e68b9a9e6f0c24b69bb3ac09e52023ee352190d1cf3"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bn-IN/firefox-50.1.0.tar.bz2"; + locale = "bn-IN"; + arch = "linux-x86_64"; + sha512 = "5b378bc2874cc2fd0f3c739048c894670ed7dfb6e0f37e7de324261c5ed62bc75e62a26a1b2b4392858d86bf2314534841eb8676aeb0bd0e4ce6c23432b4b4a8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/br/firefox-50.1.0.tar.bz2"; + locale = "br"; + arch = "linux-x86_64"; + sha512 = "eb33bf820530e267a5b5c322951563cf66c886bd71f30d6aa8cc43a2a9b16b6e58d207648b68fb1f2c0d1fd645aba6292c6d8674a3fef7c23f3d2ef706973ab9"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bs/firefox-50.1.0.tar.bz2"; + locale = "bs"; + arch = "linux-x86_64"; + sha512 = "aaa4221204b3f736e31fee50c30e73a919066f8cd1f25bf4fc42532edd0a87c557a10f11e275e8b8d2396fe876b8859760d952a311caf0bdfd967e813144b86b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ca/firefox-50.1.0.tar.bz2"; + locale = "ca"; + arch = "linux-x86_64"; + sha512 = "e98b08fb0cd937375fd7473617fd234659fdd08d1299f0792efb9757b356447c479335bea765b0fad902d3b055569fe491a30b73d3f1c3d32c76c3cd1e621ab8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cak/firefox-50.1.0.tar.bz2"; + locale = "cak"; + arch = "linux-x86_64"; + sha512 = "e8a5ec70d52574929edfe93064f03d254e894a790093b2ae86d3f34376db646366a6970d06eaf3f3fe5cfdc89a8f11d0c289061f41d66d7602c0a841cf589428"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cs/firefox-50.1.0.tar.bz2"; + locale = "cs"; + arch = "linux-x86_64"; + sha512 = "3b5e7ea9571eb8ec0f66ca9d062405e3efa874cfa6d39bc455a14f1f25ce1923b276272deda191ddec085d52042ca8cb633e89a8e908ecc428b0d8c3877b08cc"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cy/firefox-50.1.0.tar.bz2"; + locale = "cy"; + arch = "linux-x86_64"; + sha512 = "78b0e26cdff7f123c6ed3721066ad7f5e9f55d0aee5d1c87c12927ae87fadb8f3e1021193134a83fe5c23c62c68cd9536151999c1ed66a885e12a4dcb4b12fb0"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/da/firefox-50.1.0.tar.bz2"; + locale = "da"; + arch = "linux-x86_64"; + sha512 = "de0f78b0d69c292c482edde52f728df7c3d865f31b8b9633d4ca5a66b4fc5f272402a0715baf5efcf14eba683f8ff633c172a5a198906991ff1735db128816b3"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/de/firefox-50.1.0.tar.bz2"; + locale = "de"; + arch = "linux-x86_64"; + sha512 = "f95e36a8393d233409b1c3ae6b56b08fbc44d4603bc932cbdd1897650d1528f57cade92b1b1cf3717191c95db54380ba3c11fbb46b25c14a514e0a00fa5b2a3a"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/dsb/firefox-50.1.0.tar.bz2"; + locale = "dsb"; + arch = "linux-x86_64"; + sha512 = "a06f9172490ac731f06701fb7f8414438c1e520bbe5669e8dae54697dc9cc3aa03837ee8f84dd1b69751a4e8d82b34f88ef3c43a37ad9fe6e0c8b1afd18956d1"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/el/firefox-50.1.0.tar.bz2"; + locale = "el"; + arch = "linux-x86_64"; + sha512 = "78e4a2fc29487347eea47069e022f13482925ce15f37918455a96eb68fed50152ef6a9a93773c4acb680957eded79c0b20883d86f87ac28895d61d777dc07cdd"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-GB/firefox-50.1.0.tar.bz2"; + locale = "en-GB"; + arch = "linux-x86_64"; + sha512 = "53deaf16fefcb954b34ce8577d0ff40d2d497c591765a16c7befa6ded348eb997e1523e873775a52a74e47c41ff06cbad3c612722036b6dce538d768d1659886"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-US/firefox-50.1.0.tar.bz2"; + locale = "en-US"; + arch = "linux-x86_64"; + sha512 = "f81b63d9737c672958674096a69c941351caa335d481dbe39ebbe051153f0680f2d3ab4832267eb27ede36b8ce8242e43374ebb49d5cd3a0c44a813efa8c7a22"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-ZA/firefox-50.1.0.tar.bz2"; + locale = "en-ZA"; + arch = "linux-x86_64"; + sha512 = "6e1247ccce230fd044f0fbc64deb345b7d82cd347595fee084b8ccedaf31071b992b988346a8bfc5e5af8a2706a47b7e4ce2681e67a11098eefb7895a73bcdd0"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/eo/firefox-50.1.0.tar.bz2"; + locale = "eo"; + arch = "linux-x86_64"; + sha512 = "c27c51252c8312f4280dcedb94906296c52c96c26dcfa21fa392c80b0d1277b8d7507daca312c69192cfd6fa70273f66a3319788bc3ae8b8e835af365f3e8fbc"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-AR/firefox-50.1.0.tar.bz2"; + locale = "es-AR"; + arch = "linux-x86_64"; + sha512 = "ece5c060bbc1809a5609dffbc477ad215245eef1e341232d2516859f1f15959d117e2728605ac57bc94fd6ff6a5b85a892275552ac0b006783d4a1d0f02fa26b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-CL/firefox-50.1.0.tar.bz2"; + locale = "es-CL"; + arch = "linux-x86_64"; + sha512 = "2df20afb64fa6d25678bb6dd91f7c042c754aa241af4e3f728d54526edc342b4e6e591d8586e9cfbcde5baeb932e092c00feabe5e3eff1f00e5065a80f0fd097"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-ES/firefox-50.1.0.tar.bz2"; + locale = "es-ES"; + arch = "linux-x86_64"; + sha512 = "5b9af2b2664caeaa574ca92d4a63cd0a86a70278f63596e6a7fef0cab3fa4dd22d1c00408e067080979d9b9017f2edd9a3e1e22b3a75710017ef94bb1ba82bb4"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-MX/firefox-50.1.0.tar.bz2"; + locale = "es-MX"; + arch = "linux-x86_64"; + sha512 = "610462c6841615e2241a3edde60333fe3ada9897dc7ec8bfeb1771025a5f9aa0acf9fded1459938c70c7fb478f659817606a133af4b38019a3dfcc7fd3b3f9dd"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/et/firefox-50.1.0.tar.bz2"; + locale = "et"; + arch = "linux-x86_64"; + sha512 = "2fa4a1683102849ef33c7a149b7628a3c783ee2466d733b328fb8ea4e1ba96917b128a00ad9a8fb75cec181b0208635667bc16d959b28ac1a4af7c96af10e07a"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/eu/firefox-50.1.0.tar.bz2"; + locale = "eu"; + arch = "linux-x86_64"; + sha512 = "0b53f26346f16dc06478bad62a0191fb2c9c9fdf2864e0d5332540eaa81a4c22b0492128df5c8d7eea9d122482986b3f97837538436730b4ddfcd1c02098d1ed"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fa/firefox-50.1.0.tar.bz2"; + locale = "fa"; + arch = "linux-x86_64"; + sha512 = "6e6d92624e89214a4110bfdfa181e46847759bb0735e18ca0fcd4b9e333b40b91f8ca48e271b3d1ff4fadc05cfce9824435dbc429f56dfecb6d98e48ea0a31ca"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ff/firefox-50.1.0.tar.bz2"; + locale = "ff"; + arch = "linux-x86_64"; + sha512 = "59865504f50aa5e5aa2bfafa1159623dd54b91e3cbcc0cd76ae84e8da063e6db11e2594b9448e5ee75fdd15188c5ba9daf335eafa13601ad942e8f6f4d2bca26"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fi/firefox-50.1.0.tar.bz2"; + locale = "fi"; + arch = "linux-x86_64"; + sha512 = "6e07761ce3aa5e42bf887ff13a35619e3e20209b94ed890b505c1f0fd79712a2daeab53ea344378c18f6f05c4673e1f146e8f6a44d325ba387ea6967188357cd"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fr/firefox-50.1.0.tar.bz2"; + locale = "fr"; + arch = "linux-x86_64"; + sha512 = "0abd50bc0a7d5a79b98900cbeff95827c46dc53163ee6cc9220f234049ec43c09bbb8a283c54a1a41387be8d0ac761fd9e215d37ad234a0bdd088b07e339757b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fy-NL/firefox-50.1.0.tar.bz2"; + locale = "fy-NL"; + arch = "linux-x86_64"; + sha512 = "2a272b160a2cde4d27f3f3da7a1d6600f4b78af11ecfcfdb3f3596d6a4a1f56b19cec7fee1066afea050b951e1eb7f3245dae28b0a91ac4110010c122609dd58"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ga-IE/firefox-50.1.0.tar.bz2"; + locale = "ga-IE"; + arch = "linux-x86_64"; + sha512 = "730f2c608d9770e2e4c154d6f1ec223290018d2412a1a6103245a71ef17876cf304acbb16e11915cb2e3564c08099a9207839dc8caeb0553cfdcbb869f6cb09c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gd/firefox-50.1.0.tar.bz2"; + locale = "gd"; + arch = "linux-x86_64"; + sha512 = "cde56f2453d780a9d0debcc012e9a139d61c1d78fcb2a4a7823982321fd65ffe6b538fbaa7a0e5dd69db6f1f3139e5386bd6e02ca5c065510a936fe35583872b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gl/firefox-50.1.0.tar.bz2"; + locale = "gl"; + arch = "linux-x86_64"; + sha512 = "161ee7b027f64698c30bc5147599853c4fa6b8f8629d33e4f11380cf4431835489e834cc3a7b42a676d9da6d6231e1e1bdc5f81f410ccf8f55f33c5ec3e07b32"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gn/firefox-50.1.0.tar.bz2"; + locale = "gn"; + arch = "linux-x86_64"; + sha512 = "b4637e7727bc726acf3c1aff2c199fef896eb98f95a04b5b899b9800d0fa2cc6b23ae0c7b5a5acb591e49b03dcab22ef73840f129d9e82dc49e5636234fa570e"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gu-IN/firefox-50.1.0.tar.bz2"; + locale = "gu-IN"; + arch = "linux-x86_64"; + sha512 = "b8028122a8132110fb951175d51d07c685c212cc56128788c75bd0c0d21452752e4fd03e6345d80806c8babffeed04f7cdc89b1b338f7d56e539b847c0da7f72"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/he/firefox-50.1.0.tar.bz2"; + locale = "he"; + arch = "linux-x86_64"; + sha512 = "57adfc574ca5160ca5f95f98c76542109dacef231ad8cbcd4c75467bb599e922d6590cb3214f4e4946a947b36e6130b25f12cf4c641b2ca91a36aab5e8489426"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hi-IN/firefox-50.1.0.tar.bz2"; + locale = "hi-IN"; + arch = "linux-x86_64"; + sha512 = "3a71226d56c373663401d144388d5c74e583ae34b4d05bb444703426991162392e338f11e993707a83943c0fe85b8a5192099b932afa03b9d3ff6a17903b1271"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hr/firefox-50.1.0.tar.bz2"; + locale = "hr"; + arch = "linux-x86_64"; + sha512 = "f919ce865004a64bcfd834475917ba24c1bfe0bf573e578984199085c073abcfce38b4e838d684f4cdf5bbc2408f84758df9f81345da6e0824f290ad311dc6c3"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hsb/firefox-50.1.0.tar.bz2"; + locale = "hsb"; + arch = "linux-x86_64"; + sha512 = "4641225b3dcf328dfbe12af68698a4504d0882c1029a36aa617f57ddf11e0edd9cd10add1d887d2154a59e6fa60bb8b13bc185529df166c72195200ef94a5dd4"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hu/firefox-50.1.0.tar.bz2"; + locale = "hu"; + arch = "linux-x86_64"; + sha512 = "1f34d1d52d28413a46d5f9efa8d8067c41ec5af861f9fca49a5b59f03e6e325455883a2ee4f9c5e3629d7a61a3f1106f24b4bf4f9a75e6659cad4ec511024ce7"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hy-AM/firefox-50.1.0.tar.bz2"; + locale = "hy-AM"; + arch = "linux-x86_64"; + sha512 = "926a0a1e036303c53fb0a5c65ec2a0285d562c86eb7396f84fa5926a3b9e67ea7872af6d8d436322ca5a939d1626adad80230abfecdeefd51d5cb3b27e16cd5e"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/id/firefox-50.1.0.tar.bz2"; + locale = "id"; + arch = "linux-x86_64"; + sha512 = "f3389014409d143a35c66d57974a77d1d811c3ff9d47f6f13b7c40c0f24154d42bb7e4908589de21b3430d44a108f3765792f7573c78e510292d824f96cc77e4"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/is/firefox-50.1.0.tar.bz2"; + locale = "is"; + arch = "linux-x86_64"; + sha512 = "58f320b32ba9a83a6a8a4f4d108c3bd87a4879da7205dfae59b24a3550e0bb90917b431b15a18e38da0d702ee8f2c8756179ea07082ff6e0aeae9f51a3820246"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/it/firefox-50.1.0.tar.bz2"; + locale = "it"; + arch = "linux-x86_64"; + sha512 = "60acfa5b847b5390fb5b733f4a35a0a9c426c4126c53f517eae3e6fea3c6c7c88092063ae0d5d3be05a1dfbab32a1e392aff7f18c6566f827cdc6d21b0e22c7f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ja/firefox-50.1.0.tar.bz2"; + locale = "ja"; + arch = "linux-x86_64"; + sha512 = "3d668102a2f56547b49add2dacbfa1a8ac285007d47585325002cf4250465dae809b50ff1d1d13dcd3f05ce6afaf76b607a696004e60d33caf52d2d531297550"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/kk/firefox-50.1.0.tar.bz2"; + locale = "kk"; + arch = "linux-x86_64"; + sha512 = "c35217a07255fcac9bdbfb52777bae3609c22984733297722c62b8391350fe2d68bea20b542d6d2d7f55fc18aa662da226bf83a62e0017c315b92eb460021cac"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/km/firefox-50.1.0.tar.bz2"; + locale = "km"; + arch = "linux-x86_64"; + sha512 = "fab7429671c3b866ddb7fd0d25101a4a83c6a1ee3822a57517b9c6288e35f6a4339f5a42d93f865a9c6ddf1a9bb5e2e23d8458b39acc34bc2701d68522feef03"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/kn/firefox-50.1.0.tar.bz2"; + locale = "kn"; + arch = "linux-x86_64"; + sha512 = "2ea7a6094ad8f9b8179028820d79d003f5c04e9bd223fd2df19c7b5daa08ba631176775e9586c7507291aa34fc1c39510bd8851b1fd9a7a08c1786f689949839"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ko/firefox-50.1.0.tar.bz2"; + locale = "ko"; + arch = "linux-x86_64"; + sha512 = "701a0873b860c62d18ab778d1b0e5c3719cd3e6b49ca37083983f9e3f988d54ebcb2ff27138d7a5e76c940f64f445f96143b0f836af4b9611999b3f49670b8c9"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lij/firefox-50.1.0.tar.bz2"; + locale = "lij"; + arch = "linux-x86_64"; + sha512 = "b394da463400ebbcb77cda8ed102f42eca419e896f0b95432e565f126e9e20aee0d9790888c691b9f7291322a3f49d44a58349f611ffc159d514a5a68f7013f4"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lt/firefox-50.1.0.tar.bz2"; + locale = "lt"; + arch = "linux-x86_64"; + sha512 = "55ac32604ec630d2540a7cd2d2a46c4161650f1a3607c2e45ee8006e6bbec0039dd4927ef28c9efd70961f7f5c4d9d6fdc83dd60b670aaaff26c31594c25c813"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lv/firefox-50.1.0.tar.bz2"; + locale = "lv"; + arch = "linux-x86_64"; + sha512 = "df012ca9e5026661622b1d0a1230399e970809f2d8f9a3d81a9b05d438e7f20c706cbf739a229b82296db15bf8bda89c266051c56c7786a673e38600bfd81164"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mai/firefox-50.1.0.tar.bz2"; + locale = "mai"; + arch = "linux-x86_64"; + sha512 = "df74e2c1465b74602ba834cedbc3e07671a813d5979e6a0d85c32e504e01136a05f4915253f785f0b03fa98a4c284d066ff2101737f40490bfe9e30165b712e0"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mk/firefox-50.1.0.tar.bz2"; + locale = "mk"; + arch = "linux-x86_64"; + sha512 = "68d80303625c9bf86bc2b86a38d9a41643416bea77445630b10a4219d725a9800fbd973e683c7dad46941fa089df6bcf1d07ba5fcf2c3739eede865eed038a97"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ml/firefox-50.1.0.tar.bz2"; + locale = "ml"; + arch = "linux-x86_64"; + sha512 = "bd1168a7b3e17edc28dbc051fb2951d134c85637b0e0bfa2ac2542211498a8018f8c8a74584d2ebfc24336dc803ec04bfdb11d5975f261f8ad92cdda6dbc1067"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mr/firefox-50.1.0.tar.bz2"; + locale = "mr"; + arch = "linux-x86_64"; + sha512 = "d62ab5e147d55ef1b02b4b4fa5b10986f4a8db2c6154d519f4704a6ad4eee99235219b5d825571c8e08128ecac84c1ec0dc19d124c83d608b4afb4606786e474"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ms/firefox-50.1.0.tar.bz2"; + locale = "ms"; + arch = "linux-x86_64"; + sha512 = "e254c8a787f2dda76cc2929665b261437d35351d6725af6d1dbdcca514638800d199827edc8cfeafd927d4f0f758cd246ac47b9cef3011aa68fb0baaaa17c882"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nb-NO/firefox-50.1.0.tar.bz2"; + locale = "nb-NO"; + arch = "linux-x86_64"; + sha512 = "b9e53d23338b7d825e0eebce3764862abacaceb5bb40f66c3d0d67a3fffc2c1f60c168385537bb042bdc45d77453977ca3c95660cbe3a27c7c87b68d047ea782"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nl/firefox-50.1.0.tar.bz2"; + locale = "nl"; + arch = "linux-x86_64"; + sha512 = "0c8de38bdb5ee3636a7a633c57e9e3445374514014221086b9db106247ca08111c987aca889a416997ed6678cae81d1414636d0fc9ff4e490444041b53cb54d9"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nn-NO/firefox-50.1.0.tar.bz2"; + locale = "nn-NO"; + arch = "linux-x86_64"; + sha512 = "4617abaa89c7caaf9481aca13e61629619b1b4a889a2ed652434c8c01d5b8ad9ad96de167f9d3687d303a8aca49492d7b6d7712f9497ae017200962cb229f855"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/or/firefox-50.1.0.tar.bz2"; + locale = "or"; + arch = "linux-x86_64"; + sha512 = "27df7d794fa1693fb79aae60ec72004cdc3fffa9eeb0662e71aeb639e46b6a4c740e08227e5e334e6c0167aab95de6310f3142bcbd3eef089dedd5eeedd29f8e"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pa-IN/firefox-50.1.0.tar.bz2"; + locale = "pa-IN"; + arch = "linux-x86_64"; + sha512 = "33101ba56588e23bb5cbd66bf8fd90e66e2fa382f4fa6b3b5d9fc6a1372957ff4e01a7a01b697ee694c589573c9a5f1e605f205bb17ac63c5b5faf8545879376"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pl/firefox-50.1.0.tar.bz2"; + locale = "pl"; + arch = "linux-x86_64"; + sha512 = "373d3355e980a3dbed1cdf8099ba31e370b270402181e61f6e1a829c2f2d9b7b73a9ebbe074e59f21ac3f934898c9c23adb0a5c09c7637fb6c67c3093bd46fbd"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pt-BR/firefox-50.1.0.tar.bz2"; + locale = "pt-BR"; + arch = "linux-x86_64"; + sha512 = "ccd935e398095d3b79e2a86b8181e1aa1988fa6a1e12c879d50457756b62ab3dea3087e8de77c7cd98dead6b0078598d22ead36285559af041254bdb454eafad"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pt-PT/firefox-50.1.0.tar.bz2"; + locale = "pt-PT"; + arch = "linux-x86_64"; + sha512 = "a8adaa40a2fa564663173641b3dc3d5642c8c3909a8c14904213c9e1cf9bdb4f03dbd44412bed023b02e6eae63bf56fcadfef0907a168879121811bffb9b9ac4"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/rm/firefox-50.1.0.tar.bz2"; + locale = "rm"; + arch = "linux-x86_64"; + sha512 = "ce37bb7d969c0fc31c2bfed7ac143e5a6d7d8035a748c5b3eb9a23dc62917ed9ad9b028a9db0b5dca156eb99cb36c763eee39ca893e5a314233e5bf4ec4dbfee"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ro/firefox-50.1.0.tar.bz2"; + locale = "ro"; + arch = "linux-x86_64"; + sha512 = "339120884b8add14d36fdb3fc3ca1355074b0f8a0a87577d1616c392230342c7361859126edfd959e11ebabc6b86c496b440acea679c61e07df59e7e298c47ae"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ru/firefox-50.1.0.tar.bz2"; + locale = "ru"; + arch = "linux-x86_64"; + sha512 = "59ade7f2ef86f412fa376e4fa6a9d7e72cbfabc10e687c7c0bb7e4b4bc2324d7e97e86075c1d7e12480b9f1dd8bffb5e4723f4183882976cd35c4ccf6f2b4726"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/si/firefox-50.1.0.tar.bz2"; + locale = "si"; + arch = "linux-x86_64"; + sha512 = "4a74944879e40876515e03b1dc2261998bfa2264e074874f886a979de5b48e453c7cbd9a020e8854089b77ca5b5182fe13c685b33991e81c7c533246f87825e4"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sk/firefox-50.1.0.tar.bz2"; + locale = "sk"; + arch = "linux-x86_64"; + sha512 = "b1440e76e19ef3ed6786f9a40330881bff498c7ab20030189c3eaed293e1ffdf991172251da1ac5d512da4897f2a46f3e0921436d86d9178d96387e33e82708c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sl/firefox-50.1.0.tar.bz2"; + locale = "sl"; + arch = "linux-x86_64"; + sha512 = "abd4e6da09005698655e2fb2bb749be35f8b9e8302ba1068e20d27e158c4ae57a0f1cb277a87a2229e4e815cd9d4656ab32cdf0614c01deab572e6c8749d4fb2"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/son/firefox-50.1.0.tar.bz2"; + locale = "son"; + arch = "linux-x86_64"; + sha512 = "17d0444a559c7a5331b93bd314003d84f853fba791efc2df6867becabab9fb7d02bba964d208f44f31af1dfb292cfcbd4de7b48454a7e83668bec26139be40b4"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sq/firefox-50.1.0.tar.bz2"; + locale = "sq"; + arch = "linux-x86_64"; + sha512 = "c416060454550ff04086aba74173500a41c4e592246eb524e682f082a75173a6752e982993df3ca096c176c0a75ed5f26a22414df5e794a042dbeb2a0de22413"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sr/firefox-50.1.0.tar.bz2"; + locale = "sr"; + arch = "linux-x86_64"; + sha512 = "f615964e4d87b74dadb841993b3c62d6d683a66ff6ed1634311f58e9c7dc522ed9f2a271a043f7ebaff37f3c1a563d862d7abf22af1015d720979f7459e2ceaa"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sv-SE/firefox-50.1.0.tar.bz2"; + locale = "sv-SE"; + arch = "linux-x86_64"; + sha512 = "4aab1caa825e685923c7c3a32ecf664e2e8cfc2389f48980f51eddaf696cd9056afd944a950dc60987adbfe977d22fab4c994c3aebe1d14c7514369f6898aa7b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ta/firefox-50.1.0.tar.bz2"; + locale = "ta"; + arch = "linux-x86_64"; + sha512 = "6e556f182e0652b79c338fb0d7bfc9da9eee5ef5c68115e748013404ba4409dbf743b03f8722b36ace38a8732924bb426e7a7af5059256ae1f0065096e68a661"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/te/firefox-50.1.0.tar.bz2"; + locale = "te"; + arch = "linux-x86_64"; + sha512 = "ff201a9e66645e148ec740921a7bb1d1b9ffd4b6200d98d06be0f235e829c6a355be0615341f899b433836fc2f2976223a6e46c4f5172590b5254a26f4998959"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/th/firefox-50.1.0.tar.bz2"; + locale = "th"; + arch = "linux-x86_64"; + sha512 = "0e9d0c10f21d3d41825194a3afe21cf4281cbf5825839f908d58821d40358ded4226b5dbe7a094b95aa087769de6179331a19a2fe780b4ee56c74ce137a33ac4"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/tr/firefox-50.1.0.tar.bz2"; + locale = "tr"; + arch = "linux-x86_64"; + sha512 = "299f07161a3439902110d8929b5ffdc332562b956d25999235b3e212241d95ce94646ba3542d7138c6ac5bbbe274c614d2f49aca8a674d252b240265397fa48b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/uk/firefox-50.1.0.tar.bz2"; + locale = "uk"; + arch = "linux-x86_64"; + sha512 = "f108296c0aee994d558cc422403f45c994d2878b69180d3cf526abe4f5b29d8dc59ed9c58f72a0d21d2550a4d32869b96ae43a1ed251e885bc7abc47b22c3894"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/uz/firefox-50.1.0.tar.bz2"; + locale = "uz"; + arch = "linux-x86_64"; + sha512 = "293e4d99572a22dc053cdc8f5ac40338eadcbd622ee1d47c2bab9914ee1d2507e89a8b4340a12d64c0c4b37f4ec312bcf94921184402852c2a7cb114da93983f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/vi/firefox-50.1.0.tar.bz2"; + locale = "vi"; + arch = "linux-x86_64"; + sha512 = "24355d25ecae3e5f18a0f3c7b87dcec8c18077292329a7ea38e5e9411c38812f394656d79f3fa653a70770ae136b3f5fbd1644a7657f448dfa78f8e795de5afb"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/xh/firefox-50.1.0.tar.bz2"; + locale = "xh"; + arch = "linux-x86_64"; + sha512 = "0c917bc8cf0a5b66f85cf1511d3fb0b2f4c4bfaa10883d277e6d4bf399b4b359d8ec39c4fcdd6dd23ba3645047318eace530527796b4be58058cb15de69853f4"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/zh-CN/firefox-50.1.0.tar.bz2"; + locale = "zh-CN"; + arch = "linux-x86_64"; + sha512 = "ceb0d7404aa7d8295920e99ccc77e2da7db6101af92d29dfc3c1f2cb4689b582542d154cbc749ad3b7a744f545ccc39e479db4fbe2c7d18c98bf3bf412eccc46"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/zh-TW/firefox-50.1.0.tar.bz2"; + locale = "zh-TW"; + arch = "linux-x86_64"; + sha512 = "e942d5d6b8891d062b452f1a083de2849cc69ac45801aee0b5c413a786ce9d67555d94416d65fb6bb6e4b74cf11ae75a1036dfc661b50fda10b95febd86a80a2"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ach/firefox-50.1.0.tar.bz2"; + locale = "ach"; + arch = "linux-i686"; + sha512 = "7546a3fb1cd0e06c9f6916c668cedcfa4671bc15a7ece8ed3ad8ebd1bce5c6ac84e2e024d7e2149844f1797d66374bb2c8769e67d1c4af941eb626c610c433f2"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/af/firefox-50.1.0.tar.bz2"; + locale = "af"; + arch = "linux-i686"; + sha512 = "a6981413d7974e2ca13ffce9fc65c0f69242d6c6bfaa6253fb13fd8fc7e62059df718b4722a7a879dc8e352fd94dcf74db41765dbafc277e8debdd7e35a1242c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/an/firefox-50.1.0.tar.bz2"; + locale = "an"; + arch = "linux-i686"; + sha512 = "e123cd3a8c9c8657f09d198b7f113b84192174b021dd816b82ee4497e307794bda1399e5425456c2d990788340a58831cd261a4c5c67e5b0ea3daa3d0ac65f65"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ar/firefox-50.1.0.tar.bz2"; + locale = "ar"; + arch = "linux-i686"; + sha512 = "618b9c24d37f4b82b1e51a5ceb5b2d3981c764f906e7959eb346adc5c974e464d4a691e50acdad7f9e0cfa5855afb6157e8ab600d22266a31fa444db9b7886da"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/as/firefox-50.1.0.tar.bz2"; + locale = "as"; + arch = "linux-i686"; + sha512 = "93e53546ca9fc554decc0c1d6590b5b84a433ab392abf9fff9712d4432bfd47a1cc57439fc65ae9be91da6d38dd462fbb81fdd7304424e42d08eeb600d298eab"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ast/firefox-50.1.0.tar.bz2"; + locale = "ast"; + arch = "linux-i686"; + sha512 = "e1115994008db11f3c69679372a3f07b6edde23dca20733b7f06a5b0c63dad2a264c02e9f94dc74976efbb3961155216111522c3f1ebca91929ae356f8218c87"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/az/firefox-50.1.0.tar.bz2"; + locale = "az"; + arch = "linux-i686"; + sha512 = "93be21a2a79d2f4cb2fb5132856837b1ac8d44c699faf623d076b95b5e61126ea540bcabbf57e2752b49cc7b5116f3345a2a78cd07104d873afc2e2127f64224"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/be/firefox-50.1.0.tar.bz2"; + locale = "be"; + arch = "linux-i686"; + sha512 = "ca41cbbe732e8e754cdb0c832ca7820d5320a8106bbb3e5d753f4a7f6eb30045b81cd84191f868076e0edca68e35b344d63ececa45eabff7102fe82c1ca19e61"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/bg/firefox-50.1.0.tar.bz2"; + locale = "bg"; + arch = "linux-i686"; + sha512 = "4e0a3ff42a8502e07afca92ff98ae675213527e68c3907b177e53a580e0391c075a41ba4e5b87c27558f86b28c1abe2dcae191334c737d37bdbbfb25c33d0024"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/bn-BD/firefox-50.1.0.tar.bz2"; + locale = "bn-BD"; + arch = "linux-i686"; + sha512 = "602cffffa7ebf0f53f3e466d3aa5d8f203698db16089e83c893092e9a0841a9a8ec6a46aa5df1e2fec020cd8a7345e4fe86fc20797ad65bcca56bb2f391390ef"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/bn-IN/firefox-50.1.0.tar.bz2"; + locale = "bn-IN"; + arch = "linux-i686"; + sha512 = "2f7ab4b093b8be7dfdbdcf2faad88eb99e8b0e19ebc17efba44d46a332754fcf16e9317398e88c8eea73680ac85f08d2f0a99768fad160d79102e8e1fd6fb8f2"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/br/firefox-50.1.0.tar.bz2"; + locale = "br"; + arch = "linux-i686"; + sha512 = "abc0fb371ae3144fcb3a5130b13c376169d8a3c3051493fb5fece9a4682757c42bf4717b6494d4220daebc3f1560397f1263706e2a3871d7ee5c0135cdfbe1a5"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/bs/firefox-50.1.0.tar.bz2"; + locale = "bs"; + arch = "linux-i686"; + sha512 = "f62657ff653edae873269a4113a93dadbbb36920e9e30ff04407d28f755bc04e35223031a60018e69cd4c3b891511109b66e7baa83656b0ac37ef5e334f3a89b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ca/firefox-50.1.0.tar.bz2"; + locale = "ca"; + arch = "linux-i686"; + sha512 = "bcc4184d882075eb2ea875c7493ca4f276796672a029ab161b4f2168e879b46a6fef454e04e53531a32ed5bf82178d8d2ef15f9e43679625e4f7632e7cf51f32"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/cak/firefox-50.1.0.tar.bz2"; + locale = "cak"; + arch = "linux-i686"; + sha512 = "88448d8c17235e318628bed05d607f30ab9db4e05f181a36e39c02f2df840a10990a534d5d5f8e16fdaeecfbf3e51bc7cd9f45b8a84b3447132bb57a87c4e2d3"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/cs/firefox-50.1.0.tar.bz2"; + locale = "cs"; + arch = "linux-i686"; + sha512 = "acb9fe18d8a5fe97cdeeea24e8a6e56895a3be16c6a5f2099a69c32768e2f76a2c0fd081d3759a2c87d002ea5021dcc5f806195d3bed06e8514c383ee8bf998f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/cy/firefox-50.1.0.tar.bz2"; + locale = "cy"; + arch = "linux-i686"; + sha512 = "89119e29496981f8ebc85d512e5d58d8bd3678cc8ea4c90e544bde60881cf5f768b4060d710f8ba4d61dfbd7299a4437f5e7aab1140a03cd498af18c480e0b4b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/da/firefox-50.1.0.tar.bz2"; + locale = "da"; + arch = "linux-i686"; + sha512 = "285363c04cb6506400077f36867a65372fae80ca6b3fbed88be219c3814d3f38a650c78f36014ae205ba9e5167b5291353c799b918c8e2bca6f23374094db209"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/de/firefox-50.1.0.tar.bz2"; + locale = "de"; + arch = "linux-i686"; + sha512 = "ea470ab934f49ff79b8cb04809f5605edb70d3ea9bc997c01802f09e3fbc8d045bb322b97b729916b6371b047f3b4ac14b25dca8e8befea401362c2024a2fa13"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/dsb/firefox-50.1.0.tar.bz2"; + locale = "dsb"; + arch = "linux-i686"; + sha512 = "74bb1ab27970819fd9a368ac5f9a14add5378d9a7c39707e12146ae8082f39593ea53b5dd730708764515b0177d7ddb675b04a8a75f259303d30f281b44527cd"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/el/firefox-50.1.0.tar.bz2"; + locale = "el"; + arch = "linux-i686"; + sha512 = "3d3eb83a16c94eaa0bcb8627239b74c0a261189b67b917d4e2fa9ac538ea353a998b691350797470ab8ab4a5effc65a35a36e4b3d372895bd691c63d439a4c9f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/en-GB/firefox-50.1.0.tar.bz2"; + locale = "en-GB"; + arch = "linux-i686"; + sha512 = "23a75b31d461ebb0a3960c6235b6c77471f3687e76f154c8d1fc8cce40ba571a9699e19a5310faa55c52b243e6fd88ec76ccbcb93dfa8b3521493805ca852d57"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/en-US/firefox-50.1.0.tar.bz2"; + locale = "en-US"; + arch = "linux-i686"; + sha512 = "b1667f7c235b3fdbd3a2c3ee6ddd7976b4142983393b0b8e0443896cd0929d7a43ca484ba5922340410fa3c4868f555a4ab581c9664281a31b912c1922a1dce5"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/en-ZA/firefox-50.1.0.tar.bz2"; + locale = "en-ZA"; + arch = "linux-i686"; + sha512 = "78238141da05b61b797440a04973187bbfb4d3cff7830385e163e8ccaa603368910be89ee7f2f4e65a47a6917835dff8f840a77a507c3ff0242baaf1b7cfb4f4"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/eo/firefox-50.1.0.tar.bz2"; + locale = "eo"; + arch = "linux-i686"; + sha512 = "af424d87210909ad480823d56f20327b0e7879bb0ce7ab43994870a69e6e91b3181e480dcc2610064f276ccfccb71badca135f3d8e00ff16947c220dfe67ee82"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/es-AR/firefox-50.1.0.tar.bz2"; + locale = "es-AR"; + arch = "linux-i686"; + sha512 = "cca38288b4ef6de4c7469cdcbd7cc29715993ca69c39febb877691b2368182a0efbb0111b45bb5a7ddf47b7c70f20638bc6dc7d6fcd46f8d8127d36bc29da3e3"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/es-CL/firefox-50.1.0.tar.bz2"; + locale = "es-CL"; + arch = "linux-i686"; + sha512 = "104a3fa6bdf86e0e70c54bfdd8c0d388a8e91a9bae0ef973fc043247907295cc5f53c44f414fe8cd6e2f17a02eae14e366fa8c11ccbb45df2055813b17fd7712"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/es-ES/firefox-50.1.0.tar.bz2"; + locale = "es-ES"; + arch = "linux-i686"; + sha512 = "be847e51e78991ac739bc32fb29cc0cc166f12f02b5ada4d4656d3447379eb9cd10f80391433607fb63e971d54a48591d60baa5cb963421f1934033e08525d7a"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/es-MX/firefox-50.1.0.tar.bz2"; + locale = "es-MX"; + arch = "linux-i686"; + sha512 = "7a7464de3223e9cf1cd0f6b7767ea0fb7ee8db0b3b2c3eb9d284cd5ee8db77b9b0ec3c604625c8c6ffffc41bbac4ea47543c1508f7f8aadbaaeb9954b7e62247"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/et/firefox-50.1.0.tar.bz2"; + locale = "et"; + arch = "linux-i686"; + sha512 = "907612ce5691ec5e4647e943ed58d437db872551da8490af3e5f7af44e7d9ac78a8c5eaf721f719af782c8b202aa24ee6a87640e54323b5eb823dbee39b2903b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/eu/firefox-50.1.0.tar.bz2"; + locale = "eu"; + arch = "linux-i686"; + sha512 = "29c76a0f49d87d162749f824e287f2c1b37cab465cdd5e5e991ce429273d492fc905772c25f4c812c6fb899249a9bb7346eefc91af9f642b4acdc70d3af6f338"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/fa/firefox-50.1.0.tar.bz2"; + locale = "fa"; + arch = "linux-i686"; + sha512 = "0deec5372d5876861af20a60d8db9d4c5aaef8c133c81bc3af6d85d2de528f96ae1da7f5fc78a9bf34bf06d9121fdb6d74e28ad40ae2b7fc23b4a0c161e09722"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ff/firefox-50.1.0.tar.bz2"; + locale = "ff"; + arch = "linux-i686"; + sha512 = "07c87801154ce44d37b1a477850bf9568651beabb4004d7cfe427c0ecf75fc85da91cffbbd60af773c8b3b7cd30e10937c9ff2fcf65409faf2dd194694d9b6c1"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/fi/firefox-50.1.0.tar.bz2"; + locale = "fi"; + arch = "linux-i686"; + sha512 = "310b71c8e46fd7ab3127cfc0743c1d98ede8adbfd01a645089cb6e5752e8ff4e3da9f8f47ab5fd7d06284b3fd76b9780d60c2898d0868e30a76dcebf35c24b05"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/fr/firefox-50.1.0.tar.bz2"; + locale = "fr"; + arch = "linux-i686"; + sha512 = "1bc1e595f12d04067b9985be57fe4ec17de89069e4d6b780c16231c4ea195fa0cd8e6daece265335fa56ac3dae9d94c3b76f93199cf1e0946f6d6ac75bd01a1a"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/fy-NL/firefox-50.1.0.tar.bz2"; + locale = "fy-NL"; + arch = "linux-i686"; + sha512 = "d07b171d615306c6de663f4592450dea92cd7298e6994ea7fb5d55f01f260c2b66d1b4bc4109f44c3d007107c78feccaa6540ddb14dc8666e0192ff3978d8f5f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ga-IE/firefox-50.1.0.tar.bz2"; + locale = "ga-IE"; + arch = "linux-i686"; + sha512 = "1c234083d098c52a7597dd727c246ea6dfc177edd1e4fc021ad5868ce9082353036d78b9297503a5eb14dc8d500a7a2549d771ea2d3c849817ab791329925d25"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/gd/firefox-50.1.0.tar.bz2"; + locale = "gd"; + arch = "linux-i686"; + sha512 = "0e88344c58c1b2e63b765949db63ed9e874b23e382f9fe833206cadde1d6c32d804d68a22f17741cc7964773858fa7adb6a6a42e7ed56dad54f2d7d0a71dce08"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/gl/firefox-50.1.0.tar.bz2"; + locale = "gl"; + arch = "linux-i686"; + sha512 = "244cf85b95f4a1eed0369f4f41ba870f4a3fd48fd85979b005ffc19ab4c03e52da87ae8687f5e3048c33599baab46fa8ed8274db5b180936076fd63e02b955b2"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/gn/firefox-50.1.0.tar.bz2"; + locale = "gn"; + arch = "linux-i686"; + sha512 = "20d51aefbc2f98f83fafd23a5800840d1bce7f0688f76d0ef322b2f1dfe44e75fd82c39fef23cc9afb15faa41514f29f8313748a2e969e2051b3824962de6e56"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/gu-IN/firefox-50.1.0.tar.bz2"; + locale = "gu-IN"; + arch = "linux-i686"; + sha512 = "b07adecbbf8aaa8dce8e7d8e03b86d5ce3bb97646404433d89d82832e692efeb532df86a5a4276dcf1f63c705507e0d87f3d72440c49e5d70c9a08968f75fbe7"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/he/firefox-50.1.0.tar.bz2"; + locale = "he"; + arch = "linux-i686"; + sha512 = "a6d9a10704ad4097af79ee05aae504a9a6ff109192241cd99c3be665f0adaffa6e5b7b39da859d61d9294cf899a5496ce0c82ac4012a318ad4aa96d6418f380f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/hi-IN/firefox-50.1.0.tar.bz2"; + locale = "hi-IN"; + arch = "linux-i686"; + sha512 = "6d78b83b289abf37267b08c72c3b3c42005ddc2f2b13c846012f342b16a3bbf9a891fcd6e24af01160d1749c1b7e76a9f62060970d52144405e4162d4c6297e1"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/hr/firefox-50.1.0.tar.bz2"; + locale = "hr"; + arch = "linux-i686"; + sha512 = "e70daf40c8a0885c344a01d1cde03b34af23a2d9c76450f0723cc5ec1b577251dfbb8bfacd3eba866953c5b3dcd2974456305a9e171025cfbd43416f679f1cc4"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/hsb/firefox-50.1.0.tar.bz2"; + locale = "hsb"; + arch = "linux-i686"; + sha512 = "8c137a61cb020dbfb1d73a698d76c4921c9a1dff5f836185caba29c22c81c7c0683cb4139b0642d4bf408e01d498de46022c36de78a3c0413eae048f2be69e72"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/hu/firefox-50.1.0.tar.bz2"; + locale = "hu"; + arch = "linux-i686"; + sha512 = "1630ad84eff835e1f56e424000515e37d52a268ce569ea12fe5abb8afde231f2aee2293046ee8aeb338ccd81ec98c92246f4b62e000ece032349eedb2ca3bb82"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/hy-AM/firefox-50.1.0.tar.bz2"; + locale = "hy-AM"; + arch = "linux-i686"; + sha512 = "dc2359753972d1eac82bc357461331d69e52bde41736ab5c4bd590491add2b592bd3e4f15f32db94922afee84af04500928ece6be14071b10ad1fc4c8b82314b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/id/firefox-50.1.0.tar.bz2"; + locale = "id"; + arch = "linux-i686"; + sha512 = "61717f0c508b61b874080e21f7cf22283b1d123e2301490af409c710ee612ee8e0e7709f3bee20891c0a76b3b2de05b4ba94885d1b3813e6612a1dd1f871d34c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/is/firefox-50.1.0.tar.bz2"; + locale = "is"; + arch = "linux-i686"; + sha512 = "57d649dd96889b533c336078b4d2380a8417a1f77e40379d51a80518ffe2024a303c2b9c42861436425098cbf2e328264972b82039b9fe13054ae3d33a93e737"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/it/firefox-50.1.0.tar.bz2"; + locale = "it"; + arch = "linux-i686"; + sha512 = "b8bb4e379f4e21bdea2190695b0f74c23b72af5c6149e8790a433c09cbe3ee170fc68a375b71ea112d15eb00b948b6c30466fe382f86e8c5da85ea7479b355ed"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ja/firefox-50.1.0.tar.bz2"; + locale = "ja"; + arch = "linux-i686"; + sha512 = "287d4ba06988e7a6022fead8af2d921fb761222cd0cbaacb7136c44e397b4620a6129f59f97d98d8a992caaf203e7c8fc130aa4e5e9c58b13a2700f63d786497"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/kk/firefox-50.1.0.tar.bz2"; + locale = "kk"; + arch = "linux-i686"; + sha512 = "f96a9b418849234b41d181ad141dbb030a8b2f26e73944694c5a805a21778d708862df988dda8ab8fe28eca0aa342153db84d6af971461f0eb8072590445ac15"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/km/firefox-50.1.0.tar.bz2"; + locale = "km"; + arch = "linux-i686"; + sha512 = "63af9259f4326d4dc356513203646712f26dd992d2150d58c4f1892d76f0a3944063dbfec0db68f67d20538aea3247313357e5a822e0a8507bfad2a7209067d4"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/kn/firefox-50.1.0.tar.bz2"; + locale = "kn"; + arch = "linux-i686"; + sha512 = "afa965fd87ca7dcf5217011cf0aa53d89e1656d64cb8ad973a149eed3897eb577bdbe3359a5310bf9e11dc6e927883c08fb7ef069756313dfc75850378ae7820"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ko/firefox-50.1.0.tar.bz2"; + locale = "ko"; + arch = "linux-i686"; + sha512 = "724726e85066350ba9fb0254462b198e198c20970664737c925ca41a474ac4070d2e746b671e8583339fb1935e9a05d6191856f5abaa6e23413efdb707d34d19"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/lij/firefox-50.1.0.tar.bz2"; + locale = "lij"; + arch = "linux-i686"; + sha512 = "e17504c60dcf3eea34c9525b3ca537656fabf90a7d888284cd5ac014a939565ba50e8b3d0fd1c936dd5be1ac59ee9f61e2de22b5b1eaeb12fca0f59a094a06eb"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/lt/firefox-50.1.0.tar.bz2"; + locale = "lt"; + arch = "linux-i686"; + sha512 = "00689c1e19f748e5676ea3b8ed0076f6a63698c57b171eb771d45e9d9ba5bcf359eeb827f5791c96ca6a31eb9ca166208fc63b4a211676b466656e537323719d"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/lv/firefox-50.1.0.tar.bz2"; + locale = "lv"; + arch = "linux-i686"; + sha512 = "1218ec478e28229f0ef8d5a7a669ed6f69722602f75185c4817a9870b35b6955f87f004317bb32cdada379075115c12ad92f73f74818c182a480393961a85bf4"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/mai/firefox-50.1.0.tar.bz2"; + locale = "mai"; + arch = "linux-i686"; + sha512 = "6fe97505743b8aa14b9bb3be57077c9da14c2049b2d0d455fc2b777b09bc42924f04c781073188fcdb3130bd5d1cba2cbc5c2ebd04fecc7e73ddb8f20f61c716"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/mk/firefox-50.1.0.tar.bz2"; + locale = "mk"; + arch = "linux-i686"; + sha512 = "e0bbe68d53a08df8e2ac46b9b51567f69fcd11b03d19b6e84f86ca9f255c0920f89b011df5fd4ff300cb3fda65470fc15ad779757421eea2b3b6db6bc7ae9c1d"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ml/firefox-50.1.0.tar.bz2"; + locale = "ml"; + arch = "linux-i686"; + sha512 = "0e6560b60dc8c0fa309c3a73c1aa3331aec82556e3ee5eec9014d8787c9a5f8311049fc7939ec69569abf689e349be08bce040bfab8bd2ee3ac0042753ce2860"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/mr/firefox-50.1.0.tar.bz2"; + locale = "mr"; + arch = "linux-i686"; + sha512 = "cc31171f3ee669fb47dfe4e416c84ed58125b1a4787a92588c3650a2062e4e7fed28f2cc5c784fcf1d804c64fb335c2e16340d46f2d879b73e4465f8c662350a"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ms/firefox-50.1.0.tar.bz2"; + locale = "ms"; + arch = "linux-i686"; + sha512 = "12d3bfa0c956b342604a043beefadbe5bff639fbe4b12614832ca36ac11a4046987f3be34dfeb5d3dbb4e9c1d8533645a8d78c3413f9730a72ae952bb07fd703"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/nb-NO/firefox-50.1.0.tar.bz2"; + locale = "nb-NO"; + arch = "linux-i686"; + sha512 = "b144e104f01a075bd0d107f77af39664323eed78987ebc78a7a2917b86d83c2d6ff3bb35b6c5230e27c8164246fb32defea91e5b84672e20f5071e0d52456726"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/nl/firefox-50.1.0.tar.bz2"; + locale = "nl"; + arch = "linux-i686"; + sha512 = "da466f3dc573096be1d55bdb03f926f0b94ee2ad8e326a3fdc29d519d00f5c0c9166b85c0c8c191d1ca7c992b05b68abff5f33882e52e43be3015a35333be3d8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/nn-NO/firefox-50.1.0.tar.bz2"; + locale = "nn-NO"; + arch = "linux-i686"; + sha512 = "85f83572953a0b54805b22f3a21cea70343092912c3b988f8408ac1df1931dda52a8686c32cdd7c91e776a17af0a390d6394b22fdf46ae1205a01499f390dc5a"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/or/firefox-50.1.0.tar.bz2"; + locale = "or"; + arch = "linux-i686"; + sha512 = "1a0b08aa675bfe8b26675f1eac53389f34d02b0c28287d1a73e663ce5d747efd0bc4db5f0f29e3e864c99447e759fdf35ff573235a7ac9b815fe8b749f0a0e88"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/pa-IN/firefox-50.1.0.tar.bz2"; + locale = "pa-IN"; + arch = "linux-i686"; + sha512 = "ee9c1c9cc27cd8470cee9a1600951274f9a663e4562cacf7452426c562815f393b726402b1356f9a60095e85278030d64f35cb1fdadd5c8cd11d6917f9c70d60"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/pl/firefox-50.1.0.tar.bz2"; + locale = "pl"; + arch = "linux-i686"; + sha512 = "a326d11cb0df567ad13e6d543426c0a28d9158f7d8f0f519b208bddad26145e3eee6350dfb54735cfc05d656ed40b022fa132991a91f1de78eb36ee4f7333fcc"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/pt-BR/firefox-50.1.0.tar.bz2"; + locale = "pt-BR"; + arch = "linux-i686"; + sha512 = "cb99dec511614bfdccf43b06e4babd28dbe0dfac464147aadccbf69bdedf3a093e625e4fcdfe0cf8db867b5854ce4c3c5d399a6e9ba932a9fd8574928962360c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/pt-PT/firefox-50.1.0.tar.bz2"; + locale = "pt-PT"; + arch = "linux-i686"; + sha512 = "2c4215b8bd5ee9ff78fdfda763c5506fb6a3c7056c9b4494d89f77ff4255c86617f4102f36bf534c0e3ff24ed27ef4a0853d24578bb39ae0a04f741422e6eba3"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/rm/firefox-50.1.0.tar.bz2"; + locale = "rm"; + arch = "linux-i686"; + sha512 = "470b3ce93cd25c24c0c9a1581da7a48c101d7a93764423073b1934dbeb5a0fc401150009a622feba1f2f799501fb03e0af79a308c4fef08ac942c5adcaaf0d91"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ro/firefox-50.1.0.tar.bz2"; + locale = "ro"; + arch = "linux-i686"; + sha512 = "7cfaa6b7b2dbe4dadc464591ffbb508e66b724eba76b6fa8e9547ef1092f1aa51f1846e9392a8531c7ba24aedb4ba49e7a2e0c1f41a0b97e6dbacdf1d6c34c75"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ru/firefox-50.1.0.tar.bz2"; + locale = "ru"; + arch = "linux-i686"; + sha512 = "5915a55e881a57797a67d59b4ae9fd95da8bcc4caaa1ad7decb78a6de7a5da7ff35139ff33f7e4ed171615ba9c25ab7df43677a58cecbee530eed25d8a7cc8ca"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/si/firefox-50.1.0.tar.bz2"; + locale = "si"; + arch = "linux-i686"; + sha512 = "a1702939f705a7c2b3b66efdd6dc27a4320ed019dcd62b59da67ef3f078be0afab91ee5158e67cb62691b1a4a002783f807d6133885bd0ac9bb05401268d5f24"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/sk/firefox-50.1.0.tar.bz2"; + locale = "sk"; + arch = "linux-i686"; + sha512 = "43b72dd5ebcb1524c5b633cbfb73eed21aaf466227f29f4ffdd93f1c49dcc2295a38b57b3ce072c40da72184e1fb954a9097ea6d6d6df6807dfc5d04ff48b327"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/sl/firefox-50.1.0.tar.bz2"; + locale = "sl"; + arch = "linux-i686"; + sha512 = "24840e76f00d6a07de581d06050f924018ae2613a6e4cba993073859dd05007b6c97a7d518a6c4b111740945357621c7325c4cd7f45adddceea270e08c1a09c3"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/son/firefox-50.1.0.tar.bz2"; + locale = "son"; + arch = "linux-i686"; + sha512 = "004f8732e194d9c1972390d0ce0d04f9e8f91583676fa5d65bcfb1ee58a6b52db5176ce8a281a3ac94391b43aa637ed157128950e589a0f0a354622da6f04132"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/sq/firefox-50.1.0.tar.bz2"; + locale = "sq"; + arch = "linux-i686"; + sha512 = "3dead0e008b4255585d22dacb6fa0aec125da6581b7ef4b1ccc6697e03a5afacd14d340bd8eb7bc0b38478bc6ca20f09364e9180313ceedf1853739ee181d125"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/sr/firefox-50.1.0.tar.bz2"; + locale = "sr"; + arch = "linux-i686"; + sha512 = "cdbf5fa9d085829828f5a395114c3efae9b82e77e34aa69b622e611de8aaf54c525ad12ca445190ba5cc9c22d979be902e4f1f6e6a746b5f97570326cd90009b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/sv-SE/firefox-50.1.0.tar.bz2"; + locale = "sv-SE"; + arch = "linux-i686"; + sha512 = "ef8a625973d0286799e2a9ea3a5a10078d912a65521be8f935ec6eb207ba53942ec5d0e0c4c5c013ea2705307dafda12294fdf708dca35f72d5ba3eb48733238"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/ta/firefox-50.1.0.tar.bz2"; + locale = "ta"; + arch = "linux-i686"; + sha512 = "64652e5c68680f1ab15bdb5ec6487387789bd4b1a1537daa215094e57156fd4a1272311d8084435994151aff5e7ddffb16b93c2048989d9c2dc455f98d072b06"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/te/firefox-50.1.0.tar.bz2"; + locale = "te"; + arch = "linux-i686"; + sha512 = "e516ee1f536dd98ab95a9a621cf4634f1ac70a3b5952cd8c6498890536b1630b362ebda8e69577eda4c0a6224f1a9cbf19453e5709dbca467e37597016eb5fe3"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/th/firefox-50.1.0.tar.bz2"; + locale = "th"; + arch = "linux-i686"; + sha512 = "0b9ae06d78e94d6f9ee5861dc911eca02f39671d8f13f2119323ed7dc394dffbe99f2d23dd3eba955d46f7d4b9775cd9fc3311337d4339748c178aa67d7467eb"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/tr/firefox-50.1.0.tar.bz2"; + locale = "tr"; + arch = "linux-i686"; + sha512 = "31be512e591504d3e8a776933f0926ae54a7797fa037e53a4627b1bb39ed61e4689cafee7d84dfb6b930ee2e4a84df158a97c1c5b201a3a8ea112e2910e65846"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/uk/firefox-50.1.0.tar.bz2"; + locale = "uk"; + arch = "linux-i686"; + sha512 = "19614a4999f5c7509a3c0b1c6bb2bc3d9f408ff6727bcf9bf93bf91a59ec8d3c04206719fe2aa2319a0e62687df871bfa2fe67117219398e19aa5a6e0782c15c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/uz/firefox-50.1.0.tar.bz2"; + locale = "uz"; + arch = "linux-i686"; + sha512 = "22bb3b4a3a5a98ad8da002a220dd2779a46fd50a3d0ff41bec8312186ae34543da44fc49518fee160aa4b48176a0d3ba0dd0c4853fea9befc66911684b83ddb1"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/vi/firefox-50.1.0.tar.bz2"; + locale = "vi"; + arch = "linux-i686"; + sha512 = "99140a71208a7912dc8b9fd3bd7f5454a0b032dee4d903304dfd14aa9abec0722fdcc6624f3c0a1c6e753bc6ab6ea512d6f8c55b5482069ed6c65d5579f562e0"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/xh/firefox-50.1.0.tar.bz2"; + locale = "xh"; + arch = "linux-i686"; + sha512 = "440573a5e364ecd59121b30f664ed23bd2fa80945562d1e5cc04303f12dfff23c96ef53ce07cf689d247a5120b9d7679533ccb6e17c27b29898154f0fc9fc581"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/zh-CN/firefox-50.1.0.tar.bz2"; + locale = "zh-CN"; + arch = "linux-i686"; + sha512 = "4a2f5550c130d0992408d328afa3dbd37f80e5b63c2b33c095ab74e397ea394cb33f87214f1b0d3650c60450738fe3eca636ed51ca1c4e5dce9b58e0f09c30f6"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/linux-i686/zh-TW/firefox-50.1.0.tar.bz2"; + locale = "zh-TW"; + arch = "linux-i686"; + sha512 = "6417da7af1792f241c8d57dd5bb05dac974db2b73a6274fe3159037bcf8ae8a23b3f1849f5b42a0bfc09f1dcbf949bcaa8b1e9cc633fd3726c12cde7e3cf542f"; + } + ]; } From 8faa589a904043bb256b69fc917619bd05ea7b35 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 13 Dec 2016 17:53:43 -0600 Subject: [PATCH 1478/1749] kde5.frameworks: 5.28 -> 5.29 --- .../libraries/kde-frameworks/default.nix | 1 + .../libraries/kde-frameworks/fetch.sh | 2 +- .../kde-frameworks/frameworkintegration.nix | 6 +- .../libraries/kde-frameworks/ktexteditor.nix | 4 +- .../kde-frameworks/plasma-framework.nix | 4 +- .../libraries/kde-frameworks/srcs.nix | 592 +++++++++--------- .../kde-frameworks/syntax-highlighting.nix | 9 + 7 files changed, 318 insertions(+), 300 deletions(-) create mode 100644 pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 397d59f8b246..936a3953a51c 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -139,6 +139,7 @@ let plasma-framework = callPackage ./plasma-framework.nix {}; solid = callPackage ./solid.nix {}; sonnet = callPackage ./sonnet.nix {}; + syntax-highlighting = callPackage ./syntax-highlighting.nix {}; threadweaver = callPackage ./threadweaver.nix {}; }; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 20d63af51264..5ca0631730bc 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/frameworks/5.28/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/frameworks/5.29/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix index 0a782ae177da..161ce52d4f28 100644 --- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, ecm, kbookmarks, kcompletion -, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications +, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications, kpackage , kwidgetsaddons, libXcursor, qtx11extras }: @@ -8,7 +8,7 @@ kdeFramework { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ - kbookmarks kcompletion kconfig kconfigwidgets knotifications ki18n kio - kiconthemes kwidgetsaddons libXcursor qtx11extras + kbookmarks kcompletion kconfig kconfigwidgets ki18n kio kiconthemes + knotifications kpackage kwidgetsaddons libXcursor qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index 8cd7e95b659a..0e444cc8db68 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -3,7 +3,7 @@ , karchive, kconfig, kguiaddons, kiconthemes, kparts , libgit2 , qtscript, qtxmlpatterns -, ki18n, kio, sonnet +, ki18n, kio, sonnet, syntax-highlighting }: kdeFramework { @@ -12,6 +12,6 @@ kdeFramework { nativeBuildInputs = [ ecm perl ]; propagatedBuildInputs = [ karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript - qtxmlpatterns sonnet + qtxmlpatterns sonnet syntax-highlighting ]; } diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index 389b7fc452ba..963e93227279 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -1,7 +1,7 @@ { kdeFramework, lib, fetchurl, ecm, kactivities, karchive , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio -, knotifications, kpackage, kservice, kwindowsystem, kxmlgui +, knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui , qtscript, qtx11extras }: @@ -12,6 +12,6 @@ kdeFramework { propagatedBuildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications - kpackage kservice kwindowsystem kxmlgui qtscript qtx11extras + kpackage kservice kwayland kwindowsystem kxmlgui qtscript qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index eebba2d6a8c7..e8ecb3d058fc 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,587 +3,595 @@ { attica = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/attica-5.28.0.tar.xz"; - sha256 = "14v6vi8awk1m58l9svpjd54ckd6milzavgfbkdspsz0km1cpqlks"; - name = "attica-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/attica-5.29.0.tar.xz"; + sha256 = "1xiaqqq77w0hxr79rpixvy5kak2xgxwi5860qf3bbpz89bpyi5d1"; + name = "attica-5.29.0.tar.xz"; }; }; baloo = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/baloo-5.28.0.tar.xz"; - sha256 = "071in785y1qplm59fmsmifzbmczvlvkf5gxdb6d0iw93pb36r7h5"; - name = "baloo-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/baloo-5.29.0.tar.xz"; + sha256 = "06zq0nnqm8qs4dx548l952i5hi6yazi4c3kb75d0k6jvjsfhgh3n"; + name = "baloo-5.29.0.tar.xz"; }; }; bluez-qt = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/bluez-qt-5.28.0.tar.xz"; - sha256 = "1rfzwrvvkc5f4l943f4r235gdniqc7njyw4fx36v00daj2r4aqi9"; - name = "bluez-qt-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/bluez-qt-5.29.0.tar.xz"; + sha256 = "15rnh8vnmxrq6phvk3g7x69pvsblhrr91z4ldd8x4q895dpwk3vg"; + name = "bluez-qt-5.29.0.tar.xz"; }; }; breeze-icons = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/breeze-icons-5.28.0.tar.xz"; - sha256 = "06zwg2g0157ac6xsgxs5f8s1sk8rh2j3y057iqmfg2ng2sh9byh2"; - name = "breeze-icons-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/breeze-icons-5.29.0.tar.xz"; + sha256 = "1bpvpza0hm3krr4b6pp9aakmjs4vnmk2bbl9zirzsj7rg2nnrb8b"; + name = "breeze-icons-5.29.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/extra-cmake-modules-5.28.0.tar.xz"; - sha256 = "0yi60qd08x5093wb8dv9cx370iaabn44hzcang92g9ssfmz0zd2h"; - name = "extra-cmake-modules-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/extra-cmake-modules-5.29.0.tar.xz"; + sha256 = "1n4q1s9q3gnxp050s0kddabbhgl0rfxrpsmfci5vsd92dri6xxs8"; + name = "extra-cmake-modules-5.29.0.tar.xz"; }; }; frameworkintegration = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/frameworkintegration-5.28.0.tar.xz"; - sha256 = "1bcjryngmmyransd5y3zd5ygri13fyy6z7piz3ai9lqmcdbwf7qn"; - name = "frameworkintegration-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/frameworkintegration-5.29.0.tar.xz"; + sha256 = "0ljsrz1yyj09k00q0xx0zps3wi6wrmkqvxrc81kw0qv14d5rxf7b"; + name = "frameworkintegration-5.29.0.tar.xz"; }; }; kactivities = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kactivities-5.28.0.tar.xz"; - sha256 = "162ilqcfp8b3lb3gpzbw94ppsdqzn6i6ymiwh12xy5nrxixdpagb"; - name = "kactivities-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kactivities-5.29.0.tar.xz"; + sha256 = "1mnpqwz6rfv07fmpdccp2fxxf0pdjp2b8jamjfn51zk4krz0vjrr"; + name = "kactivities-5.29.0.tar.xz"; }; }; kactivities-stats = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kactivities-stats-5.28.0.tar.xz"; - sha256 = "0pjgjl5bwmq0n23nwcqjp3b412fsibnvwsr3s3l67k9scmdpbm4v"; - name = "kactivities-stats-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kactivities-stats-5.29.0.tar.xz"; + sha256 = "16cxmp9pzmcap722fclx8xjap56ldslghcn8qj0n8ds5crcd6h80"; + name = "kactivities-stats-5.29.0.tar.xz"; }; }; kapidox = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kapidox-5.28.0.tar.xz"; - sha256 = "1whkl9rzhjnnmpj532d23mlrwhp5wcfxfvq4z4bxyr64g9plbzyq"; - name = "kapidox-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kapidox-5.29.0.tar.xz"; + sha256 = "184jjm3kyb1m1mdqac8h37g4cibni86zan4d52ac00mz7lmibmhp"; + name = "kapidox-5.29.0.tar.xz"; }; }; karchive = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/karchive-5.28.0.tar.xz"; - sha256 = "1s068z0ih6qk3m4lm10wm28y0nq5qwn4gpnx9vckar51xbrl4bb7"; - name = "karchive-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/karchive-5.29.0.tar.xz"; + sha256 = "11i9kj890n2y4mgs3vykfg0r5iva4g3ydk3ywbkcmvryd2hvp4ch"; + name = "karchive-5.29.0.tar.xz"; }; }; kauth = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kauth-5.28.0.tar.xz"; - sha256 = "09m7dipkykw75dbka6mhsvrikbniwshl1l0qxcny3ywc0fkzgf40"; - name = "kauth-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kauth-5.29.0.tar.xz"; + sha256 = "0789q90sk4203x94y508sd03zzd7pll9yg480kbfavqr8bxivigj"; + name = "kauth-5.29.0.tar.xz"; }; }; kbookmarks = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kbookmarks-5.28.0.tar.xz"; - sha256 = "1lfvps0xzpzn42n7rpsdcmsiryclykz6h1hk8sp6nsbhqwzd0r65"; - name = "kbookmarks-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kbookmarks-5.29.0.tar.xz"; + sha256 = "1ipziszcf7hddzi0kd41ddz56m79dy6jz325k37byzmc4xj15abi"; + name = "kbookmarks-5.29.0.tar.xz"; }; }; kcmutils = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kcmutils-5.28.0.tar.xz"; - sha256 = "0wj3f5ykzb7q9536y9wk8mnfcb6zay2mmc25dg67mdznzwdy36aa"; - name = "kcmutils-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kcmutils-5.29.0.tar.xz"; + sha256 = "1winmnr1pdspj3i3qwlblqsppb641yj3bcvl50xy8gh47w1n39q2"; + name = "kcmutils-5.29.0.tar.xz"; }; }; kcodecs = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kcodecs-5.28.0.tar.xz"; - sha256 = "0r01raiva4iddiz5qqshmbmidgkf4q6illanz6zwmc4n66c6s3q3"; - name = "kcodecs-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kcodecs-5.29.0.tar.xz"; + sha256 = "0ki9aws9kfhcchp8qwl696qwcgz4a2z4w1f9rarl7hblhlly0mx7"; + name = "kcodecs-5.29.0.tar.xz"; }; }; kcompletion = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kcompletion-5.28.0.tar.xz"; - sha256 = "1yrlhf6n7xlkid3xbpirf8n6kybc3sqp5fnb01kr1rcl89qs273f"; - name = "kcompletion-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kcompletion-5.29.0.tar.xz"; + sha256 = "1h2yd5gsb24h7k41fcmmbg96i4k3rmqc5pgp6vnb7m767mlcy6kb"; + name = "kcompletion-5.29.0.tar.xz"; }; }; kconfig = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kconfig-5.28.0.tar.xz"; - sha256 = "0kdsaqv880wihxv6il8wailmymh0rh0jrbhg8iz2ljf3ir7g56zy"; - name = "kconfig-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kconfig-5.29.0.tar.xz"; + sha256 = "0izss1hz41pbmfsxa8xlj5f6hx4r5jjpapp1km9926yy104jxhfn"; + name = "kconfig-5.29.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kconfigwidgets-5.28.0.tar.xz"; - sha256 = "0cy53jaq15n8hw2m67l0y6x722ywg0ijfz5ak5vq3fjjhc9fmq8d"; - name = "kconfigwidgets-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kconfigwidgets-5.29.0.tar.xz"; + sha256 = "0xay4kfz3cfhs82h0qp707qflb4vxrar7sh7b7wwkp4s0yhq15fa"; + name = "kconfigwidgets-5.29.0.tar.xz"; }; }; kcoreaddons = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kcoreaddons-5.28.0.tar.xz"; - sha256 = "10x2sgd1acsg1kmb741zk8sbss1j9nncfr1ac2pq0fc236ivkiyb"; - name = "kcoreaddons-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kcoreaddons-5.29.0.tar.xz"; + sha256 = "1xmk9hqrzfn7bix9ch5v7nrl7ff16z1pmz3rghyb06cvvbx3k2z2"; + name = "kcoreaddons-5.29.0.tar.xz"; }; }; kcrash = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kcrash-5.28.0.tar.xz"; - sha256 = "0gsly5wvyh0d6yfk5yyv1pgaazwlwvahz245y9sliwzrbxhgj1yv"; - name = "kcrash-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kcrash-5.29.0.tar.xz"; + sha256 = "097294n52ac2mh55i8cwvx75rfgr12kvpf5zszha97whn0hm9nrv"; + name = "kcrash-5.29.0.tar.xz"; }; }; kdbusaddons = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kdbusaddons-5.28.0.tar.xz"; - sha256 = "07mzb1xr8wyiid25p8kg6mjp6vq8ngvv1ikhq75zvd2cbax530c8"; - name = "kdbusaddons-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kdbusaddons-5.29.0.tar.xz"; + sha256 = "15is9d0kmcwd7qy8annf2y1bqwq3vwcrlqym1pjsifyc5n226b0j"; + name = "kdbusaddons-5.29.0.tar.xz"; }; }; kdeclarative = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kdeclarative-5.28.0.tar.xz"; - sha256 = "1g7bf3smdiwgfhdzwskp3l7l4bn838q1cdy4hp9mzqdssz956wmn"; - name = "kdeclarative-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kdeclarative-5.29.0.tar.xz"; + sha256 = "0ki58bd97a7vw90989msxy9npgha6652qhydn8ks0x8gxd9zwcq3"; + name = "kdeclarative-5.29.0.tar.xz"; }; }; kded = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kded-5.28.0.tar.xz"; - sha256 = "115ywk3vdyhwzna59bpiqfffcc128vafl823yh5fzkwbp8w7qdn5"; - name = "kded-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kded-5.29.0.tar.xz"; + sha256 = "092j7a7jm0h4lc0yphy5z6mg3r29fxjvghajcdla5vfqha33j8pb"; + name = "kded-5.29.0.tar.xz"; }; }; kdelibs4support = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/portingAids/kdelibs4support-5.28.0.tar.xz"; - sha256 = "1l6r2812173p8svazq7sam8c2pgh83hdwf35hv3qn7qw30dpg8jl"; - name = "kdelibs4support-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/portingAids/kdelibs4support-5.29.0.tar.xz"; + sha256 = "1wiilwgyk3rdxha076mz2wpwmpgaprv7j0c8bzk2qqmxph5n9hz1"; + name = "kdelibs4support-5.29.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kdesignerplugin-5.28.0.tar.xz"; - sha256 = "12v9pbfniljp23bllxxq6hfv6qnp2q8yjsix6fy6hwf8yrsq42m3"; - name = "kdesignerplugin-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kdesignerplugin-5.29.0.tar.xz"; + sha256 = "01x8i7rm0c71cql57s7ikwdb03n1i0hkhgf88w24dzwnv7b6l2yg"; + name = "kdesignerplugin-5.29.0.tar.xz"; }; }; kdesu = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kdesu-5.28.0.tar.xz"; - sha256 = "1f6awbnqs14si13n1ryibb0z3mj90bg0vk320hgabd2zxma00vwp"; - name = "kdesu-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kdesu-5.29.0.tar.xz"; + sha256 = "1lkxfss8i641k09h4b5qcf7xiybskfrp8z1zzllcmjfaqfcwwk45"; + name = "kdesu-5.29.0.tar.xz"; }; }; kdewebkit = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kdewebkit-5.28.0.tar.xz"; - sha256 = "19nq6dghnxdzq6xbry283gijsvnzpgp4sl5l3b6xi9n1iq4f91w9"; - name = "kdewebkit-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kdewebkit-5.29.0.tar.xz"; + sha256 = "0xg41ij5in3n08np65wgf5h4qwy4p7y8nlrcn4qakiincif7xqs0"; + name = "kdewebkit-5.29.0.tar.xz"; }; }; kdnssd = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kdnssd-5.28.0.tar.xz"; - sha256 = "1gkqfcz8glfa6krbayaay4kyq3zazcyr21zjg78la76vfnranh0r"; - name = "kdnssd-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kdnssd-5.29.0.tar.xz"; + sha256 = "1bg3z5ng43iy2v081n5ma8lk9qnhks2m95hmfn82wc19jb5lgvja"; + name = "kdnssd-5.29.0.tar.xz"; }; }; kdoctools = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kdoctools-5.28.0.tar.xz"; - sha256 = "1mndmxy7vgdkii8axzkzclqqimg0ksn2dmwiqsljcjcik0zfx47c"; - name = "kdoctools-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kdoctools-5.29.0.tar.xz"; + sha256 = "0zd3zc42avw4ml0i4ayvzif1s0lrg5770q8hvi7m2ycxip2xrfk0"; + name = "kdoctools-5.29.0.tar.xz"; }; }; kemoticons = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kemoticons-5.28.0.tar.xz"; - sha256 = "10qxm9q7bsbbg419f8d0703mikd8w99a8fh501fpm3sgh6k7pbyv"; - name = "kemoticons-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kemoticons-5.29.0.tar.xz"; + sha256 = "0xxm4haxkyqb3sbifbp9k58vb9n79y8h3c5xfxwc3y7xiwbswaba"; + name = "kemoticons-5.29.0.tar.xz"; }; }; kfilemetadata = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kfilemetadata-5.28.0.tar.xz"; - sha256 = "0sxifxzyqq0haxfira8ldq9gwali7p5vbbh8jslj8wlxm0dczyw6"; - name = "kfilemetadata-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kfilemetadata-5.29.0.tar.xz"; + sha256 = "1hliggn5h3mi81hz6d4flrv5d25bqbih6xq6miysrr7ws5vg07c2"; + name = "kfilemetadata-5.29.0.tar.xz"; }; }; kglobalaccel = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kglobalaccel-5.28.0.tar.xz"; - sha256 = "0a60f2bs7dhx0rsrgva2p97dcala6jrjfg4z2nv0m4bv82i4kchc"; - name = "kglobalaccel-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kglobalaccel-5.29.0.tar.xz"; + sha256 = "0wsmnwxnmcgi7rnkvh4vfcvv9pwq1kcd98j5l6h9xwbirz247caz"; + name = "kglobalaccel-5.29.0.tar.xz"; }; }; kguiaddons = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kguiaddons-5.28.0.tar.xz"; - sha256 = "1f3k6g8cqgq49ka9wsfflp0vnqgk81nlp012lb5v875yil6f9m3f"; - name = "kguiaddons-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kguiaddons-5.29.0.tar.xz"; + sha256 = "1cgq04k66xzmawqrgh2xhyl1dmylkcfsf1mgbilanq46niv6v47k"; + name = "kguiaddons-5.29.0.tar.xz"; }; }; khtml = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/portingAids/khtml-5.28.0.tar.xz"; - sha256 = "17dgxicfbpik65m2bjc07qnp2s54wj4zx4czci7v9chfy23d52sb"; - name = "khtml-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/portingAids/khtml-5.29.0.tar.xz"; + sha256 = "1rrhpx5ny868nhd2z52zf4n2kybxv8lciyi3wla0k87gwcdm3ryv"; + name = "khtml-5.29.0.tar.xz"; }; }; ki18n = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/ki18n-5.28.0.tar.xz"; - sha256 = "0ymg8mnpvas101war3pgm3wv8ssf1wxa6mxg9ym1xx24mx7xzhzw"; - name = "ki18n-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/ki18n-5.29.0.tar.xz"; + sha256 = "0w4nqyqi9p92vfi5b07s9k8hjmkj2qdclnyclsdy7lshkxsqfbm7"; + name = "ki18n-5.29.0.tar.xz"; }; }; kiconthemes = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kiconthemes-5.28.0.tar.xz"; - sha256 = "1i5cpsqfn1vcch8izbrgig2km580gdxf02qmib4ynbwzcfvrnbqc"; - name = "kiconthemes-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kiconthemes-5.29.0.tar.xz"; + sha256 = "09dj6v7mvmhbkax35884g729ikfdvazvnhz327vgsb3ybbmx475h"; + name = "kiconthemes-5.29.0.tar.xz"; }; }; kidletime = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kidletime-5.28.0.tar.xz"; - sha256 = "0cwq8jvsimxriiazivls8yix9jyglk2giqwv34a1ic1cnackhwq7"; - name = "kidletime-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kidletime-5.29.0.tar.xz"; + sha256 = "0nnrgi38jn5r2gvmsg3425y1k53g5n5bzbhcf71d484d00740rix"; + name = "kidletime-5.29.0.tar.xz"; }; }; kimageformats = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kimageformats-5.28.0.tar.xz"; - sha256 = "1h17jm55r9ijmng5mb1w9nqk2hw6h965j9c2nrd8wl9dzy616kra"; - name = "kimageformats-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kimageformats-5.29.0.tar.xz"; + sha256 = "0385al48zdnpv2d2g59ls8y8fljlfyflpvrladxcqr75ywsap7xa"; + name = "kimageformats-5.29.0.tar.xz"; }; }; kinit = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kinit-5.28.0.tar.xz"; - sha256 = "0hwa4anljh5v53gswziacwr6ryvhp136k6y85d10074lrckdr912"; - name = "kinit-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kinit-5.29.0.tar.xz"; + sha256 = "0cqh8dljgr72zny4hhypc4j7mc6lrplbdvw262vszq5hqn25dn6n"; + name = "kinit-5.29.0.tar.xz"; }; }; kio = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kio-5.28.0.tar.xz"; - sha256 = "1hqc88c2idi9fkb7jy82csb0i740lghv0p2fg1gaglcarjdz7nia"; - name = "kio-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kio-5.29.0.tar.xz"; + sha256 = "0sswjmbjnfi7sh6j3qzc98jkpp3bwgmfmvg61r484sj65900xkjj"; + name = "kio-5.29.0.tar.xz"; }; }; kitemmodels = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kitemmodels-5.28.0.tar.xz"; - sha256 = "0zi7wsqcmjd7fms8r2vqvwwvzw75p275qyn6whpgblb09l0pn78z"; - name = "kitemmodels-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kitemmodels-5.29.0.tar.xz"; + sha256 = "1ss291hkvyhkzm5v1klrbhkkvw0f35acdf7q2x04ggs06cvryxw3"; + name = "kitemmodels-5.29.0.tar.xz"; }; }; kitemviews = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kitemviews-5.28.0.tar.xz"; - sha256 = "0wrlwawgnz1yjav4hfirc3lcki0hqy0cgr8bwhr9nhm27ndgv28p"; - name = "kitemviews-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kitemviews-5.29.0.tar.xz"; + sha256 = "1872rynqi9pgc0670vhxa5n7r63arh4q1g62sw76xp5s0kzgxpvh"; + name = "kitemviews-5.29.0.tar.xz"; }; }; kjobwidgets = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kjobwidgets-5.28.0.tar.xz"; - sha256 = "0xh62bjd6qqbmx1jbv9qac1ng0h056mwrs8rkdqd8k10ghmsfx6a"; - name = "kjobwidgets-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kjobwidgets-5.29.0.tar.xz"; + sha256 = "0sim3sxz02sg9y1vlp9d5xxby9anx2s10z80iys2mbhw1hw1ivn8"; + name = "kjobwidgets-5.29.0.tar.xz"; }; }; kjs = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/portingAids/kjs-5.28.0.tar.xz"; - sha256 = "0w6zijdk4rabsda9msp5dd2kgg8xrh000chmx17xjqa661bgsfql"; - name = "kjs-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/portingAids/kjs-5.29.0.tar.xz"; + sha256 = "196lnlynnc4kf7hy2zw2dyba5h1mn6l5d1000h50g62fbg8xwh7k"; + name = "kjs-5.29.0.tar.xz"; }; }; kjsembed = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/portingAids/kjsembed-5.28.0.tar.xz"; - sha256 = "0mgcdpmk7sprxk58c63b9c5maz9pyi4b77332ci4ixz9pi94899j"; - name = "kjsembed-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/portingAids/kjsembed-5.29.0.tar.xz"; + sha256 = "1g5ppari446fa4ybjgj5j63fz4grj341019w2s4dqyp05l5sf197"; + name = "kjsembed-5.29.0.tar.xz"; }; }; kmediaplayer = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/portingAids/kmediaplayer-5.28.0.tar.xz"; - sha256 = "139fbhqdhg2pgqadfbig27cnh2p9bds50c0nc9b6pnrwlirl7sm2"; - name = "kmediaplayer-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/portingAids/kmediaplayer-5.29.0.tar.xz"; + sha256 = "0hs6vy28c0f41c8s0ip5ggy96rhrf3p3kb1d69v8z9yi1jd9jhaw"; + name = "kmediaplayer-5.29.0.tar.xz"; }; }; knewstuff = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/knewstuff-5.28.0.tar.xz"; - sha256 = "0p5a6zprqfnhiim0l0qigjy7kky0m4w2nykhllwvr6lda1rg8qs3"; - name = "knewstuff-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/knewstuff-5.29.0.tar.xz"; + sha256 = "1cfkppd1p40lbadrj34lh7msix0bpqmnnc1xwh2wx35va58phrc1"; + name = "knewstuff-5.29.0.tar.xz"; }; }; knotifications = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/knotifications-5.28.0.tar.xz"; - sha256 = "1a55c0abs9yg7qaajgidj8bmfbwkysf24300532lnia71n1ms25s"; - name = "knotifications-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/knotifications-5.29.0.tar.xz"; + sha256 = "0bb6s72p78wiq172fx5f07c55zvd3rackgh1fcgkzg84lnvzx938"; + name = "knotifications-5.29.0.tar.xz"; }; }; knotifyconfig = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/knotifyconfig-5.28.0.tar.xz"; - sha256 = "0riia9lvp33lqh8ld5r1r0adnfnxikbvmdi4k7kfc4pzra93h10f"; - name = "knotifyconfig-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/knotifyconfig-5.29.0.tar.xz"; + sha256 = "1kab22gfb12bc2dl87m13crcrwhf8djdr8cmwrykjdm1ln2a1d4w"; + name = "knotifyconfig-5.29.0.tar.xz"; }; }; kpackage = { - version = "5.28.1"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kpackage-5.28.1.tar.xz"; - sha256 = "0ym5fhhigp7argk7c1zyn2fvfjykgxh3miipidf142c8y3d98vbp"; - name = "kpackage-5.28.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kpackage-5.29.0.tar.xz"; + sha256 = "1hgzwfb0yxd6n8dc8hrkdsrf21s2xzrka69mhzq0giskpbd2m8fs"; + name = "kpackage-5.29.0.tar.xz"; }; }; kparts = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kparts-5.28.0.tar.xz"; - sha256 = "1jghgddgz0ghq6n51l1i6jc1s10g0ckda5nlwh4myziv229g9pik"; - name = "kparts-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kparts-5.29.0.tar.xz"; + sha256 = "0arpaz5qdswyj47z9craijsf4zafh50bw8vvklg1jc385bbgxhv1"; + name = "kparts-5.29.0.tar.xz"; }; }; kpeople = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kpeople-5.28.0.tar.xz"; - sha256 = "0dqz6varz3nrnp8jfysdsp2r2mm46hn3vfcqcyyqk3nmv6sd9mpp"; - name = "kpeople-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kpeople-5.29.0.tar.xz"; + sha256 = "19sb0j5qbi299f752z589cbbh3rjxkzm074v3rj9sqgah1hdssg8"; + name = "kpeople-5.29.0.tar.xz"; }; }; kplotting = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kplotting-5.28.0.tar.xz"; - sha256 = "1vmwxj03qhrfnz3jg30ka28afpqg0hlgm46dbzyg86kg8hc2hgb2"; - name = "kplotting-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kplotting-5.29.0.tar.xz"; + sha256 = "07yz1f5ifjvxsaphbyvbvqzvmc1w6rkb9fh8xglf8z9p9drz23qb"; + name = "kplotting-5.29.0.tar.xz"; }; }; kpty = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kpty-5.28.0.tar.xz"; - sha256 = "1q22wzx5xpmbj56xg4miiscb1xqqk2lfkljfdi87zl05vwmnc7hn"; - name = "kpty-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kpty-5.29.0.tar.xz"; + sha256 = "08b8qg35g9g4rkfn6zwv2kggh6y5wlg33zbj28n1idszq6qpgh7i"; + name = "kpty-5.29.0.tar.xz"; }; }; kross = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/portingAids/kross-5.28.0.tar.xz"; - sha256 = "06qx87v090d5wxbpqj2sgwhpha7gqmamdx4zffdvc0xa6g1mm6x4"; - name = "kross-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/portingAids/kross-5.29.0.tar.xz"; + sha256 = "1q6pm6iv3896y1sj7b8p7agjlzfi9f5qmpbadk499d0rn9c6520v"; + name = "kross-5.29.0.tar.xz"; }; }; krunner = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/krunner-5.28.0.tar.xz"; - sha256 = "1mmbrpgw090z41l2vg350hmm3ya2qkfkjmq7v5d90jpb7z7y6pr9"; - name = "krunner-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/krunner-5.29.0.tar.xz"; + sha256 = "1kjzl239a136p6zpkgj570s5i649hzwrgylq213jh31h251a93qx"; + name = "krunner-5.29.0.tar.xz"; }; }; kservice = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kservice-5.28.0.tar.xz"; - sha256 = "0mlc3vw0vq1rwcg803dsybzlwxj1n6hg13z9sg0h28wsbyss3l4l"; - name = "kservice-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kservice-5.29.0.tar.xz"; + sha256 = "0440hgcwm8p421y8xrlill9n2bzfrr0v8ln7pcm45b09bwsgz5l7"; + name = "kservice-5.29.0.tar.xz"; }; }; ktexteditor = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/ktexteditor-5.28.0.tar.xz"; - sha256 = "1sl152xasbhgpph4f6apkc54b26smgxbd3cxbvch2hfi5cxgb8fq"; - name = "ktexteditor-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/ktexteditor-5.29.0.tar.xz"; + sha256 = "19krz968bxyv9r43gw1nh7fkkfsgsidhg2k9z0p7cplm6asqvdas"; + name = "ktexteditor-5.29.0.tar.xz"; }; }; ktextwidgets = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/ktextwidgets-5.28.0.tar.xz"; - sha256 = "0gwjb0isjfrqd15lvln6bwql1lpk2r1vp5f72zxygz2ay8ar1wxp"; - name = "ktextwidgets-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/ktextwidgets-5.29.0.tar.xz"; + sha256 = "11iwcak2r12wxbkj8i7pg3g1cnymmgh8lvkpbsszkmyisqbyrz27"; + name = "ktextwidgets-5.29.0.tar.xz"; }; }; kunitconversion = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kunitconversion-5.28.0.tar.xz"; - sha256 = "0n6ndy1yarilnk2l09h92qk32v02hknafif1i9mmwcibldvc963q"; - name = "kunitconversion-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kunitconversion-5.29.0.tar.xz"; + sha256 = "1vzmx3wiphi88xc5dh69vj5jdmz0pxzbiiqiqyi38a1nkq7a9pv7"; + name = "kunitconversion-5.29.0.tar.xz"; }; }; kwallet = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kwallet-5.28.0.tar.xz"; - sha256 = "0n25mvjwy3sv5bg2x75psz6d6f8yl53j3wfmx9ayh57jk4rq24rm"; - name = "kwallet-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kwallet-5.29.0.tar.xz"; + sha256 = "15jcn8zg7bz2vn6kwxvj0b6k9kpnx48zrcfa2ibb1rjp71cxgwc1"; + name = "kwallet-5.29.0.tar.xz"; }; }; kwayland = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kwayland-5.28.0.tar.xz"; - sha256 = "0xm4agsv8hyx8aaiv4zpa121s08ayhbps3pbfbds2ckk57k6ba8k"; - name = "kwayland-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kwayland-5.29.0.tar.xz"; + sha256 = "0mz9v7g91im2xwdh5f4ym8z52ylva7kyr0hxl5p88b7y6azxqmz9"; + name = "kwayland-5.29.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kwidgetsaddons-5.28.0.tar.xz"; - sha256 = "1p22s1cbwpwbm03qxs0wqb1i7w1s19b119diwkmb8xl90cqfdwnn"; - name = "kwidgetsaddons-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kwidgetsaddons-5.29.0.tar.xz"; + sha256 = "19hvs3jqmj0jwsjszq6fn7m6d5d80bsd5wz4x8m39w1nmsgj032d"; + name = "kwidgetsaddons-5.29.0.tar.xz"; }; }; kwindowsystem = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kwindowsystem-5.28.0.tar.xz"; - sha256 = "0lzafiwj58gg5vccnvwrhiwjq67y8cn3gllirgw13vz3f69sbr3i"; - name = "kwindowsystem-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kwindowsystem-5.29.0.tar.xz"; + sha256 = "19bzirhkjqn41f9n540wnhrc0y5qvxcbgi87np9ijc3mpkzfn7in"; + name = "kwindowsystem-5.29.0.tar.xz"; }; }; kxmlgui = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kxmlgui-5.28.0.tar.xz"; - sha256 = "0plw6fckpssgwf18f5i4vhfp55jmdvfh2rc5lg8fwmlqgqkvrbac"; - name = "kxmlgui-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kxmlgui-5.29.0.tar.xz"; + sha256 = "1h85hiy58jl25r7d9z43kkybfvd2hjk5l4nmcy9jw5lrmmgnrgq0"; + name = "kxmlgui-5.29.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/kxmlrpcclient-5.28.0.tar.xz"; - sha256 = "1xrdh5ipldahcv0pxp7dnzjz1ihnkg4r2hpylg6bwvq81clw8xd1"; - name = "kxmlrpcclient-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kxmlrpcclient-5.29.0.tar.xz"; + sha256 = "09rw4id0lg5j4ql46vj2pvwnjcn5nk40s0bl03z8jkqygg8w57b2"; + name = "kxmlrpcclient-5.29.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/modemmanager-qt-5.28.0.tar.xz"; - sha256 = "1yfqqp596srvsi0yqrkpm5gzlwjf4szk6hy0wszr12gjjzqprilq"; - name = "modemmanager-qt-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/modemmanager-qt-5.29.0.tar.xz"; + sha256 = "08imlqr8xxah58gcyqv968gbmamf2xkjg31cs32h79yqcddjpvrd"; + name = "modemmanager-qt-5.29.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/networkmanager-qt-5.28.0.tar.xz"; - sha256 = "1iq8xrw55k2k9af57l4lfrw72gjxgk7pp7k3m7amjfp0hdqw8602"; - name = "networkmanager-qt-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/networkmanager-qt-5.29.0.tar.xz"; + sha256 = "0km2yv0gpl584n6vh27d0q0lrrmc79hpcfxwihwk6g5rrlv5qnba"; + name = "networkmanager-qt-5.29.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/oxygen-icons5-5.28.0.tar.xz"; - sha256 = "05bypc4k86lsjp7d4lpbpsnms7k1gnjyahdbks420585ca0v4qkp"; - name = "oxygen-icons5-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/oxygen-icons5-5.29.0.tar.xz"; + sha256 = "1j9jxlfzndzimvk0zvk5nqqnic5bj04yg4a0v9kqlmr8l1mj4g4k"; + name = "oxygen-icons5-5.29.0.tar.xz"; }; }; plasma-framework = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/plasma-framework-5.28.0.tar.xz"; - sha256 = "0j4mfd8wzrspvyy281lww981fly2rkbhnixb9b0pj5k9i8gvkh7q"; - name = "plasma-framework-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/plasma-framework-5.29.0.tar.xz"; + sha256 = "1c341i5gvm65mk8dhwn61fmw0hc1npvj3mcwz0gy1ynkgch6afrh"; + name = "plasma-framework-5.29.0.tar.xz"; + }; + }; + prison = { + version = "5.29.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.29/prison-5.29.0.tar.xz"; + sha256 = "0hc7gk1xxhk5s6fk6rm822kpbr2k0kc40xpjg07gpglbvnxdbr7l"; + name = "prison-5.29.0.tar.xz"; }; }; solid = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/solid-5.28.0.tar.xz"; - sha256 = "0g6frc7hckbkvzgq40qrymllgp56a3v39l5d2ajqipwb4kabhdpy"; - name = "solid-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/solid-5.29.0.tar.xz"; + sha256 = "01y9fqar113bjh5l8mh03xwgv1j88ivnb1rxjcpgilv63qx2cw9k"; + name = "solid-5.29.0.tar.xz"; }; }; sonnet = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/sonnet-5.28.0.tar.xz"; - sha256 = "1vzn3kvi126jnkq2s5110yii8946kaxp452735fx0l0jqjn92dy8"; - name = "sonnet-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/sonnet-5.29.0.tar.xz"; + sha256 = "0rb9fslf6y694cwbng198r21nrid07gzirn3c11g91skskh8sd90"; + name = "sonnet-5.29.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/syntax-highlighting-5.28.0.tar.xz"; - sha256 = "0gf1ldlk4gav6bg5b1231hphaal4simyngirvr1yizcb1rrlygdy"; - name = "syntax-highlighting-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/syntax-highlighting-5.29.0.tar.xz"; + sha256 = "0fbqkj3qsai3m322d2qmvh93h35sx7wdc28jxp8v8yddl59a1k6b"; + name = "syntax-highlighting-5.29.0.tar.xz"; }; }; threadweaver = { - version = "5.28.0"; + version = "5.29.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.28/threadweaver-5.28.0.tar.xz"; - sha256 = "10hy4pvw84l2z8778gsfv5i8pqrfjidvlgd5rc8xffx65s3f28b5"; - name = "threadweaver-5.28.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/threadweaver-5.29.0.tar.xz"; + sha256 = "0sl9r6dz4l63f40a15kzsgqrsvdaxnm1rqkj61za8cbdbk2q42g6"; + name = "threadweaver-5.29.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix new file mode 100644 index 000000000000..24b1bbc4f674 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -0,0 +1,9 @@ +{ kdeFramework, lib +, ecm, perl +}: + +kdeFramework { + name = "syntax-highlighting"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ ecm perl ]; +} From 8e7ea1795a4cb5879f3d678004115d1a50f1b555 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 14 Dec 2016 08:53:49 +0900 Subject: [PATCH 1479/1749] firefox-bin: fix updateScript --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 219f208af71e..c640266539a1 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -223,7 +223,7 @@ stdenv.mkDerivation { tr " " ":"`; do # create an entry for every locale cat >> $tmpfile < Date: Wed, 14 Dec 2016 09:03:56 +0900 Subject: [PATCH 1480/1749] firefox: 50.0.2 -> 50.1.0, firefox-esr: 45.5.1esr -> 45.6.0esr --- pkgs/applications/networking/browsers/firefox/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 6000f2602312..a170b7fbab82 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -147,14 +147,14 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "50.0.2"; - sha512 = "cfcc3e5a703e4d3284e3b3dcb34e5f77825e5a98b49a75bf22f8ac431c0429e6cd21c4e1f5e046fe82899cb4d2bc5b7a432b306c4af35034d83a9f351393f7fd"; + version = "50.1.0"; + sha512 = "2jwpk3aymkcq9f4xhzc31sb1c90vy3dvyqq2hvw97vk9dw7rgvv2cki10ns5cshbc4k57yd3j8nm7ppy2kw6na6771mj6sbijdjw39p"; }; firefox-esr-unwrapped = common { pname = "firefox-esr"; - version = "45.5.1esr"; - sha512 = "36c56e1486a6a35f71526bd81d01fb4fc2b9df852eb2feb39b77c902fcf90d713d8fcdcd6113978630345e1ed36fa5cf0df6da7b6bf7e85a84fe014cb11f9a03"; + version = "45.6.0esr"; + sha512 = "086ci461hmz6kdn0ly9dlc723gc117si4a11a1c51gh79hczhahdaxg5s4r3k59rb43gpwxrlvm4wx1aka36bsihnh8a4caxnp72v5r"; }; } From 7d134fc8368a66824a440c8f97435401d7141c75 Mon Sep 17 00:00:00 2001 From: Leonardo Taglialegne Date: Wed, 14 Dec 2016 01:05:14 +0100 Subject: [PATCH 1481/1749] Fix typo in configuration-hackage2nix.yaml (#21129) --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 265edae2157b..24c9c50e850a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -33,7 +33,7 @@ core-packages: # Hack: The following package is a core package of GHCJS. If we don't declare # it, then hackage2nix will generate a Hackage database where all dependants - # if this library are maked as "broken". + # of this library are maked as "broken". - ghcjs-base-0 default-package-overrides: From 96be6a11a85e9e253cf733e57ce7c67fd1a3b81c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 14 Dec 2016 02:54:13 +0100 Subject: [PATCH 1482/1749] torbrowser: support H.264 playback Fixes https://github.com/NixOS/nixpkgs/issues/20840 Some notes for future reference: - Firefox only supports legacy gstreamer (0.10) - gmp and ffmpeg are appearantly used by gst-ffmpeg so must be in the library search path - Setting GST_DEBUG="*:3" or so was useful in figuring out what to add --- pkgs/tools/security/tor/torbrowser.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index d0484b251a49..0368d9d7a0bd 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -1,13 +1,20 @@ { stdenv, fetchurl, makeDesktopItem , libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2 , atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib +, gstreamer, gst_plugins_base, gst_plugins_good, gst_ffmpeg, gmp, ffmpeg }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt + gstreamer gst_plugins_base gmp ffmpeg ]; + + gstPlugins = [ gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg ]; + + gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x: + "${x}/lib/gstreamer-0.10") gstPlugins; in stdenv.mkDerivation rec { @@ -66,6 +73,7 @@ stdenv.mkDerivation rec { fi export FONTCONFIG_PATH=\$HOME/Data/fontconfig export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor + export GST_PLUGIN_SYSTEM_PATH=${gstPluginsPath} exec $out/share/tor-browser/Browser/firefox --class "Tor Browser" -no-remote -profile ~/Data/Browser/profile.default "\$@" EOF chmod +x $out/bin/tor-browser From 22211307104f10ab788c4c3afee7aa81a82239de Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 14 Dec 2016 03:09:44 +0100 Subject: [PATCH 1483/1749] torbrowser: support pulseaudio playback --- pkgs/tools/security/tor/torbrowser.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 0368d9d7a0bd..6354d3c538eb 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -2,6 +2,7 @@ , libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2 , atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib , gstreamer, gst_plugins_base, gst_plugins_good, gst_ffmpeg, gmp, ffmpeg +, libpulseaudio }: let @@ -9,7 +10,8 @@ let stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt gstreamer gst_plugins_base gmp ffmpeg - ]; + libpulseaudio + ] ; gstPlugins = [ gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg ]; From 05fb82732c97582ecf0a35ed81111ab5d1c088d4 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Tue, 13 Dec 2016 21:23:16 -0500 Subject: [PATCH 1484/1749] use symlink to ensure cupsd.conf PATH always points to a valid store path even if cups rewrites its config file due to config changes made through its web-based management UI, we need to keep the PATH pointing to currently-live nix store directories. fixes #20806. --- nixos/modules/services/printing/cupsd.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 368d7ac761ac..3041dccfd154 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -75,7 +75,7 @@ let '') cfg.listenAddresses} Listen /var/run/cups/cups.sock - SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin + SetEnv PATH /var/lib/cups/path/lib/cups/filter:/var/lib/cups/path/bin DefaultShared ${if cfg.defaultShared then "Yes" else "No"} @@ -310,6 +310,13 @@ in for i in *; do [ ! -e "/var/lib/cups/$i" ] && ln -s "${rootdir}/etc/cups/$i" "/var/lib/cups/$i" done + + #update path reference + [ -L /var/lib/cups/path ] && \ + rm /var/lib/cups/path + [ ! -e /var/lib/cups/path ] && \ + ln -s ${bindir} /var/lib/cups/path + ${optionalString cfg.gutenprint '' if [ -d /var/lib/cups/ppd ]; then ${gutenprint}/bin/cups-genppdupdate -p /var/lib/cups/ppd From b55cef75149cd9cf71e9d0da8fbf87cbdbfefb52 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 14 Dec 2016 03:43:47 +0100 Subject: [PATCH 1485/1749] torbrowser: prefer local builds The build consists of downloading some stuff & writing a wrapper, the additional Hydra load is hardly justified. --- pkgs/tools/security/tor/torbrowser.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 6354d3c538eb..f08d741f6938 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { "0zvqf444h35ikv1f3nwkh2jx51zj5k9w4zdxx32zcrnxpk5nhn97"; }; + preferLocalBuild = true; + desktopItem = makeDesktopItem { name = "torbrowser"; exec = "tor-browser"; From 52cb1df30c0413752a85a9fb01d48c1a3dba69ce Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 14 Dec 2016 03:48:20 +0100 Subject: [PATCH 1486/1749] kodi/wrapper: fix typo, preferLocalBuilds -> preferLocalBuild --- pkgs/applications/video/kodi/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index efd0f257ca01..e6d3fbb090fc 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { done) ''; - preferLocalBuilds = true; + preferLocalBuild = true; meta = with kodi.meta; { inherit license homepage; From b26b37d8663371529dee39bc649ff0c78249d4cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 4 Dec 2016 22:10:24 +0000 Subject: [PATCH 1487/1749] glide: 0.12.2 -> 0.12.3 --- pkgs/development/tools/glide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix index 66335412b497..4f853e900b39 100644 --- a/pkgs/development/tools/glide/default.nix +++ b/pkgs/development/tools/glide/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "glide-${version}"; - version = "0.12.2"; - + version = "0.12.3"; + goPackagePath = "github.com/Masterminds/glide"; src = fetchFromGitHub { rev = "v${version}"; owner = "Masterminds"; repo = "glide"; - sha256 = "15cdrcslkiggd6sg5j40amflydpqz1s63f13mvlg309adfhsk4qz"; + sha256 = "0hvfikvxfk94aqms1bdxqxqpamzy0v8binv5jwglzw2sf2437ww0"; }; meta = with stdenv.lib; { From e065861a4f3adb07df55f756a7bcaf894a0383ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 14 Dec 2016 10:26:20 +0100 Subject: [PATCH 1488/1749] buildGoPackage: reduce the default meta.platforms platforms.all makes no sense as go.meta.platforms is smaller. Discussion: https://github.com/NixOS/nixpkgs/pull/20923#issuecomment-266763319 --- pkgs/development/go-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index d3a31f321892..c707592e4ae3 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -211,7 +211,7 @@ go.stdenv.mkDerivation ( meta = { # Add default meta information - platforms = lib.platforms.all; + platforms = go.meta.platforms or lib.platforms.all; } // meta // { # add an extra maintainer to every package maintainers = (meta.maintainers or []) ++ From f8a28b8f69ff77ac2ec883cdd134504ce5b95834 Mon Sep 17 00:00:00 2001 From: Samuel Rivas Date: Wed, 14 Dec 2016 10:56:20 +0100 Subject: [PATCH 1489/1749] terraform 0.7.11 -> 0.7.13 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 1c481adcf1ea..119e33e4d1e3 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.11"; + version = "0.7.13"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "0rmzhf2rwxci57ll5nv2vvmic9cn64dbbg1fb5g78njljzpsc5qw"; + sha256 = "0s23gc9rlnsg6x8llxnnw30b9c5kndy73jimrfxpqb4mha7mjn5n"; }; postInstall = '' From 08b3e3944ba6fcbf24ebb1a50482a59f9ad6eded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 14 Dec 2016 11:05:01 +0100 Subject: [PATCH 1490/1749] telegraf: 1.1.1 -> 1.1.2 --- pkgs/servers/monitoring/telegraf/default.nix | 4 ++-- .../monitoring/telegraf/{deps-1.1.1.nix => deps-1.1.2.nix} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/servers/monitoring/telegraf/{deps-1.1.1.nix => deps-1.1.2.nix} (99%) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index a29c6e16fa85..996c839acff9 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.1.1"; + version = "1.1.2"; goPackagePath = "github.com/influxdata/telegraf"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "0i3bmfs54s6m8im5gjm5ccyz31gpvp9cghxjxj46l0g77ncij7dj"; + sha256 = "0dgrbdyz261j28wcq636125ha4xmfgh4y9shlg8m1y6jqdqd2zf2"; }; goDeps = ./. + builtins.toPath "/deps-${version}.nix"; diff --git a/pkgs/servers/monitoring/telegraf/deps-1.1.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.1.2.nix similarity index 99% rename from pkgs/servers/monitoring/telegraf/deps-1.1.1.nix rename to pkgs/servers/monitoring/telegraf/deps-1.1.2.nix index c7c2468f9a11..b62ae44dbc92 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.1.1.nix +++ b/pkgs/servers/monitoring/telegraf/deps-1.1.2.nix @@ -446,8 +446,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "1516eb9ddc5e61ba58874047a98f8b44b5e585e8"; - sha256 = "1pnl1g2l1y5vmnraq97rbm0nirprqvfzxsp6h4xacn1429jdl5bv"; + rev = "4d0c402af66c78735c5ccf820dc2ca7de5e4ff08"; + sha256 = "1wkp7chzpz6brq2y0k2mvsf0iaknns279wfsjn5gm6gvih49lqni"; }; } { From 321987a1b80f02e80437fcd0541dd3d582e6222e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Dec 2016 07:06:19 -0600 Subject: [PATCH 1491/1749] kpackage: patch for package name collisions --- .../kde-frameworks/kpackage/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index 76ab7dbe013a..c3b89a05d198 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, copyPathsToStore +{ kdeFramework, fetchurl, lib, copyPathsToStore , ecm , karchive , kconfig @@ -12,5 +12,18 @@ kdeFramework { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = + copyPathsToStore (lib.readPathsFromFile ./. ./series) + ++ [ + (fetchurl { + url = "https://cgit.kde.org/kpackage.git/patch/?id=26e59d58438cc777873a6afc7817418ec735aaa3"; + sha256 = "05ad3awdq8cz1bmnhnf1lapvm70z5qc8sbdzrcgxlka7wzdbm5lw"; + name = "fix-cmake-failure-package-id-collision.patch"; + }) + (fetchurl { + url = "https://cgit.kde.org/kpackage.git/patch/?id=17915200921836d61266ad93dd6c3b87db1dc9e4"; + sha256 = "07irfx297lf39cyrv10i3q4z04fr8msm6pcp8mcwvss4gih05b74"; + name = "fix-cmake-failure-package-id-collision.patch"; + }) + ]; } From fa0a63ec13bcd87710c10a29ba3489374333c4ef Mon Sep 17 00:00:00 2001 From: Renaud Date: Wed, 14 Dec 2016 14:58:02 +0100 Subject: [PATCH 1492/1749] fail2ban service : improve ssh jail (#21131) Improvement to the ssh-iptables to block the port(s) actually defined for sshd in config.services.openssh.ports --- nixos/modules/services/security/fail2ban.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index 22e3bb0066cc..716ae7a2d2f4 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -143,7 +143,7 @@ in services.fail2ban.jails.ssh-iptables = '' filter = sshd - action = iptables[name=SSH, port=ssh, protocol=tcp] + action = iptables-multiport[name=SSH, port="${concatMapStringsSep "," (p: toString p) config.services.openssh.ports}", protocol=tcp] maxretry = 5 ''; From 88f53c989e8aa92f2b5bebb4af7e37470445d838 Mon Sep 17 00:00:00 2001 From: bnikolic Date: Wed, 14 Dec 2016 14:03:54 +0000 Subject: [PATCH 1493/1749] bazaar: enable sftp transport (#21132) SFTP transport needs python paramiko package, which is now an optional input --- pkgs/applications/version-management/bazaar/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index a397acddbcfa..47d667a0c067 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python2Packages +, withSFTP ? true + }: python2Packages.buildPythonApplication rec { version = "2.7"; @@ -12,6 +14,9 @@ python2Packages.buildPythonApplication rec { doCheck = false; + propagatedBuildInputs = [] + ++ stdenv.lib.optionals withSFTP [ python2Packages.paramiko ]; + # Bazaar can't find the certificates alone patches = [ ./add_certificates.patch ]; postPatch = '' From 4d2406c7d5b49632b390cc3bb4f41c99a0c330d9 Mon Sep 17 00:00:00 2001 From: Joris Guyonvarch Date: Wed, 14 Dec 2016 15:22:00 +0100 Subject: [PATCH 1494/1749] ffcast: init at 2.5.0 (#21141) --- lib/maintainers.nix | 1 + pkgs/tools/X11/ffcast/default.nix | 32 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/tools/X11/ffcast/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 664c50dd5794..a1a61f97e299 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -188,6 +188,7 @@ gridaphobe = "Eric Seidel "; guibert = "David Guibert "; guillaumekoenig = "Guillaume Koenig "; + guyonvarch = "Joris Guyonvarch "; hakuch = "Jesse Haber-Kucharsky "; havvy = "Ryan Scheel "; hbunke = "Hendrik Bunke "; diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix new file mode 100644 index 000000000000..936805ed17ca --- /dev/null +++ b/pkgs/tools/X11/ffcast/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, autoconf, automake, perl, libX11 }: + +stdenv.mkDerivation rec { + name = "ffcast-${version}"; + version = "2.5.0"; + rev = "7c3bf681e7ca9b242e55dbf0c07856ed994d94e9"; + + src = fetchgit { + url = https://github.com/lolilolicon/FFcast; + sha256 = "1s1y6rqjq126jvdzc75wz20szisbz8h8fkphlwxcxzl9xll17akj"; + }; + + buildInputs = [ autoconf automake perl libX11 ]; + + preConfigure = '' + ./bootstrap + ''; + + configureFlags = [ "--enable-xrectsel" ]; + + postBuild = '' + make DESTDIR="$out" install + ''; + + meta = with stdenv.lib; { + description = "Run commands on rectangular screen regions"; + homepage = https://github.com/lolilolicon/FFcast; + license = licenses.gpl3; + maintainers = [ maintainers.guyonvarch ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1882397933b..48cf5d105bd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6958,6 +6958,8 @@ in fcgi = callPackage ../development/libraries/fcgi { }; + ffcast = callPackage ../tools/X11/ffcast { }; + fflas-ffpack = callPackage ../development/libraries/fflas-ffpack {}; fflas-ffpack_1 = callPackage ../development/libraries/fflas-ffpack/1.nix {}; From b139b17fa88132df2c0afd9f614ca44bf2fd4448 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 14 Dec 2016 09:30:31 -0500 Subject: [PATCH 1495/1749] subversion: 1.9.4 -> 1.9.5 --- pkgs/applications/version-management/subversion/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 034bde6911ec..1fbedcaf9d7e 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -103,15 +103,13 @@ let }); in { - subversion18 = common { version = "1.8.16"; sha256 = "0imkxn25n6sbcgfldrx4z29npjprb1lxjm5fb89q4297161nx3zi"; }; subversion19 = common { - version = "1.9.4"; - sha256 = "16cjkvvq628hbznkhqkppzs8nifcr7k43s5y4c32cgwqmgigjrqj"; + version = "1.9.5"; + sha256 = "1ramwly6p74jhb2rdm5ygxjri7jds940cilyvnsdq60xzy5cckwa"; }; - } From a21a11bae2e1cb72bead14825037f1cf0451677f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 4 Dec 2016 20:44:56 +0100 Subject: [PATCH 1496/1749] LTS Haskell 7.13 --- .../configuration-hackage2nix.yaml | 137 +++++++++--------- 1 file changed, 70 insertions(+), 67 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 24c9c50e850a..220b7bc8dc21 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.11 + # LTS Haskell 7.13 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -146,7 +146,7 @@ default-package-overrides: - app-settings ==0.2.0.9 - appar ==0.1.4 - apply-refact ==0.3.0.0 - - arbtt ==0.9.0.10 + - arbtt ==0.9.0.11 - arithmoi ==0.4.3.0 - array-memoize ==0.6.0 - arrow-list ==0.7 @@ -170,7 +170,7 @@ default-package-overrides: - auto-update ==0.1.4 - autoexporter ==0.2.2 - aws ==0.14.1 - - b9 ==0.5.21 + - b9 ==0.5.30 - bake ==0.4 - bank-holidays-england ==0.1.0.5 - base-compat ==0.9.1 @@ -197,7 +197,7 @@ default-package-overrides: - binary-orphans ==0.1.5.1 - binary-parser ==0.5.2 - binary-search ==1.0.0.3 - - binary-tagged ==0.1.4.1 + - binary-tagged ==0.1.4.2 - binary-typed ==1.0 - bindings-DSL ==1.0.23 - bindings-GLFW ==3.1.2.2 @@ -223,8 +223,8 @@ default-package-overrides: - blastxml ==0.3.2 - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.0.2 - - blaze-html ==0.8.1.2 - - blaze-markup ==0.7.1.0 + - blaze-html ==0.8.1.3 + - blaze-markup ==0.7.1.1 - blaze-svg ==0.3.6 - blaze-textual ==0.2.1.0 - bloodhound ==0.11.0.0 @@ -236,7 +236,7 @@ default-package-overrides: - both ==0.1.1.0 - BoundedChan ==1.0.3.0 - boundingboxes ==0.2.3 - - bower-json ==0.8.0 + - bower-json ==0.8.1 - boxes ==0.1.4 - broadcast-chan ==0.1.1 - bson ==0.3.2.3 @@ -251,7 +251,7 @@ default-package-overrides: - byteset ==0.1.1.0 - bytestring-builder ==0.10.8.1.0 - bytestring-conversion ==0.3.1 - - bytestring-handle ==0.1.0.4 + - bytestring-handle ==0.1.0.5 - bytestring-lexing ==0.5.0.2 - bytestring-progress ==1.0.7 - bytestring-tree-builder ==0.2.7.1 @@ -259,12 +259,12 @@ default-package-overrides: - bzlib ==0.5.0.5 - bzlib-conduit ==0.2.1.4 - c2hs ==0.28.1 - - Cabal ==1.24.1.0 + - Cabal ==1.24.2.0 - cabal-dependency-licenses ==0.1.2.0 - - cabal-file-th ==0.2.3 + - cabal-file-th ==0.2.4 - cabal-helper ==0.7.2.0 - cabal-install ==1.24.0.1 - - cabal-rpm ==0.10.0 + - cabal-rpm ==0.10.1 - cabal-sort ==0.0.5.3 - cabal-src ==0.3.0.2 - cache ==0.1.0.0 @@ -281,7 +281,7 @@ default-package-overrides: - cassava-conduit ==0.3.2 - cassava-megaparsec ==0.1.0 - cassette ==0.1.0 - - cayley-client ==0.2.1.0 + - cayley-client ==0.2.1.1 - cereal ==0.5.4.0 - cereal-conduit ==0.7.3 - cereal-text ==0.1.0.2 @@ -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.1 - - classy-prelude-conduit ==1.0.1 - - classy-prelude-yesod ==1.0.1 + - classy-prelude ==1.0.2 + - classy-prelude-conduit ==1.0.2 + - classy-prelude-yesod ==1.0.2 - clay ==0.11 - clckwrks ==0.23.19.2 - clckwrks-cli ==0.2.16 @@ -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.2 + - conduit-combinators ==1.0.8.3 - conduit-extra ==1.1.15 - conduit-iconv ==0.1.1.1 - conduit-parse ==0.1.2.0 @@ -454,7 +454,7 @@ default-package-overrides: - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.0.1.3 - - direct-sqlite ==2.3.18 + - direct-sqlite ==2.3.19 - directory-tree ==0.12.1 - discount ==0.1.1 - disk-free-space ==0.1.0.1 @@ -491,7 +491,7 @@ default-package-overrides: - easy-file ==0.2.1 - Ebnf2ps ==1.0.15 - ed25519 ==0.0.5.0 - - ede ==0.2.8.5 + - ede ==0.2.8.6 - EdisonAPI ==1.3.1 - EdisonCore ==1.3.1.1 - edit-distance ==0.2.2.1 @@ -515,7 +515,7 @@ default-package-overrides: - eq ==4.0.4 - equivalence ==0.3.1 - erf ==2.0.0.0 - - errors ==2.1.2 + - errors ==2.1.3 - ersatz ==0.3.1 - etcd ==1.0.5 - ether ==0.4.0.2 @@ -525,7 +525,7 @@ default-package-overrides: - exact-combinatorics ==0.2.0.8 - exact-pi ==0.4.1.2 - exception-mtl ==0.4.0.1 - - exception-transformers ==0.4.0.4 + - exception-transformers ==0.4.0.5 - exceptional ==0.3.0.0 - exceptions ==0.8.3 - executable-hash ==0.2.0.2 @@ -587,7 +587,7 @@ default-package-overrides: - foreign-store ==0.2 - formatting ==6.2.4 - fortran-src ==0.1.0.4 - - Frames ==0.1.6 + - Frames ==0.1.8 - free ==4.12.4 - free-vl ==0.1.4 - freenect ==1.2.1 @@ -607,9 +607,11 @@ default-package-overrides: - generic-xmlpickler ==0.1.0.5 - GenericPretty ==1.2.1 - generics-eot ==0.2.1.1 - - generics-sop ==0.2.2.0 - - generics-sop-lens ==0.1.2.0 + - generics-sop ==0.2.3.0 + - generics-sop-lens ==0.1.2.1 - geniplate-mirror ==0.7.4 + - genvalidity ==0.2.0.4 + - genvalidity-hspec ==0.2.0.5 - getopt-generics ==0.13 - ghc-events ==0.4.4.0 - ghc-exactprint ==0.5.2.1 @@ -798,7 +800,7 @@ default-package-overrides: - hashable ==1.2.4.0 - hashable-extras ==0.2.3 - hashable-time ==0.2 - - hashmap ==1.3.1.1 + - hashmap ==1.3.2 - hashtables ==1.2.1.0 - haskeline ==0.7.2.3 - haskell-gi ==0.18 @@ -817,7 +819,7 @@ default-package-overrides: - haskoin-core ==0.4.0 - hasql ==0.19.15.2 - hastache ==0.6.1 - - hasty-hamiltonian ==1.1.4 + - hasty-hamiltonian ==1.1.5 - HaTeX ==3.17.0.2 - hatex-guide ==1.3.1.5 - hbayes ==0.5.2 @@ -831,7 +833,7 @@ default-package-overrides: - heap ==1.0.3 - heaps ==0.3.3 - hebrew-time ==0.1.1 - - hedis ==0.9.4 + - hedis ==0.9.5 - here ==1.2.9 - heredoc ==0.2.0.0 - hex ==0.1.2 @@ -844,7 +846,7 @@ default-package-overrides: - hidapi ==0.1.4 - hierarchical-clustering ==0.4.6 - highlighting-kate ==0.6.3 - - hinotify ==0.3.8.1 + - hinotify ==0.3.9 - hint ==0.6.0 - histogram-fill ==0.8.4.1 - hit ==0.6.3 @@ -874,7 +876,6 @@ default-package-overrides: - hostname ==1.0 - hostname-validate ==1.0.0 - hourglass ==0.2.10 - - hpack ==0.14.1 - hpack-convert ==0.14.6 - hpc-coveralls ==1.0.6 - hPDB ==1.2.0.9 @@ -994,7 +995,7 @@ default-package-overrides: - inline-r ==0.9.0.0 - insert-ordered-containers ==0.1.0.1 - integration ==0.2.1 - - intero ==0.1.19 + - intero ==0.1.20 - interpolate ==0.1.0 - interpolatedstring-perl6 ==1.0.0 - IntervalMap ==0.5.2.0 @@ -1033,7 +1034,7 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.1.1 - json ==0.9.1 - - json-autotype ==1.0.14 + - json-autotype ==1.0.15 - json-rpc-generic ==0.2.1.2 - json-schema ==0.7.4.1 - JuicyPixels ==3.2.8 @@ -1053,7 +1054,7 @@ default-package-overrides: - kraken ==0.0.3 - lackey ==0.4.1 - language-c ==0.5.0 - - language-c-quote ==0.11.7 + - language-c-quote ==0.11.7.1 - language-dockerfile ==0.3.5.0 - language-ecmascript ==0.17.1.0 - language-fortran ==0.5.1 @@ -1091,6 +1092,7 @@ default-package-overrides: - lift-generics ==0.1.1 - lifted-async ==0.9.0 - lifted-base ==0.2.3.8 + - line ==1.0.1.0 - linear ==1.20.5 - linear-accelerate ==0.2 - linux-file-extents ==0.2.0.0 @@ -1120,18 +1122,18 @@ default-package-overrides: - markdown ==0.1.16 - markdown-unlit ==0.4.0 - markup ==3.1.0 - - math-functions ==0.2.0.2 - - matrices ==0.4.3 + - math-functions ==0.2.1.0 + - matrices ==0.4.4 - matrix ==0.3.5.0 - maximal-cliques ==0.1.1 - mbox ==0.3.3 - - mcmc-types ==1.0.2 + - mcmc-types ==1.0.3 - megaparsec ==5.0.1 - memory ==0.13 - MemoTrie ==0.6.4 - mersenne-random ==1.0.0.1 - mersenne-random-pure64 ==0.2.0.5 - - messagepack ==0.5.3 + - messagepack ==0.5.4 - messagepack-rpc ==0.5.1 - metrics ==0.3.0.2 - MFlow ==0.4.6.0 @@ -1143,8 +1145,8 @@ default-package-overrides: - microlens-mtl ==0.1.10.0 - microlens-platform ==0.3.7.0 - microlens-th ==0.4.1.0 - - mighty-metropolis ==1.0.3 - - mime-mail ==0.4.11 + - mighty-metropolis ==1.0.4 + - mime-mail ==0.4.12 - mime-mail-ses ==0.3.2.3 - mime-types ==0.1.0.7 - misfortune ==0.1.1.2 @@ -1163,7 +1165,7 @@ default-package-overrides: - monad-logger ==0.3.20.1 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.6 - - monad-logger-syslog ==0.1.2.0 + - monad-logger-syslog ==0.1.3.0 - monad-loops ==0.4.3 - monad-par ==0.3.4.8 - monad-par-extras ==0.3.3 @@ -1205,7 +1207,7 @@ default-package-overrides: - mustache ==2.1.2 - mutable-containers ==0.3.3 - mwc-probability ==1.2.2 - - mwc-random ==0.13.4.0 + - mwc-random ==0.13.5.0 - mwc-random-monad ==0.7.3.1 - nagios-check ==0.3.2 - names-th ==0.2.0.2 @@ -1261,7 +1263,7 @@ default-package-overrides: - opaleye-trans ==0.3.3 - open-browser ==0.2.1.0 - OpenGL ==3.0.1.0 - - OpenGLRaw ==3.2.3.0 + - OpenGLRaw ==3.2.4.0 - openpgp-asciiarmor ==0.1 - opensource ==0.1.0.0 - openssl-streams ==1.2.1.0 @@ -1284,16 +1286,16 @@ default-package-overrides: - pagination ==0.1.1 - palette ==0.1.0.4 - pandoc ==1.17.1 - - pandoc-citeproc ==0.10.2.2 + - pandoc-citeproc ==0.10.3 - pandoc-types ==1.16.1.1 - pango ==0.13.3.1 - parallel ==3.2.1.0 - parallel-io ==0.3.3 - - parseargs ==0.2.0.7 + - parseargs ==0.2.0.8 - parsec ==3.1.11 - parsers ==0.12.4 - partial-handler ==1.0.2 - - path ==0.5.9 + - path ==0.5.11 - path-extra ==0.0.3 - path-io ==1.2.0 - path-pieces ==0.2.1 @@ -1329,22 +1331,22 @@ default-package-overrides: - pipes-aeson ==0.4.1.7 - pipes-attoparsec ==0.5.1.4 - pipes-bgzf ==0.2.0.1 - - pipes-bytestring ==2.1.3 + - pipes-bytestring ==2.1.4 - pipes-cacophony ==0.4.0 - pipes-cliff ==0.12.0.0 - - pipes-concurrency ==2.0.6 + - pipes-concurrency ==2.0.7 - pipes-csv ==1.4.3 - - pipes-extras ==1.0.7 + - pipes-extras ==1.0.8 - pipes-fastx ==0.3.0.0 - - pipes-group ==1.0.5 + - pipes-group ==1.0.6 - pipes-http ==1.0.4 - pipes-illumina ==0.1.0.0 - pipes-mongodb ==0.1.0.0 - pipes-network ==0.6.4.1 - - pipes-parse ==3.0.7 - - pipes-random ==1.0.0.1 + - pipes-parse ==3.0.8 + - pipes-random ==1.0.0.2 - pipes-safe ==2.2.4 - - pipes-text ==0.0.2.4 + - pipes-text ==0.0.2.5 - pipes-wai ==3.2.0 - pixelated-avatar-generator ==0.1.3 - pkcs10 ==0.1.1.0 @@ -1398,7 +1400,7 @@ default-package-overrides: - proxied ==0.2 - psql-helpers ==0.1.0.0 - PSQueue ==1.1 - - psqueues ==0.2.2.2 + - psqueues ==0.2.2.3 - publicsuffix ==0.20160716 - pure-cdb ==0.1.2 - pure-io ==0.2.1 @@ -1439,7 +1441,7 @@ default-package-overrides: - read-editor ==0.1.0.2 - read-env-var ==0.1.0.1 - readable ==0.3.1 - - ReadArgs ==1.2.2 + - ReadArgs ==1.2.3 - readline ==1.0.3.0 - rebase ==1.0.6 - redis-io ==0.7.0 @@ -1584,9 +1586,9 @@ default-package-overrides: - smallcaps ==0.6.0.3 - smallcheck ==1.1.1 - smoothie ==0.4.2.3 - - smsaero ==0.6.1 + - smsaero ==0.6.2 - smtLib ==1.0.8 - - smtp-mail ==0.1.4.5 + - smtp-mail ==0.1.4.6 - snap-core ==1.0.1.0 - snap-server ==1.0.1.1 - snowflake ==0.1.1.1 @@ -1601,7 +1603,7 @@ default-package-overrides: - sourcemap ==0.1.6 - spdx ==0.2.1.0 - speculation ==1.5.0.3 - - speedy-slice ==0.1.4 + - speedy-slice ==0.1.5 - sphinx ==0.6.0.2 - Spintax ==0.1.0.1 - splice ==0.6.1.1 @@ -1615,11 +1617,11 @@ default-package-overrides: - spool ==0.1 - spoon ==0.3.1 - sql-words ==0.1.4.1 - - sqlite-simple ==0.4.10.0 + - sqlite-simple ==0.4.12.0 - srcloc ==0.5.1.0 - stache ==0.1.8 - stack-run-auto ==0.1.1.4 - - stackage-curator ==0.14.1.1 + - stackage-curator ==0.14.3 - stackage-types ==1.2.0 - state-plus ==0.1.2 - stateref ==0.3 @@ -1738,7 +1740,7 @@ default-package-overrides: - th-expand-syns ==0.4.1.0 - th-extras ==0.0.0.4 - th-lift ==0.7.6 - - th-lift-instances ==0.1.10 + - th-lift-instances ==0.1.11 - th-orphans ==0.13.3 - th-printf ==0.3.1 - th-reify-compat ==0.0.1.1 @@ -1824,7 +1826,7 @@ default-package-overrides: - universe-instances-trans ==1.0.0.1 - universe-reverse-instances ==1.0 - unix-bytestring ==0.3.7.3 - - unix-compat ==0.4.2.0 + - unix-compat ==0.4.3.1 - unix-time ==0.3.7 - Unixutils ==1.54.1 - unordered-containers ==0.2.7.1 @@ -1847,6 +1849,7 @@ default-package-overrides: - vado ==0.0.7 - validate-input ==0.4.0.0 - validation ==0.5.4 + - validity ==0.3.0.4 - varying ==0.5.0.3 - vault ==0.3.0.6 - vcswrapper ==0.1.3 @@ -1906,7 +1909,7 @@ default-package-overrides: - webkitgtk3-javascriptcore ==0.14.2.1 - webpage ==0.0.4 - webrtc-vad ==0.1.0.3 - - websockets ==0.9.7.0 + - websockets ==0.9.8.2 - weigh ==0.0.3 - werewolf ==1.5.1.1 - werewolf-slack ==1.0.2.0 @@ -1930,9 +1933,9 @@ default-package-overrides: - wreq ==0.4.1.0 - writer-cps-mtl ==0.1.1.0 - writer-cps-transformers ==0.1.1.0 - - wuss ==1.1.1 + - wuss ==1.1.3 - X11 ==1.6.1.2 - - x509 ==1.6.4 + - x509 ==1.6.5 - x509-store ==1.6.2 - x509-system ==1.6.4 - x509-validation ==1.6.5 @@ -1958,19 +1961,19 @@ default-package-overrides: - xss-sanitize ==0.3.5.7 - yackage ==0.8.1 - yahoo-finance-api ==0.1.0.0 - - yaml ==0.8.20 + - yaml ==0.8.21.1 - Yampa ==0.10.5 - YampaSynth ==0.2 - yarr ==1.4.0.2 - yes-precure5-command ==5.5.3 - yesod ==1.4.3.1 - - yesod-auth ==1.4.13.5 + - yesod-auth ==1.4.15 - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 - yesod-auth-hashdb ==1.5.1.3 - yesod-auth-oauth2 ==0.2.2 - yesod-bin ==1.4.18.7 - - yesod-core ==1.4.26 + - yesod-core ==1.4.30 - yesod-eventsource ==1.4.0.1 - yesod-fay ==0.8.0 - yesod-fb ==0.3.4 @@ -1985,8 +1988,8 @@ default-package-overrides: - yesod-static ==1.5.1.1 - yesod-static-angular ==0.1.8 - yesod-table ==2.0.3 - - yesod-test ==1.5.3 - - yesod-websockets ==0.2.4 + - yesod-test ==1.5.4.1 + - yesod-websockets ==0.2.4.1 - yi ==0.12.6 - yi-fuzzy-open ==0.1.0.1 - yi-language ==0.2.1 From 7c3839b90c8903e63bc81c99174d83c82f43143c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Dec 2016 20:34:55 +0100 Subject: [PATCH 1497/1749] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-13-gcb8e8a4 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/c76f2cde8dabf0805cba8f05d3dc1b3d482788e2. --- .../haskell-modules/hackage-packages.nix | 3985 ++++++++++------- 1 file changed, 2452 insertions(+), 1533 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4640b607e7ce..840c45d3d019 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -919,8 +919,8 @@ self: { ({ mkDerivation, base, mtl, multirec, parsec }: mkDerivation { pname = "Annotations"; - version = "0.2.1"; - sha256 = "12e2c8ad03795c5bceffc8f421655097f96bcde1ff68d98dbe2bd2990f790cc7"; + version = "0.2.2"; + sha256 = "31c0d4765aba5d21df0e2b38521828fda860139609c2f6a6947423650f66161c"; libraryHaskellDepends = [ base mtl multirec parsec ]; testHaskellDepends = [ base mtl multirec parsec ]; description = "Constructing, analyzing and destructing annotated trees"; @@ -1744,8 +1744,8 @@ self: { }: mkDerivation { pname = "BlogLiterately"; - version = "0.8.4.2"; - sha256 = "f1d7a0e67ee04bc5c76596800369a9dc8d187b8b9d34081859d2d245fbd2b2f1"; + version = "0.8.4.3"; + sha256 = "56789deadc7e7a3b94b6dbbc0f8857565348ddde049ed8f0d938d4701f761721"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -1768,8 +1768,8 @@ self: { }: mkDerivation { pname = "BlogLiterately-diagrams"; - version = "0.2.0.4"; - sha256 = "392de367b3caaa293a6a1d341217c8c08e58c14b3cddd3943b88b59a3b848b6e"; + version = "0.2.0.5"; + sha256 = "9aa44dcff5bdddc3e3331a359ce517ec5f04258ebf2ab8c52c0971c38cd01948"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -2353,7 +2353,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_1_24_1_0" = callPackage + "Cabal_1_24_2_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, old-time, pretty , process, QuickCheck, regex-posix, tagged, tasty, tasty-hunit @@ -2361,8 +2361,8 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "1.24.1.0"; - sha256 = "dd2085dafae5cb2b5f8f0ef068ad66a779fb1bf2d68642d3906ac0c666a96a6b"; + version = "1.24.2.0"; + sha256 = "b7d0eb8e3503fbca460c0a6ca5c88352cecfe1b69e0bbc79827872134ed86340"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix @@ -5439,8 +5439,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.1.6"; - sha256 = "7a7a6639b04e9650d5dde93bb67bc0f26b053fd3456a34808f39640a0f780a50"; + version = "0.1.8"; + sha256 = "5b695c025c1e153d40b5ac8a526ca4986b1b4ae9350354e6373593b15d9c3e57"; libraryHaskellDepends = [ base ghc-prim pipes primitive readable template-haskell text transformers vector vinyl @@ -5801,8 +5801,8 @@ self: { }: mkDerivation { pname = "GPipe-GLFW"; - version = "1.2.3"; - sha256 = "a6854b9e0a2790db5205d22035cfa6e68c8e2341918a875e851f22264a9b5c40"; + version = "1.3.0"; + sha256 = "f929bfa320a76ca8c9769bf38b9de6b8928b9ef63f9b09c31a9dfe209f8826b6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base GLFW-b GPipe transformers ]; @@ -7568,11 +7568,12 @@ self: { }: mkDerivation { pname = "HMarkov"; - version = "1.0.0.3"; - sha256 = "0f43a9e0dd4da3258f89668e240081f4d0144003b8b45283ea3a0b446715a8a7"; + version = "1.0.1.1"; + sha256 = "f7b2753019c7348487d2b7df31f1b59522c008a90d59926a0f7fa6670fa89d03"; libraryHaskellDepends = [ base lens mtl random vector ]; testHaskellDepends = [ - base QuickCheck random tasty tasty-hunit tasty-quickcheck vector + base lens mtl QuickCheck random tasty tasty-hunit tasty-quickcheck + vector ]; homepage = "https://github.com/swizzard/HMarkov#readme"; description = "Markov-generated sequences"; @@ -11924,6 +11925,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "NMap" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "NMap"; + version = "0.12"; + sha256 = "84133b162935f6f249fd8a7d19dcf378482fec0d292df929cee2dd4984281ab5"; + libraryHaskellDepends = [ base containers ]; + description = "A transparent nested Map structure"; + license = "LGPL"; + }) {}; + "NTRU" = callPackage ({ mkDerivation, arithmoi, base, bytestring, containers, crypto-api , polynomial, random, SHA, split @@ -12762,23 +12774,6 @@ self: { }) {}; "OpenGLRaw" = callPackage - ({ mkDerivation, base, bytestring, containers, fixed, half, mesa - , text, transformers - }: - mkDerivation { - pname = "OpenGLRaw"; - version = "3.2.3.0"; - sha256 = "e64cb1b8ea0f87857e44396fb948751bdcace2a1c924875c8aa91b20e4d90ba3"; - libraryHaskellDepends = [ - base bytestring containers fixed half text transformers - ]; - librarySystemDepends = [ mesa ]; - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) mesa;}; - - "OpenGLRaw_3_2_4_0" = callPackage ({ mkDerivation, base, bytestring, containers, fixed, half, mesa , text, transformers }: @@ -12793,7 +12788,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mesa;}; "OpenGLRaw21" = callPackage @@ -13993,8 +13987,8 @@ self: { }: mkDerivation { pname = "R-pandoc"; - version = "0.2.1"; - sha256 = "57f08dfd05b50b9961ad4427fa6925d3a388618d73b41df7bee095b8349cbbd3"; + version = "0.2.2"; + sha256 = "988608b7353738a664a0557be210e82fd0db8e4a116577221fddc6b9b86d69cd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14436,8 +14430,8 @@ self: { ({ mkDerivation, base, hspec, system-filepath, text }: mkDerivation { pname = "ReadArgs"; - version = "1.2.2"; - sha256 = "47a1a21621a45a960f516393c1e7c5d33a7d840db0f7eff20d43e6fc7fc9deec"; + version = "1.2.3"; + sha256 = "9f4b2a9dfa9f0d851f79853a56ffde3b35e218d5f2bf8354c91a1344a1251a69"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base system-filepath text ]; @@ -15763,13 +15757,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Spintax_0_2_0_0" = callPackage - ({ mkDerivation, attoparsec, base, extra, mwc-random, text }: + "Spintax_0_3_0_0" = callPackage + ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: mkDerivation { pname = "Spintax"; - version = "0.2.0.0"; - sha256 = "33b5e8e7d3e41ef5a8b008e2a1084c23b57e26af147f5158dca59256b875336a"; - libraryHaskellDepends = [ attoparsec base extra mwc-random text ]; + version = "0.3.0.0"; + sha256 = "b417809b3734c582f1a08be3a14845b913562077bfc35b3bf067ced2309b0ffc"; + libraryHaskellDepends = [ + attoparsec base extra mtl mwc-random text + ]; homepage = "https://github.com/MichelBoucey/spintax"; description = "Random text generation based on spintax"; license = stdenv.lib.licenses.bsd3; @@ -15957,6 +15953,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Stack" = callPackage + ({ mkDerivation, base, nats, stm }: + mkDerivation { + pname = "Stack"; + version = "0.3.2"; + sha256 = "2ba17b68a6daef6040f30cfd6b0044380890bc9f7faf8ab21192ff467d2757e5"; + libraryHaskellDepends = [ base nats stm ]; + homepage = "https://en.wikipedia.org/wiki/Stack_(abstract_data_type)"; + description = "Stack data structure"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Stasis" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -19464,6 +19472,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "acme-smuggler" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "acme-smuggler"; + version = "0.1.0.1"; + sha256 = "740ecdf25dd30475f44b865490b8efecfb39621e91569c988d21ca0762946ac7"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/benclifford/acme-smuggler"; + description = "Smuggle arbitrary values in ()"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "acme-strfry" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -20004,6 +20025,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "aeson-better-errors_0_9_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, dlist, mtl, scientific + , text, transformers, transformers-compat, unordered-containers + , vector, void + }: + mkDerivation { + pname = "aeson-better-errors"; + version = "0.9.1.0"; + sha256 = "68f001bf055ec7b755d91019f2a0ef136307d157a231acddad6b4cc561f67327"; + libraryHaskellDepends = [ + aeson base bytestring dlist mtl scientific text transformers + transformers-compat unordered-containers vector void + ]; + homepage = "https://github.com/hdgarrood/aeson-better-errors"; + description = "Better error messages when decoding JSON values"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-bson" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, bson, bytestring , containers, text, unordered-containers, vector @@ -20806,8 +20846,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, random, vector }: mkDerivation { pname = "aivika"; - version = "4.6"; - sha256 = "1e84a2957a7f974e4e11cdaa2a7c4ec3da5b03fe15a0fed07427e9ee74712bba"; + version = "5.0.1"; + sha256 = "ec5dd90074c05a947f3c1506fb58d7ab0eae497b31c2bba9641c9ff3cbf5ca57"; libraryHaskellDepends = [ array base containers mtl random vector ]; @@ -20957,8 +20997,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "4.6.1"; - sha256 = "0177336d1d520bf303a3702a90dd33e31195d825f949872f3525fe940b7c01f8"; + version = "5.0.1"; + sha256 = "7a4e0088489642819513ab9acc0e05ab2ec94e4fddf5ac2df519740e7d7333d9"; libraryHaskellDepends = [ aivika array base containers mtl random vector ]; @@ -21727,7 +21767,7 @@ self: { license = "unknown"; }) {}; - "amazonka_1_4_4_2" = callPackage + "amazonka_1_4_5" = callPackage ({ mkDerivation, amazonka-core, base, bytestring, conduit , conduit-extra, directory, exceptions, http-conduit, ini, mmorph , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text @@ -21735,8 +21775,8 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "1.4.4.2"; - sha256 = "c0880ecc8794f71d1e7a9a3e6aae4e788430c7a8beeb0fae75f6b779ffd8640f"; + version = "1.4.5"; + sha256 = "86e7b7ef0dea4a6bc9a7644ec17908a3d9f781ac1190fcb4bd33690b8bca885c"; libraryHaskellDepends = [ amazonka-core base bytestring conduit conduit-extra directory exceptions http-conduit ini mmorph monad-control mtl resourcet @@ -21768,14 +21808,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "amazonka-apigateway_1_4_4" = callPackage + "amazonka-apigateway_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-apigateway"; - version = "1.4.4"; - sha256 = "a32aab9e4c78b15f609de4718845e593dcd5c4c29ee18643dde47c9c33adba21"; + version = "1.4.5"; + sha256 = "cccd4f7832b75b3df0de5946fdc0d9277fe2e267fce7a93524ebc609234d0e4a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -21805,14 +21845,14 @@ self: { license = "unknown"; }) {}; - "amazonka-application-autoscaling_1_4_4" = callPackage + "amazonka-application-autoscaling_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-application-autoscaling"; - version = "1.4.4"; - sha256 = "f45fc7dd0b3b7be5cd4fa188cf7b0a3007c48db11ee8c92cbf16e6e20ea66f7e"; + version = "1.4.5"; + sha256 = "e6b4e51be8eb4279e0a5daa81b858e6b7a35a7005d48e038c1b53d5c9feec24e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -21824,6 +21864,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-appstream" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-appstream"; + version = "1.4.5"; + sha256 = "7f15da60e2afdf90ea98bec5734c5f387e2676fd7ef9a1388501396f7782517c"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon AppStream SDK"; + license = "unknown"; + }) {}; + "amazonka-autoscaling" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers @@ -21842,14 +21900,14 @@ self: { license = "unknown"; }) {}; - "amazonka-autoscaling_1_4_4" = callPackage + "amazonka-autoscaling_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-autoscaling"; - version = "1.4.4"; - sha256 = "bb54c9340d38d4b08cbb43321eaad731416a38dda4a36e768e12d0d54ec8ab13"; + version = "1.4.5"; + sha256 = "f887bf9f7ff88edc228dee99a858a097e6235f066886430ce4d7c5dc339e6bda"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -21861,6 +21919,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-budgets" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-budgets"; + version = "1.4.5"; + sha256 = "a1363b6057e1e85b9e4a18491056f8eeeee7dbd4798cc3292ba89fb4e7ea1d8b"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Budgets SDK"; + license = "unknown"; + }) {}; + "amazonka-certificatemanager" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers @@ -21879,14 +21955,14 @@ self: { license = "unknown"; }) {}; - "amazonka-certificatemanager_1_4_4" = callPackage + "amazonka-certificatemanager_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-certificatemanager"; - version = "1.4.4"; - sha256 = "dea7c0aaa3f69f3da3f8755ee47a4a402603aad8602f3a8ce92a302fabbf0fc6"; + version = "1.4.5"; + sha256 = "9990c1090044eb24013197b94bb923e800c6312c87c89f4caae6bbe36c0632b0"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -21916,14 +21992,14 @@ self: { license = "unknown"; }) {}; - "amazonka-cloudformation_1_4_4" = callPackage + "amazonka-cloudformation_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-cloudformation"; - version = "1.4.4"; - sha256 = "aee7abe767b8287213406e1e79db9be1d83f510f9239f8faf7e03cca3e40a923"; + version = "1.4.5"; + sha256 = "fac2471ee46e386baa7751ac091194d90f84c96eb0c0a1094e790ecb62ddb7f6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -21953,14 +22029,14 @@ self: { license = "unknown"; }) {}; - "amazonka-cloudfront_1_4_4" = callPackage + "amazonka-cloudfront_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-cloudfront"; - version = "1.4.4"; - sha256 = "ef921bc77e37c6e0cc8ad8943fe11360ecc0f7ae3031fd99cfc4a28023201cfb"; + version = "1.4.5"; + sha256 = "0e89f49e5ab607a45f5ac94d9b47d3102c11c5d7b7249eb0303e9350a3a5aad1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -21990,14 +22066,14 @@ self: { license = "unknown"; }) {}; - "amazonka-cloudhsm_1_4_4" = callPackage + "amazonka-cloudhsm_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "1.4.4"; - sha256 = "cf37dcb18bd9baa0cd8ddcf334fdbf9a649a5aebacc63a11b7e9de70f994d5d4"; + version = "1.4.5"; + sha256 = "0114a91437d3dfa7e03e656750a47fe2b4c223ec5c4a66ad533bd0893c77a837"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22027,14 +22103,14 @@ self: { license = "unknown"; }) {}; - "amazonka-cloudsearch_1_4_4" = callPackage + "amazonka-cloudsearch_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "1.4.4"; - sha256 = "27c1fe0dee9fbb1ec9f1d90e89527483133d14cf85b9199cbf9b7e96f3586e42"; + version = "1.4.5"; + sha256 = "62c42b596e1682e438966f536db36e284926141487dd9c49a634f3ffacba325b"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22064,14 +22140,14 @@ self: { license = "unknown"; }) {}; - "amazonka-cloudsearch-domains_1_4_4" = callPackage + "amazonka-cloudsearch-domains_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "1.4.4"; - sha256 = "f5516758925123c47a89ffb1abe120efca0ac2c0f218babc13089f7c6e78e1ff"; + version = "1.4.5"; + sha256 = "e0090397d9d6ce30a99537bb5041b6085aa758502a809d8e5744cd222fea028a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22101,14 +22177,14 @@ self: { license = "unknown"; }) {}; - "amazonka-cloudtrail_1_4_4" = callPackage + "amazonka-cloudtrail_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "1.4.4"; - sha256 = "114a334efd63d9b5ef8b50425a96e8672e5d84f6cabb2b8d4c15784d1afa4b46"; + version = "1.4.5"; + sha256 = "45e80bd1a66402e9a56355a88bfaa3407fd9549f3ee66a9d9a344fccfaccc276"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22138,14 +22214,14 @@ self: { license = "unknown"; }) {}; - "amazonka-cloudwatch_1_4_4" = callPackage + "amazonka-cloudwatch_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "1.4.4"; - sha256 = "e76a1f166dd3f4ac110579961f4b142a42017e800d401a7fd8bfa85ecea0257c"; + version = "1.4.5"; + sha256 = "00e6b5f8d949ed5b4d4c7fc2c8264677018c54d7e5f36a6ead297da22f8c2201"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22175,14 +22251,14 @@ self: { license = "unknown"; }) {}; - "amazonka-cloudwatch-events_1_4_4" = callPackage + "amazonka-cloudwatch-events_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-cloudwatch-events"; - version = "1.4.4"; - sha256 = "cf7be01a292dbeb153560891f2eb65df1583df0248073668211320bf5fbe2559"; + version = "1.4.5"; + sha256 = "b1a2b8119e6c104e2820febd9a743c74b220ea70b2fdb4d464a8edc0bdc9fc7d"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22212,14 +22288,14 @@ self: { license = "unknown"; }) {}; - "amazonka-cloudwatch-logs_1_4_4" = callPackage + "amazonka-cloudwatch-logs_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "1.4.4"; - sha256 = "4c29612100b88bd6d9e611f20e555ed69939e66e9e1502561ae345095ba23060"; + version = "1.4.5"; + sha256 = "10cffb3ce3f6ee216b740b78d56a3689b7f1d4e0e367c92afac8f4d412799032"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22231,6 +22307,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-codebuild" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-codebuild"; + version = "1.4.5"; + sha256 = "24426e202b2171181bd3b0ffe8fa2e2032561d233fa36f1fe0dfb890887afdd0"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon CodeBuild SDK"; + license = "unknown"; + }) {}; + "amazonka-codecommit" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers @@ -22249,14 +22343,14 @@ self: { license = "unknown"; }) {}; - "amazonka-codecommit_1_4_4" = callPackage + "amazonka-codecommit_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-codecommit"; - version = "1.4.4"; - sha256 = "02d3c4988f82a20b2175a99203aec701efbeeb25a47bda53f6a755937f77d261"; + version = "1.4.5"; + sha256 = "fc8fed2cedf92680d4cffe7467c6b33259a0fb9b2461f11017eb85ce1a668063"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22286,14 +22380,14 @@ self: { license = "unknown"; }) {}; - "amazonka-codedeploy_1_4_4" = callPackage + "amazonka-codedeploy_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-codedeploy"; - version = "1.4.4"; - sha256 = "d900d37a7f47aaeec516dd149a2d2a8595a2dfaa75168624d49fdb96d2246482"; + version = "1.4.5"; + sha256 = "b1f0222e0d3504c116f5b1ff6d4769edafe7655bb0fd0deaa955689e9f7071b7"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22323,14 +22417,14 @@ self: { license = "unknown"; }) {}; - "amazonka-codepipeline_1_4_4" = callPackage + "amazonka-codepipeline_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-codepipeline"; - version = "1.4.4"; - sha256 = "dca521df26d5f53de2780b72a3d9c922326cc48847519e1ad088f330a5c02a6e"; + version = "1.4.5"; + sha256 = "6608a8f8f1adc996cbba830988cde869c425b1bc779bdb7f259d619f654646ec"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22360,14 +22454,14 @@ self: { license = "unknown"; }) {}; - "amazonka-cognito-identity_1_4_4" = callPackage + "amazonka-cognito-identity_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "1.4.4"; - sha256 = "61dc9389d62ee2f260dec8c3ba07a03afdb01c5150ac87b49ffba58561ce16df"; + version = "1.4.5"; + sha256 = "2cac79694e1b0c0a694525904bf8031d57a79c5fee2dda16b1126655ccf50d06"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22397,14 +22491,14 @@ self: { license = "unknown"; }) {}; - "amazonka-cognito-idp_1_4_4" = callPackage + "amazonka-cognito-idp_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-cognito-idp"; - version = "1.4.4"; - sha256 = "8e7370f170810959f61aaf2030f570e4486f24c2741cd185339e6c06039dc263"; + version = "1.4.5"; + sha256 = "bcf273498b47ecdfe30922bc22ad68d8d04773fd1a4ede8d98b6598cd7126618"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22434,14 +22528,14 @@ self: { license = "unknown"; }) {}; - "amazonka-cognito-sync_1_4_4" = callPackage + "amazonka-cognito-sync_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "1.4.4"; - sha256 = "85c4ff9369475464be0c912557b7e05876a401240ed63eb9582293e39c655c59"; + version = "1.4.5"; + sha256 = "1331523164798c0162904f58d95a100fec9527652fcdebb81846c460a6344edf"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22471,14 +22565,14 @@ self: { license = "unknown"; }) {}; - "amazonka-config_1_4_4" = callPackage + "amazonka-config_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-config"; - version = "1.4.4"; - sha256 = "a0d2e3dc82dbdcf3387a2ba5be959442b261b31083e063453cf4c1a4fd1b9a91"; + version = "1.4.5"; + sha256 = "775c5b9ff6efb185ee6954aaf57f607ac1fcc386daf6a7aa7071e7364c7fbe24"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22522,7 +22616,7 @@ self: { license = "unknown"; }) {}; - "amazonka-core_1_4_4" = callPackage + "amazonka-core_1_4_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , case-insensitive, conduit, conduit-extra, cryptonite, deepseq , exceptions, hashable, http-conduit, http-types, lens, memory, mtl @@ -22533,8 +22627,8 @@ self: { }: mkDerivation { pname = "amazonka-core"; - version = "1.4.4"; - sha256 = "ad0b79e5f369d079389250310ac865125f41b8025b18bbec93293e787112f45b"; + version = "1.4.5"; + sha256 = "db13e1d0ced722c21187815f34975d08a6e5a432ed58c17b3bbac75389cdee7f"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite deepseq exceptions hashable @@ -22571,14 +22665,14 @@ self: { license = "unknown"; }) {}; - "amazonka-datapipeline_1_4_4" = callPackage + "amazonka-datapipeline_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-datapipeline"; - version = "1.4.4"; - sha256 = "cd68a5f94435542e4a348b23931ab619f866ed9ce773d500f6575eb9e1b5c1cb"; + version = "1.4.5"; + sha256 = "258812a9a3c553bf56e8d18f32ff69d28860f65664fb2510e5f5b1ff3ff25cb5"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22608,14 +22702,14 @@ self: { license = "unknown"; }) {}; - "amazonka-devicefarm_1_4_4" = callPackage + "amazonka-devicefarm_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-devicefarm"; - version = "1.4.4"; - sha256 = "242a32cdb5502ac586f2e1ffb2921280907cbf6eecaaf431206bb6f3aa5d8e3b"; + version = "1.4.5"; + sha256 = "ea472974c93f360186baea4a5b746ac37ff1c573c778b747c9be479dda458802"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22645,14 +22739,14 @@ self: { license = "unknown"; }) {}; - "amazonka-directconnect_1_4_4" = callPackage + "amazonka-directconnect_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-directconnect"; - version = "1.4.4"; - sha256 = "043dbd7e4ebc086155270118ca4329f3ad03a730c0b8aabe183958fba844de0d"; + version = "1.4.5"; + sha256 = "52139e543342d60607fc24e0ff5a25e38dc8868590aefbabf659bced71b3dea9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22682,14 +22776,14 @@ self: { license = "unknown"; }) {}; - "amazonka-discovery_1_4_4" = callPackage + "amazonka-discovery_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-discovery"; - version = "1.4.4"; - sha256 = "9bbb7e4f2baec019ce8fb41ff6382e5fa1a7c3010012cad2f7d315f5220e8045"; + version = "1.4.5"; + sha256 = "df5781938eda734bcce63fc6f7b674422bfa1dde5dbdf46d6cc1cf7bcdbcadb8"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22719,14 +22813,14 @@ self: { license = "unknown"; }) {}; - "amazonka-dms_1_4_4" = callPackage + "amazonka-dms_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-dms"; - version = "1.4.4"; - sha256 = "a8f6b3684de4d1b190aebf1966e2497fc8f8b18bed3dea687e4603fe8b70caaa"; + version = "1.4.5"; + sha256 = "334209b75c646cb4783ec19b98bece9274291402627bc65a86180bffb15171fc"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22756,14 +22850,14 @@ self: { license = "unknown"; }) {}; - "amazonka-ds_1_4_4" = callPackage + "amazonka-ds_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-ds"; - version = "1.4.4"; - sha256 = "5cae6b1926cfd6ea5f7fb4ad596a3d7fec80ad6e2ae6bb37f837ce5e5a9b48a0"; + version = "1.4.5"; + sha256 = "e711f34752793135a9bc088789f69482faf3044d23394c0455a8873ec76944dd"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22793,14 +22887,14 @@ self: { license = "unknown"; }) {}; - "amazonka-dynamodb_1_4_4" = callPackage + "amazonka-dynamodb_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-dynamodb"; - version = "1.4.4"; - sha256 = "9e0d23783e6e02eb3dd3edaa890a90a92be51024bd1e25967e680e8be257f49e"; + version = "1.4.5"; + sha256 = "74b23d5a012af7b2f3a14001a41496e22bdc61884aa52b8aac7f687c64bcd762"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22830,14 +22924,14 @@ self: { license = "unknown"; }) {}; - "amazonka-dynamodb-streams_1_4_4" = callPackage + "amazonka-dynamodb-streams_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-dynamodb-streams"; - version = "1.4.4"; - sha256 = "575ee098e69bf18cb59549cac9ff4ce9c40ef54860b58210886290c933b04fa9"; + version = "1.4.5"; + sha256 = "83a340d763fbcd62b0b6f4c09358646516c7949b5f86423d4263874175e1feed"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22867,14 +22961,14 @@ self: { license = "unknown"; }) {}; - "amazonka-ec2_1_4_4" = callPackage + "amazonka-ec2_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-ec2"; - version = "1.4.4"; - sha256 = "6fef83cb09e9ca74a6f1fb18f3add1420fc6c237aeafdb450a97d3216037741c"; + version = "1.4.5"; + sha256 = "e4a4938f947b6d69b799b5abc47a2d36e57ba68fdcc51a10b01c2566510cd498"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22904,14 +22998,14 @@ self: { license = "unknown"; }) {}; - "amazonka-ecr_1_4_4" = callPackage + "amazonka-ecr_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-ecr"; - version = "1.4.4"; - sha256 = "d38d111fa1801b048fcadd67475b0a916a0813636607df2db48747c8190148db"; + version = "1.4.5"; + sha256 = "c3fa1094ea22402a87f4803301b74081bfd3a6dd1db42536ade0994548fd690c"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22941,14 +23035,14 @@ self: { license = "unknown"; }) {}; - "amazonka-ecs_1_4_4" = callPackage + "amazonka-ecs_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-ecs"; - version = "1.4.4"; - sha256 = "fd2b867115fcd1a0b0ea992f3d2e902d7a5b66cce7c62da66ee1ac49c93aa574"; + version = "1.4.5"; + sha256 = "ba72592448eee9123acc7b700067343712c6c05f0635d6a52ebdcf3c08e2c414"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22978,14 +23072,14 @@ self: { license = "unknown"; }) {}; - "amazonka-efs_1_4_4" = callPackage + "amazonka-efs_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-efs"; - version = "1.4.4"; - sha256 = "fb10cf8284a036623620f80c5fd938d5200e4e5ba67a8352e5549479a5661544"; + version = "1.4.5"; + sha256 = "e8fba140dc9ca493da92ba57873b54e4488ad63d1a7e6b914b0149338cb52c50"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23015,14 +23109,14 @@ self: { license = "unknown"; }) {}; - "amazonka-elasticache_1_4_4" = callPackage + "amazonka-elasticache_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-elasticache"; - version = "1.4.4"; - sha256 = "70a1bfb0f6f48d4c7d650c20c0397b6722f9658e59c99b330ad1002bfdaedc2f"; + version = "1.4.5"; + sha256 = "6f592d7af0a9b0433ab9332bbfbb84b3b75c27b6a4df45006ff096c261be45bb"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23052,14 +23146,14 @@ self: { license = "unknown"; }) {}; - "amazonka-elasticbeanstalk_1_4_4" = callPackage + "amazonka-elasticbeanstalk_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "1.4.4"; - sha256 = "ebd1f78511256ff1592e71bd4368308689faec1fbee98d7217436a735cf93270"; + version = "1.4.5"; + sha256 = "e3ac291b93b951ab557ff82bed2cbe702e56b8b24e5f95e3330777fb82df59f8"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23089,14 +23183,14 @@ self: { license = "unknown"; }) {}; - "amazonka-elasticsearch_1_4_4" = callPackage + "amazonka-elasticsearch_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-elasticsearch"; - version = "1.4.4"; - sha256 = "c69aefafbd4a6117fec49da4dac96bf26ac06f82474b6b515f99803f00c87222"; + version = "1.4.5"; + sha256 = "bdc5f8bf276fde27b5357048f77b261569cddc1ffe1de2ff1035e436b9255303"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23126,14 +23220,14 @@ self: { license = "unknown"; }) {}; - "amazonka-elastictranscoder_1_4_4" = callPackage + "amazonka-elastictranscoder_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "1.4.4"; - sha256 = "1d66ce985ba936e20b13364c672b4e3f017edbeae2ecc5005899f20072844ec7"; + version = "1.4.5"; + sha256 = "306760ad72bae83f29cfa574caac2646e3eac6935596d0e7ed66201b8e2c123b"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23163,14 +23257,14 @@ self: { license = "unknown"; }) {}; - "amazonka-elb_1_4_4" = callPackage + "amazonka-elb_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-elb"; - version = "1.4.4"; - sha256 = "1fac7fd383a58c8455e0de38fbafc9aff7fd6301594adafe3660380f16a63f4f"; + version = "1.4.5"; + sha256 = "e6ca6ef93fc988ff9cb4314ff6668f415ea4306d41a5e8c555d6deefd210eb62"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23188,8 +23282,8 @@ self: { }: mkDerivation { pname = "amazonka-elbv2"; - version = "1.4.4"; - sha256 = "41587adac7111d7fd6e4c913bdb3a135fab0a81b90b8d137f4554043de7a9ba2"; + version = "1.4.5"; + sha256 = "fa4c8d492f85be81c2ad3d47f08d464acb7003e9fb003724daa8992de75dd847"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23219,14 +23313,14 @@ self: { license = "unknown"; }) {}; - "amazonka-emr_1_4_4" = callPackage + "amazonka-emr_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-emr"; - version = "1.4.4"; - sha256 = "5c9ad06a37ffa2d8c79ad068430c361c7e792f59528846aae18380f75453dcd7"; + version = "1.4.5"; + sha256 = "2c99f0be432d535e7e55a958cb6d8c65e9e48dc5f337daf61705aa2de0e924b7"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23256,14 +23350,14 @@ self: { license = "unknown"; }) {}; - "amazonka-gamelift_1_4_4" = callPackage + "amazonka-gamelift_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-gamelift"; - version = "1.4.4"; - sha256 = "bfef8aeb54f867d9c818405082022492c47ff4bcea2239610b51d8529b73707b"; + version = "1.4.5"; + sha256 = "e05847758651f3f658c1db3275798deffaabc4eb0ed1e1e2bc87ef1608dc8152"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23293,14 +23387,14 @@ self: { license = "unknown"; }) {}; - "amazonka-glacier_1_4_4" = callPackage + "amazonka-glacier_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-glacier"; - version = "1.4.4"; - sha256 = "551f1dd605fcd0d8efc2cf8db2fefd1385eefcbe40aee62ed7991acae8c19b7a"; + version = "1.4.5"; + sha256 = "9ca17da801fa3b470796a4285e5d45592005d2d9ec96bb3d9298868535ad52e3"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23312,6 +23406,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-health" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-health"; + version = "1.4.5"; + sha256 = "ec1def33813329c965a92c4becd7b942750c8da9b1f81b00b673aa676c1e2e61"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Health APIs and Notifications SDK"; + license = "unknown"; + }) {}; + "amazonka-iam" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers @@ -23330,14 +23442,14 @@ self: { license = "unknown"; }) {}; - "amazonka-iam_1_4_4" = callPackage + "amazonka-iam_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-iam"; - version = "1.4.4"; - sha256 = "b2911ae52d1476f7109a96c2fc2e1ba58950aae6de57aefc1c4ad0c74be19067"; + version = "1.4.5"; + sha256 = "c37c6081febdce459a9683ac9ea22f45161dd86d56f452e2699f819a729068ca"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23367,14 +23479,14 @@ self: { license = "unknown"; }) {}; - "amazonka-importexport_1_4_4" = callPackage + "amazonka-importexport_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-importexport"; - version = "1.4.4"; - sha256 = "463e6ad69547306e34848a40382aea4ff187b1fc7e838481b08f9ad5970167df"; + version = "1.4.5"; + sha256 = "24b131fbf1af88531c1688541cc357e22cc4cd770a5a691ea59b02bd3959c5ec"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23404,14 +23516,14 @@ self: { license = "unknown"; }) {}; - "amazonka-inspector_1_4_4" = callPackage + "amazonka-inspector_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-inspector"; - version = "1.4.4"; - sha256 = "76fe8fc64f948ed26e36c11fe7aa3650bd7f971726a2dbd5215d3be58ff1ba01"; + version = "1.4.5"; + sha256 = "8408f9535fbd5c3136a2adc5afb7d698520db7a5577c598c8d7ed02e9d9aa78a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23441,14 +23553,14 @@ self: { license = "unknown"; }) {}; - "amazonka-iot_1_4_4" = callPackage + "amazonka-iot_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-iot"; - version = "1.4.4"; - sha256 = "fde976b7e41af4cb3d3a6399f0a8e5b76993f11b94381a1fffdafbdc2c67a1bd"; + version = "1.4.5"; + sha256 = "bac8bb743fc67bbcd62b2c636c922af58d0866df1859cd266ceda2f1d3d66293"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23478,14 +23590,14 @@ self: { license = "unknown"; }) {}; - "amazonka-iot-dataplane_1_4_4" = callPackage + "amazonka-iot-dataplane_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-iot-dataplane"; - version = "1.4.4"; - sha256 = "ba3451574fbf7a49ec5f50e5c8479bfb3235db42a792760d01247968412900f5"; + version = "1.4.5"; + sha256 = "3b3dc22d05f534fefb163600963793dbcd9d077200255f7ce106fe54f6d4d962"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23515,14 +23627,14 @@ self: { license = "unknown"; }) {}; - "amazonka-kinesis_1_4_4" = callPackage + "amazonka-kinesis_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-kinesis"; - version = "1.4.4"; - sha256 = "734f9f465eec775faa97f0379933d469ce35c8ac6651bfd47b530ccc3d0c739a"; + version = "1.4.5"; + sha256 = "69661eeaf4b9c9e8082d3e576eb705ae8de3c3e90c814f90bc0cbd0e2f1ea24d"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23540,8 +23652,8 @@ self: { }: mkDerivation { pname = "amazonka-kinesis-analytics"; - version = "1.4.4"; - sha256 = "fe628e5e65947849c7ec390140144d257bebf994ea2a76ddb6b11eaee69c02a9"; + version = "1.4.5"; + sha256 = "36917ed8d951b2cae224f1fd1f41a94741d5a51d7606de11af28f3bb63e5908a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23571,14 +23683,14 @@ self: { license = "unknown"; }) {}; - "amazonka-kinesis-firehose_1_4_4" = callPackage + "amazonka-kinesis-firehose_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-kinesis-firehose"; - version = "1.4.4"; - sha256 = "33274c4050b98ce89cb5495a92642d9ea99edcff70a2c8e994c6761921a4bef9"; + version = "1.4.5"; + sha256 = "fcdccc16e54f79b99d98e32790284ea0d64207bce0e0405e9cfd7632d24ce103"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23608,14 +23720,14 @@ self: { license = "unknown"; }) {}; - "amazonka-kms_1_4_4" = callPackage + "amazonka-kms_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-kms"; - version = "1.4.4"; - sha256 = "20537bfd340f26e2f78fde482754e362e2a9369d4697141192c1cd3e759a62ac"; + version = "1.4.5"; + sha256 = "8578614ba763ed460f78b55ae975680b43d856a7c57d7380c034097d1c68f0f6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23645,14 +23757,14 @@ self: { license = "unknown"; }) {}; - "amazonka-lambda_1_4_4" = callPackage + "amazonka-lambda_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-lambda"; - version = "1.4.4"; - sha256 = "0dd073dd98625b829ed38345f57615f65492158c6731b9ca7522414d24ba9eb3"; + version = "1.4.5"; + sha256 = "b210aa40ff787d5c848278609b9a9b4d001f1c0a38b965488e6d416af949cf22"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23664,6 +23776,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-lightsail" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-lightsail"; + version = "1.4.5"; + sha256 = "9204a4a4d70e8edd998011a5e3216f269ba291e004d3ad88a343d1c097c3e980"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Lightsail SDK"; + license = "unknown"; + }) {}; + "amazonka-marketplace-analytics" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers @@ -23682,14 +23812,14 @@ self: { license = "unknown"; }) {}; - "amazonka-marketplace-analytics_1_4_4" = callPackage + "amazonka-marketplace-analytics_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-marketplace-analytics"; - version = "1.4.4"; - sha256 = "0027736e24e0fe98388269a64c8d27fbec52e6c6944241c22a6d9d8dbd191d2d"; + version = "1.4.5"; + sha256 = "43d428b51e7a38aac08c64dc2dc01e98021a11b5fa9d178c351808d4f109ab28"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23719,14 +23849,14 @@ self: { license = "unknown"; }) {}; - "amazonka-marketplace-metering_1_4_4" = callPackage + "amazonka-marketplace-metering_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-marketplace-metering"; - version = "1.4.4"; - sha256 = "047fa110ee9969017e81b1643dfc653c86efa7cb10999bb2185ebac1a4832397"; + version = "1.4.5"; + sha256 = "76144fe48a26014c40ec0fca4f828c9e4b5dfd08f1efc0ffb5b3b1829d8e3cde"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23756,14 +23886,14 @@ self: { license = "unknown"; }) {}; - "amazonka-ml_1_4_4" = callPackage + "amazonka-ml_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-ml"; - version = "1.4.4"; - sha256 = "f03c3da79b2e386f5355f2b5f8cab536f739b99aa44865a33876b751de15cd12"; + version = "1.4.5"; + sha256 = "579b0d042abdc637d14f394a89b2e192b1c5e1bc82fff1c666e6f5eac9544865"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23793,14 +23923,14 @@ self: { license = "unknown"; }) {}; - "amazonka-opsworks_1_4_4" = callPackage + "amazonka-opsworks_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-opsworks"; - version = "1.4.4"; - sha256 = "8b15270cfe54ff8ab6f427118771bc26878ac5f21bd2bd0785b74c6736bab2ba"; + version = "1.4.5"; + sha256 = "c91802c8bdcf0d259d86b382e5ce1fb25795e73810631f9367d5603afc2f8d34"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23812,6 +23942,60 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-opsworks-cm" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-opsworks-cm"; + version = "1.4.5"; + sha256 = "5791722b0bb3783dfc11ddffa284024b5317f3da817040b4a6389b6dec9d29d3"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon OpsWorks for Chef Automate SDK"; + license = "unknown"; + }) {}; + + "amazonka-pinpoint" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-pinpoint"; + version = "1.4.5"; + sha256 = "91267103b0453e5f56ef6e01f24a139ea2c4020a8344cd8664e7958f9ac1bcdd"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Pinpoint SDK"; + license = "unknown"; + }) {}; + + "amazonka-polly" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-polly"; + version = "1.4.5"; + sha256 = "b5d5e2347c9a98daf4182e16a8100c6c1ffe5ed86d9adc69ae888c5aaeb3cec6"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Polly SDK"; + license = "unknown"; + }) {}; + "amazonka-rds" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers @@ -23831,14 +24015,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "amazonka-rds_1_4_4" = callPackage + "amazonka-rds_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-rds"; - version = "1.4.4"; - sha256 = "dbc9ae2a6945ee1cad0c7ac0df9557dd362648b0ee8b73ccfc7e7da79f732f30"; + version = "1.4.5"; + sha256 = "8377e03b84e6d8d8ec2417046ce3d67bc052632fc05d92f2f6299e6808c2a30b"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23868,14 +24052,14 @@ self: { license = "unknown"; }) {}; - "amazonka-redshift_1_4_4" = callPackage + "amazonka-redshift_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-redshift"; - version = "1.4.4"; - sha256 = "1329dfc9055b46d1539a871d2c148760f1f62802a2d7b3d4253aacd91b7caa2d"; + version = "1.4.5"; + sha256 = "b7ecd60b51ff6b28d3435ef716485a2ebb1e3863a13cdb90b4ceb2ec65ffa84a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23887,6 +24071,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-rekognition" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-rekognition"; + version = "1.4.5"; + sha256 = "a6c3aec679aa4b7c4484644b22738fb9611dffe72c38fd80ecf1c19c067a25be"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Rekognition SDK"; + license = "unknown"; + }) {}; + "amazonka-route53" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers @@ -23905,15 +24107,15 @@ self: { license = "unknown"; }) {}; - "amazonka-route53_1_4_4" = callPackage + "amazonka-route53_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-route53"; - version = "1.4.4"; - sha256 = "74cb1fa132aa0888c8c12acd1aca4e87360ae4a238052dcf21fc3070a10d609d"; - libraryHaskellDepends = [ amazonka-core base ]; + version = "1.4.5"; + sha256 = "68f49826d8f594abc99311081a9d8224f6e79457e6118c5bc7a55bd4aed8425d"; + libraryHaskellDepends = [ amazonka-core base text ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text time unordered-containers @@ -23942,14 +24144,14 @@ self: { license = "unknown"; }) {}; - "amazonka-route53-domains_1_4_4" = callPackage + "amazonka-route53-domains_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-route53-domains"; - version = "1.4.4"; - sha256 = "bbcdbda4a0f0a7bc408e033183bc46cc680b121d43d2ad44a66b07c70195a6f1"; + version = "1.4.5"; + sha256 = "1fb74290a0c019f4dfa1fba75b553efd90c440fb3f4a89fba66dd5ec7ad4fd3d"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23979,14 +24181,14 @@ self: { license = "unknown"; }) {}; - "amazonka-s3_1_4_4" = callPackage + "amazonka-s3_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-s3"; - version = "1.4.4"; - sha256 = "bd32c46e99cca9c1acf6647813975411c5fec92690982fc2e00881da58759435"; + version = "1.4.5"; + sha256 = "78297e966eac3ba9045612c8e09d3e6e34c83b5dfb3d59e489edc7cd3a2fe4ad"; libraryHaskellDepends = [ amazonka-core base lens text ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24016,14 +24218,14 @@ self: { license = "unknown"; }) {}; - "amazonka-sdb_1_4_4" = callPackage + "amazonka-sdb_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-sdb"; - version = "1.4.4"; - sha256 = "eae1f14a0ae2e0ea39ed9a1212d63fe9d7262e01d05bce8869b83525e690c58d"; + version = "1.4.5"; + sha256 = "fdec685f8184680eaea76456db18cd552ccb77fd40e941d3590f2f57f2bec6b2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24041,8 +24243,8 @@ self: { }: mkDerivation { pname = "amazonka-servicecatalog"; - version = "1.4.4"; - sha256 = "6d2766375d3ed2b0f3b4f4604eab62887a23a7ecd64c1a8c8ed5411a1af0432a"; + version = "1.4.5"; + sha256 = "a5e0106a155a5bd51ac6bb8f2d1037419a621fe5402f2a0888399bb98f74d6e7"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24072,14 +24274,14 @@ self: { license = "unknown"; }) {}; - "amazonka-ses_1_4_4" = callPackage + "amazonka-ses_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-ses"; - version = "1.4.4"; - sha256 = "ceb5a1d20b2b2a2b5cbb6e54a731f82902552c01f5b7406cedd469256e74ec56"; + version = "1.4.5"; + sha256 = "a30f23624dcba2d779dc67a13e9b6f9092f7526e1bf54290fdd0684ae42e1329"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24091,14 +24293,50 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-shield" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-shield"; + version = "1.4.5"; + sha256 = "8c2ec2c561fca8653d33136d0f93f6dc4cd4de1b15a0cc00e5eb0ec9d7242fdc"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Shield SDK"; + license = "unknown"; + }) {}; + + "amazonka-sms" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-sms"; + version = "1.4.5"; + sha256 = "4a6ffbf02c58db9928517f48d392d7068a5439b39a7a119a727a9c6dd7b0da78"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Server Migration Service SDK"; + license = "unknown"; + }) {}; + "amazonka-snowball" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-snowball"; - version = "1.4.4"; - sha256 = "d66c1d7ed36ff62a79a973ba9afbd2e050933d59350bfc65e7fc0a59d7b26103"; + version = "1.4.5"; + sha256 = "e27f2c73800874531269dae80e823575ac71820453f1b8c6e406d542ed831e1e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24128,14 +24366,14 @@ self: { license = "unknown"; }) {}; - "amazonka-sns_1_4_4" = callPackage + "amazonka-sns_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-sns"; - version = "1.4.4"; - sha256 = "335f380c3579f139ab5deff522fbfd07398ba6019214923e92657b322a8eadef"; + version = "1.4.5"; + sha256 = "e875c23e6a55cb9753d84f1dab58a39728b9c1ec6b1834db8b5b5d150f888681"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24166,14 +24404,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "amazonka-sqs_1_4_4" = callPackage + "amazonka-sqs_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-sqs"; - version = "1.4.4"; - sha256 = "cfd9c9d4ee269a36a9f05f4fae6261f8707fcf43d738b57758bdbf43a9eff466"; + version = "1.4.5"; + sha256 = "90a38f27bdbe229300cf4a64a253078e51703ad76eb799b597f2ff580fac52dd"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24203,25 +24441,43 @@ self: { license = "unknown"; }) {}; - "amazonka-ssm_1_4_4" = callPackage + "amazonka-ssm_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-ssm"; - version = "1.4.4"; - sha256 = "fdf85f55da22e55c8569b2f5149e7f45acd99a6d3bd656d42977f8885a3e727f"; + version = "1.4.5"; + sha256 = "fbd16ca62f55f53904e78db6e6e3832b94b84541ca22271cd73c51ab7150df52"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text time unordered-containers ]; homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Systems Management Service SDK"; + description = "Amazon Simple Systems Manager (SSM) SDK"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-stepfunctions" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-stepfunctions"; + version = "1.4.5"; + sha256 = "990379c5baff3e530eea53dbd00a43bf49868d81bdc4abd057e6d9ea6ef05218"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Step Functions SDK"; + license = "unknown"; + }) {}; + "amazonka-storagegateway" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers @@ -24240,14 +24496,14 @@ self: { license = "unknown"; }) {}; - "amazonka-storagegateway_1_4_4" = callPackage + "amazonka-storagegateway_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-storagegateway"; - version = "1.4.4"; - sha256 = "5375ce7683cd502795f810dbefd8207b823b1d74a63a29f1f3b9c3bd1bf458c7"; + version = "1.4.5"; + sha256 = "8cdf92d74e7911efabb6cc67bbcdaecbcf71363fc1277b5eb1cadc8c4cf21aeb"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24277,14 +24533,14 @@ self: { license = "unknown"; }) {}; - "amazonka-sts_1_4_4" = callPackage + "amazonka-sts_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-sts"; - version = "1.4.4"; - sha256 = "5eac6f9cb9b5710cf24fdae9f46362d05ae3f1d14a791c7439653b6f2a3f9b9f"; + version = "1.4.5"; + sha256 = "b83baf2122c0c30f52a5e7f9d896b2d9b623ed768e61bf7e9d246534f36de3d5"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24314,14 +24570,14 @@ self: { license = "unknown"; }) {}; - "amazonka-support_1_4_4" = callPackage + "amazonka-support_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-support"; - version = "1.4.4"; - sha256 = "162469b9af326e2a6003a86783fb9275e6ba7c402452c200e94380bbd83455e2"; + version = "1.4.5"; + sha256 = "135f841dfa793226d7b5d166dfa1d8f0c4fce632228329052178389791db8e2b"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24351,14 +24607,14 @@ self: { license = "unknown"; }) {}; - "amazonka-swf_1_4_4" = callPackage + "amazonka-swf_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-swf"; - version = "1.4.4"; - sha256 = "f99a09b5d58a125c2cf3f52a2e20fec1b8d5f9b1aac40e01ee4f53872c67f574"; + version = "1.4.5"; + sha256 = "4397c168cb7bb864e8819ac12e76b9b86885721fda9bc97f42bd6482d7279928"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24392,7 +24648,7 @@ self: { license = "unknown"; }) {}; - "amazonka-test_1_4_4_2" = callPackage + "amazonka-test_1_4_5" = callPackage ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring , case-insensitive, conduit, conduit-extra, groom, http-client , http-types, process, resourcet, tasty, tasty-hunit @@ -24401,8 +24657,8 @@ self: { }: mkDerivation { pname = "amazonka-test"; - version = "1.4.4.2"; - sha256 = "aff0b797f4d00a89d6f0a97e662157f8c510ea8585db26a8f8c2ad2ee37fdd46"; + version = "1.4.5"; + sha256 = "988872cbcd4b102f1fd45a5160b81026087bf4eec1c982dcaaa3df8296b75e3a"; libraryHaskellDepends = [ aeson amazonka-core base bifunctors bytestring case-insensitive conduit conduit-extra groom http-client http-types process @@ -24433,14 +24689,14 @@ self: { license = "unknown"; }) {}; - "amazonka-waf_1_4_4" = callPackage + "amazonka-waf_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-waf"; - version = "1.4.4"; - sha256 = "8a3b59a42d1344cd48418764b17afabacdc1720247af144f332282e41104e88b"; + version = "1.4.5"; + sha256 = "fdc63d12726b015627b135539c732116e96b947be9a774df72ee1d1646cff155"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24470,14 +24726,14 @@ self: { license = "unknown"; }) {}; - "amazonka-workspaces_1_4_4" = callPackage + "amazonka-workspaces_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: mkDerivation { pname = "amazonka-workspaces"; - version = "1.4.4"; - sha256 = "ea89d4cd168dec09787c276ede32ce85536d46e15c88a3fcfe5b3205303307e7"; + version = "1.4.5"; + sha256 = "356c5f0267aa61f4cc3181a8719f7e3a3d9244c473c728aaaba0b4babcb7a7df"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -24489,6 +24745,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-xray" = callPackage + ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring + , tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "amazonka-xray"; + version = "1.4.5"; + sha256 = "e133389857343433d017950ec6b9c853d884d391b91986691f9e6afeeecee250"; + libraryHaskellDepends = [ amazonka-core base ]; + testHaskellDepends = [ + amazonka-core amazonka-test base bytestring tasty tasty-hunit text + time unordered-containers + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon X-Ray SDK"; + license = "unknown"; + }) {}; + "amby" = callPackage ({ mkDerivation, base, bytestring, cassava, Chart, Chart-cairo , Chart-diagrams, colour, containers, data-default @@ -25897,6 +26171,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "apply-refact_0_3_0_1" = callPackage + ({ mkDerivation, base, containers, directory, filemanip, filepath + , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact + , silently, syb, tasty, tasty-expected-failure, tasty-golden + , temporary, transformers, unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.3.0.1"; + sha256 = "1754bd300db92fdf668d4698af053d4da686512264275478946b7e0710c5e814"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filemanip ghc ghc-exactprint mtl process + refact syb temporary transformers unix-compat + ]; + executableHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact syb temporary transformers + unix-compat + ]; + testHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact silently syb tasty + tasty-expected-failure tasty-golden temporary transformers + unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "apportionment" = callPackage ({ mkDerivation, base, containers, utility-ht }: mkDerivation { @@ -26044,8 +26350,8 @@ self: { }: mkDerivation { pname = "arbtt"; - version = "0.9.0.10"; - sha256 = "cc58ebe8508c682f783b238652f0415958c948b4957854624c4f23c131b0fcc2"; + version = "0.9.0.11"; + sha256 = "9133fb9cc88568c3baec403e674e95cfe0ebedc1ff974499d97e93d916bdefef"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -28227,6 +28533,8 @@ self: { pname = "avers"; version = "0.0.17.0"; sha256 = "3e6b4a39ccb99373a1a574625b86d4948f4ba4a747652e3c5ddd8d8b09fe212d"; + revision = "1"; + editedCabalFile = "76f5fea6b94a6dd6041577fd29de245130f3003c73296a94baea62f066b9b474"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -28270,6 +28578,8 @@ self: { pname = "avers-api-docs"; version = "0.0.17.0"; sha256 = "24029af182f7eff072fa05615cea5cf69ab2c5b481f1b2df5f7a606714ca716f"; + revision = "1"; + editedCabalFile = "cfd40f6559ac3e05f5d0da009454b18208e7b76ec87a15fa7311d4f0a7caf7ec"; libraryHaskellDepends = [ aeson avers avers-api base cookie lens servant servant-swagger swagger2 text unordered-containers @@ -28291,6 +28601,8 @@ self: { pname = "avers-server"; version = "0.0.17.0"; sha256 = "6da0c28f2b75989805cb4c2c7bf10b1b6ac4211f310d2bb902a4a7725ce05c3c"; + revision = "1"; + editedCabalFile = "8fb371992bc5535a3d923ec6e16e975ac3d5efaadbb1ae8d4e08400b318f92dc"; libraryHaskellDepends = [ aeson avers avers-api base base64-bytestring bytestring bytestring-conversion containers cookie cryptonite either @@ -29040,8 +29352,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.21"; - sha256 = "a7db049d73b0800399cef22fa016932cd5699d6faf9f6056a350eae1952f6cb4"; + version = "0.5.30"; + sha256 = "27e1437813bc55f173251c3e38f8de81fdc31ebb0f0ae59f10c954ce4cc4c071"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29498,10 +29810,8 @@ self: { }: mkDerivation { pname = "barrier"; - version = "0.1.0"; - sha256 = "9f7c56af995b47791ee0ffa69c27d3de0b895125dbd5fe0c84d8b621467f90ba"; - revision = "2"; - editedCabalFile = "bcb912e8105f792720b8515ddf9b37d6a1eecd17cb325cc40bd688641068e9e6"; + version = "0.1.1"; + sha256 = "6395da01eea1984c7bcc85c624b1b5dfbe0b6b764adeed7b04c9fa4d8de91ed9"; libraryHaskellDepends = [ base blaze-svg bytestring template-haskell text unordered-containers @@ -30580,6 +30890,8 @@ self: { pname = "bifunctors"; version = "5.4.1"; sha256 = "3746f971f69ce31ced23d12e4785d96985f5c620ac7a26d5f4efead970c43b87"; + revision = "1"; + editedCabalFile = "64c592384987528035860a9b2b5d77995f16e9c7d138cf7310e1facd42e36505"; libraryHaskellDepends = [ base base-orphans comonad containers semigroups tagged template-haskell transformers transformers-compat @@ -31176,8 +31488,8 @@ self: { }: mkDerivation { pname = "binary-tagged"; - version = "0.1.4.1"; - sha256 = "86ae562f528dd85e1d87f2e4c886be168e1b1dd78c42e22ae3e9bf36ff879acd"; + version = "0.1.4.2"; + sha256 = "311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers generics-sop hashable nats scientific semigroups SHA tagged text @@ -33255,28 +33567,6 @@ self: { }) {}; "blaze-html" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring - , containers, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-html"; - version = "0.8.1.2"; - sha256 = "f7ee92b38112e939bf251530afb7385a1588a8a6c929f409492dfde7b67ef2b7"; - libraryHaskellDepends = [ - base blaze-builder blaze-markup bytestring text - ]; - testHaskellDepends = [ - base blaze-builder blaze-markup bytestring containers HUnit - QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast HTML combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-html_0_8_1_3" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring , containers, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text @@ -33296,7 +33586,6 @@ self: { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-html-contrib" = callPackage @@ -33369,25 +33658,6 @@ self: { }) {}; "blaze-markup" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-markup"; - version = "0.7.1.0"; - sha256 = "62ce7977b68873eda328c4e8e3c2034102a49718d63631a6dc76abf479b7c6ba"; - libraryHaskellDepends = [ base blaze-builder bytestring text ]; - testHaskellDepends = [ - base blaze-builder bytestring containers HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast markup combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-markup_0_7_1_1" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, text @@ -33404,7 +33674,6 @@ self: { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-shields" = callPackage @@ -34051,8 +34320,8 @@ self: { }: mkDerivation { pname = "bookkeeper"; - version = "0.2.3"; - sha256 = "7aa2a2a42ed03eee2eccc96ed63cfa3b090f55dd432936dc801cd331b684f5b6"; + version = "0.2.4"; + sha256 = "0f75317b35b8c4984fd9e1c0f3a33179387648b1aad33efc7a00d0cc0b7e1f9f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34390,17 +34659,17 @@ self: { }) {}; "bower-json" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, base, bytestring, mtl - , scientific, tasty, tasty-hunit, text, transformers + ({ mkDerivation, aeson, aeson-better-errors, base, bytestring + , deepseq, mtl, scientific, tasty, tasty-hunit, text, transformers , unordered-containers, vector }: mkDerivation { pname = "bower-json"; - version = "0.8.0"; - sha256 = "ee8efa507020dc3f7439849a3662d6bbc72dfec8c1ae8d158e75546138dff3cf"; + version = "0.8.1"; + sha256 = "3fb3cdecc55a0997a9d4d9c3443bcf39b7feed09feb8629fc89b48b1ca7b713f"; libraryHaskellDepends = [ - aeson aeson-better-errors base bytestring mtl scientific text - transformers unordered-containers vector + aeson aeson-better-errors base bytestring deepseq mtl scientific + text transformers unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring tasty tasty-hunit text unordered-containers @@ -34596,8 +34865,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.14"; - sha256 = "5cccff3f432593ad50288e66a78a115c5e030bbb3aca37c332a914d6743bcc81"; + version = "0.15.2"; + sha256 = "7407473d133588df46c43480a2b41a50a04a7f0e63a996c6422a07592b8ca85e"; libraryHaskellDepends = [ base containers contravariant data-default deepseq microlens microlens-mtl microlens-th template-haskell text text-zipper @@ -35314,8 +35583,8 @@ self: { ({ mkDerivation, base, bytestring, cryptohash, QuickCheck }: mkDerivation { pname = "bytestring-arbitrary"; - version = "0.1.0"; - sha256 = "248378d6a7b75e8b9cbadcb3793ddcb17bd1ef7b36ffce02dc99ff11ef49c92b"; + version = "0.1.1"; + sha256 = "bbe78d37e9788ecf6fc4d64633047579b66e71ffcab70cbc8be100a722056efd"; libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ]; testHaskellDepends = [ base bytestring cryptohash QuickCheck ]; homepage = "https://github.com/tsuraan/bytestring-arbitrary"; @@ -35415,24 +35684,6 @@ self: { }) {}; "bytestring-handle" = callPackage - ({ mkDerivation, base, bytestring, HUnit, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - }: - mkDerivation { - pname = "bytestring-handle"; - version = "0.1.0.4"; - sha256 = "3083c6434a6ec552c6c29030f7b2c44b53dead5f05f4a8363e3c350552ffbe60"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "http://hub.darcs.net/ganesh/bytestring-handle"; - description = "ByteString-backed Handles"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bytestring-handle_0_1_0_5" = callPackage ({ mkDerivation, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 }: @@ -35448,7 +35699,6 @@ self: { homepage = "http://hub.darcs.net/ganesh/bytestring-handle"; description = "ByteString-backed Handles"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-lexing" = callPackage @@ -35583,6 +35833,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytestring-time" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, hspec + , QuickCheck, text, time + }: + mkDerivation { + pname = "bytestring-time"; + version = "0.1.0"; + sha256 = "824afd4536f2062ffb16169b0989dc26890a83cd1515dff34e33b826608a7603"; + libraryHaskellDepends = [ attoparsec base bytestring text time ]; + testHaskellDepends = [ + attoparsec base bytestring Cabal hspec QuickCheck text time + ]; + homepage = "https://github.com/klangner/bytestring-time"; + description = "Library for Time parsing from ByteString"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bytestring-tree-builder" = callPackage ({ mkDerivation, base, base-prelude, bytestring , quickcheck-instances, semigroups, tasty, tasty-hunit @@ -35972,8 +36239,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.35.5"; - sha256 = "7cd914109290b09c8269a42809cb0d0c29d5e9f9dec8226333d2e3179bb8c381"; + version = "4.35.6"; + sha256 = "8ef80d1bc5b3085475c3486c900defb0aeae2ef5ff23bf6d41653d12a3e7e4de"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36045,21 +36312,6 @@ self: { }) {}; "cabal-file-th" = callPackage - ({ mkDerivation, base, Cabal, directory, template-haskell }: - mkDerivation { - pname = "cabal-file-th"; - version = "0.2.3"; - sha256 = "2866e1bea82f5873423411bec9dbded2e4cc878ad7d05108c1339b62cbda5c4d"; - revision = "1"; - editedCabalFile = "50bc6cf5a335a2608ab1e5e59b73f184d3f48d91f49fec189701416ff3e1e37e"; - libraryHaskellDepends = [ base Cabal directory template-haskell ]; - testHaskellDepends = [ base ]; - homepage = "http://github.com/nkpart/cabal-file-th"; - description = "Template Haskell expressions for reading fields from a project's cabal file"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cabal-file-th_0_2_4" = callPackage ({ mkDerivation, base, Cabal, directory, pretty, template-haskell }: mkDerivation { @@ -36073,7 +36325,6 @@ self: { homepage = "http://github.com/nkpart/cabal-file-th"; description = "Template Haskell expressions for reading fields from a project's cabal file"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-ghc-dynflags" = callPackage @@ -36186,10 +36437,8 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "1.24.0.1"; - sha256 = "09f5fd8a2aa7f9565800a711a133f8142d36d59b38f59da09c25045b83ee9ecc"; - revision = "1"; - editedCabalFile = "bf42e042bf673561d1d6c2c82d5679e1d0972e6ba8ee2d76604fd188174fa797"; + version = "1.24.0.2"; + sha256 = "2ac8819238a0e57fff9c3c857e97b8705b1b5fef2e46cd2829e85d96e2a00fe0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36412,24 +36661,6 @@ self: { }) {}; "cabal-rpm" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath, old-locale - , process, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; - version = "0.10.0"; - sha256 = "b516bd0850bd1433bd5bba7e93d98c6fe22ea785aa0d640584208d9c22437112"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal directory filepath old-locale process time unix - ]; - homepage = "https://github.com/juhp/cabal-rpm"; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "cabal-rpm_0_10_1" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, old-locale , process, time, unix }: @@ -36445,7 +36676,6 @@ self: { homepage = "https://github.com/juhp/cabal-rpm"; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-scripts" = callPackage @@ -38481,29 +38711,6 @@ self: { }) {}; "cayley-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , exceptions, hspec, http-client, http-conduit, lens, lens-aeson - , mtl, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; - version = "0.2.1.0"; - sha256 = "670264faf8ac3366ffe40d22fae24fde437d60fffbff6f1753a92aef798a1c19"; - revision = "1"; - editedCabalFile = "96e6564d03d1aa6a47aba589a085374b0c50a85af96ed56d1f884774905c0359"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - homepage = "https://github.com/MichelBoucey/cayley-client"; - description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cayley-client_0_2_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector @@ -40600,38 +40807,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, say - , semigroups, stm, stm-chans, text, time, time-locale-compat - , transformers, transformers-base, unordered-containers, vector - , vector-instances - }: - mkDerivation { - pname = "classy-prelude"; - version = "1.0.1"; - sha256 = "a27cb14f5b8dfde02da08a2e7cce0d0f9ae59d7a42cdb838ef10584e5a42c993"; - 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 say semigroups stm stm-chans 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_2" = callPackage ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim , hashable, hspec, lifted-async, lifted-base, monad-unlift @@ -40664,28 +40839,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.1"; - sha256 = "1307d30366f8827f9226db01895db0b5aa0712aa07abb41754c992ac1fc0006c"; - 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_2" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet , transformers, void @@ -40708,26 +40861,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.1"; - sha256 = "b7a0b195b9647fa49664dbaab4128c0e8f8b1a26f62063c0b6ed273c55e93b53"; - 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_2" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types , persistent, yesod, yesod-newsfeed, yesod-static @@ -40751,8 +40884,8 @@ self: { ({ mkDerivation, base, template-haskell, type-list }: mkDerivation { pname = "classyplate"; - version = "0.2.0.0"; - sha256 = "962081fdb262da338d9e1076cb6ac21a75a6230f641301f06580de88cf796188"; + version = "0.3.0.0"; + sha256 = "a422c975aa2e1fd56ad44261f45023d555a777a81bee672de547c7b7ff7c4bc6"; libraryHaskellDepends = [ base template-haskell type-list ]; description = "Fuseable type-class based generics"; license = stdenv.lib.licenses.bsd3; @@ -41265,6 +41398,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clit" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, bytestring + , http-client, http-client-tls, http-types, optparse-applicative + , split + }: + mkDerivation { + pname = "clit"; + version = "0.1.0.0"; + sha256 = "7845c4a1d58becddb4683fa2972e3aa40eb62ca43d63e7c9b63905666af23c6b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson authenticate-oauth base bytestring http-client + http-client-tls http-types optparse-applicative split + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/vmchale/command-line-tweeter#readme"; + description = "Post tweets that you pipe to stdin"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cloben" = callPackage ({ mkDerivation, base, foldl, process, system-filepath, temporary , text, turtle @@ -42108,8 +42262,8 @@ self: { }: mkDerivation { pname = "coin"; - version = "1.1.1"; - sha256 = "e020b0b4f31586832db5e56e0d757d60546071d2ca7bfef1f451d154f02486a2"; + version = "1.2"; + sha256 = "d046c554fbb2111641744507625518b8a3b012fcbe8c7a88e3ce971291f47907"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -42304,6 +42458,8 @@ self: { pname = "collections-api"; version = "1.0.0.0"; sha256 = "b4dc47ec1552b66e69a465e9f974c8afab914b6a85f8214398969b1daf0efc6d"; + revision = "2"; + editedCabalFile = "b497904367aafbe7949dfa846aa34eec27b9ee99bc61ee2f665d48fdf83e7d1c"; libraryHaskellDepends = [ array base QuickCheck ]; homepage = "http://code.haskell.org/collections/"; description = "API for collection data structures"; @@ -42429,8 +42585,10 @@ self: { }: mkDerivation { pname = "colour-space"; - version = "0.1.1.0"; - sha256 = "1dcb84098dfbe7389e4794fef80e629a95cc3607f5277092965f8a4604152339"; + version = "0.1.2.0"; + sha256 = "963b04b703a2d5f273ffc43b3687e6d58afed144eef47d4070b0bdec6f3bd3e5"; + revision = "1"; + editedCabalFile = "54a4d19227a0e550ad5c89295596d5c8b3b3d8d9ffd0b1f937ca48198ce6e7ad"; libraryHaskellDepends = [ base colour constrained-categories JuicyPixels linear linearmap-category manifolds semigroups vector-space @@ -43789,34 +43947,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.2"; - sha256 = "561cd11eef07fd400528e79186c1c57e43583d19e47b4f45216e154687cf5382"; - 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_3" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers , directory, filepath, hspec, monad-control, mono-traversable, mtl @@ -43842,7 +43972,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 @@ -44051,6 +44180,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "conf-json" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, directory, hspec + , QuickCheck + }: + mkDerivation { + pname = "conf-json"; + version = "1.1"; + sha256 = "3d870c1fade614cac69169404ea6b1d6318a8026e121a14937a0e8e74ca1fe49"; + revision = "6"; + editedCabalFile = "8e300dbe34fc4677039940c6d91fb746a086097b276356b43019fecf24fadbb7"; + libraryHaskellDepends = [ aeson base bytestring directory ]; + testHaskellDepends = [ + aeson base binary bytestring directory hspec QuickCheck + ]; + homepage = "https://github.com/ciez/conf-json"; + description = "read, parse json config"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "conffmt" = callPackage ({ mkDerivation, base, language-conf, megaparsec , optparse-applicative, pretty, text @@ -44439,12 +44587,12 @@ self: { }) {}; "console-style" = callPackage - ({ mkDerivation, base, mtl, semigroups, transformers }: + ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "console-style"; - version = "0.0.2.0"; - sha256 = "5e6e372560a61bcd882af5f8255e6c3fbe4d28e8ad459e3dc9c28853ef809f5c"; - libraryHaskellDepends = [ base mtl semigroups transformers ]; + version = "0.0.2.1"; + sha256 = "6d818ea841d7acfe6c42cc3fc7751e324656abfd0509ce470bc8bdbf52d1bd7f"; + libraryHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/minad/console-style#readme"; description = "Styled console text output using ANSI escape sequences"; license = stdenv.lib.licenses.mit; @@ -45742,15 +45890,15 @@ self: { }) {}; "countable-inflections" = callPackage - ({ mkDerivation, base, bytestring, exceptions, hspec, pcre-light - , QuickCheck, text + ({ mkDerivation, base, bytestring, exceptions, hspec, pcre-utils + , QuickCheck, regex-pcre-builtin, text }: mkDerivation { pname = "countable-inflections"; - version = "0.1.0"; - sha256 = "24bb1f350cfbab09c8de1ededab28f138038d04c86e3614d8dc8514f8c8f1db9"; + version = "0.2.0"; + sha256 = "1ee92bece3c2bbf153dac013ee854fe8132702ee74cb61c07e7999ca1e35496d"; libraryHaskellDepends = [ - base bytestring exceptions pcre-light text + base bytestring exceptions pcre-utils regex-pcre-builtin text ]; testHaskellDepends = [ base hspec QuickCheck text ]; homepage = "https://github.com/tippenein/countable-inflections"; @@ -47145,6 +47293,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "crypto-rng" = callPackage + ({ mkDerivation, base, bytestring, crypto-api, DRBG, exceptions + , monad-control, mtl, transformers-base + }: + mkDerivation { + pname = "crypto-rng"; + version = "0.1.0.0"; + sha256 = "cde72050adb3c430de86c9c830d9fe9255ab857285c35adc20bded58f3df12cc"; + libraryHaskellDepends = [ + base bytestring crypto-api DRBG exceptions monad-control mtl + transformers-base + ]; + homepage = "https://github.com/scrive/crypto-rng"; + description = "Cryptographic random number generator"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "crypto-simple" = callPackage ({ mkDerivation, base, bytestring, cryptonite, hspec, QuickCheck }: mkDerivation { @@ -47480,8 +47645,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.6.0"; - sha256 = "08d43d6d701b85ffa3617c8142e23a32daef3156a704b0d30d892e1beb875424"; + version = "0.6.1"; + sha256 = "aa97c5076d7d1d217ea62027b7529b8acfb6539001aafa50da3064fb4afbf1c1"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -50469,16 +50634,16 @@ self: { "datasets" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, directory - , file-embed, filepath, hashable, HTTP, stringsearch, text, time - , vector + , file-embed, filepath, hashable, microlens, stringsearch, text + , time, vector, wreq }: mkDerivation { pname = "datasets"; - version = "0.2.1"; - sha256 = "af3d9e9093358b9b1a320645a0411c750e9b7ed723f3d29088b5addaeeeb1277"; + version = "0.2.2"; + sha256 = "d79ae10e42a208a4413f8b4851c18cff671ec0f578108f2f71bbf7cba215f127"; libraryHaskellDepends = [ aeson base bytestring cassava directory file-embed filepath - hashable HTTP stringsearch text time vector + hashable microlens stringsearch text time vector wreq ]; homepage = "https://github.com/glutamate/datasets"; description = "Classical data sets for statistics and machine learning"; @@ -51397,15 +51562,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "declarative_0_3_3" = callPackage + "declarative_0_3_4" = callPackage ({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types , mighty-metropolis, mwc-probability, pipes, primitive , speedy-slice, transformers }: mkDerivation { pname = "declarative"; - version = "0.3.3"; - sha256 = "77d14c47453135ed727b0e8323244a68bb10b74a6c4bdaf5e24eb8a619683dee"; + version = "0.3.4"; + sha256 = "4d731ea4199f322fa8028a44ed3e5155e2ae58f27542f1e8a8f0ee4116ec226b"; libraryHaskellDepends = [ base hasty-hamiltonian lens mcmc-types mighty-metropolis mwc-probability pipes primitive speedy-slice transformers @@ -52269,10 +52434,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "derive-storable"; - version = "0.1.0.4"; - sha256 = "eb45d84603824334442b68ef07eb107d1b7ccd69e17161ef2a7fc5b5b4df339a"; - revision = "1"; - editedCabalFile = "7b6e8b2dc9d542e818d131d4f6e52a14fed5dce75c20855b7f2d21ab51b74608"; + version = "0.1.0.6"; + sha256 = "692a0f29e0959a51d3159f6ca0bb2c9d95fd38cc2ed9d8d26b242f998dd9b012"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://www.github.com/mkloczko/derive-storable/"; @@ -52346,6 +52509,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_3_5" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, QuickCheck, tagged + , template-haskell, transformers, transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.3.5"; + sha256 = "0a165c8eeb78349ded41cf51750753cdd0e25c139171789f7a4b0c6be4ccd231"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell transformers + transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat + ]; + homepage = "https://github.com/haskell-compat/deriving-compat"; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -52571,6 +52757,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dhall" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , http-client, http-client-tls, microlens, microlens-mtl + , neat-interpolation, optparse-generic, parsers, system-fileio + , system-filepath, text, text-format, transformers, trifecta + , unordered-containers, vector + }: + mkDerivation { + pname = "dhall"; + version = "1.0.1"; + sha256 = "4bc7a6e0de32900ac64b58024ea989c3afaeab0f9a3e1256a04090eb6233b428"; + revision = "1"; + editedCabalFile = "a149e10771a65c573ffb2c9ed1c6694f11392590a36d60a9b1c48f02d0e9e77c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring containers http-client + http-client-tls microlens microlens-mtl neat-interpolation parsers + system-fileio system-filepath text text-format transformers + trifecta unordered-containers vector + ]; + executableHaskellDepends = [ base optparse-generic text trifecta ]; + description = "A configuration language guaranteed to terminate"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dia-base" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -53097,6 +53309,8 @@ self: { pname = "diagrams-pgf"; version = "1.4"; sha256 = "068f1fbc8c3ebdfa37d47e96e060b8040c7425c014aecd8e4f022477a51e6687"; + revision = "1"; + editedCabalFile = "831aa29cc0f758091f2a7a288537b305dec5a846d178f8c55e31d37f33bc75b8"; libraryHaskellDepends = [ base bytestring bytestring-builder colour containers diagrams-core diagrams-lib directory filepath hashable JuicyPixels mtl @@ -53352,8 +53566,8 @@ self: { }: mkDerivation { pname = "dib"; - version = "0.5.0"; - sha256 = "2f4a58c4a97c55bed558fee3be61886e05d55cd560f13d98f5cdce4d8ddbe294"; + version = "0.6.1"; + sha256 = "3465169e4968fb9b6c0bbd5f283e1778e429dd33005494707c3945fc6b9deb78"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53910,8 +54124,8 @@ self: { ({ mkDerivation, base, numtype-tf, time }: mkDerivation { pname = "dimensional-tf"; - version = "0.3.0.3"; - sha256 = "50081bf621515ee7fbe54f7aac45b0f3df7433dcc6ba681e0ca418f0cd17b110"; + version = "0.3.0.4"; + sha256 = "818bed66794f5669ddadb74887542ebe87df474d436f2ae0903b063909574d14"; libraryHaskellDepends = [ base numtype-tf time ]; homepage = "http://dimensional.googlecode.com/"; description = "Statically checked physical dimensions, implemented using type families"; @@ -54130,8 +54344,8 @@ self: { }: mkDerivation { pname = "direct-sqlite"; - version = "2.3.18"; - sha256 = "47311cb4070220012f6a7e3e75c04ba1da6e4c1975cdf823a1e13bee72dc433d"; + version = "2.3.19"; + sha256 = "f47e9b99888ddd9e3f3811a575590cbc35f4e41f0897f01f0d0b9b44c2e6eb3c"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base base16-bytestring bytestring directory HUnit temporary text @@ -54158,12 +54372,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_2_7_1" = callPackage + "directory_1_3_0_0" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.2.7.1"; - sha256 = "cf3c0984238ac5bb67706b03f86f823feb50d46092ed6ec6e523b89a1d0836cf"; + version = "1.3.0.0"; + sha256 = "369cd8212b0167b48ea7ad1f44a4ae7648286af21449bd816492ced03fbdd387"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -54439,6 +54653,8 @@ self: { pname = "distributed-process"; version = "0.6.6"; sha256 = "e881775dabea50ccd3370242c8a3acd87c9b8ce9e47f3d4c2d0a6b2ec7b3b7d0"; + revision = "1"; + editedCabalFile = "5958661e4bceb18f38e9eb9828a58d1c811102f84a74376d7b18b88cde8ba1e7"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq distributed-static exceptions hashable mtl network-transport random @@ -54563,8 +54779,8 @@ self: { pname = "distributed-process-execution"; version = "0.1.2.2"; sha256 = "9fbfca6b394e52af462586127a0edc2efc2a160ae8f69a9d34234a71e3dbf7b5"; - revision = "1"; - editedCabalFile = "c7fad93838da34d675ea6484d0697e437ab3453d580e9759fa0c5bd66f86d7bf"; + revision = "2"; + editedCabalFile = "cfd179986e0282f924ce5d7977a44fa31cc8de3115a5de842b9151f11b0578a2"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process distributed-process-client-server distributed-process-extras @@ -54598,8 +54814,8 @@ self: { pname = "distributed-process-extras"; version = "0.2.1.2"; sha256 = "c1a4e1a5e3ec30089251db40fd479b19c5fd74c9dd8ca50f8eb32aaf9747a048"; - revision = "1"; - editedCabalFile = "5f287b8a5c2d4460cc101fd2b96d116fa74876b894f8ae5ab44b925af5f233d6"; + revision = "2"; + editedCabalFile = "e487c5799fa82b7e6b88ddf2d58e21d9add876a967b2820f502ac5c5307aec31"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process fingertree hashable mtl stm time transformers unordered-containers @@ -55158,6 +55374,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dmc" = callPackage + ({ mkDerivation, base, hspec, process, QuickCheck }: + mkDerivation { + pname = "dmc"; + version = "1.1"; + sha256 = "76467975ce4b2e65ae67c42e84a78fd995655f39754595e920b903b13009c2ae"; + revision = "2"; + editedCabalFile = "a6e8ae3524d68892f9bd71b80c0cb52f4ef0c11ec7212b554f63e25ae65afde6"; + libraryHaskellDepends = [ base process ]; + testHaskellDepends = [ base hspec process QuickCheck ]; + homepage = "https://github.com/ciez/dmc"; + description = "cmd: run shell commands from code"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "dmenu" = callPackage ({ mkDerivation, base, containers, directory, lens, mtl, process , transformers @@ -55673,25 +55904,16 @@ self: { }) {}; "dominion" = callPackage - ({ mkDerivation, base, hscolour, hspec, lens, mtl, random - , random-extras, random-fu, transformers - }: + ({ mkDerivation, base, containers, hspec, lens, mtl, random }: mkDerivation { pname = "dominion"; - version = "0.1.0.4"; - sha256 = "be25f1fb393288603a619b5fd26b25b05c756726c8f5ee69f447cea61250d78f"; + version = "0.1.1.0"; + sha256 = "bea01160caf8636409a3f07f3021c310ee81b67d6037fd62d533993ee746b112"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base hscolour lens mtl random random-extras random-fu transformers - ]; - executableHaskellDepends = [ - base hscolour lens mtl random random-extras random-fu transformers - ]; - testHaskellDepends = [ - base hscolour hspec lens mtl random random-extras random-fu - transformers - ]; + libraryHaskellDepends = [ base containers lens mtl random ]; + executableHaskellDepends = [ base containers lens mtl random ]; + testHaskellDepends = [ base containers hspec lens mtl random ]; homepage = "http://github.com/egonschiele/dominion"; description = "A simulator for the board game Dominion"; license = stdenv.lib.licenses.bsd3; @@ -55873,6 +56095,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "double-conversion_2_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, HUnit, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "double-conversion"; + version = "2.0.2.0"; + sha256 = "44cde172395401169e844d6791b6eb0ef2c2e55a08de8dda96551cfe029ba26b"; + libraryHaskellDepends = [ base bytestring ghc-prim text ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + homepage = "https://github.com/bos/double-conversion"; + description = "Fast conversion between double precision floating point and text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "double-metaphone" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -56937,23 +57178,24 @@ self: { "dynamic-plot" = callPackage ({ mkDerivation, base, colour, colour-space, constrained-categories , containers, data-default, deepseq, diagrams-cairo, diagrams-core - , diagrams-gtk, diagrams-lib, free-vector-spaces, glib, gtk, lens - , linearmap-category, manifolds, MemoTrie, MonadRandom, mtl - , process, random, semigroups, tagged, time, transformers, vector - , vector-space + , diagrams-gtk, diagrams-lib, free-vector-spaces, glib, gtk + , JuicyPixels, lens, linearmap-category, manifold-random, manifolds + , MemoTrie, mtl, process, random, random-fu, semigroups, tagged + , time, transformers, vector, vector-space }: mkDerivation { pname = "dynamic-plot"; - version = "0.2.0.0"; - sha256 = "4a5e2d6105139bd8756d3b1d1d2fbffcf36cb435e02973efa9066123cbd3e528"; + version = "0.2.1.0"; + sha256 = "8d75d0d068f801f2da0199738b43261966f265f62f58b3ad9f5b33e7c7158999"; revision = "1"; - editedCabalFile = "a527e3da82b5b147ba9cfed25526a2a34eb07cd42710dbea9aee590a15d88fed"; + editedCabalFile = "d2d367212ca5c730e629b14d04a12eccc8bee0d3bead4f16c7db230507753c4e"; libraryHaskellDepends = [ base colour colour-space constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk - diagrams-lib free-vector-spaces glib gtk lens linearmap-category - manifolds MemoTrie MonadRandom mtl process random semigroups tagged - time transformers vector vector-space + diagrams-lib free-vector-spaces glib gtk JuicyPixels lens + linearmap-category manifold-random manifolds MemoTrie mtl process + random random-fu semigroups tagged time transformers vector + vector-space ]; homepage = "https://github.com/leftaroundabout/dynamic-plot"; description = "Interactive diagram windows"; @@ -56998,6 +57240,34 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "dynamodb-simple" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb + , base, bytestring, conduit, containers, double-conversion + , exceptions, generics-sop, hashable, hspec, lens, monad-loops + , monad-supply, safe-exceptions, scientific, semigroups, tagged + , template-haskell, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "dynamodb-simple"; + version = "0.2.0.0"; + sha256 = "d1fbc3a6f4df1b8a8a5125227e3492299cca6b88cec6b24d838ade5f081406b9"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-dynamodb base bytestring + conduit containers double-conversion exceptions generics-sop + hashable lens monad-loops monad-supply scientific semigroups tagged + template-haskell text transformers unordered-containers vector + ]; + testHaskellDepends = [ + amazonka amazonka-dynamodb base conduit containers hashable hspec + lens safe-exceptions semigroups tagged text transformers + unordered-containers + ]; + homepage = "https://github.com/ondrap/dynamodb-simple"; + description = "Typesafe library for working with DynamoDB database"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dynobud" = callPackage ({ mkDerivation, aeson, base, binary, casadi-bindings , casadi-bindings-core, cereal, containers, data-default-class @@ -57166,6 +57436,9 @@ self: { pname = "easyrender"; version = "0.1.1.2"; sha256 = "303d5f310105be9afd27382134ff4d7802a899f980192953f46a9602ae2aa616"; + revision = "1"; + editedCabalFile = "26ce39b96e803d7176fd787298a8dd123f80bc67165bddda9bbb722dfa4bfd3e"; + setupHaskellDepends = [ base superdoc ]; libraryHaskellDepends = [ base bytestring containers mtl superdoc zlib ]; @@ -57175,6 +57448,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "easytensor" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "easytensor"; + version = "0.1.0.0"; + sha256 = "7ff2225d2081f0151f64cc53cea036f02188e278ba005b1e561e0d1701f0b031"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ghc-prim ]; + executableHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/achirkin/easytensor#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.mit; + }) {}; + "ebeats" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -57367,30 +57656,6 @@ self: { }) {}; "ede" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors - , bytestring, comonad, directory, filepath, free, lens, mtl - , parsers, scientific, semigroups, tasty, tasty-golden, text - , text-format, text-manipulate, trifecta, unordered-containers - , vector - }: - mkDerivation { - pname = "ede"; - version = "0.2.8.5"; - sha256 = "899e146093fc5353f6e86130898e2396d39c5365a412e67a8435252e8a4f2fb3"; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base bifunctors bytestring comonad directory - filepath free lens mtl parsers scientific semigroups text - text-format text-manipulate trifecta unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bifunctors bytestring directory tasty tasty-golden text - ]; - homepage = "http://github.com/brendanhay/ede"; - description = "Templating language with similar syntax and features to Liquid or Jinja2"; - license = "unknown"; - }) {}; - - "ede_0_2_8_6" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors , bytestring, comonad, directory, filepath, free, lens, mtl , parsers, scientific, semigroups, tasty, tasty-golden, text @@ -57412,7 +57677,6 @@ self: { homepage = "http://github.com/brendanhay/ede"; description = "Templating language with similar syntax and features to Liquid or Jinja2"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "edenmodules" = callPackage @@ -58353,6 +58617,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "elm-export-persistent" = callPackage + ({ mkDerivation, aeson, base, elm-export, persistent, scientific + , text, unordered-containers + }: + mkDerivation { + pname = "elm-export-persistent"; + version = "0.1.1"; + sha256 = "a1866db56266261df0d8e99acc0534c32db75c1314b0578c089f02e34cad7ca2"; + libraryHaskellDepends = [ + aeson base elm-export persistent scientific text + unordered-containers + ]; + homepage = "https://github.com/jb55/elm-export-persistent"; + description = "elm-export persistent entities"; + license = stdenv.lib.licenses.mit; + }) {}; + "elm-get" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, base, binary , bytestring, containers, directory, Elm, filepath, HTTP @@ -59769,21 +60050,6 @@ self: { }) {}; "errors" = callPackage - ({ mkDerivation, base, safe, transformers, transformers-compat - , unexceptionalio - }: - mkDerivation { - pname = "errors"; - version = "2.1.2"; - sha256 = "5c818778b88b76eca016348a04395c1d4913d7c125c0b9c0a1ccf69accf9d887"; - libraryHaskellDepends = [ - base safe transformers transformers-compat unexceptionalio - ]; - description = "Simplified error-handling"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "errors_2_1_3" = callPackage ({ mkDerivation, base, safe, transformers, transformers-compat , unexceptionalio }: @@ -59796,7 +60062,6 @@ self: { ]; description = "Simplified error-handling"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ersaconcat" = callPackage @@ -60323,8 +60588,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.8.2.0"; - sha256 = "2d3e90201da379a76f68aed93b0058d76f766ae07e4078c797e5f91c0e315f1b"; + version = "0.8.2.1"; + sha256 = "aed31b9515e726ae439323590336295cbdcd9c530aebb95f976a1068fc4c6848"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -60579,8 +60844,8 @@ self: { }: mkDerivation { pname = "exception-transformers"; - version = "0.4.0.4"; - sha256 = "d9b3a527acaeb1c03746db4704d8f64453d02ab4b89d16bd90fb4dbe7b9e7696"; + version = "0.4.0.5"; + sha256 = "564caaaac6c2d1759a13d2c2c8a1d7a4b0109035558c4641fa7a8a378961088b"; libraryHaskellDepends = [ base stm transformers transformers-compat ]; @@ -60613,6 +60878,8 @@ self: { pname = "exceptions"; version = "0.8.3"; sha256 = "4d6ad97e8e3d5dc6ce9ae68a469dc2fd3f66e9d312bc6faa7ab162eddcef87be"; + revision = "1"; + editedCabalFile = "fc13261461399b8610d60468757f2fc0a62ed660dee998f4329e33dd76d2191b"; libraryHaskellDepends = [ base mtl stm template-haskell transformers transformers-compat ]; @@ -62062,6 +62329,8 @@ self: { pname = "fb"; version = "1.0.13"; sha256 = "52af3e05b5721b5d38fea9231e9fde68b0e1987c4cc979acaf6e2f940537935e"; + revision = "1"; + editedCabalFile = "ff5a76303ad659f13394147cf6a3bbc3ee25e0ddf2df684d5b9a199c546dc75c"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bytestring cereal conduit conduit-extra crypto-api cryptohash @@ -63269,6 +63538,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "find-source-files" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath, mtl }: + mkDerivation { + pname = "find-source-files"; + version = "0.1.0.0"; + sha256 = "2c5307c3221ee9a932a93963d4d730ba1d84cce525c598571a4e4570d1753ec6"; + libraryHaskellDepends = [ base Cabal directory filepath mtl ]; + homepage = "https://github.com/oisdk/find-source-files#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.mit; + }) {}; + "fingertree" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 @@ -63676,6 +63957,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fixed-width" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "fixed-width"; + version = "0.1.0.0"; + sha256 = "c7e7a455513626b2ce6ddeb54036fd789d9e00b02ab4f13396b8add0c0e1b53f"; + libraryHaskellDepends = [ base ]; + description = "Fixed width subsets of an Int64/Word64"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fixedprec" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -63894,22 +64186,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "flat-mcmc_1_4_0" = callPackage + "flat-mcmc_1_4_2" = callPackage ({ mkDerivation, base, formatting, mcmc-types, monad-par , monad-par-extras, mwc-probability, pipes, primitive, text , transformers, vector }: mkDerivation { pname = "flat-mcmc"; - version = "1.4.0"; - sha256 = "daf0ba3202b7c315e022db361eb01d399d6cec4c742a12d94aeb7a13e95f2b7b"; - isLibrary = true; - isExecutable = true; + version = "1.4.2"; + sha256 = "0da3a4fc0d29b994c7aa8a9e5d3f902f15e5a61bde143300438ecaa2318631fa"; libraryHaskellDepends = [ base formatting mcmc-types monad-par monad-par-extras mwc-probability pipes primitive text transformers vector ]; - executableHaskellDepends = [ base vector ]; testHaskellDepends = [ base vector ]; homepage = "https://github.com/jtobin/flat-mcmc"; description = "Painless general-purpose sampling"; @@ -64480,15 +64769,16 @@ self: { }) {}; "fmt" = callPackage - ({ mkDerivation, base, text, text-format }: + ({ mkDerivation, base, hspec, text, text-format }: mkDerivation { pname = "fmt"; - version = "0.0.0.1"; - sha256 = "e118bd72ec75ad1c749cf43492e85aeed5ee8a3cf616e2af4884f492123d8b30"; + version = "0.0.0.2"; + sha256 = "8cf2554099987e09090d8b7ac084ff1b389c934e3de1cc99c0f29d754ff0a20a"; libraryHaskellDepends = [ base text text-format ]; + testHaskellDepends = [ base hspec text ]; homepage = "http://github.com/aelve/fmt"; description = "Nice formatting library"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; }) {}; "fn" = callPackage @@ -66050,6 +66340,8 @@ self: { pname = "frisby"; version = "0.2"; sha256 = "a3389559849cfc3284923d9b543897abc924c5c076a383890a6a8f21cf4d5247"; + revision = "1"; + editedCabalFile = "12db65dfa550e3fb99cf8924ebf71c9308465391ee91a897741fdbcca65fe1c6"; libraryHaskellDepends = [ array base containers mtl ]; homepage = "http://repetae.net/computer/frisby/"; description = "Linear time composable parser for PEG grammars"; @@ -66883,8 +67175,8 @@ self: { ({ mkDerivation, base, cmdargs, directory, old-time, process }: mkDerivation { pname = "fuzzytime"; - version = "0.7.7"; - sha256 = "f98a572c199ad3c5cc9232e83df33b22bf90fd46c48d264e100fa411e7f7cb9b"; + version = "0.7.8"; + sha256 = "805ae4943fb04808e5e582919235a8e0f61ffc0878fbce41cea29d2609822a1c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -67766,8 +68058,8 @@ self: { ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { pname = "generics-sop"; - version = "0.2.2.0"; - sha256 = "3509e6fd5d9e1337691a88bb7941731f03cf93a42f12a6227dd1a5def9616220"; + version = "0.2.3.0"; + sha256 = "2e2c8291de476e103d1978c6ad569be05705fbc178ac89ec68d6a8e20672d377"; libraryHaskellDepends = [ base ghc-prim template-haskell ]; testHaskellDepends = [ base ]; description = "Generic Programming using True Sums of Products"; @@ -67778,10 +68070,8 @@ self: { ({ mkDerivation, base, generics-sop, lens }: mkDerivation { pname = "generics-sop-lens"; - version = "0.1.2.0"; - sha256 = "bafd04f0238e19d73da60ae018c1c82cb3e4be49990c61a6049dec2dafff40f6"; - revision = "1"; - editedCabalFile = "6ea2756e5e916c6a7d24f7d261bb0bf27925b8d8dd30332df4a053160596afcc"; + version = "0.1.2.1"; + sha256 = "4e49d4cc580d45e25e0abdeee12b1191ae75937af1c7ca03333979584a8a525c"; libraryHaskellDepends = [ base generics-sop lens ]; homepage = "https://github.com/phadej/generics-sop-lens#readme"; description = "Lenses for types in generics-sop"; @@ -67973,6 +68263,8 @@ self: { pname = "genvalidity"; version = "0.2.0.4"; sha256 = "dca8c978f6bedb08199042fa7001dc94143cc69bb3bfc0d4dc90346a19ca8e57"; + revision = "2"; + editedCabalFile = "6865bde6373f043b1411042b9837392bcc3662c1ed78fa1b53f905af3fbb3461"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -68005,6 +68297,8 @@ self: { pname = "genvalidity-hspec"; version = "0.2.0.5"; sha256 = "af4b3a7db29bc9cfe9f10de84256350de91a67d6d3676c8fb269dddf32bce62b"; + revision = "1"; + editedCabalFile = "34c42da21c1b3a5120be73a5b01f005d3c9278c8b45bce87b8d10b25d185db46"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; @@ -68857,14 +69151,14 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.0.0"; - sha256 = "58adf44ad70a30be50397c8ec85390596afa821dca40b92378d46e31e6fb0fe8"; + version = "1.0.1"; + sha256 = "3949eb1542f92ed99b38d4f2eb3efb6161fe3250a778b71e638af52463c23de4"; libraryHaskellDepends = [ attoparsec base containers scientific text time ]; testHaskellDepends = [ - attoparsec base directory filepath process tasty tasty-hunit - temporary text + attoparsec base containers directory filepath process tasty + tasty-hunit temporary text ]; homepage = "https://github.com/maoe/ghc-prof"; description = "Library for parsing GHC time and allocation profiling reports"; @@ -69264,8 +69558,8 @@ self: { ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.7.0.2"; - sha256 = "eccf3df2533b5ebcc619f79bb791b84e01765ce66f77b3039cbece34a0302de1"; + version = "0.7.0.3"; + sha256 = "e2c65cfafc438029ef8e9ad504ca01e9c92168d9e6f863411a3e8c6ea62cde33"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; @@ -69294,8 +69588,8 @@ self: { ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.7.0.1"; - sha256 = "3a4d95d81f32e46bbd0b50254d56b57315dbfd2cdd47845116095356f5122af4"; + version = "0.7.0.3"; + sha256 = "3ec7c0973dfce18d77df9b6162c29c4af6ea2356da679510c034ae8c31a4c029"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; @@ -69307,8 +69601,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.7.0.2"; - sha256 = "7ff04a5bc39b2b84c98badd6f8f569ca9d97fec348c0734821801f7090a1efd6"; + version = "0.7.0.3"; + sha256 = "77ecc2d8ee887d4a35cf6161106e278613fe7552569af3a49f136c64dddde0be"; isLibrary = false; isExecutable = false; description = "DOM library using JSFFI and GHCJS"; @@ -69473,14 +69767,14 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) atk;}; - "gi-atk_2_0_6" = callPackage + "gi-atk_2_0_9" = callPackage ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-atk"; - version = "2.0.6"; - sha256 = "774a1cdc10424d51c91c37438866a6254bf1af4723a422e96b82fd6b28eeedb2"; + version = "2.0.9"; + sha256 = "246b50192e25a6f125cb51b2c57a38cb76702fe02c7b87b89e548851479598bf"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi-base text @@ -69519,15 +69813,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;}; - "gi-cairo_1_0_6" = callPackage + "gi-cairo_1_0_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gobjectIntrospection, haskell-gi, haskell-gi-base, text , transformers }: mkDerivation { pname = "gi-cairo"; - version = "1.0.6"; - sha256 = "f47f69ac0a09baad360bc24fab8b46261884566e22c975fad2711ab03b537d77"; + version = "1.0.9"; + sha256 = "acdc06c2543aae4462dee525b7fb806fd974e58d3d1b3482167f5bde2eb14a99"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi-base text transformers @@ -69567,15 +69861,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; - "gi-gdk_3_0_6" = callPackage + "gi-gdk_3_0_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gdk"; - version = "3.0.6"; - sha256 = "9c3c974dfa90533fda145d86494690e92c103bd18f32c1225a7a47098aaf6278"; + version = "3.0.9"; + sha256 = "6a908ed5be0a79c0d25a82ddcad4c910e2e65f756696141aaac970ac853fee22"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib @@ -69615,15 +69909,15 @@ self: { }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gobjectIntrospection;}; - "gi-gdkpixbuf_2_0_6" = callPackage + "gi-gdkpixbuf_2_0_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf , gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi , haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.6"; - sha256 = "f6901f27a610d675e2770144a47d549702619da6a6f3be3c79315c706aa6fa91"; + version = "2.0.9"; + sha256 = "880089ae75884e8e89b2ebba3d524c9f07864b37f3dc8475fea14ed18a01efb0"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject @@ -69663,15 +69957,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - "gi-gio_2_0_6" = callPackage + "gi-gio_2_0_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, glib, gobjectIntrospection, haskell-gi , haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gio"; - version = "2.0.6"; - sha256 = "25f5c90a7549f5d0571e749f80b4ae782b3734575cb88dcc355776edf1e99779"; + version = "2.0.9"; + sha256 = "fb08fb617f7d845d8e6f50802ad6f30e6063ee71c05dc10da29f581227f16bb8"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi-base text @@ -69693,8 +69987,8 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.6"; - sha256 = "dd9333861386a6dff7ee76d12c9e3faae4231a18abf482db2f24ad1b0ff67068"; + version = "1.0.9"; + sha256 = "773fc9bb6d55006f12f68fdb4a68edc25fdc74448549a819ecb4f88a2f0b0efb"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gobject haskell-gi-base text @@ -69728,15 +70022,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - "gi-glib_2_0_6" = callPackage + "gi-glib_2_0_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib , gobjectIntrospection, haskell-gi, haskell-gi-base, text , transformers }: mkDerivation { pname = "gi-glib"; - version = "2.0.6"; - sha256 = "51d0f914fad2d0f36c19d0a4e39c5908ed106d5d400e9f04ded6ee36a26eabc5"; + version = "2.0.9"; + sha256 = "1b295151c9d5f83c13c01204f67c10d071173377a67d6c1d4e8093a253c86555"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi-base text transformers @@ -69771,15 +70065,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - "gi-gobject_2_0_6" = callPackage + "gi-gobject_2_0_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , gobjectIntrospection, haskell-gi, haskell-gi-base, text , transformers }: mkDerivation { pname = "gi-gobject"; - version = "2.0.6"; - sha256 = "2f2731932c3168e6239b206de266426e5f43a8e2ad2ed78e06fca97b0712e22c"; + version = "2.0.9"; + sha256 = "8525c707a7f6569ac57da4c16fc5c2ea174f4282c8436ba789d36d22cdbe7f1a"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib haskell-gi-base text @@ -69801,8 +70095,8 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.6"; - sha256 = "5cc2ba47575c854bbc66ea37941c9efc53a962e3a611b9ca31d505ae9e9505ed"; + version = "1.0.9"; + sha256 = "4ed3756052c41b4198d7c3cfd5d179f2d0f49d2a43d20f2be320d85c0a61b22e"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi-base text @@ -69823,8 +70117,8 @@ self: { }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.6"; - sha256 = "470c68fd68c09df37d12efe93ed250024dea0cd0948eac578b8d1f6c6e24996d"; + version = "1.0.9"; + sha256 = "c6021390e020c2d5c21b003bffb6340059feca7ea416fcad60d5c6bb0c0841c8"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase @@ -69847,8 +70141,8 @@ self: { }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.6"; - sha256 = "9130496376c4bbaa230b21a230fd3a4decd971328c9e6b6b90d4d9e78ebd97e2"; + version = "1.0.9"; + sha256 = "5e86bc44fcc16d4009a5cd881169d29abffbd08e8ff0a07098b9e54729137e5d"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst @@ -69871,8 +70165,8 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.6"; - sha256 = "9bd777b6f49d516b63f550ff59c0a32768bf92f097ebec903f478ea3652872ae"; + version = "1.0.9"; + sha256 = "1d36e8f907c6ece57c1db76b9a3ebf866b2ce57f9312c0153ab2e1259356c6ab"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase @@ -69911,15 +70205,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; - "gi-gtk_3_0_6" = callPackage + "gi-gtk_3_0_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gtk"; - version = "3.0.6"; - sha256 = "85a001a538a0657b548a5729c2b17ea2265d39b83af718069874eef77202574c"; + version = "3.0.9"; + sha256 = "5b7b6d064b97066c058288a366e37dffa0b330a4a1d15f3018ed46d2b3a877f3"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -69942,8 +70236,8 @@ self: { }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.1.0"; - sha256 = "9dbf08bcecc1dfc3cee64073632410a6ece816ffa51fb6326b2c8c7c1ca44742"; + version = "0.3.2.0"; + sha256 = "1e028105e79012de9bc54d576bc888994f950512c4ef1b72ad0776bcdeb4a1e6"; libraryHaskellDepends = [ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi-base mtl text transformers @@ -69961,8 +70255,8 @@ self: { }: mkDerivation { pname = "gi-gtkosxapplication"; - version = "2.0.6"; - sha256 = "e9ad5632649a9b3bb6452116a110e4aef2a332b9091bce411f9c169ade9b5141"; + version = "2.0.9"; + sha256 = "d4661ae492916d4fc16f34b234e6c22917f3fc8bf37aef0ae6f2dd17123b7834"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk @@ -69984,8 +70278,8 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.6"; - sha256 = "3d97242b370c3937ec34a969548ad968c9b8cc3176a665347adb5014bf2a87b7"; + version = "3.0.9"; + sha256 = "3ba4e8d8b446c4c37248748535951e31803140a69cf53a69bdb0e68e254b5090"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -70021,14 +70315,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;}; - "gi-javascriptcore_4_0_6" = callPackage + "gi-javascriptcore_4_0_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; - version = "4.0.6"; - sha256 = "50e289b13b10d4a7d1724a8bc5cab500611a0453d55743ec7decb91099c24146"; + version = "4.0.9"; + sha256 = "9acd59b75799a572919c3a65541de73296b6f33f54572902c91eeb93ee7a5375"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi-base text transformers @@ -70049,8 +70343,8 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.6"; - sha256 = "285151350c4354d466c31cff6479913583803913d153d276c0dc76681d66656c"; + version = "0.7.9"; + sha256 = "7c87c5003d96303398ccca3c2e256d409c8853a7007158e052469ac650aa0221"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-glib gi-gobject @@ -70091,15 +70385,15 @@ self: { }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; inherit (pkgs.gnome2) pango;}; - "gi-pango_1_0_6" = callPackage + "gi-pango_1_0_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi , haskell-gi-base, pango, text, transformers }: mkDerivation { pname = "gi-pango"; - version = "1.0.6"; - sha256 = "662c5e9df26fbe0e8238d033be49101fc78a0c6c802434f2de23f7c0c3d97c02"; + version = "1.0.9"; + sha256 = "2410b013c336f70b0711aa52b2ff9145945b5fd4b246b09703adac86ca00df1b"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi-base text @@ -70126,8 +70420,8 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.6"; - sha256 = "41409f273ad2a43e2965ee572814c1586c6f9fd25d8f41597ad4a8ff275d238d"; + version = "1.0.9"; + sha256 = "7c9e3c78703852ab5e879f8b3ecbb3e6898389d10d1458e3b6341ada252464a4"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-glib gi-gobject gi-pango @@ -70148,8 +70442,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.6"; - sha256 = "9c803e86d513a49dbcc70841c52bd0bc1f2c283f7d953c5b563e1ec04f20ae71"; + version = "0.18.9"; + sha256 = "6566f9698ff21dc0eac6b8fb79db191ad48044b424a8d7a2b931ca69a1d517a8"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gio gi-glib gi-gobject @@ -70183,15 +70477,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome2) libsoup;}; - "gi-soup_2_4_6" = callPackage + "gi-soup_2_4_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text , transformers }: mkDerivation { pname = "gi-soup"; - version = "2.4.6"; - sha256 = "ecca7b24c9f45b0446a5f2aa43d1424c9e9c05fbb93d57e74d486729c4052dcd"; + version = "2.4.9"; + sha256 = "e4e45ac1d877e1334ee6b57154422dad87e3e03c2f453f34c05e75aafb7a5daa"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject @@ -70212,8 +70506,8 @@ self: { }: mkDerivation { pname = "gi-vte"; - version = "2.91.7"; - sha256 = "72d63ab29583c73c9978515ff840061f138da27799ffe9e2f7c981380317ce86"; + version = "2.91.10"; + sha256 = "8da2e88e7b00ac3f7ab1523836415a53cb92f3c6da576d48fc9fd363f88b3bf0"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject @@ -70250,7 +70544,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {webkit = null;}; - "gi-webkit_3_0_6" = callPackage + "gi-webkit_3_0_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base @@ -70258,8 +70552,8 @@ self: { }: mkDerivation { pname = "gi-webkit"; - version = "3.0.6"; - sha256 = "b6f97ee8164291fadb69e8aa1e087e9d07250a6d9ed5614629448f96b7044610"; + version = "3.0.9"; + sha256 = "5cd7b6d244b3aeb9eba3f437d40e3b3fbc2fcb253d84d1d5e1e105e7deefc976"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -70282,8 +70576,8 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.6"; - sha256 = "6aa7e0c02ce4ff6686ee71ea956f5fd040d459a5a99957a066b49d938d00f9da"; + version = "4.0.9"; + sha256 = "982635e1c9f7f726100ed980eb12f7bee523d4b8aae14889c10024409f112be5"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib @@ -70306,8 +70600,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.6"; - sha256 = "c3ad70065775cb53c8164a4b9a573a8dfee535e5d0552e91c3cbc93e4b691076"; + version = "4.0.9"; + sha256 = "df4bac3557c8b29c1fd6b8e7da859a394eef2df5bed12dab5491a57b585835ac"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gobject gi-gtk gi-javascriptcore @@ -70572,7 +70866,7 @@ self: { , clientsession, concurrent-output, conduit, conduit-extra , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus , directory, disk-free-space, dlist, dns, edit-distance, esqueleto - , exceptions, fdo-notify, feed, filepath, git, gnupg, gnutls + , exceptions, fdo-notify, feed, filepath, free, git, gnupg, gnutls , hinotify, hslogger, http-client, http-conduit, http-types, IfElse , lsof, magic, MissingH, monad-control, monad-logger, mountpoints , mtl, network, network-info, network-multicast @@ -70580,16 +70874,17 @@ self: { , optparse-applicative, path-pieces, perl, persistent , persistent-sqlite, persistent-template, process, QuickCheck , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi - , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck - , tasty-rerun, template-haskell, text, time, torrent, transformers - , unix, unix-compat, unordered-containers, utf8-string, uuid, wai - , wai-extra, warp, warp-tls, wget, which, xml-types, yesod - , yesod-core, yesod-default, yesod-form, yesod-static + , securemem, shakespeare, socks, stm, stm-chans, tasty, tasty-hunit + , tasty-quickcheck, tasty-rerun, template-haskell, text, time + , torrent, transformers, unix, unix-compat, unordered-containers + , utf8-string, uuid, wai, wai-extra, warp, warp-tls, wget, which + , xml-types, yesod, yesod-core, yesod-default, yesod-form + , yesod-static }: mkDerivation { pname = "git-annex"; - version = "6.20161118"; - sha256 = "84d83b41ce671b29f7c718979bb06d2bb3e3a3f3a3536257f3c6a3da993e47ba"; + version = "6.20161210"; + sha256 = "b568cceda32908e7cd66b34181811d4da3d3197d71009eac20c1c4c4379f6381"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -70607,17 +70902,17 @@ self: { case-insensitive clientsession concurrent-output conduit conduit-extra containers crypto-api cryptonite data-default DAV dbus directory disk-free-space dlist dns edit-distance esqueleto - exceptions fdo-notify feed filepath gnutls hinotify hslogger + exceptions fdo-notify feed filepath free gnutls hinotify hslogger http-client http-conduit http-types IfElse magic MissingH monad-control monad-logger mountpoints mtl network network-info network-multicast network-protocol-xmpp network-uri old-locale optparse-applicative path-pieces persistent persistent-sqlite persistent-template process QuickCheck random regex-tdfa resourcet - SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit - tasty-quickcheck tasty-rerun template-haskell text time torrent - transformers unix unix-compat unordered-containers utf8-string uuid - wai wai-extra warp warp-tls xml-types yesod yesod-core - yesod-default yesod-form yesod-static + SafeSemaphore sandi securemem shakespeare socks stm stm-chans tasty + tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time + torrent transformers unix unix-compat unordered-containers + utf8-string uuid wai wai-extra warp warp-tls xml-types yesod + yesod-core yesod-default yesod-form yesod-static ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which @@ -71040,8 +71335,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "0.1.9"; - sha256 = "df10ca8f6c8dd97e3dbf6f173a63498a674f7564d727c5647782ec029bd4d1ef"; + version = "0.2.0"; + sha256 = "847d33683b290360fdaa1a42dcbe5767920392e86abc357973d1e1afd2fac6c8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71055,6 +71350,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "github-tools" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, github + , groom, html, http-client, http-client-tls, monad-parallel + , tabular, tagsoup, text, time, vector + }: + mkDerivation { + pname = "github-tools"; + version = "0.1.1"; + sha256 = "d6aa2c877079bf89188d8bbbb006df135e481ce047ba26be4c8f7566d44257ad"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers exceptions github groom html http-client + http-client-tls monad-parallel tabular tagsoup text time vector + ]; + homepage = "https://toktok.github.io/"; + description = "Various Github helper utilities"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "github-types" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, hspec, hspec-smallcheck , http-conduit, smallcheck, text, time, unordered-containers @@ -71480,15 +71795,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glabrous_0_2_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , cereal, cereal-text, directory, either, hspec, text + , unordered-containers + }: + mkDerivation { + pname = "glabrous"; + version = "0.2.0"; + sha256 = "2c4b636c0f53ddd51f6bc8f0e208cca8cf1326ce107b7164ca80ea629fed8dbb"; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring cereal cereal-text + either text unordered-containers + ]; + testHaskellDepends = [ + base directory either hspec text unordered-containers + ]; + homepage = "https://github.com/MichelBoucey/glabrous"; + description = "A template DSL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "glade" = callPackage - ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, libglade }: + ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools + , libglade + }: mkDerivation { pname = "glade"; - version = "0.12.5.0"; - sha256 = "79eea09019429ba552b49ae11cf287577937234bd54713aa82ecf3968b3f7435"; + version = "0.13.1"; + sha256 = "6bb9c72052085c83c1810f1389875d260b9d65f1ea4c4e64022270291ae9be45"; + setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk ]; libraryPkgconfigDepends = [ libglade ]; - libraryToolDepends = [ gtk2hs-buildtools ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the glade library"; license = stdenv.lib.licenses.lgpl21; @@ -71637,8 +71976,8 @@ self: { pname = "glirc"; version = "2.20.1.1"; sha256 = "63f0f8d82ea8d2f90103faf9ccd9fa301275b9400bbf1c3db62f8c51cbfa40fe"; - revision = "2"; - editedCabalFile = "1ffce4f6773283058717e61b7544579d002d258e904ca7e4d97b10a65e1b97a5"; + revision = "3"; + editedCabalFile = "d9ff6df2f3d84db85981806342ea6a4022a155283f9d4569753ac7ecf5535005"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -72218,18 +72557,18 @@ self: { "gnss-converters" = callPackage ({ mkDerivation, base, basic-prelude, binary-conduit, bytestring , conduit, conduit-extra, exceptions, extra, HUnit-approx, lens - , monad-control, mtl, random, resourcet, rtcm, sbp, tasty - , tasty-hunit, time, transformers-base, unordered-containers + , monad-control, mtl, resourcet, rtcm, sbp, tasty, tasty-hunit + , time, transformers-base, unordered-containers }: mkDerivation { pname = "gnss-converters"; - version = "0.1.20"; - sha256 = "217adfa4568c7099c722e519399a56c930ae23c48cc49bed1947368e8d48c043"; + version = "0.2.1"; + sha256 = "47732c64bb1091ac79386d142ba790cf809b4390244c710d3a5c246feb24e4c2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base basic-prelude conduit-extra exceptions extra lens - monad-control mtl random resourcet rtcm sbp time transformers-base + monad-control mtl resourcet rtcm sbp time transformers-base unordered-containers ]; executableHaskellDepends = [ @@ -77873,6 +78212,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hable" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hable"; + version = "0.3.1"; + sha256 = "836a85271112fe458f75084144d871c5562a0590c11d9ab52ed248312852091e"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mekeor/hable"; + description = "customizable pretty printer library for tables"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "hablog" = callPackage ({ mkDerivation, base, bifunctors, blaze-html, blaze-markup , bytestring, containers, directory, filepath, markdown, mime-types @@ -80139,8 +80490,10 @@ self: { }: mkDerivation { pname = "haphviz"; - version = "0.2.0.0"; - sha256 = "352fd5f9b696341f33ef262a15df817d3831f0bea09de1d5babb34d4388e238d"; + version = "0.2.0.1"; + sha256 = "3271b7fa3364dd3d41ad186c886107827ec733a792f9b0f383c09b9dc5796103"; + revision = "1"; + editedCabalFile = "1da984c52a02dbea9a2add72cf90555e5b2d72cb4557064dc2ac630809b3edf2"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base checkers hspec QuickCheck quickcheck-text text @@ -81161,6 +81514,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasbolt" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , data-binary-ieee754, data-default, hex, hspec, network + , network-simple, QuickCheck, text, transformers + }: + mkDerivation { + pname = "hasbolt"; + version = "0.1.0.2"; + sha256 = "0ef9006c38adb2d4caf4de88c1ac9b3ad26175fc2c4c54ac70ac5e4750062462"; + libraryHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 data-default + hex network network-simple text transformers + ]; + testHaskellDepends = [ + base bytestring containers hex hspec QuickCheck text + ]; + homepage = "https://github.com/zmactep/hasbolt#readme"; + description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hascal" = callPackage ({ mkDerivation, base, HUnit, numbers }: mkDerivation { @@ -81473,18 +81847,6 @@ self: { }) {}; "hashmap" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable }: - mkDerivation { - pname = "hashmap"; - version = "1.3.1.1"; - sha256 = "a4c2d96c89b0a3fbf1ca06c6f8174c2fd996f3813017653a676ca075d8a07da7"; - libraryHaskellDepends = [ base containers deepseq hashable ]; - homepage = "https://github.com/foxik/hashmap"; - description = "Persistent containers Map and Set based on hashing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hashmap_1_3_2" = callPackage ({ mkDerivation, base, containers, deepseq, hashable }: mkDerivation { pname = "hashmap"; @@ -81494,7 +81856,6 @@ self: { homepage = "https://github.com/foxik/hashmap"; description = "Persistent containers Map and Set based on hashing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashring" = callPackage @@ -81616,18 +81977,22 @@ self: { }) {}; "haskakafka" = callPackage - ({ mkDerivation, base, bytestring, c2hs, containers, either-unwrap - , hspec, rdkafka, regex-posix, temporary, unix + ({ mkDerivation, base, bytestring, c2hs, cmdargs, containers + , either-unwrap, hspec, pretty-show, rdkafka, regex-posix + , temporary, unix }: mkDerivation { pname = "haskakafka"; - version = "1.0.0"; - sha256 = "67426843d25b9f16d6cea9a62859b2052d3a965810c0c19b7f215d1a428c3b48"; + version = "1.2.0"; + sha256 = "eb4b010f0662f15b987bec00fa093c75726af94131e039fda63436ed87bc1c22"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers temporary unix ]; - librarySystemDepends = [ rdkafka ]; + libraryPkgconfigDepends = [ rdkafka ]; libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base bytestring cmdargs pretty-show ]; testHaskellDepends = [ base bytestring containers either-unwrap hspec regex-posix ]; @@ -82125,6 +82490,33 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + "haskell-gi_0_20" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl + , pretty-show, process, regex-tdfa, safe, text, transformers + , xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.20"; + sha256 = "9eec8bad2539b01d833f31cde7dbbe3cc911ab7ba89b68b20d4b2dfc0716d6f6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers directory filepath haskell-gi-base + mtl pretty-show process regex-tdfa safe text transformers + xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + executableHaskellDepends = [ + base containers directory filepath haskell-gi-base pretty-show text + ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -82138,6 +82530,20 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-base_0_20" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.20"; + sha256 = "d62e8b11d67441974e7cb52b0a30e7a1efe6051ddde62c48fe276185c670b80a"; + libraryHaskellDepends = [ base bytestring containers text ]; + libraryPkgconfigDepends = [ glib ]; + homepage = "https://github.com/haskell-gi/haskell-gi-base"; + description = "Foundation for libraries generated by haskell-gi"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "haskell-google-trends" = callPackage ({ mkDerivation, base, bytestring, haskell-fake-user-agent, lens , regex-base, regex-posix, tagsoup, text, wreq @@ -82219,25 +82625,17 @@ self: { "haskell-kubernetes" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, either , http-api-data, http-types, lens, network-uri, QuickCheck - , quickcheck-instances, scientific, servant, servant-client - , servant-server, split, text, transformers, unordered-containers - , vector, wai + , quickcheck-instances, scientific, servant, servant-client, split + , text, unordered-containers, vector, wai }: mkDerivation { pname = "haskell-kubernetes"; - version = "0.4.0"; - sha256 = "38cc46fc4540be0c3b3eb0dab282d549f91d45f64856b7f8b9e32dbf7c51b6c0"; - isLibrary = true; - isExecutable = true; + version = "0.5.0"; + sha256 = "f81d4713d2588d95c276768e7845f505b7d5c44b8febf2a34e373a35945ba52d"; libraryHaskellDepends = [ aeson base bytestring containers either http-api-data http-types lens network-uri QuickCheck quickcheck-instances scientific servant - servant-client servant-server split text unordered-containers - vector wai - ]; - executableHaskellDepends = [ - base either network-uri QuickCheck servant servant-client split - transformers + servant-client split text unordered-containers vector wai ]; homepage = "https://github.com/soundcloud/haskell-kubernetes"; description = "Haskell bindings to the Kubernetes API (via swagger-codegen)"; @@ -82256,6 +82654,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-menu" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "haskell-menu"; + version = "0.2.1"; + sha256 = "c43b6ba537425f02a52e7065224de0a399eadd1e2436f3553d8bc0b1057a48a3"; + libraryHaskellDepends = [ base containers ]; + homepage = "https://github.com/jlamothe/haskell-menu"; + description = "A simple menu system for Haskell programs"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "haskell-modbus" = callPackage ({ mkDerivation, array, base, bytestring, cereal, hspec }: mkDerivation { @@ -82676,15 +83086,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-src-exts_1_19_0" = callPackage + "haskell-src-exts_1_19_1" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck , tasty, tasty-golden, tasty-smallcheck }: mkDerivation { pname = "haskell-src-exts"; - version = "1.19.0"; - sha256 = "da2b747a26e5b8ba9d41f5b6e1d821ed184f0f002c120f88af1f3e9e51e6ac47"; + version = "1.19.1"; + sha256 = "f0f5b2867673d654c7cce8a5fcc69222ea09af460c29a819c23cccf6311ba971"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ @@ -84332,6 +84742,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasql-generic" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring, containers + , contravariant, generics-sop, hasql, postgresql-binary, scientific + , text, time, uuid, vector + }: + mkDerivation { + pname = "hasql-generic"; + version = "0.1.0.4"; + sha256 = "d60dbe2e88395a878c7e920e49a5a7d8b3aae63b5c63bf73659d120cdc14fa82"; + libraryHaskellDepends = [ + aeson base binary-parser bytestring containers contravariant + generics-sop hasql postgresql-binary scientific text time uuid + vector + ]; + homepage = "https://github.com/chris-kahn/hasql-generic#readme"; + description = "Generic encoder and decoder deriving for Hasql"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hasql-optparse-applicative" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative @@ -84599,8 +85028,8 @@ self: { }: mkDerivation { pname = "hasty-hamiltonian"; - version = "1.1.4"; - sha256 = "595b3cde3461f81df391c9d5335695fbf64a80187fb52036b75b495da74a92ed"; + version = "1.1.5"; + sha256 = "d3a62d1933ca6ebc2b53a7a620922809297350d33986904e69072c1e8bfa3fa6"; libraryHaskellDepends = [ base lens mcmc-types mwc-probability pipes primitive transformers ]; @@ -85915,8 +86344,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.9.4"; - sha256 = "15935228da585669041395cac32c8e570ea4efa122b0ae9f71fa1a0c129f70d1"; + version = "0.9.5"; + sha256 = "fe9d461f8a24f134947c89832472463d65150c37b53cf53ea89fd199ef8d1b71"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq mtl network resource-pool scanner stm text time unordered-containers vector @@ -86819,20 +87248,20 @@ self: { }) {}; "heterocephalus" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, containers + ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist , doctest, Glob, parsec, shakespeare, template-haskell, text }: mkDerivation { pname = "heterocephalus"; - version = "1.0.1.0"; - sha256 = "9b13428f919b3df7fd7f6f4012826223370951065f0fb020ae57a80810368103"; + version = "1.0.2.0"; + sha256 = "d0ec193259c06ae95d5e05c17cd42087465e876d04248212d58dc4ccd72004f3"; libraryHaskellDepends = [ - base blaze-html blaze-markup containers parsec shakespeare + base blaze-html blaze-markup containers dlist parsec shakespeare template-haskell text ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/arowM/heterocephalus#readme"; - description = "A type safe template engine for collaborating with front end development tools"; + description = "A type-safe template engine for working with popular front end development tools"; license = stdenv.lib.licenses.mit; }) {}; @@ -86938,6 +87367,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hexml" = callPackage + ({ mkDerivation, base, bytestring, extra }: + mkDerivation { + pname = "hexml"; + version = "0.1"; + sha256 = "dab6b475d2c9e9e1b733c37d3a97ebd7f1ef1db606b17c97544ce53d9748226a"; + revision = "1"; + editedCabalFile = "a46997607148d6e6ddb555d128cf73c9dfe29b1aeccf383beb283e4d06ff79f6"; + libraryHaskellDepends = [ base bytestring extra ]; + testHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/ndmitchell/hexml#readme"; + description = "XML subset DOM parser"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hexpat" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, List, text , transformers, utf8-string @@ -88194,12 +88638,12 @@ self: { }) {}; "hinotify" = callPackage - ({ mkDerivation, base, containers, directory, unix }: + ({ mkDerivation, async, base, containers, directory, unix }: mkDerivation { pname = "hinotify"; - version = "0.3.8.1"; - sha256 = "37d46e32c362ff1e2d9c8d79a553e0d2e59e009d46708163fb05a07e1a71810d"; - libraryHaskellDepends = [ base containers directory unix ]; + version = "0.3.9"; + sha256 = "f2480e4c08a516831c2221eebc6a9d3242e892932d9315c34cbe92a101c5df99"; + libraryHaskellDepends = [ async base containers directory unix ]; testHaskellDepends = [ base directory ]; homepage = "https://github.com/kolmodin/hinotify.git"; description = "Haskell binding to inotify"; @@ -88307,8 +88751,8 @@ self: { }: mkDerivation { pname = "hinterface"; - version = "0.5.0.0"; - sha256 = "44520a3892dbefda790b3a44f2896a808db3a22751582ed41a0935f8b2b7544f"; + version = "0.5.0.1"; + sha256 = "0c25984c5713318e00990d0a787fb3d788fe0211273d1f7901a8d590b4d3a700"; libraryHaskellDepends = [ array async base binary bytestring containers cryptonite exceptions lifted-async lifted-base memory monad-control monad-logger mtl @@ -88359,8 +88803,8 @@ self: { }: mkDerivation { pname = "hip"; - version = "1.1.0.2"; - sha256 = "86ff4302827f4d320efd2b574dee5f6383e41b330a38b1f5dca2a717973659f5"; + version = "1.2.0.0"; + sha256 = "d72879134b56197e0abf21abd09b0198581cb0302574711ffbcfff6da17dd083"; libraryHaskellDepends = [ base bytestring Chart Chart-diagrams colour deepseq directory filepath JuicyPixels netpbm primitive process repa temporary vector @@ -89021,6 +89465,7 @@ self: { homepage = "http://hledger.org"; description = "Command-line interface for the hledger accounting tool"; license = "GPL"; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "hledger-api" = callPackage @@ -89078,7 +89523,40 @@ self: { homepage = "https://github.com/gebner/hledger-diff"; description = "Compares the transactions in two ledger files"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ gebner ]; + maintainers = with stdenv.lib.maintainers; [ gebner peti ]; + }) {}; + + "hledger-iadd" = callPackage + ({ mkDerivation, base, brick, containers, directory, free + , hledger-lib, hspec, megaparsec, microlens, optparse-applicative + , QuickCheck, text, text-format, text-zipper, time, transformers + , unordered-containers, vector, vty, xdg-basedir + }: + mkDerivation { + pname = "hledger-iadd"; + version = "1.1.1"; + sha256 = "89a1d0846caccdd7a7272821cef105ec6fb405d4b3390b0e335fc036e25c8386"; + revision = "1"; + editedCabalFile = "518e975bfd1de87c7cfbbaaa0f710d450e3f5e344725510377cb64abcf11baee"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base brick containers directory free hledger-lib megaparsec + microlens optparse-applicative text text-format text-zipper time + transformers unordered-containers vector vty xdg-basedir + ]; + executableHaskellDepends = [ + base brick directory free hledger-lib megaparsec microlens + optparse-applicative text text-format text-zipper time transformers + unordered-containers vector vty xdg-basedir + ]; + testHaskellDepends = [ + base free hledger-lib hspec megaparsec QuickCheck text text-format + time transformers vector + ]; + homepage = "https://github.com/hpdeifel/hledger-iadd#readme"; + description = "A terminal UI as drop-in replacement for hledger add"; + license = stdenv.lib.licenses.bsd3; }) {}; "hledger-interest" = callPackage @@ -89114,6 +89592,7 @@ self: { ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "hledger-lib" = callPackage @@ -89156,8 +89635,8 @@ self: { pname = "hledger-ui"; version = "1.0.5"; sha256 = "ba859b4c1f8199413c30ddc0db2a7e11206d79ae235e6d9005de6d6cc1b98875"; - revision = "1"; - editedCabalFile = "3189cd365d74e481da18730d14c0ac538f435a331cfe76d519e37214f94adf54"; + revision = "2"; + editedCabalFile = "6ef7d005fa20fd8c0001944f37f618305af941d1a8bdb91c6a4f2422fa23b69f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89169,7 +89648,7 @@ self: { homepage = "http://hledger.org"; description = "Curses-style user interface for the hledger accounting tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "hledger-vty" = callPackage @@ -89233,6 +89712,7 @@ self: { homepage = "http://hledger.org"; description = "Web interface for the hledger accounting tool"; license = "GPL"; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "hlibBladeRF" = callPackage @@ -89329,15 +89809,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hlint_1_9_38" = callPackage + "hlint_1_9_39" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs , directory, extra, filepath, haskell-src-exts, hscolour, process , refact, transformers, uniplate }: mkDerivation { pname = "hlint"; - version = "1.9.38"; - sha256 = "43131e26bfcca9fa9dab0f4fd3a260d895586d57b871ee886f124ad1d41f989d"; + version = "1.9.39"; + sha256 = "66cffc12e38c0dfbbab61219381c0af6b41a48462a71e3810612ff2bbdc0b38f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91199,6 +91679,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hora" = callPackage + ({ mkDerivation, base, binary, hspec, QuickCheck, time }: + mkDerivation { + pname = "hora"; + version = "1.1.1"; + sha256 = "9f375a418afca764c29a46c86beaef73a429fb2902368bc27b9d6072b6cfdbd1"; + libraryHaskellDepends = [ base binary time ]; + testHaskellDepends = [ base binary hspec QuickCheck time ]; + homepage = "https://github.com/ciez/hora"; + description = "date time"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "horizon" = callPackage ({ mkDerivation, AC-Angle, base, time }: mkDerivation { @@ -91500,37 +91993,6 @@ self: { }) {}; "hpack" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers - , deepseq, directory, filepath, Glob, hspec, interpolate, mockery - , QuickCheck, temporary, text, unordered-containers, yaml - }: - mkDerivation { - pname = "hpack"; - version = "0.14.1"; - sha256 = "a930e8719c52f42826efab92f33252e3dfbf664296ce8075334b48e38bc51280"; - revision = "1"; - editedCabalFile = "59a63c997869623189c5e2bb3df8b1da09dda3a2258cbef43a87cbb4a40addc5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-compat containers deepseq directory filepath Glob - text unordered-containers yaml - ]; - executableHaskellDepends = [ - aeson base base-compat containers deepseq directory filepath Glob - text unordered-containers yaml - ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat containers deepseq directory - filepath Glob hspec interpolate mockery QuickCheck temporary text - unordered-containers yaml - ]; - homepage = "https://github.com/sol/hpack#readme"; - description = "An alternative format for Haskell packages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hpack_0_15_0" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers , deepseq, directory, filepath, Glob, hspec, interpolate, mockery , QuickCheck, temporary, text, unordered-containers, yaml @@ -91557,7 +92019,6 @@ self: { homepage = "https://github.com/sol/hpack#readme"; description = "An alternative format for Haskell packages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpack-convert" = callPackage @@ -92219,6 +92680,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hreader_1_1_0" = callPackage + ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl + , tagged, transformers, transformers-base + }: + mkDerivation { + pname = "hreader"; + version = "1.1.0"; + sha256 = "2a2b02c059b343ab7ff0d340b6545a003b0d563fb8a1ad2d53d6c2f4759a7d3a"; + libraryHaskellDepends = [ + base exceptions hset mmorph monad-control mtl tagged transformers + transformers-base + ]; + testHaskellDepends = [ base hset transformers-base ]; + homepage = "https://bitbucket.org/s9gf4ult/hreader"; + description = "Generalization of MonadReader and ReaderT using hset"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hreader-lens" = callPackage ({ mkDerivation, base, comonad, hreader, hset, lens, lens-action , profunctors @@ -93003,6 +93483,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsbc" = callPackage + ({ mkDerivation, attoparsec, base, text, vector }: + mkDerivation { + pname = "hsbc"; + version = "0.1.0.2"; + sha256 = "0cc76047ced42e4860f3876fdebcc2057d6d95917ebc2401f929308e7ba66e75"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ attoparsec base text vector ]; + description = "Command Line Calculator"; + license = stdenv.lib.licenses.mit; + }) {}; + "hsbencher" = callPackage ({ mkDerivation, async, base, bytestring, containers, data-default , directory, filepath, GenericPretty, HUnit, io-streams, mtl @@ -100205,6 +100698,50 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gmp;}; + "idris_0_99" = callPackage + ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal + , ansi-wl-pprint, array, async, base, base64-bytestring, binary + , blaze-html, blaze-markup, bytestring, cheapskate, containers + , deepseq, directory, filepath, fingertree, fsnotify, gmp + , haskeline, ieee754, libffi, mtl, network, optparse-applicative + , parsers, pretty, process, regex-tdfa, safe, split, tagged, tasty + , tasty-golden, tasty-rerun, terminal-size, text, time + , transformers, transformers-compat, trifecta, uniplate, unix + , unordered-containers, utf8-string, vector + , vector-binary-instances, zip-archive + }: + mkDerivation { + pname = "idris"; + version = "0.99"; + sha256 = "f124c22a56d3547f878fdcfcddb36884bf69279411a724bb18b7829e8bdfa4e9"; + configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async + base base64-bytestring binary blaze-html blaze-markup bytestring + cheapskate containers deepseq directory filepath fingertree + fsnotify haskeline ieee754 libffi mtl network optparse-applicative + parsers pretty process regex-tdfa safe split terminal-size text + time transformers transformers-compat trifecta uniplate unix + unordered-containers utf8-string vector vector-binary-instances + zip-archive + ]; + librarySystemDepends = [ gmp ]; + executableHaskellDepends = [ + base directory filepath haskeline transformers + ]; + testHaskellDepends = [ + base bytestring containers directory filepath haskeline + optparse-applicative process tagged tasty tasty-golden tasty-rerun + time transformers + ]; + homepage = "http://www.idris-lang.org/"; + description = "Functional Programming Language with Dependent Types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gmp;}; + "ieee" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -101851,22 +102388,24 @@ self: { }) {}; "inline-java" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , distributed-closure, filepath, ghc-heap-view, hspec, inline-c - , jni, jvm, language-java, monad-loops, process, singletons, syb + ({ mkDerivation, base, binary, bytestring, Cabal, containers + , directory, distributed-closure, filepath, ghc-heap-view, hspec + , inline-c, jni, jvm, language-java, process, singletons, syb , template-haskell, temporary, text, thread-local-storage, vector }: mkDerivation { pname = "inline-java"; - version = "0.5.1"; - sha256 = "b134f3a7904da62a23118bffe7f42bee1ea0c6fa4b84216679609520faeea098"; + version = "0.6"; + sha256 = "364c14c0003b6bdbb6338c017ff706ca2bd57dde828c801a1b588356ce15a4c1"; libraryHaskellDepends = [ - base binary bytestring containers distributed-closure filepath - ghc-heap-view inline-c jni jvm language-java monad-loops process - singletons syb template-haskell temporary text thread-local-storage - vector + base binary bytestring Cabal containers directory + distributed-closure filepath ghc-heap-view inline-c jni jvm + language-java process singletons syb template-haskell temporary + text thread-local-storage vector + ]; + testHaskellDepends = [ + base bytestring hspec jni jvm singletons text ]; - testHaskellDepends = [ base bytestring hspec jvm singletons text ]; homepage = "http://github.com/tweag/inline-java#readme"; description = "Java interop via inline Java code in Haskell modules"; license = stdenv.lib.licenses.bsd3; @@ -102357,8 +102896,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.19"; - sha256 = "77dbd2811296b7b6a57a2d90d59580ea6d0d13f7611528233e020978408521ad"; + version = "0.1.20"; + sha256 = "e93fd2df3a3cd1c6a0203420a94b0329c08b51a51ef8d5ec5a38efe61469da77"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103707,16 +104246,19 @@ self: { "itemfield" = callPackage ({ mkDerivation, base, brick, data-default, HUnit, microlens - , microlens-th, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, vty + , microlens-th, QuickCheck, random, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, vty }: mkDerivation { pname = "itemfield"; - version = "1.2.0.0"; - sha256 = "a55b83a20a599c4acbba6aecc68db6d8de982f646c125f68bf0a48f6d4260716"; - revision = "1"; - editedCabalFile = "cefe94a562c871d018efedccd5246afd8a019463e4bb3e1e20d3b8d52939de17"; + version = "1.2.2.1"; + sha256 = "fe8bfe62a98a286f86f80f65cd3d5c09097fcc75eafda4281e8c19f999233b90"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base brick microlens text vty ]; + executableHaskellDepends = [ + base brick data-default microlens microlens-th random text vty + ]; testHaskellDepends = [ base brick data-default HUnit microlens microlens-th QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text @@ -105015,8 +105557,8 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.7.0.1"; - sha256 = "60581922dd1ccef07eb2319653d4b8448cbf65039c32680269277d731d0e95aa"; + version = "0.7.0.3"; + sha256 = "3ee57a6d2640833a511ac1b0aadbfa46bd0be09efabde9bb5e32ddb6d330a2df"; libraryHaskellDepends = [ base base-compat jsaddle lens text transformers ]; @@ -105213,12 +105755,12 @@ self: { ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, GenericPretty, hashable, hflags, lens, mmap, mtl , pretty, process, QuickCheck, scientific, smallcheck, text - , uniplate, unordered-containers, vector + , uniplate, unordered-containers, vector, yaml }: mkDerivation { pname = "json-autotype"; - version = "1.0.14"; - sha256 = "37536fd9cd18ae8fa9527359cbfb8c69dc5bed51abdd7c7931ac0d12642fd2f4"; + version = "1.0.15"; + sha256 = "4552e903a49953d48a5f60fb8532b51c40f3061c39cc842d6282ab42f6bbe045"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105229,7 +105771,7 @@ self: { executableHaskellDepends = [ aeson base bytestring containers filepath GenericPretty hashable hflags lens mtl pretty process scientific text uniplate - unordered-containers vector + unordered-containers vector yaml ]; testHaskellDepends = [ aeson base bytestring containers directory filepath GenericPretty @@ -105961,8 +106503,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.9"; - sha256 = "1f551eb113d97545ec3343a2e1e23dbf8ae1dfadef8d864d82e32cb664b54854"; + version = "0.2.10"; + sha256 = "24f5eb0e48f6f05fe8ef41400891f3fd3ce2a7d4ac59822454c610a79a4ffad8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106276,6 +106818,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "kalman" = callPackage + ({ mkDerivation, base, Chart, Chart-cairo, Chart-diagrams, hmatrix + , random-fu, random-fu-multivariate, vector + }: + mkDerivation { + pname = "kalman"; + version = "1.0.0.2"; + sha256 = "817cc80d31a8c06864978991b7c16fb11c5910f113d7f2157fff45504c4e3c07"; + libraryHaskellDepends = [ + base hmatrix random-fu random-fu-multivariate vector + ]; + testHaskellDepends = [ + base Chart Chart-cairo Chart-diagrams hmatrix random-fu + random-fu-multivariate + ]; + homepage = "https://github.com/idontgetoutmuch/Kalman"; + description = "Kalman and particle filters and smoothers"; + license = stdenv.lib.licenses.mit; + }) {}; + "kan-extensions" = callPackage ({ mkDerivation, adjunctions, array, base, comonad, containers , contravariant, distributive, free, mtl, semigroupoids, tagged @@ -106988,8 +107550,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactivevalues"; - version = "0.2.2.0"; - sha256 = "27756d64d0b275d9556f0ffbefdad8e1bb9942f5fc17d585e6148cfc31496e8b"; + version = "0.2.2.1"; + sha256 = "27785b27fafb6249a538d400dd47405fa66fc5267de1f17b7ff7a4a4fe738566"; libraryHaskellDepends = [ base contravariant ]; testHaskellDepends = [ base directory filepath hlint HUnit mtl process QuickCheck @@ -107652,6 +108214,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "krapsh" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base16-bytestring + , binary, bytestring, containers, cryptohash-sha256, deepseq + , exceptions, formatting, hashable, hspec, lens, monad-logger, mtl + , QuickCheck, random, raw-strings-qq, scientific, SHA, text + , text-format, transformers, unordered-containers, vector, wreq + }: + mkDerivation { + pname = "krapsh"; + version = "0.1.6.0"; + sha256 = "12c4c3a9d4e0d013056ad269a51ae77078a6a582b9b5924d5e58b73251176d6e"; + libraryHaskellDepends = [ + aeson aeson-pretty base base16-bytestring binary bytestring + containers cryptohash-sha256 deepseq exceptions formatting hashable + lens monad-logger mtl QuickCheck random scientific SHA text + text-format transformers unordered-containers vector wreq + ]; + testHaskellDepends = [ + aeson base bytestring containers formatting hspec QuickCheck + raw-strings-qq text vector + ]; + homepage = "https://github.com/krapsh/kraps-haskell"; + description = "Haskell bindings for Spark Dataframes and Datasets"; + license = stdenv.lib.licenses.asl20; + }) {}; + "krpc" = callPackage ({ mkDerivation, base, bencoding, bytestring, containers , data-default-class, hspec, lifted-base, monad-control @@ -108584,8 +109172,8 @@ self: { }: mkDerivation { pname = "lambdatex"; - version = "0.1.0.4"; - sha256 = "0f289460551802ad7d01c1bfc0c52c827e20e961633e228e33cb9dc8bdd178bf"; + version = "0.1.1.0"; + sha256 = "ab86128908697c0f595076b36769e26365d927ade325879d9b350deb489c0164"; libraryHaskellDepends = [ async base containers directory HaTeX mtl text transformers ]; @@ -108790,8 +109378,8 @@ self: { }: mkDerivation { pname = "language-c-quote"; - version = "0.11.7"; - sha256 = "d35d3b22cc12ed6e7b1036401d394f0a55c9b278e807144f64d0eca41121a230"; + version = "0.11.7.1"; + sha256 = "5583e92748e6b4cac01536bff86eb119e424e136e03bb3ea0d2db3217328f88c"; libraryHaskellDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -109354,7 +109942,7 @@ self: { hydraPlatforms = [ "x86_64-linux" ]; }) {}; - "language-puppet_1_3_2_1" = callPackage + "language-puppet_1_3_4" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, either, exceptions, filecache, formatting @@ -109368,8 +109956,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.2.1"; - sha256 = "2540cebeae24f1ad783cd52cff87c55734fe631626f211c2f8579a1c5d4b1ac4"; + version = "1.3.4"; + sha256 = "6944b5f03001c07d3b8208db6125594af6ebd101f7025ef45bb01cee071018bc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110214,6 +110802,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "leapseconds-announced_2017_1" = callPackage + ({ mkDerivation, base, QuickCheck, time }: + mkDerivation { + pname = "leapseconds-announced"; + version = "2017.1"; + sha256 = "0f9c1add6d3015df20b4ca2b6c0256af4b27732bee5467f3c85cbc698307f619"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ base QuickCheck time ]; + homepage = "https://github.com/bjornbm/leapseconds-announced"; + description = "Leap seconds announced at library release time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "learn" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -110761,8 +111363,8 @@ self: { ({ mkDerivation, base, doctest, lens }: mkDerivation { pname = "lens-tutorial"; - version = "1.0.1"; - sha256 = "66494550d66d4c62ea56d0184d118e302d3f1f12505c5c7c0a00e098e77272ab"; + version = "1.0.2"; + sha256 = "ef2638f69bfbb35f15adc20bde588419889eb0f7c899b3f03ae746fc08d1e1b5"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base doctest ]; description = "Tutorial for the lens library"; @@ -110832,8 +111434,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.0.3.1"; - sha256 = "f7270a276914c96190c570397cc9e0dcadb874dec438ff32c2e36eda6d72bee3"; + version = "1.0.3.2"; + sha256 = "7c4fcfd08e2b4369f14a3502215cdb6f70a8f776350a6113d3d6f8dbc7a1c397"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -111378,6 +111980,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "liblawless" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, binary + , bytestring, containers, containers-unicode-symbols, contravariant + , data-textual, directory, exceptions, filepath, hjsonschema, lens + , machines, mtl, parsers, path, path-io, protolude, QuickCheck + , random, semigroups, stm, stm-containers, temporary + , test-framework, test-framework-quickcheck2, test-framework-th + , text, text-icu, text-icu-normalized, text-printer, time + , transformers, yaml, zippers + }: + mkDerivation { + pname = "liblawless"; + version = "0.13.3"; + sha256 = "b1c3660a40a50db947712b3768a8cf3ceb8c614e5d71cdf18e4bceedff90a16b"; + libraryHaskellDepends = [ + aeson base base-unicode-symbols binary bytestring containers + containers-unicode-symbols contravariant data-textual directory + exceptions filepath hjsonschema lens machines mtl parsers path + path-io protolude random semigroups stm stm-containers temporary + text text-icu text-icu-normalized text-printer time transformers + yaml zippers + ]; + testHaskellDepends = [ + base binary bytestring exceptions filepath QuickCheck semigroups + temporary test-framework test-framework-quickcheck2 + test-framework-th text time transformers + ]; + description = "Prelude based on protolude for GHC 8 and beyond"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "liblinear-enumerator" = callPackage ({ mkDerivation, base, bindings-DSL, enumerator, mtl, vector }: mkDerivation { @@ -112153,6 +112786,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "line_2_1_0_2" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types + , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text + , time, transformers, wai + }: + mkDerivation { + pname = "line"; + version = "2.1.0.2"; + sha256 = "456d5ffaec68338fc5892371445e0ff8fa768a68008107f0de22aa0fb962a813"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptohash-sha256 + http-conduit http-types scotty text time transformers wai + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring cryptohash-sha256 hspec + hspec-wai QuickCheck quickcheck-instances raw-strings-qq scotty + text time transformers + ]; + homepage = "https://github.com/noraesae/line"; + description = "Haskell SDK for the LINE API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "line-break" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -112333,21 +112991,19 @@ self: { "linearmap-category" = callPackage ({ mkDerivation, base, constrained-categories, containers - , free-vector-spaces, ieee754, lens, linear, semigroups, vector - , vector-space + , free-vector-spaces, ieee754, lens, linear, manifolds-core + , semigroups, tagged, vector, vector-space }: mkDerivation { pname = "linearmap-category"; - version = "0.2.0.0"; - sha256 = "99e027c01da96c907a94b8bd57a7e36597d57b4786aa4835b1b66e921bad21d3"; - revision = "1"; - editedCabalFile = "2da156de9e6cffcbd1b9910c4d177250d27a18bf77bdae54bf8560c26b1b89b7"; + version = "0.3.0.1"; + sha256 = "f8f24aa068e6578798b9fcdbbc4e7058322db89cf630540b7b91a7cbfe5d5f78"; libraryHaskellDepends = [ base constrained-categories containers free-vector-spaces ieee754 - lens linear semigroups vector vector-space + lens linear manifolds-core semigroups tagged vector vector-space ]; homepage = "https://github.com/leftaroundabout/linearmap-family"; - description = "Native, matrix-free linear algebra"; + description = "Native, complete, matrix-free linear algebra"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -114236,16 +114892,16 @@ self: { "logging-effect" = callPackage ({ mkDerivation, async, base, exceptions, free, monad-control, mtl - , stm, stm-delay, text, time, transformers, transformers-base - , wl-pprint-text + , semigroups, stm, stm-delay, text, time, transformers + , transformers-base, wl-pprint-text }: mkDerivation { pname = "logging-effect"; - version = "1.1.0"; - sha256 = "51275afa770efb4bef3bea13fb294eeb9f7b7ca8186879d49dfa4b2cdcfbdb48"; + version = "1.1.1"; + sha256 = "4e1a6f746757ebf787820cbdb202b0b9ff206a44a24895d5500bec2ffc789fc5"; libraryHaskellDepends = [ - async base exceptions free monad-control mtl stm stm-delay text - time transformers transformers-base wl-pprint-text + async base exceptions free monad-control mtl semigroups stm + stm-delay text time transformers transformers-base wl-pprint-text ]; homepage = "https://github.com/ocharles/logging-effect"; description = "A mtl-style monad transformer for general purpose & compositional logging"; @@ -115034,8 +115690,8 @@ self: { }: mkDerivation { pname = "lua-bc"; - version = "0.1.0.3"; - sha256 = "a441ce9aa5d7eb13f5ec7cd4254f1827b17f729c166ec4c2b4eb4475a2fee20f"; + version = "0.1.1"; + sha256 = "6a4186dc3ad092df6b5cfd78a0b18175a1944e7044de6a7817f90b195090e02e"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 pretty text vector @@ -116543,8 +117199,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.3.0.0"; - sha256 = "1ea6a797e4325a16d4a4c7f59d2f732a5c5796491dad79a2b82db3a84feaf369"; + version = "0.4.0.0"; + sha256 = "7300fabce3e4c7723cc320f4c96bbd7980ca4e72cb694aa422b91d51b6e26c5e"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -116557,19 +117213,18 @@ self: { "manifolds" = callPackage ({ mkDerivation, base, comonad, constrained-categories, containers - , deepseq, free-vector-spaces, linear, linearmap-category, MemoTrie - , microlens, microlens-th, semigroups, tagged, transformers - , trivial-constraint, vector, vector-space, void + , deepseq, free-vector-spaces, lens, linear, linearmap-category + , manifolds-core, MemoTrie, semigroups, tagged, transformers + , vector, vector-space, void }: mkDerivation { pname = "manifolds"; - version = "0.3.0.0"; - sha256 = "011ee59126ab31c49ec4fab8cfe1a77ca76b170f74ecae75f4458e25593616ab"; + version = "0.4.0.0"; + sha256 = "7a4a8a4c392b5e0743e0984bbd361a744a7e054838ca9353131b0bea04e09f93"; libraryHaskellDepends = [ base comonad constrained-categories containers deepseq - free-vector-spaces linear linearmap-category MemoTrie microlens - microlens-th semigroups tagged transformers trivial-constraint - vector vector-space void + free-vector-spaces lens linear linearmap-category manifolds-core + MemoTrie semigroups tagged transformers vector vector-space void ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; @@ -116577,6 +117232,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "manifolds-core" = callPackage + ({ mkDerivation, base, tagged, vector-space }: + mkDerivation { + pname = "manifolds-core"; + version = "0.4.0.0"; + sha256 = "53a19cc72ef02345f161676d04701249fbf36cd02303672a1d5e3ecd78341568"; + libraryHaskellDepends = [ base tagged vector-space ]; + homepage = "https://github.com/leftaroundabout/manifolds"; + description = "The basic classes for the manifolds hierarchy"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "map-exts" = callPackage ({ mkDerivation, base, bytestring, cassava, containers }: mkDerivation { @@ -116927,24 +117594,27 @@ self: { }) {}; "marvin" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, classy-prelude - , configurator, directory, filepath, hslogger, lens, mtl, mustache - , network-uri, optparse-generic, random, template-haskell - , text-format, text-icu, vector, websockets, wreq, wuss + ({ mkDerivation, aeson, async, base, bytestring, configurator + , directory, filepath, hashable, hslogger, lens, mono-traversable + , mtl, mustache, network-uri, optparse-applicative + , optparse-generic, pcre-light, random, template-haskell, text + , text-format, unordered-containers, vector, websockets, wreq, wuss }: mkDerivation { pname = "marvin"; - version = "0.0.1"; - sha256 = "ba51c4f1559352f14821486200f931c6a8e2b5670a3b3e435574c2ce014fe614"; + version = "0.0.2"; + sha256 = "93cb2eaeb405ed22c165ff2d546e3cc34892663361ef4bf39e4ce03262be8643"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring classy-prelude configurator hslogger - lens mtl network-uri optparse-generic random template-haskell - text-format text-icu vector websockets wreq wuss + aeson async base bytestring configurator hashable hslogger lens + mono-traversable mtl network-uri optparse-generic pcre-light random + template-haskell text text-format unordered-containers vector + websockets wreq wuss ]; executableHaskellDepends = [ - base classy-prelude directory filepath mustache optparse-generic + aeson base bytestring configurator directory filepath + mono-traversable mustache optparse-applicative text ]; homepage = "https://github.com/JustusAdam/marvin#readme"; description = "A modular bot for slack"; @@ -117044,28 +117714,6 @@ self: { }) {inherit (pkgs) pcre;}; "math-functions" = callPackage - ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , vector, vector-th-unbox - }: - mkDerivation { - pname = "math-functions"; - version = "0.2.0.2"; - sha256 = "2358ee156011a9d97cae2596c788bd00cd6ee698e5fb1c67e0eefb15aff24737"; - libraryHaskellDepends = [ - base deepseq primitive vector vector-th-unbox - ]; - testHaskellDepends = [ - base deepseq erf HUnit primitive QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 vector - vector-th-unbox - ]; - homepage = "https://github.com/bos/math-functions"; - description = "Special functions and Chebyshev polynomials"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "math-functions_0_2_1_0" = callPackage ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 , vector, vector-th-unbox @@ -117085,7 +117733,6 @@ self: { homepage = "https://github.com/bos/math-functions"; description = "Special functions and Chebyshev polynomials"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mathblog" = callPackage @@ -117202,14 +117849,14 @@ self: { }) {eng = null; mat = null; mx = null;}; "matrices" = callPackage - ({ mkDerivation, base, primitive, tasty, tasty-hunit + ({ mkDerivation, base, deepseq, primitive, tasty, tasty-hunit , tasty-quickcheck, vector }: mkDerivation { pname = "matrices"; - version = "0.4.3"; - sha256 = "7bc65e57db63146824e8b840f72ce0980251337b98819148439b1afe8d0d4039"; - libraryHaskellDepends = [ base primitive vector ]; + version = "0.4.4"; + sha256 = "50f110321d71db257adfbe0f126542e936148ee473679edc1c2bf37c60d539ee"; + libraryHaskellDepends = [ base deepseq primitive vector ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck vector ]; @@ -117477,8 +118124,8 @@ self: { ({ mkDerivation, base, containers, mwc-probability, transformers }: mkDerivation { pname = "mcmc-types"; - version = "1.0.2"; - sha256 = "5d2fd31114e45516b2437827e89b0572e9e9db87a7201d77b437de6e2bba54f3"; + version = "1.0.3"; + sha256 = "3c4b25030b05567694ddc313ca808a32133ad5433b4d89837e1ed00bbfcefc6e"; libraryHaskellDepends = [ base containers mwc-probability transformers ]; @@ -117574,6 +118221,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mealstrom" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , hashable, list-t, postgresql-simple, resource-pool, stm + , stm-containers, tasty, tasty-hunit, text, time, uuid + }: + mkDerivation { + pname = "mealstrom"; + version = "0.0.0.1"; + sha256 = "bde77bd197b39ff4673048ee17ec42043d96fbbea101e8650d9db9229757e83f"; + libraryHaskellDepends = [ + aeson async base bytestring containers hashable list-t + postgresql-simple resource-pool stm stm-containers text time uuid + ]; + testHaskellDepends = [ + aeson async base bytestring hashable list-t postgresql-simple + resource-pool stm stm-containers tasty tasty-hunit text time uuid + ]; + homepage = "https://github.com/linearray/mealstrom"; + description = "Manipulate FSMs and store them in PostgreSQL"; + license = stdenv.lib.licenses.mit; + }) {}; + "means" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { @@ -118168,14 +118837,19 @@ self: { }) {}; "messagepack" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck - , test-framework, test-framework-quickcheck2, test-framework-th + ({ mkDerivation, base, bytestring, cereal, containers, deepseq + , QuickCheck, test-framework, test-framework-quickcheck2 + , test-framework-th }: mkDerivation { pname = "messagepack"; - version = "0.5.3"; - sha256 = "0c7e98943db3712fe4bc6a2ffcbe92cc1637d8ccc5fc73c333568a6856a8b67c"; - libraryHaskellDepends = [ base bytestring cereal containers ]; + version = "0.5.4"; + sha256 = "939590c05d5b0831b3b4796f2e1a070e290982c92b2009f2aa1ef5f4b05b5d7c"; + revision = "1"; + editedCabalFile = "4bfea0a7200706d1826fab53e19df38e5df759672d50095143b4ef078e8d235c"; + libraryHaskellDepends = [ + base bytestring cereal containers deepseq + ]; testHaskellDepends = [ base bytestring cereal containers QuickCheck test-framework test-framework-quickcheck2 test-framework-th @@ -118894,8 +119568,8 @@ self: { }: mkDerivation { pname = "mighty-metropolis"; - version = "1.0.3"; - sha256 = "29b68aecb78fbe97cfcba96ba09dbd69b6e2b7df1cdb073a7be90ecf23db7e80"; + version = "1.0.4"; + sha256 = "6e670796298b3f47a7226c0ce51a97889395119e3de32e4722186af55d8092cf"; libraryHaskellDepends = [ base mcmc-types mwc-probability pipes primitive transformers ]; @@ -119012,8 +119686,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.11"; - sha256 = "84fa24f83206cb88377128395c2d6db2d08bbe9b568ba6ab8eeb76952abedfee"; + version = "0.4.12"; + sha256 = "93e1caa9932bec12dc1b931db2f3ea9e2e2db9b8382b7babaf0a5e559936217c"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -119612,8 +120286,10 @@ self: { }: mkDerivation { pname = "mnist-idx"; - version = "0.1.2.5"; - sha256 = "e8881f03789ae5046b33a051a0cc5a269614642d5876d893fc4a9c34b9bdad56"; + version = "0.1.2.6"; + sha256 = "0ea524a09dbf48c372859b491439b8131f4f0875e8a6d980342d0d438d61a9ae"; + revision = "1"; + editedCabalFile = "4e91ab8e67b03b8d567f0b2d900b1364840d2a83c3bd5a8f312e4b0467a9bac6"; libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base binary directory hspec vector ]; homepage = "https://github.com/kryoxide/mnist-idx/"; @@ -120398,22 +121074,6 @@ self: { }) {}; "monad-logger-syslog" = callPackage - ({ mkDerivation, base, bytestring, fast-logger, hsyslog - , monad-logger, text, transformers - }: - mkDerivation { - pname = "monad-logger-syslog"; - version = "0.1.2.0"; - sha256 = "8b7d6598cbe4046aaeb7f86e526f259be4dde43967bf8a15f8ce3ea9f33221c2"; - libraryHaskellDepends = [ - base bytestring fast-logger hsyslog monad-logger text transformers - ]; - homepage = "https://github.com/fpco/monad-logger-syslog"; - description = "syslog output for monad-logger"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-logger-syslog_0_1_3_0" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hsyslog , monad-logger, text, transformers }: @@ -120427,7 +121087,6 @@ self: { homepage = "https://github.com/fpco/monad-logger-syslog"; description = "syslog output for monad-logger"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-loops" = callPackage @@ -121725,8 +122384,8 @@ self: { }: mkDerivation { pname = "morph"; - version = "0.1.0.1"; - sha256 = "8ac454d889af2ebe0ef92011e85c9b005be07262a642e3435dac6951c38363f6"; + version = "0.1.1.1"; + sha256 = "3b325579797ef49dbc5c49ad0fa05b451806f7178121beb2ee548a988b9745dc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121767,7 +122426,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "morte_1_6_4" = callPackage + "morte_1_6_5" = callPackage ({ mkDerivation, alex, array, base, binary, containers, deepseq , Earley, http-client, http-client-tls, microlens, microlens-mtl , mtl, optparse-applicative, pipes, QuickCheck, system-fileio @@ -121776,8 +122435,8 @@ self: { }: mkDerivation { pname = "morte"; - version = "1.6.4"; - sha256 = "8066f8a4092d3fee6fc67bb361bee0a71dc59f9bb38bb81e4d85d9f799076598"; + version = "1.6.5"; + sha256 = "49d292a44d25fe4372856da87380165e1da317c6fafc8bb0d047bbce867787c9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123456,20 +124115,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "mwc-random" = callPackage - ({ mkDerivation, base, primitive, time, vector }: + "mwc-probability_1_3_0" = callPackage + ({ mkDerivation, base, mwc-random, primitive, transformers }: mkDerivation { - pname = "mwc-random"; - version = "0.13.4.0"; - sha256 = "c52cfdeab2fe6cae3e2b0de382757372df571b7c25a6712ab205fb784b5a8aea"; - libraryHaskellDepends = [ base primitive time vector ]; - doCheck = false; - homepage = "https://github.com/bos/mwc-random"; - description = "Fast, high quality pseudo random number generation"; - license = stdenv.lib.licenses.bsd3; + pname = "mwc-probability"; + version = "1.3.0"; + sha256 = "0f9ba623fa2fea7770e3f1cacb1d8a0b14711e60039590d5181864e5a2fe1f6f"; + libraryHaskellDepends = [ base mwc-random primitive transformers ]; + homepage = "http://github.com/jtobin/mwc-probability"; + description = "Sampling function-based probability distributions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mwc-random_0_13_5_0" = callPackage + "mwc-random" = callPackage ({ mkDerivation, base, primitive, time, vector }: mkDerivation { pname = "mwc-random"; @@ -123480,7 +124139,6 @@ self: { homepage = "https://github.com/bos/mwc-random"; description = "Fast, high quality pseudo random number generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mwc-random-monad" = callPackage @@ -123643,8 +124301,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "0.7.1.0"; - sha256 = "0d0107914bc3f869eac868e1ad66a1ceba97cd68e2f5b9a595eecab24840edeb"; + version = "0.8.0.0"; + sha256 = "5fe7c723b869a0cd160005f6080960c989b678e154c24f4c2419b775b73eece4"; libraryHaskellDepends = [ base binary binary-ieee754 binary-parsers blaze-textual bytestring bytestring-lexing cryptonite io-streams memory monad-loops network @@ -123665,8 +124323,8 @@ self: { }: mkDerivation { pname = "mysql-haskell-openssl"; - version = "0.7.0.0"; - sha256 = "c960cc61a13f63df2cc776af9b876ff8e68f181237ec772d27c21684ed7e791b"; + version = "0.8.0.0"; + sha256 = "653df3a834ee18da50c2f740a9d241b0d0bc046b584c4fbc66e5a529ff27b616"; libraryHaskellDepends = [ base HsOpenSSL io-streams mysql-haskell network tcp-streams tcp-streams-openssl wire-streams @@ -126267,21 +126925,21 @@ self: { }) {}; "nicovideo-translator" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, cmdargs - , containers, dns, http-client, http-types, iso639, lens - , naver-translate, setlocale, text, text-format, wai, warp, wreq - , xml-conduit + ({ mkDerivation, aeson, async, base, bytestring, case-insensitive + , cmdargs, containers, dns, http-client, http-types, iso639, lens + , lens-aeson, setlocale, text, text-format, unordered-containers + , wai, warp, wreq, xml-conduit }: mkDerivation { pname = "nicovideo-translator"; - version = "0.1.0.1"; - sha256 = "d2a7963385d06c67dad7d3aadd215c7d243e1e189b9fc3358bceb36a5c65f68a"; + version = "0.2.0.0"; + sha256 = "039a1dd1e25450b96ee513091b382f2f9e00826fa2ae69811da9c9a2fe0d4bf0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring case-insensitive cmdargs containers dns http-client - http-types iso639 lens naver-translate setlocale text text-format - wai warp wreq xml-conduit + aeson async base bytestring case-insensitive cmdargs containers dns + http-client http-types iso639 lens lens-aeson setlocale text + text-format unordered-containers wai warp wreq xml-conduit ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/dahlia/nicovideo-translator"; @@ -126684,8 +127342,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "nonfree"; - version = "0.1.0.1"; - sha256 = "11d7f5d66a6ec832cb2c15b5f33b6b2fbc3cdf8c49da3a5a8f9ca252531c4e16"; + version = "0.1.0.2"; + sha256 = "e0c3207fdc46af5d182ae135f32d8a0ccb7a7779ba8898d954bf6703ee42b0f2"; libraryHaskellDepends = [ base ]; description = "Free structures sans laws"; license = stdenv.lib.licenses.mit; @@ -127756,15 +128414,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "octane_0_17_0" = callPackage + "octane_0_18_0" = callPackage ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers , data-default-class, file-embed, http-client, http-client-tls , overloaded-records, rattletrap, text }: mkDerivation { pname = "octane"; - version = "0.17.0"; - sha256 = "deeb94a970a88397c37e00b9f3540a98984351cd81b03477339d4747d53c0288"; + version = "0.18.0"; + sha256 = "cf92a63584772d60388b550d93d73f08bac3a26b21c4ad2dc6003837e1e9674f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128097,8 +128755,8 @@ self: { }: mkDerivation { pname = "ombra"; - version = "0.2.1.0"; - sha256 = "46add5581e4f4588ee409646372d7adf3e9248ca314c5c7f3319470c1b404d5c"; + version = "0.2.2.0"; + sha256 = "006dde6ad3c4273078f7129a67380b1002b2fb6f2f92f253695e846a23181d60"; libraryHaskellDepends = [ base gl hashable hashtables transformers unordered-containers vect ]; @@ -129101,8 +129759,8 @@ self: { }: mkDerivation { pname = "opentype"; - version = "0.1.0"; - sha256 = "ff80076a81c6aec66347718f11fb7990a45c46e5719db185268007930ca46d6c"; + version = "0.1.1"; + sha256 = "c074b4b424201266f126ffe4360adbe00c9c855d65b4d48aeaf835033c504b0d"; libraryHaskellDepends = [ base binary bytestring containers ghc microlens microlens-th mtl pretty-hex time unordered-containers vector @@ -129148,10 +129806,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "operational-alacarte"; - version = "0.3"; - sha256 = "c9e6ebe251d0854ed71fcf10ea54af2489f6819e180c55d6f15cc1fe3cb5dfcc"; - revision = "1"; - editedCabalFile = "b8fa0a71719bbc82e750cab4dacede2ba752370169dd210f75c66e244ffb5ff8"; + version = "0.3.1"; + sha256 = "d52a77eee6056ac730bf9b953018044aa5ed9b381e7cd4e7a6e59348c1969d58"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base ]; homepage = "https://github.com/emilaxelsson/operational-alacarte"; @@ -130445,7 +131101,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_1_19" = callPackage + "pandoc_1_19_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , cmark, containers, data-default, deepseq, Diff, directory @@ -130460,8 +131116,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "1.19"; - sha256 = "227a5a70c8510e95f7dcc4dc1af3ebd9fb3efd252e5cbbda38aa1b9eb178f638"; + version = "1.19.1"; + sha256 = "9d22db0a1536de0984f4a605f1a28649e68d540e6d892947d9644987ecc4172a"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -130495,39 +131151,6 @@ self: { }) {}; "pandoc-citeproc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hs-bibutils, mtl - , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.10.2.2"; - sha256 = "1475a2e0a13922df9c931c0480154fa4f02bd81ef34b166596b035898c94dd7a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring directory filepath pandoc pandoc-types - process temporary text yaml - ]; - doCheck = false; - homepage = "https://github.com/jgm/pandoc-citeproc"; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-citeproc_0_10_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , containers, data-default, directory, filepath, hs-bibutils, mtl , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 @@ -130558,7 +131181,6 @@ self: { homepage = "https://github.com/jgm/pandoc-citeproc"; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -130678,18 +131300,18 @@ self: { }) {}; "pandoc-placetable" = callPackage - ({ mkDerivation, base, explicit-exception, http-conduit - , pandoc-types, spreadsheet, utf8-string + ({ mkDerivation, aeson, base, bytestring, explicit-exception + , http-conduit, pandoc-types, spreadsheet, utf8-string }: mkDerivation { pname = "pandoc-placetable"; - version = "0.4.1"; - sha256 = "8c1e03f5bd538301eda3c5b83b594693638b805b6fead191a10d9b73a7c18383"; + version = "0.4.2"; + sha256 = "5151cd72e3277229e87efd0e7cb150434baa1be76e117e5644f93bfba4f81579"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base explicit-exception http-conduit pandoc-types spreadsheet - utf8-string + aeson base bytestring explicit-exception http-conduit pandoc-types + spreadsheet utf8-string ]; homepage = "https://github.com/mb21/pandoc-placetable"; description = "Pandoc filter to include CSV files"; @@ -131327,8 +131949,8 @@ self: { ({ mkDerivation, base, containers, process }: mkDerivation { pname = "parseargs"; - version = "0.2.0.7"; - sha256 = "900eaca47e0ddbdadf137377f1eb6b16b69eabed54ce45a4c22b176ba8ddb45d"; + version = "0.2.0.8"; + sha256 = "7b789204c15d0c478db3d133f349a6970b5509fc6af655faedc03c7426dcf7d6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -131892,8 +132514,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.4.2.0"; - sha256 = "bd2304d0f4dbc6e6533771c8a24e2103018ac7ea8d86de9bf45b503ca40aec97"; + version = "0.4.5.0"; + sha256 = "d60fb0d72ad518e3f3cf49fe6576ad5f2c1f371d75884394791fe2dcf417c5c9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -131961,16 +132583,22 @@ self: { "path" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions - , filepath, hspec, HUnit, mtl, template-haskell + , filepath, genvalidity, genvalidity-hspec, hspec, HUnit, mtl + , QuickCheck, template-haskell, validity }: mkDerivation { pname = "path"; - version = "0.5.9"; - sha256 = "e67982fe579b6318def4769db9a7a3ae07ac7b67b4e8d6326f568cb72aafa727"; + version = "0.5.11"; + sha256 = "bf0d9ea00271017893f59d5e136cb22116278220899609104d7906635286ac14"; + revision = "1"; + editedCabalFile = "a7cad89b8049cd067990a13713c27513b7c473182accfebae5eb2aa0a1d2c197"; libraryHaskellDepends = [ aeson base deepseq exceptions filepath template-haskell ]; - testHaskellDepends = [ aeson base bytestring hspec HUnit mtl ]; + testHaskellDepends = [ + aeson base bytestring filepath genvalidity genvalidity-hspec hspec + HUnit mtl QuickCheck validity + ]; description = "Support for well-typed paths"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -133726,8 +134354,8 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "10.4"; - sha256 = "333f39cc5317bd188435e001b3dfbe44d5b2afbc536b59e76b86fa23d827e9f7"; + version = "10.5"; + sha256 = "cd4a959d4648589e14b71aa0940141c7881166f8ad0257eb427c3acf71942c7b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -134428,17 +135056,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pipes_4_2_0" = callPackage - ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework - , test-framework-quickcheck2, transformers + "pipes_4_3_1" = callPackage + ({ mkDerivation, base, exceptions, mmorph, mtl, QuickCheck + , test-framework, test-framework-quickcheck2, transformers }: mkDerivation { pname = "pipes"; - version = "4.2.0"; - sha256 = "1e407197e94c3c8642fd2c7b4f8e5a3e537844dff2780c396464a47ae0ec0124"; - revision = "1"; - editedCabalFile = "1ce0aac0a280be337215bcf2a8b73b081a948bfb93e24045a7e3a3c3e6adfad0"; - libraryHaskellDepends = [ base mmorph mtl transformers ]; + version = "4.3.1"; + sha256 = "35a6e296e04f992bcda28ffedf1774e23c866b6ac79025f50ee5226bda3fd001"; + libraryHaskellDepends = [ + base exceptions mmorph mtl transformers + ]; testHaskellDepends = [ base mtl QuickCheck test-framework test-framework-quickcheck2 transformers @@ -134572,8 +135200,8 @@ self: { }: mkDerivation { pname = "pipes-bytestring"; - version = "2.1.3"; - sha256 = "d2211e068fe28c5e6a5dc0089eec0dd31bedd4b942285965a02f8aa20c4c6f3e"; + version = "2.1.4"; + sha256 = "6c3f72de28aa538887f6c442884e88a4a0219057998e3710b81439dcb4466deb"; libraryHaskellDepends = [ base bytestring pipes pipes-group pipes-parse transformers ]; @@ -134696,8 +135324,8 @@ self: { ({ mkDerivation, async, base, contravariant, pipes, stm, void }: mkDerivation { pname = "pipes-concurrency"; - version = "2.0.6"; - sha256 = "e0523b67c40c0e0fba04e2eb695adae9142ee199a8f54326f770cb33d66a3b8e"; + version = "2.0.7"; + sha256 = "14a47f0096361b495330b4489c3534ee37f507550ffa2f57cb0e70362df47559"; libraryHaskellDepends = [ base contravariant pipes stm void ]; testHaskellDepends = [ async base pipes stm ]; description = "Concurrency for the pipes ecosystem"; @@ -134810,8 +135438,8 @@ self: { }: mkDerivation { pname = "pipes-extras"; - version = "1.0.7"; - sha256 = "f4d441160cf5d50ad83c15c88c80b835e39d7a73a4e7943c6a6d4c796df28be2"; + version = "1.0.8"; + sha256 = "4d0f7932212988b5e4c661238d66db316cd11bae15506a87d925ae058194d37b"; libraryHaskellDepends = [ base foldl pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers @@ -134871,8 +135499,8 @@ self: { }: mkDerivation { pname = "pipes-group"; - version = "1.0.5"; - sha256 = "dbcdfe483c57f337a259635d2fde149e1d2b081092f0b1b30fc7d175b38e2ef5"; + version = "1.0.6"; + sha256 = "07ad6f6ba7675b59aeb3be77171170da99a6f54e18b8d477d52f94b05e8ab766"; libraryHaskellDepends = [ base free pipes pipes-parse transformers ]; @@ -134947,8 +135575,8 @@ self: { }: mkDerivation { pname = "pipes-key-value-csv"; - version = "0.4.0.1"; - sha256 = "940f5961dba5bfcc50f8e54e3263156cd80d73ee34730961eaa81b0f36f77734"; + version = "0.4.0.2"; + sha256 = "3d2ecb1a9fc0a276aebdf626191def168df95de896d929f96bf9927658c4ef6c"; libraryHaskellDepends = [ base bifunctors containers data-default-class lens mtl pipes pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text @@ -135077,8 +135705,8 @@ self: { ({ mkDerivation, base, pipes, transformers }: mkDerivation { pname = "pipes-parse"; - version = "3.0.7"; - sha256 = "3f61375dd13d6ca6aa4d73ba62e3dbc8f02f6ad62d6dffb5f1eecd21e1637824"; + version = "3.0.8"; + sha256 = "d28f831b2c8229cca567ee95570787d2dd3f5cfcff3b3c44ee308360a8c107a9"; libraryHaskellDepends = [ base pipes transformers ]; description = "Parsing infrastructure for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; @@ -135129,8 +135757,8 @@ self: { ({ mkDerivation, base, mwc-random, pipes, vector }: mkDerivation { pname = "pipes-random"; - version = "1.0.0.1"; - sha256 = "e18371195212d91ccb7f08f0d4065b3fd314988480bc72fce03f60716ac29ccd"; + version = "1.0.0.2"; + sha256 = "1b176ae550fd31ebe8d0d5fca6f1c420b50adb2364d68f7fcaeb7006a48c6520"; libraryHaskellDepends = [ base mwc-random pipes vector ]; description = "Producers for handling randomness"; license = stdenv.lib.licenses.bsd3; @@ -135189,6 +135817,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-safe_2_2_5" = callPackage + ({ mkDerivation, base, containers, exceptions, monad-control, mtl + , pipes, transformers, transformers-base + }: + mkDerivation { + pname = "pipes-safe"; + version = "2.2.5"; + sha256 = "0242cfe67853dc5bd94c979b06da25423d8bf96c3b095f4d33b745c78605a67c"; + libraryHaskellDepends = [ + base containers exceptions monad-control mtl pipes transformers + transformers-base + ]; + description = "Safety for the pipes ecosystem"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-shell" = callPackage ({ mkDerivation, async, base, bytestring, directory, hspec, pipes , pipes-bytestring, pipes-safe, process, stm, stm-chans, text @@ -135230,8 +135875,8 @@ self: { }: mkDerivation { pname = "pipes-text"; - version = "0.0.2.4"; - sha256 = "0e16ad5f29c981100452f23aa6c4998cc96427d70af5be389559fd6223279fb0"; + version = "0.0.2.5"; + sha256 = "4489ee02a8ebfd87049fc4dd1380b21e6f33984eb0101c836ab8e054759c0f2a"; libraryHaskellDepends = [ base bytestring pipes pipes-bytestring pipes-group pipes-parse pipes-safe streaming-commons text transformers @@ -135814,6 +136459,26 @@ self: { license = "GPL"; }) {}; + "plotlyhs" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , lucid, microlens, microlens-th, text + }: + mkDerivation { + pname = "plotlyhs"; + version = "0.1.0"; + sha256 = "445bc874f9edef177830e39968ac487bfd156702750c74f287ed6387a07b5f5b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring lucid microlens + microlens-th text + ]; + executableHaskellDepends = [ aeson base lucid microlens text ]; + homepage = "https://github.com/glutamate/plotlyhs"; + description = "Haskell bindings to Plotly.js"; + license = stdenv.lib.licenses.mit; + }) {}; + "plots" = callPackage ({ mkDerivation, adjunctions, base, base-orphans, colour , containers, data-default, diagrams-core, diagrams-lib, directory @@ -137733,6 +138398,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "praglude" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, casing + , containers, data-default, deepseq, directory, filepath, hashable + , lens, mtl, random, semigroups, string-convert, template-haskell + , text, time, unordered-containers, vector + }: + mkDerivation { + pname = "praglude"; + version = "0.2.1.0"; + sha256 = "6d0a637bccc13464149d75482e61ed8f10caf93d721d43f49e583032aad6d776"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring casing containers + data-default deepseq directory filepath hashable lens mtl random + semigroups string-convert template-haskell text time + unordered-containers vector + ]; + homepage = "https://github.com/tdammers/praglude"; + description = "A pragmatic Prelude"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "precis" = callPackage ({ mkDerivation, base, Cabal, containers, cpphs, directory , filepath, haskell-src-exts, xhtml @@ -137917,17 +138603,17 @@ self: { "pregame" = callPackage ({ mkDerivation, aeson, array, base, bytestring, containers , data-default, deepseq, either, ghc-prim, integer-gmp, lens, mtl - , safe, stm, text, text-conversions, time, tuple + , safe, StateVar, stm, text, text-conversions, time, tuple , unordered-containers, vector }: mkDerivation { pname = "pregame"; - version = "1.0.1.0"; - sha256 = "218237f29e51e0635845008541629efc4fcc66403b90c4401087e5279871a9f4"; + version = "1.0.3.0"; + sha256 = "447c76f91a0b79f55250168258f840d73062d77ec44c9727ccddcba9561a777f"; libraryHaskellDepends = [ aeson array base bytestring containers data-default deepseq either - ghc-prim integer-gmp lens mtl safe stm text text-conversions time - tuple unordered-containers vector + ghc-prim integer-gmp lens mtl safe StateVar stm text + text-conversions time tuple unordered-containers vector ]; homepage = "https://github.com/jxv/pregame"; description = "Prelude for applications"; @@ -138665,6 +139351,8 @@ self: { pname = "proc"; version = "0.0.9"; sha256 = "8a8e6685d3b917d9db2ccbd55028af49bf0a2a51f27a7dcf7901413230c96c5c"; + revision = "1"; + editedCabalFile = "bf249bc625b72139c2e981f4bf0500fc6c7a749c28824c63f62f68cee9fbe028"; libraryHaskellDepends = [ base containers directory filepath process regex-tdfa split strict xformat @@ -138687,14 +139375,16 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_4_2_0" = callPackage - ({ mkDerivation, base, deepseq, directory, filepath, unix }: + "process_1_4_3_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory, filepath + , unix + }: mkDerivation { pname = "process"; - version = "1.4.2.0"; - sha256 = "1c2ba524a238e464ae9c22582bea92da2d4c5227e1704a984bb8631dcb562bec"; + version = "1.4.3.0"; + sha256 = "5473f4d20a19c3ba448ace7d4d01ec821ad531574c23934fd3c55627f5a7f0eb"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -138737,6 +139427,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "process-extras_0_7_1" = callPackage + ({ mkDerivation, base, bytestring, data-default, deepseq + , generic-deriving, HUnit, ListLike, mtl, process, text + }: + mkDerivation { + pname = "process-extras"; + version = "0.7.1"; + sha256 = "d25f6228825960b90f86aba3e49bf27fe1cd2f893b44ccb748c3442aa6bcd30f"; + libraryHaskellDepends = [ + base bytestring data-default deepseq generic-deriving ListLike mtl + process text + ]; + testHaskellDepends = [ base HUnit ]; + homepage = "https://github.com/seereason/process-extras"; + description = "Process extras"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "process-iterio" = callPackage ({ mkDerivation, base, bytestring, cpphs, iterIO, process , transformers @@ -139036,6 +139745,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "profiteur_0_4_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath + , text, unordered-containers, vector + }: + mkDerivation { + pname = "profiteur"; + version = "0.4.0.0"; + sha256 = "8198f5905f8da27ada8c0bce0f5dab39bd1d7d8a802b70a974febc6366e7b91d"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson attoparsec base bytestring filepath text unordered-containers + vector + ]; + homepage = "http://github.com/jaspervdj/profiteur"; + description = "Treemap visualiser for GHC prof files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "profunctor-extras" = callPackage ({ mkDerivation, base, profunctors }: mkDerivation { @@ -139937,24 +140666,6 @@ self: { }) {}; "psqueues" = callPackage - ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit - , QuickCheck, tagged, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "psqueues"; - version = "0.2.2.2"; - sha256 = "97b539c4d9da0f0460cd17153641a647b59eb04fde00ec38ea8b56dd9086423f"; - libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; - testHaskellDepends = [ - array base deepseq ghc-prim hashable HUnit QuickCheck tagged - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - description = "Pure priority search queues"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "psqueues_0_2_2_3" = callPackage ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit , QuickCheck, tagged, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -139970,7 +140681,6 @@ self: { ]; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pstemmer" = callPackage @@ -140022,12 +140732,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "publicsuffix_0_20161129" = callPackage + "publicsuffix_0_20161206" = callPackage ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20161129"; - sha256 = "419e1c5019b6c255087c88e27992d733a550442c40b8a58ee40e647cc76fb894"; + version = "0.20161206"; + sha256 = "0f6ef27c6e71f62c7f994dff75f53ba46a469da00a688c6428932426e80b2959"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -140503,7 +141213,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "purescript_0_10_2" = callPackage + "purescript_0_10_3" = callPackage ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty , ansi-terminal, ansi-wl-pprint, base, base-compat, bower-json , boxes, bytestring, clock, containers, data-ordlist, directory @@ -140520,8 +141230,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.10.2"; - sha256 = "45e60466575afed67fbc5244c4e0d3c7184c5aa009ebe7b81aa92a673d212e14"; + version = "0.10.3"; + sha256 = "261e2afde8bf1d58a9c9c23296b37b57dfcd47d4f25cc7798a36a6e73978c5c2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140786,28 +141496,29 @@ self: { "puzzle-draw" = callPackage ({ mkDerivation, aeson, base, blaze-svg, bytestring, containers - , deepseq, diagrams-lib, diagrams-svg, filepath, hashable, mtl - , optparse-applicative, parsec, SVGFonts, tasty, tasty-hunit, text + , deepseq, diagrams-lib, diagrams-svg, filepath, hashable, hspec + , linear, mtl, optparse-applicative, parsec, process, SVGFonts + , tasty, tasty-golden, tasty-hspec, tasty-hunit, text , unordered-containers, vector-space, yaml }: mkDerivation { pname = "puzzle-draw"; - version = "0.1.0.4"; - sha256 = "118edc89b2a1bcdb9c5ce93c475eeb173709308d25e668875374a69214116c49"; + version = "0.2.0.0"; + sha256 = "02dcb3892d34d719fc93ca02168b63fff8ff25a2cb0e926cf74de49b8f5b5113"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base containers diagrams-lib diagrams-svg filepath hashable - mtl optparse-applicative parsec SVGFonts text unordered-containers - vector-space yaml + linear mtl optparse-applicative parsec SVGFonts text + unordered-containers vector-space yaml ]; executableHaskellDepends = [ aeson base diagrams-lib diagrams-svg filepath optparse-applicative - yaml + process tasty tasty-golden yaml ]; testHaskellDepends = [ base blaze-svg bytestring containers deepseq diagrams-lib - diagrams-svg tasty tasty-hunit text yaml + diagrams-svg hspec tasty tasty-hspec tasty-hunit text yaml ]; description = "Creating graphics for pencil puzzles"; license = stdenv.lib.licenses.mit; @@ -141076,6 +141787,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) qhull;}; + "qr-imager" = callPackage + ({ mkDerivation, aeson, base, bytestring, cryptonite, directory + , haskell-qrencode, jose-jwt, JuicyPixels, lens, vector + }: + mkDerivation { + pname = "qr-imager"; + version = "0.1.0.0"; + sha256 = "400145049487f03edc3d249bf44afa596db328e98f1e616c378a83f32fbd129a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cryptonite directory haskell-qrencode + jose-jwt JuicyPixels lens vector + ]; + executableHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/vmchale/QRImager#readme"; + description = "Library to generate QR codes from bytestrings and objects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "qrcode" = callPackage ({ mkDerivation, array, base, containers, mtl, vector }: mkDerivation { @@ -141698,16 +142429,13 @@ self: { }) {}; "quickcheck-special" = callPackage - ({ mkDerivation, base, bytestring, nats, QuickCheck - , quickcheck-instances, scientific, text - }: + ({ mkDerivation, base, bytestring, QuickCheck, scientific, text }: mkDerivation { pname = "quickcheck-special"; - version = "0.1.0.0"; - sha256 = "70883efb33e6b072b016ef2df32c90f30e01c3f015c4095374fdf6451cb60113"; + version = "0.1.0.2"; + sha256 = "3938d6992d9c269f0318cf247db4a9f472eb6f1e69d2e249fa8841ba92a19977"; libraryHaskellDepends = [ - base bytestring nats QuickCheck quickcheck-instances scientific - text + base bytestring QuickCheck scientific text ]; homepage = "https://github.com/minad/quickcheck-special#readme"; description = "Edge cases and special values for QuickCheck Arbitrary instances"; @@ -141883,16 +142611,14 @@ self: { "quipper" = callPackage ({ mkDerivation, base, containers, directory, easyrender, mtl - , process, random, template-haskell, unix + , primes, process, random, template-haskell, unix }: mkDerivation { pname = "quipper"; - version = "0.7"; - sha256 = "38d86bce23509ff81a0e2964d9c04107c4cbb8ecf799abfed216cc2192dcc47c"; - revision = "1"; - editedCabalFile = "ed852a0a36ec59cf0c95e5cec2d0bc82e19a0576f75236ee986f7a221a721c7b"; + version = "0.8.1"; + sha256 = "69dad741fde6f2fb2d3c9497a93f6c31a90f1150205c2cc11c02455d501a2c8c"; libraryHaskellDepends = [ - base containers directory easyrender mtl process random + base containers directory easyrender mtl primes process random template-haskell unix ]; homepage = "http://www.mathstat.dal.ca/~selinger/quipper/"; @@ -142357,6 +143083,36 @@ self: { license = "LGPL"; }) {}; + "raketka" = callPackage + ({ mkDerivation, aeson, async, base, binary, bytestring, conf-json + , containers, distributed-process + , distributed-process-simplelocalnet, hspec, network + , network-transport, network-transport-tcp, QuickCheck, random, stm + , tagged, template-haskell + }: + mkDerivation { + pname = "raketka"; + version = "1.1.1"; + sha256 = "00de213d145e568d11272776d9c394339aee1b28358995cffb606056bf3c1572"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base binary conf-json containers distributed-process + distributed-process-simplelocalnet network network-transport + network-transport-tcp random stm tagged template-haskell + ]; + executableHaskellDepends = [ + aeson async base binary bytestring conf-json containers + distributed-process distributed-process-simplelocalnet network + network-transport network-transport-tcp random stm tagged + template-haskell + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/ciez/raketka"; + description = "basic distributed-process node with configurable peers"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "rakhana" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, lens , mtl, pipes, scientific, transformers, vector, zlib @@ -142987,8 +143743,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "1.0.0"; - sha256 = "faba10702e6e41b73ab6b30d3232c1dfdf648ab5131392bdf24da81fc0f34e49"; + version = "2.0.0"; + sha256 = "a58e5c7b1c5e8318ab552ac204248075cf1d8adb6024555f0b06d99de6c750ba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144038,16 +144794,19 @@ self: { }) {}; "recursion-schemes" = callPackage - ({ mkDerivation, base, bifunctors, comonad, free, transformers + ({ mkDerivation, base, base-orphans, bifunctors, comonad, free + , HUnit, semigroups, template-haskell, transformers , transformers-compat }: mkDerivation { pname = "recursion-schemes"; - version = "5"; - sha256 = "c6d298c2e59e2143e833d21dd82613510df55f18000b19264c68d253dfa709fc"; + version = "5.0.1"; + sha256 = "b7a97c72fd7edc2d85060626a1f7e3c56756868aec43510dfe41c1e1fa43ff03"; libraryHaskellDepends = [ - base bifunctors comonad free transformers transformers-compat + base base-orphans bifunctors comonad free semigroups + template-haskell transformers transformers-compat ]; + testHaskellDepends = [ base HUnit ]; homepage = "http://github.com/ekmett/recursion-schemes/"; description = "Generalized bananas, lenses and barbed wire"; license = stdenv.lib.licenses.bsd3; @@ -144900,19 +145659,22 @@ self: { }) {}; "regex-do" = callPackage - ({ mkDerivation, array, base, bytestring, hspec, mtl, QuickCheck - , regex-base, regex-pcre, stringsearch, text + ({ mkDerivation, array, base, bytestring, hspec, QuickCheck + , regex-base, regex-pcre, stringsearch, tagged, text }: mkDerivation { pname = "regex-do"; - version = "2.6.2"; - sha256 = "041396ec83639de987378825bf576dce7c52beded82801cc49af43b0a54dc76a"; + version = "3.1"; + sha256 = "487ab5968208a0d7ad7b37016145e4a864dc35ae36976ea77328ae3d6b9d590b"; + revision = "3"; + editedCabalFile = "ca32ec1c90923370783cfe79bbdae877f4f98f8e816a32dde618874842c2f178"; libraryHaskellDepends = [ - array base bytestring mtl regex-base regex-pcre stringsearch text + array base bytestring regex-base regex-pcre stringsearch tagged + text ]; testHaskellDepends = [ - array base bytestring hspec mtl QuickCheck regex-base regex-pcre - stringsearch text + array base bytestring hspec QuickCheck regex-base regex-pcre + stringsearch tagged text ]; homepage = "https://github.com/ciez/regex-do"; description = "PCRE wrapper"; @@ -145497,8 +146259,8 @@ self: { }: mkDerivation { pname = "rei"; - version = "0.4.0.1"; - sha256 = "108fcfa34f91486946a25d5a1df58e8d2bb6930c852ea8ae4dc5ff81d882ed75"; + version = "0.4.0.3"; + sha256 = "195fc1c1a1cff8665d61d8fdd768a72949a4531a41c182e791f5e4824a5000c6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -146452,6 +147214,8 @@ self: { pname = "req"; version = "0.1.0"; sha256 = "c93bae94d0b640f0d459a3da79c6021f7d8403099e9f08c35a2cddf64eea2269"; + revision = "1"; + editedCabalFile = "03f0eb9f9ae76f17e56ff02d4e1f42769c323183497c81f0c0cb2c721e0eed2f"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive connection data-default-class http-api-data http-client http-client-tls @@ -147570,6 +148334,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "riscv-isa" = callPackage + ({ mkDerivation, base, hspec, mtl, QuickCheck }: + mkDerivation { + pname = "riscv-isa"; + version = "0.1.0.0"; + sha256 = "6a88e07161d0a3bd97cccf3e1d4a88063b09c22e843d6bd7a9af4389849f891a"; + revision = "1"; + editedCabalFile = "f998732d08cb67e2d7b6f80b6f9240caedc65e4297d1d90ca87758e78a247e73"; + libraryHaskellDepends = [ base mtl QuickCheck ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/cocreature/riscv-isa#readme"; + description = "Haskell representation of the RISC-V instruction set architecture"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rison" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, hspec , scientific, text, unordered-containers, vector @@ -149083,8 +149862,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "safe-access"; - version = "0.3.0.0"; - sha256 = "1eddd50993f6ed86041dbc2f543263eb6261d5d34d3128beb416a44cb8d59215"; + version = "0.3.1.0"; + sha256 = "936ddafc0664e4b62f11ebb6b2c3169f06c67e107a0d8f05e27896940eb4bf9f"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "http://darcs.redspline.com/safe-access"; description = "A simple environment to control access to data"; @@ -149547,6 +150326,8 @@ self: { pname = "sampling"; version = "0.2.0"; sha256 = "0300849bb9b276455397df71fcf061e1db8563045af176f04a2ad31dd333295a"; + revision = "1"; + editedCabalFile = "705929c9a629db8150478fd996315889fb8e5ab16dd584bc969727d6cc7e25b1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base foldl mwc-random primitive vector ]; @@ -149556,6 +150337,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sampling_0_3_1" = callPackage + ({ mkDerivation, base, containers, foldl, mwc-random, primitive + , vector + }: + mkDerivation { + pname = "sampling"; + version = "0.3.1"; + sha256 = "0bc2557dd64e4a933c9c6abab083e57b52508236c94d2151fd6890acc54e691b"; + libraryHaskellDepends = [ + base containers foldl mwc-random primitive vector + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/jtobin/sampling"; + description = "Sample values from collections"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "samtools" = callPackage ({ mkDerivation, base, bytestring, c2hs, seqloc, vector, zlib }: mkDerivation { @@ -149892,8 +150691,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "2.1.0"; - sha256 = "4120efabc373ed18cf009ba8ca3961aca97b31bd0c347e748f2bfbf0e8d47519"; + version = "2.1.3"; + sha256 = "1feff9aa39dc4bd34de1cb0da5fcf105429aafa1e28c97cfff19a44403c79951"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152047,8 +152846,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "seqid"; - version = "0.5.0"; - sha256 = "54d4602699b9e3a59d9fbe27258005ee877f0871b4d285e25336231e43953c15"; + version = "0.5.1"; + sha256 = "cea36ce861a457efe5854b3ae9ffef9fc95ea32f14c34e577e5e3d84a5f86695"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/LukeHoersten/seqid"; description = "Sequence ID production and consumption"; @@ -152280,24 +153079,25 @@ self: { , base16-bytestring, base64-bytestring, binary, binary-orphans , bytestring, cereal, cereal-vector, clock, containers , data-msgpack, deepseq, directory, either, exceptions, extra - , filepath, formatting, hashable, hspec, lens, mtl + , filepath, formatting, hashable, hspec, lens, monad-control, mtl , optparse-applicative, parsec, QuickCheck, quickcheck-instances - , safecopy, scientific, semigroups, template-haskell, text + , safecopy, scientific, semigroups, stm, template-haskell, text , text-format, time-units, transformers, unordered-containers , vector, yaml }: mkDerivation { pname = "serokell-util"; - version = "0.1.2.1"; - sha256 = "585328969b7403c64b05eb05d908074d2742e40ce5d549d161c298d91a69f3db"; + version = "0.1.2.3"; + sha256 = "f30880e753f8c7e258906ab0a83f15f23b4ae90cd3bbba02719556421dc97f0a"; libraryHaskellDepends = [ acid-state aeson aeson-extra base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal cereal-vector clock containers data-msgpack deepseq directory - either exceptions extra filepath formatting hashable lens mtl - optparse-applicative parsec QuickCheck quickcheck-instances - safecopy scientific semigroups template-haskell text text-format - time-units transformers unordered-containers vector yaml + either exceptions extra filepath formatting hashable lens + monad-control mtl optparse-applicative parsec QuickCheck + quickcheck-instances safecopy scientific semigroups stm + template-haskell text text-format time-units transformers + unordered-containers vector yaml ]; testHaskellDepends = [ aeson base binary bytestring cereal data-msgpack hspec QuickCheck @@ -153489,8 +154289,8 @@ self: { }: mkDerivation { pname = "servant-snap"; - version = "0.7.0.3"; - sha256 = "8b3892b6572677b74d1351b8dd9f274a0428c0bcdd2a0ab599ce96edfe7c2a8b"; + version = "0.7.0.5"; + sha256 = "4a92e5a97f025541914cbd48266a7498af2ba25e467c13c4abfab4b8d36144f1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154344,6 +155144,8 @@ self: { pname = "shake"; version = "0.15.10"; sha256 = "36331a3cf3e29578c3134e4ee6481dd932e7d40704f5c38703a0eb231ba433d0"; + revision = "1"; + editedCabalFile = "bb24876b00ef8cd3f8500ef729a01278e6e4ba9c7e12391cb76c2217ddc55563"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154925,6 +155727,8 @@ self: { pname = "shelly"; version = "1.6.8.1"; sha256 = "e5a32f7552779667d1f0164d271e99c9ddcabdf1a7a1503cd6fc8ba0bb4445cd"; + revision = "1"; + editedCabalFile = "455095701152d4564c2b0a6e553f3add129b7bd0a91174a3bc2bc2292bdd5501"; libraryHaskellDepends = [ async base bytestring containers directory enclosed-exceptions exceptions lifted-async lifted-base monad-control mtl process @@ -157281,8 +158085,26 @@ self: { }: mkDerivation { pname = "smsaero"; - version = "0.6.1"; - sha256 = "95d9bd63df306b6ed2ebee3a31c91484bcc29fa72cab77e89f55746bd03bf102"; + version = "0.6.2"; + sha256 = "32f2dcbde9d588e11cebba3149a5e3a9e915cb47e13de8a4466690a171d490ec"; + libraryHaskellDepends = [ + aeson base containers http-api-data http-client servant + servant-client servant-docs text time + ]; + homepage = "https://github.com/GetShopTV/smsaero"; + description = "SMSAero API and HTTP client based on servant library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "smsaero_0_7_1" = callPackage + ({ mkDerivation, aeson, base, containers, http-api-data + , http-client, servant, servant-client, servant-docs, text, time + }: + mkDerivation { + pname = "smsaero"; + version = "0.7.1"; + sha256 = "cfec597fbd1ea285ce0f035e7f90bda241eca0536a1d22320f5a16ff6909c990"; libraryHaskellDepends = [ aeson base containers http-api-data http-client servant servant-client servant-docs text time @@ -157341,8 +158163,8 @@ self: { }: mkDerivation { pname = "smtp-mail"; - version = "0.1.4.5"; - sha256 = "dcb32836cdcc165442d9c182866fa05d959bf22a8349e952e3525dbf585e0e04"; + version = "0.1.4.6"; + sha256 = "86dacbef87a2519222a1165b49401a437887a249f5bfd63a99702198dad214bc"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring bytestring cryptohash filepath mime-mail network text @@ -159927,8 +160749,8 @@ self: { }: mkDerivation { pname = "speedy-slice"; - version = "0.1.4"; - sha256 = "b400e6475d77de2c4dbaf09ee0a3581fd8f34b44c7952e3108ab27960960ea92"; + version = "0.1.5"; + sha256 = "d072049b142e1df47a2a6b269dc7a9fc754a1ecd62ed5c6a6e8fb4122dd02441"; libraryHaskellDepends = [ base lens mcmc-types mwc-probability pipes primitive transformers ]; @@ -160410,8 +161232,8 @@ self: { }: mkDerivation { pname = "sproxy2"; - version = "1.92.0"; - sha256 = "8f93a7d03db1508a2a7e53998edef027a00f75d33a1532113e56a651dc6e3f9e"; + version = "1.93.0"; + sha256 = "162c72464a0e4d77201db79ed332d14832a8a145c19246aa64b7156360aadcc9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160585,27 +161407,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.10.0"; - sha256 = "634a7c5728da62899b5b72c372e0da7571a7d26a1162f9490e44d79a2ff04df2"; - 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_12_0" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text , time, transformers @@ -160624,7 +161425,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 @@ -161024,32 +161824,57 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stache_0_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , directory, exceptions, file-embed, filepath, hspec + , hspec-megaparsec, megaparsec, mtl, template-haskell, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "stache"; + version = "0.2.0"; + sha256 = "0952d6849a297d3ef020feaeb128be4af7d25ab97fa948eb0339a7f75d0a1831"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory exceptions + filepath megaparsec mtl template-haskell text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec hspec-megaparsec + megaparsec text yaml + ]; + homepage = "https://github.com/stackbuilders/stache"; + description = "Mustache templates for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async , attoparsec, base, base-compat, base16-bytestring , base64-bytestring, binary, binary-tagged, blaze-builder, byteable , bytestring, Cabal, clock, conduit, conduit-extra, containers - , cryptohash, cryptohash-conduit, deepseq, directory, edit-distance - , either, enclosed-exceptions, errors, exceptions, extra - , fast-logger, filelock, filepath, fsnotify, generic-deriving - , gitrev, hashable, hastache, hit, hpack, hpc, hspec, http-client - , http-client-tls, http-conduit, http-types, lifted-async - , lifted-base, microlens, monad-control, monad-logger, monad-unlift - , mono-traversable, mtl, neat-interpolation, open-browser - , optparse-applicative, optparse-simple, path, path-io, persistent - , persistent-sqlite, persistent-template, pretty, process - , project-template, QuickCheck, regex-applicative-text, resourcet - , retry, safe, semigroups, smallcheck, split, stm, store + , cryptohash, cryptohash-conduit, deepseq, directory, either + , errors, exceptions, extra, fast-logger, file-embed, filelock + , filepath, fsnotify, generic-deriving, gitrev, hashable, hastache + , hit, hpack, hpc, hspec, http-client, http-client-tls + , http-conduit, http-types, lifted-async, lifted-base, microlens + , monad-control, monad-logger, monad-unlift, mono-traversable, mtl + , neat-interpolation, open-browser, optparse-applicative + , optparse-simple, path, path-io, persistent, persistent-sqlite + , persistent-template, pid1, pretty, process, project-template + , QuickCheck, regex-applicative-text, resourcet, retry, safe + , safe-exceptions, semigroups, smallcheck, split, stm, store , streaming-commons, tar, template-haskell, temporary, text - , text-binary, th-reify-many, time, tls, transformers + , text-binary, text-metrics, th-reify-many, time, tls, transformers , transformers-base, unicode-transforms, unix, unix-compat , unordered-containers, vector, vector-binary-instances, yaml , zip-archive, zlib }: mkDerivation { pname = "stack"; - version = "1.2.0"; - sha256 = "6a13a98413ea5f1a0642d9080892e6bcd996a17baa4d61521c0e0f3d9bb810b3"; + version = "1.3.0"; + sha256 = "060ed345ee724b916427430004548c519eb0219242a019ee06c8afd9a793497b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161057,18 +161882,18 @@ self: { base-compat base16-bytestring base64-bytestring binary binary-tagged blaze-builder byteable bytestring Cabal clock conduit conduit-extra containers cryptohash cryptohash-conduit deepseq - directory edit-distance either enclosed-exceptions errors - exceptions extra fast-logger filelock filepath fsnotify - generic-deriving hashable hastache hit hpack hpc http-client - http-client-tls http-conduit http-types lifted-async lifted-base - microlens monad-control monad-logger monad-unlift mtl open-browser - optparse-applicative path path-io persistent persistent-sqlite - persistent-template pretty process project-template - regex-applicative-text resourcet retry safe semigroups split stm - store streaming-commons tar template-haskell temporary text - text-binary time tls transformers transformers-base - unicode-transforms unix unix-compat unordered-containers vector - vector-binary-instances yaml zip-archive zlib + directory either errors exceptions extra fast-logger file-embed + filelock filepath fsnotify generic-deriving hashable hastache hit + hpack hpc http-client http-client-tls http-conduit http-types + lifted-async lifted-base microlens monad-control monad-logger + monad-unlift mtl open-browser optparse-applicative path path-io + persistent persistent-sqlite persistent-template pid1 pretty + process project-template regex-applicative-text resourcet retry + safe safe-exceptions semigroups split stm store streaming-commons + tar template-haskell temporary text text-binary text-metrics time + tls transformers transformers-base unicode-transforms unix + unix-compat unordered-containers vector vector-binary-instances + yaml zip-archive zlib ]; executableHaskellDepends = [ base bytestring Cabal containers directory either filelock filepath @@ -161078,10 +161903,11 @@ self: { ]; testHaskellDepends = [ attoparsec base bytestring Cabal conduit conduit-extra containers - cryptohash directory exceptions filepath hspec http-conduit - monad-logger mono-traversable neat-interpolation path path-io - QuickCheck resourcet retry smallcheck store template-haskell - temporary text th-reify-many transformers vector + cryptohash directory exceptions filepath hspec http-client-tls + http-conduit monad-logger mono-traversable neat-interpolation path + path-io QuickCheck resourcet retry smallcheck store + template-haskell temporary text th-reify-many transformers vector + yaml ]; doCheck = false; preCheck = "export HOME=$TMPDIR"; @@ -161293,8 +162119,8 @@ self: { }: mkDerivation { pname = "stackage-curator"; - version = "0.14.1.1"; - sha256 = "1db3dee8833fe6e42f1266c9b78a5cbee9b02d6a9c83f4cf7e2c607f4a6ad6d5"; + version = "0.14.3"; + sha256 = "ce868f0bc6c385d23672421df9a8613c418e50e793a9ffbb16a2e0a4003ba8fa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161323,7 +162149,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stackage-curator_0_14_3" = callPackage + "stackage-curator_0_14_4_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal , classy-prelude-conduit, conduit, conduit-extra, containers @@ -161339,8 +162165,8 @@ self: { }: mkDerivation { pname = "stackage-curator"; - version = "0.14.3"; - sha256 = "ce868f0bc6c385d23672421df9a8613c418e50e793a9ffbb16a2e0a4003ba8fa"; + version = "0.14.4.1"; + sha256 = "37d3b9ac875d46d209efcaa9c6e0d1ab1edb421f1153292238582ee1aff66add"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162028,12 +162854,12 @@ self: { }) {}; "stb-image-redux" = callPackage - ({ mkDerivation, base, hspec, primitive, vector }: + ({ mkDerivation, base, hspec, vector }: mkDerivation { pname = "stb-image-redux"; - version = "0.2.0.0"; - sha256 = "1ad898ff99f7c1d6532dea98c6acdb1f786bc7c6095f72b179e423aaac3b9515"; - libraryHaskellDepends = [ base primitive vector ]; + version = "0.2.1.0"; + sha256 = "c0e4a5d2bf6d99934430ffd068cb3d28003554c5c8beb84ce76dd487f191eb1d"; + libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base hspec vector ]; homepage = "https://github.com/sasinestro/stb-image-redux#readme"; description = "Image loading and writing microlibrary"; @@ -162573,8 +163399,8 @@ self: { }: mkDerivation { pname = "stompl"; - version = "0.4.0"; - sha256 = "8766eec4d48e44d08fbcb009f9d3098ba1b10193caac14935b2c0c1889ae0d7d"; + version = "0.5.0"; + sha256 = "b0538c190c3fa1f63d81aa2518561c2ae6dd1407f86b56794a2024e9b59a5158"; libraryHaskellDepends = [ attoparsec base bytestring mime split text utf8-string word8 ]; @@ -162878,15 +163704,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_2_2" = callPackage + "stratosphere_0_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.2.2"; - sha256 = "e7f212a1dad585810e72adbf572b4324a5bfbc4fe7ace581c613fa668bc24ed1"; + version = "0.3.0"; + sha256 = "628b988750e237e3c1d26de2ccf03753b964fb84f3f46320d2d6a7665aa557a9"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring hashable lens template-haskell text unordered-containers @@ -163247,6 +164073,60 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "strelka" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, base64-bytestring + , bifunctors, bytestring, hashable, http-media, mtl, semigroups + , strelka-core, text, transformers, unordered-containers + }: + mkDerivation { + pname = "strelka"; + version = "1"; + sha256 = "a29e67ccb1929d3f1455ae80472098219ec3dc58b9b5bc9534cb61869ee831d5"; + libraryHaskellDepends = [ + attoparsec base base-prelude base64-bytestring bifunctors + bytestring hashable http-media mtl semigroups strelka-core text + transformers unordered-containers + ]; + homepage = "https://github.com/nikita-volkov/strelka"; + description = "A simple, flexible and composable web-router"; + license = stdenv.lib.licenses.mit; + }) {}; + + "strelka-core" = callPackage + ({ mkDerivation, base, base-prelude, bifunctors, bytestring + , hashable, mtl, semigroups, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "strelka-core"; + version = "0.1"; + sha256 = "9cccd19850c9b6afd0a544041476988520b035ec519061d7b92f1f781be69221"; + libraryHaskellDepends = [ + base base-prelude bifunctors bytestring hashable mtl semigroups + text transformers unordered-containers + ]; + homepage = "https://github.com/nikita-volkov/strelka-core"; + description = "Core components of \"strelka\""; + license = stdenv.lib.licenses.mit; + }) {}; + + "strelka-wai" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, case-insensitive + , http-types, strelka-core, text, unordered-containers, wai, warp + }: + mkDerivation { + pname = "strelka-wai"; + version = "1"; + sha256 = "b30e1e4732acb5c5db772609655a23e8311a627b788dcbcf99dce8cbb3f16137"; + libraryHaskellDepends = [ + base base-prelude bytestring case-insensitive http-types + strelka-core text unordered-containers wai warp + ]; + homepage = "https://github.com/nikita-volkov/strelka-wai"; + description = "WAI compatibility layer for \"strelka\""; + license = stdenv.lib.licenses.mit; + }) {}; + "strict" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -164297,8 +165177,8 @@ self: { }: mkDerivation { pname = "super-user-spark"; - version = "0.3.1.0"; - sha256 = "9daf90541bbb17621d0a0c4993f9601bffcbb1452d862c990f5bf147afaab3ef"; + version = "0.3.2.0"; + sha256 = "dbef4d44404a06ca283b8b8e4886373a4dd18d042679dd54998d59256aae118d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164318,15 +165198,13 @@ self: { }) {}; "superbuffer" = callPackage - ({ mkDerivation, base, bytestring, HTF, QuickCheck }: + ({ mkDerivation, async, base, bytestring, HTF, QuickCheck }: mkDerivation { pname = "superbuffer"; - version = "0.1.0.0"; - sha256 = "85d6e38f100ec5847067f569f964e1bbf04df58b001275b70589d58191be2105"; - revision = "1"; - editedCabalFile = "162970f213762fe4be50f554d52e2500150fa400cff70e8069127a84c50dfb4a"; + version = "0.2.0.1"; + sha256 = "ced2a0ed729661412d28da1248d39a5b47bb4513847deae59219a0fc12b51166"; libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base bytestring HTF QuickCheck ]; + testHaskellDepends = [ async base bytestring HTF QuickCheck ]; homepage = "https://github.com/agrafix/superbuffer#readme"; description = "Efficiently build a bytestring from smaller chunks"; license = stdenv.lib.licenses.bsd3; @@ -165112,10 +165990,8 @@ self: { }: mkDerivation { pname = "syntactic"; - version = "3.6.2"; - sha256 = "f110ce1a2d5029756c6388666a4d817c4c739665c1c2cea718858302b2f07a73"; - revision = "1"; - editedCabalFile = "48bee990f011eaa13392605459eb15eaa5d63d798cd8b50ec293a4430f4266d3"; + version = "3.6.3"; + sha256 = "93b6c366dcd4a0a09005ffc27ff3d62a9ee070308b6300c415fe8301c8f4f3f0"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view @@ -166139,6 +167015,8 @@ self: { pname = "tagged"; version = "0.8.5"; sha256 = "e47c51c955ed77b0fa36897f652df990aa0a8c4eb278efaddcd604be00fc8d99"; + revision = "1"; + editedCabalFile = "a8d7b211a0831f5acf65a36003aebab7673ffb6a874a49715e05e7b76a6cb896"; libraryHaskellDepends = [ base deepseq template-haskell transformers transformers-compat ]; @@ -169348,6 +170226,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "text-time" = callPackage + ({ mkDerivation, attoparsec, base, Cabal, formatting, hspec + , QuickCheck, text, time + }: + mkDerivation { + pname = "text-time"; + version = "0.2.0"; + sha256 = "cf62c803c3532b5ea7c1dec673f86df935d588f9a41e1e6f33b9715d0f2cf392"; + libraryHaskellDepends = [ attoparsec base formatting text time ]; + testHaskellDepends = [ + attoparsec base Cabal formatting hspec QuickCheck text time + ]; + homepage = "https://github.com/klangner/text-time"; + description = "Library for Time parsing from Text into UTCTime"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "text-utf7" = callPackage ({ mkDerivation, base, bytestring, quickcheck-instances, tasty , tasty-hunit, tasty-quickcheck, text @@ -169864,8 +170759,8 @@ self: { }: mkDerivation { pname = "th-lift-instances"; - version = "0.1.10"; - sha256 = "a3b8afd8789f508d9a421952994ff82cd33c40e99f81c85080fee07044ff2174"; + version = "0.1.11"; + sha256 = "1da46afabdc73c86f279a0557d5a8f9af1296f9f6043264ba354b1c9cc65a6b8"; libraryHaskellDepends = [ base bytestring containers template-haskell text th-lift vector ]; @@ -170158,6 +171053,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "these_0_7_3" = callPackage + ({ mkDerivation, aeson, base, bifunctors, binary, containers + , data-default-class, deepseq, hashable, keys, mtl, profunctors + , QuickCheck, quickcheck-instances, semigroupoids, tasty + , tasty-quickcheck, transformers, transformers-compat + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "these"; + version = "0.7.3"; + sha256 = "14339c111ec2caffcb2a9f64164a5dc307a0afb716925ddcb1774d9d442a3d9b"; + libraryHaskellDepends = [ + aeson base bifunctors binary containers data-default-class deepseq + hashable keys mtl profunctors QuickCheck semigroupoids transformers + transformers-compat unordered-containers vector vector-instances + ]; + testHaskellDepends = [ + aeson base bifunctors binary containers hashable QuickCheck + quickcheck-instances tasty tasty-quickcheck transformers + unordered-containers vector + ]; + homepage = "https://github.com/isomorphism/these"; + description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "thespian" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -171063,6 +171985,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "time-series-lib" = callPackage + ({ mkDerivation, base, Cabal, hspec, QuickCheck }: + mkDerivation { + pname = "time-series-lib"; + version = "0.1.0"; + sha256 = "91ae1189fb4579c217381514ca62bd028799a27f5ad7ae81c4acc3d0b7504fe0"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base Cabal hspec QuickCheck ]; + doHaddock = false; + homepage = "https://github.com/klangner/time-series-lib"; + description = "Library for Time Series processing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "time-units" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -171182,8 +172118,8 @@ self: { ({ mkDerivation, ansi-terminal, base, linear, time, transformers }: mkDerivation { pname = "timeless"; - version = "0.9.0.1"; - sha256 = "2dd43e752b92715d96e71dd82b65cfd6d9f89c808cb2bb70442d8b133cc01443"; + version = "1.0.1.2"; + sha256 = "f028c0d7deb751629c80c720d8b378b8fed3af68c4da28afbfbd1fa55d5acc70"; libraryHaskellDepends = [ ansi-terminal base linear time transformers ]; @@ -171192,6 +172128,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timeless-tutorials" = callPackage + ({ mkDerivation, base, timeless }: + mkDerivation { + pname = "timeless-tutorials"; + version = "1.0.0.0"; + sha256 = "1b4631bde7afe9fcd49b22b7baf82927328981b49491f4d28ad39be3ec471e17"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base timeless ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/carldong/timeless-tutorials#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "timelike" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -171392,12 +172343,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timeseries" = callPackage + ({ mkDerivation, base, bytestring, bytestring-time, Cabal, cassava + , hspec, QuickCheck, text, time, vector + }: + mkDerivation { + pname = "timeseries"; + version = "0.1.0"; + sha256 = "2aef662eb22472b18b4de81d763a2e98a2f2feb8d1658651376c0709c7b088a0"; + libraryHaskellDepends = [ + base bytestring bytestring-time cassava text time vector + ]; + testHaskellDepends = [ + base bytestring bytestring-time Cabal cassava hspec QuickCheck text + time vector + ]; + homepage = "https://github.com/klangner/timeseries"; + description = "Library for Time Series processing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "timespan" = callPackage ({ mkDerivation, base, time }: mkDerivation { pname = "timespan"; - version = "0.1.0.0"; - sha256 = "37500d586e16bad624a5a9419b750abf82e5107e3588dd873d6505e6e56253f8"; + version = "0.2.0.0"; + sha256 = "4e6ce1f32725700c4b78ed4806d90a5ce1275dce9504f78164a454a4ef4b8fe6"; libraryHaskellDepends = [ base time ]; homepage = "https://github.com/agrafix/timespan#readme"; description = "Useful timespan datatype and functions"; @@ -172533,19 +173504,19 @@ self: { }) {}; "transformers-abort" = callPackage - ({ mkDerivation, base, data-default-class, monad-control, pointed - , semigroupoids, transformers, transformers-base + ({ mkDerivation, base, monad-control, pointed, semigroupoids + , transformers, transformers-base }: mkDerivation { pname = "transformers-abort"; - version = "0.5.0.1"; - sha256 = "f525bd66622ceb6dcdf38d7f96cc3fbcf5e9cc8bc1f5f126e2fbc011a3dc1b68"; + version = "0.6.0.1"; + sha256 = "4acca1807cc99bf4f366e25e7ab66069b7d19f5f4bedca675c75805bf3b7a461"; libraryHaskellDepends = [ - base data-default-class monad-control pointed semigroupoids - transformers transformers-base + base monad-control pointed semigroupoids transformers + transformers-base ]; homepage = "https://github.com/mvv/transformers-abort"; - description = "A better error monad transformer"; + description = "Error and short-circuit monad transformers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -173690,6 +174661,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "turtle_1_3_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , directory, doctest, foldl, hostname, managed, optional-args + , optparse-applicative, process, stm, system-fileio + , system-filepath, temporary, text, time, transformers, unix + , unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.3.0"; + sha256 = "6004c179342c8b341f804046584d1ff6630483af5053d74603877df8d1699a47"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock directory foldl hostname + managed optional-args optparse-applicative process stm + system-fileio system-filepath temporary text time transformers unix + unix-compat + ]; + testHaskellDepends = [ base doctest ]; + description = "Shell programming, Haskell-style"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -175081,6 +176075,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "typesafe-precure" = callPackage + ({ mkDerivation, base, dlist, hspec, monad-skeleton + , template-haskell + }: + mkDerivation { + pname = "typesafe-precure"; + version = "0.2.0.0"; + sha256 = "f024a0c5a135b2ffbaf4ae97d9614d6f0d09652327061ba134f1c4b38e4b130e"; + libraryHaskellDepends = [ + base dlist monad-skeleton template-haskell + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/igrep/typesafe-precure#readme"; + description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "typescript-docs" = callPackage ({ mkDerivation, base, blaze-html, cmdtheline, containers , filemanip, filepath, language-typescript, parsec, split, syb @@ -175721,14 +176732,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "unfoldable_0_9" = callPackage + "unfoldable_0_9_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, QuickCheck, random , transformers }: mkDerivation { pname = "unfoldable"; - version = "0.9"; - sha256 = "decb997909f9cd8c6ad618a46290c6df922e525361ec5d06e9db3b3822a40f77"; + version = "0.9.1"; + sha256 = "08e2565142d11f21242d631dfd78ad02da93fd6fa3e75af0df4c1024123db236"; + revision = "1"; + editedCabalFile = "6b047ce80f7c2eab1edef56df078b25bd86bcb496f1c8f9962758a229324ef7c"; libraryHaskellDepends = [ base containers ghc-prim QuickCheck random transformers ]; @@ -176055,8 +177068,8 @@ self: { ({ mkDerivation, base, deepseq, prelude-extras }: mkDerivation { pname = "uniform-pair"; - version = "0.1.12"; - sha256 = "91a4b9682568510ac79c66fff0c002c8994b5de6e09f42e93512188e293ffed0"; + version = "0.1.13"; + sha256 = "d31ea7498d3d317dbb22796fc4b26a06d16be5a398c2216ae9820b901503bf9d"; libraryHaskellDepends = [ base deepseq prelude-extras ]; homepage = "https://github.com/conal/uniform-pair/"; description = "Uniform pairs with class instances"; @@ -176459,8 +177472,8 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "unix-compat"; - version = "0.4.2.0"; - sha256 = "35f11770757853be6134b3e4d72a20ecd32c5b0326abebf2605d7ac00bd8d60c"; + version = "0.4.3.1"; + sha256 = "72801d5a654a6e108c153f412ebd54c37fb445643770e0b97701a59e109f7e27"; libraryHaskellDepends = [ base unix ]; homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; @@ -177105,8 +178118,8 @@ self: { }: mkDerivation { pname = "uri-templater"; - version = "0.2.0.0"; - sha256 = "ba1c40d5c4cfc904ec355c0a179b38a4eebb9cd453b2d803df4fbaf37789fe7a"; + version = "0.2.1.0"; + sha256 = "b18621a1c4deed63e892395d4a2b0d20c7dbc81ecc8d977a18d99f23cc03943c"; libraryHaskellDepends = [ ansi-wl-pprint base charset containers dlist HTTP mtl parsers template-haskell text trifecta unordered-containers vector @@ -177114,7 +178127,7 @@ self: { testHaskellDepends = [ ansi-wl-pprint base HUnit mtl template-haskell ]; - homepage = "http://github.com/sanetracker/uri-templater"; + homepage = "http://github.com/iand675/uri-templater"; description = "Parsing & Quasiquoting for RFC 6570 URI Templates"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -178270,12 +179283,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "varying_0_6_0_0" = callPackage + "varying_0_7_0_3" = callPackage ({ mkDerivation, base, hspec, QuickCheck, time, transformers }: mkDerivation { pname = "varying"; - version = "0.6.0.0"; - sha256 = "f26af9b5a31095c8a8b8deabae2257a91ff749f99a0f5406b7c537a6e96b5c12"; + version = "0.7.0.3"; + sha256 = "6cd417fad6b30d8f9bd5a01dd21d059ecbc26cd1faf27bb7973eea43b5640309"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base transformers ]; @@ -178462,20 +179475,22 @@ self: { }) {}; "vcsgui" = callPackage - ({ mkDerivation, base, directory, filepath, gtk3, mtl, process - , text, vcswrapper + ({ mkDerivation, base, directory, filepath, gi-gtk, gi-gtk-hs + , haskell-gi-base, mtl, process, text, vcswrapper }: mkDerivation { pname = "vcsgui"; - version = "0.1.3.0"; - sha256 = "0d8997fec3f3a0025045408f8e619abd9568247a08228daa0ff7fa9508e7b06b"; + version = "0.2.1.0"; + sha256 = "ef43f033ca5ad099a48890bc0b29a881b846e94e0fad833d65091027243836b8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory filepath gtk3 mtl process text vcswrapper + base directory filepath gi-gtk gi-gtk-hs haskell-gi-base mtl + process text vcswrapper ]; executableHaskellDepends = [ - base directory filepath gtk3 mtl process text vcswrapper + base directory filepath gi-gtk gi-gtk-hs haskell-gi-base mtl + process text vcswrapper ]; homepage = "https://github.com/forste/haskellVCSGUI"; description = "GUI library for source code management systems"; @@ -179281,6 +180296,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "vinyl_0_5_3" = callPackage + ({ mkDerivation, base, doctest, ghc-prim, lens, singletons }: + mkDerivation { + pname = "vinyl"; + version = "0.5.3"; + sha256 = "00f86a43def432c564226daae42b130a67c5fb413f3b097f43a14fbfb57608a6"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base doctest lens singletons ]; + description = "Extensible Records"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vinyl-gl" = callPackage ({ mkDerivation, base, containers, GLUtil, HUnit, linear, OpenGL , tagged, test-framework, test-framework-hunit, transformers @@ -179695,7 +180723,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vty_5_13" = callPackage + "vty_5_14" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers , data-default, deepseq, directory, filepath, hashable, HUnit , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec @@ -179706,8 +180734,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.13"; - sha256 = "1eabce0fa3ebfe22a4ff1324a5dc48d1fc1363bfe362b6df0b3801ca63b1f117"; + version = "5.14"; + sha256 = "6f96be6c79c55850f09589b940bfebcc774adddf8a8258af2235320893c53912"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182214,6 +183242,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {webkit = null;}; + "webkit2gtk3-javascriptcore" = callPackage + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit2gtk }: + mkDerivation { + pname = "webkit2gtk3-javascriptcore"; + version = "0.14.2.1"; + sha256 = "b24b110013f96c770a2c1683d3b35d73da31f9777dbe6e09ac704aff3ae442f8"; + setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; + libraryHaskellDepends = [ base ]; + libraryPkgconfigDepends = [ webkit2gtk ]; + description = "JavaScriptCore FFI from webkitgtk"; + license = stdenv.lib.licenses.bsd3; + }) {webkit2gtk = null;}; + "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers, webkit @@ -182310,8 +183351,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.9.7.0"; - sha256 = "07141953f005347214233617ce2654265dea67f63ffbcf4656fdea47066b7baa"; + version = "0.9.8.2"; + sha256 = "09ec17dfbf9f07da27575ce7853b0c80d87ad959c2b271f27be4c4e54615eca2"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary blaze-builder bytestring case-insensitive containers entropy network random SHA text @@ -183038,19 +184079,17 @@ self: { }) {}; "wl-pprint-annotated" = callPackage - ({ mkDerivation, base, containers, deepseq, HUnit, semigroups - , test-framework, test-framework-hunit, text + ({ mkDerivation, base, containers, deepseq, HUnit, test-framework + , test-framework-hunit, text }: mkDerivation { pname = "wl-pprint-annotated"; - version = "0.0.1.2"; - sha256 = "7fa75ad09c60f72fa75430c862667847cd83fa4c9e912bf86b00f3eed6a4af33"; - libraryHaskellDepends = [ - base containers deepseq semigroups text - ]; + version = "0.0.1.3"; + sha256 = "f59627ca7e26bafee3954a0ce807243e93f38b229e7ecbb335d0e1fc32decae1"; + libraryHaskellDepends = [ base containers deepseq text ]; testHaskellDepends = [ - base containers deepseq HUnit semigroups test-framework - test-framework-hunit text + base containers deepseq HUnit test-framework test-framework-hunit + text ]; homepage = "https://github.com/minad/wl-pprint-annotated#readme"; description = "Wadler/Leijen pretty printer with annotations and slightly modernized API"; @@ -183240,8 +184279,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.2.13"; - sha256 = "3c6ab5d67238b760d883c3943c3131720d0f07f4edb037c6531b9a827529f7d7"; + version = "0.2.14"; + sha256 = "0c154567da03ceb1fd748223bce9cb62f6c6b3cede94ab79e1b2693329fcf062"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183883,21 +184922,6 @@ self: { }) {}; "wuss" = callPackage - ({ mkDerivation, base, bytestring, connection, network, websockets - }: - mkDerivation { - pname = "wuss"; - version = "1.1.1"; - sha256 = "285d9122bd2da4e6968d7c4f199858ccb2a6ea888f83cf7873f8cc651b755cdf"; - libraryHaskellDepends = [ - base bytestring connection network websockets - ]; - homepage = "https://github.com/tfausak/wuss#readme"; - description = "Secure WebSocket (WSS) clients"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wuss_1_1_3" = callPackage ({ mkDerivation, base, bytestring, connection, network, websockets }: mkDerivation { @@ -183910,7 +184934,6 @@ self: { homepage = "https://github.com/tfausak/wuss#readme"; description = "Secure WebSocket (WSS) clients"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wx" = callPackage @@ -184141,8 +185164,8 @@ self: { }: mkDerivation { pname = "x509"; - version = "1.6.4"; - sha256 = "be0e7f9bddbd260cd247dce30c15f33a53937f51f304a05aec98accbcde93d42"; + version = "1.6.5"; + sha256 = "b53894214e23ab2795f2a9f4c885e37b35a223bbc03763b0017ce06dc8394783"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers cryptonite hourglass memory mtl pem @@ -186235,37 +187258,6 @@ self: { }) {}; "yaml" = callPackage - ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat - , bytestring, conduit, containers, directory, enclosed-exceptions - , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific - , semigroups, template-haskell, temporary, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.8.20"; - sha256 = "d5cda5b2849afb9f0d7572759c3e006798d7efaeeb0bf0d3825f12832a0a3b11"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - enclosed-exceptions filepath resourcet scientific semigroups - template-haskell text transformers unordered-containers vector - ]; - libraryPkgconfigDepends = [ libyaml ]; - executableHaskellDepends = [ aeson base bytestring ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring conduit directory hspec - HUnit mockery resourcet temporary text transformers - unordered-containers vector - ]; - homepage = "http://github.com/snoyberg/yaml/"; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libyaml;}; - - "yaml_0_8_21_1" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat , bytestring, conduit, containers, directory, enclosed-exceptions , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific @@ -186294,7 +187286,6 @@ self: { homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libyaml;}; "yaml-config" = callPackage @@ -186806,8 +187797,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.4.13.5"; - sha256 = "42bfdfe72f5ef9f9e43d12dcd47f5a3415e6b883d455a7ad4cbfb7e900e760bf"; + version = "1.4.15"; + sha256 = "a917b003c348aa4b3d8c673efb32e0ea0f9190affa86d435b9bea9f11ab85cfd"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup byteable bytestring conduit @@ -186822,36 +187813,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-auth_1_4_14" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, data-default, email-validate, file-embed - , http-client, http-conduit, http-types, lifted-base, mime-mail - , network-uri, nonce, persistent, persistent-template, random - , resourcet, safe, shakespeare, template-haskell, text, time - , transformers, unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.4.14"; - sha256 = "44f5c8c4f1c129fd8552d583679bb848b54ab3ed81e86e7038edaf8996a6ca85"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup byteable bytestring conduit - conduit-extra containers cryptohash data-default email-validate - file-embed http-client http-conduit http-types lifted-base - mime-mail network-uri nonce persistent persistent-template random - resourcet safe shakespeare template-haskell text time transformers - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - homepage = "http://www.yesodweb.com/"; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -187101,6 +188062,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-auth-nopassword" = callPackage + ({ mkDerivation, base, blaze-markup, http-types, pwstore-fast, text + , uuid, yesod-auth, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-auth-nopassword"; + version = "0.1.0.1"; + sha256 = "a2ae8ba484ebd509eb8507b879eae29876ee9284facf1dfc4f94eea4f092106f"; + libraryHaskellDepends = [ + base blaze-markup http-types pwstore-fast text uuid yesod-auth + yesod-core yesod-form + ]; + homepage = "https://github.com/danpalmer/yesod-auth-nopassword#readme"; + description = "A plugin for Yesod to provide email-only authentication"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-auth-oauth" = callPackage ({ mkDerivation, authenticate-oauth, base, bytestring, lifted-base , text, transformers, yesod-auth, yesod-core, yesod-form @@ -187373,8 +188351,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.26"; - sha256 = "2441476cd66d5e615ce33d7d378f121e6f05875fa92a0e8afd3ab47c3d50dd6d"; + version = "1.4.30"; + sha256 = "1136dbf0beacbb7ea18b73616e059aa85ec5fbbf0ecae88e7ff3ac8eb685f654"; libraryHaskellDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit @@ -187398,47 +188376,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-core_1_4_28" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , blaze-html, blaze-markup, byteable, bytestring, case-insensitive - , cereal, clientsession, conduit, conduit-extra, containers, cookie - , data-default, deepseq, deepseq-generics, directory, exceptions - , fast-logger, hspec, hspec-expectations, http-types, HUnit - , lifted-base, monad-control, monad-logger, mtl, mwc-random - , network, old-locale, parsec, path-pieces, primitive, QuickCheck - , random, resourcet, safe, semigroups, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , transformers-base, unix-compat, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.4.28"; - sha256 = "f544294deb9f9ac499885b6978d64a9467213908d19b6af6a4c46846d1990186"; - libraryHaskellDepends = [ - aeson auto-update base blaze-builder blaze-html blaze-markup - byteable bytestring case-insensitive cereal clientsession conduit - conduit-extra containers cookie data-default deepseq - deepseq-generics directory exceptions fast-logger http-types - lifted-base monad-control monad-logger mtl mwc-random old-locale - parsec path-pieces primitive random resourcet safe semigroups - shakespeare template-haskell text time transformers - transformers-base unix-compat unordered-containers vector wai - wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base blaze-builder bytestring clientsession conduit - conduit-extra containers cookie hspec hspec-expectations http-types - HUnit lifted-base mwc-random network path-pieces QuickCheck random - resourcet shakespeare streaming-commons template-haskell text - transformers wai wai-extra - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -187768,6 +188705,8 @@ self: { pname = "yesod-ip"; version = "0.5.0"; sha256 = "b6945480c694b48c03daceb6c286636f65ed9c442b7b94774814c1078418a029"; + revision = "1"; + editedCabalFile = "257cdc5ff06969dc0298e4b92be3907fce4e9ad20eefd132e2f634bab47d0a83"; libraryHaskellDepends = [ base http-api-data ip path-pieces persistent text yesod-core yesod-form @@ -187978,6 +188917,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-persistent_1_4_1_0" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent + , persistent-sqlite, persistent-template, resource-pool, resourcet + , text, transformers, wai-extra, yesod-core + }: + mkDerivation { + pname = "yesod-persistent"; + version = "1.4.1.0"; + sha256 = "98f422757210b30b2bd0d75828408a9fb1d67fa81e02ec304848c1922da4e91c"; + libraryHaskellDepends = [ + base blaze-builder conduit persistent persistent-template + resource-pool resourcet transformers yesod-core + ]; + testHaskellDepends = [ + base blaze-builder conduit hspec persistent persistent-sqlite text + wai-extra yesod-core + ]; + homepage = "http://www.yesodweb.com/"; + description = "Some helpers for using Persistent from Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-platform" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding , asn1-parse, asn1-types, attoparsec-conduit, authenticate @@ -188455,8 +189417,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.5.3"; - sha256 = "4253af356d95fd1888501a640460a48b1ccc4fa81fdd2fd22dfa3c22dd44ab19"; + version = "1.5.4.1"; + sha256 = "36c08c34d5fef656bb3469194b77b0802c60db4120af0f6dfd2b08f4a9d9659d"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive containers cookie hspec-core html-conduit @@ -188472,34 +189434,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-test_1_5_4" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, case-insensitive, containers, cookie - , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base - , monad-control, network, persistent, pretty-show, text, time - , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core - , yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.5.4"; - sha256 = "c8b69211a49939fa74e3d799626487dcc358213896eec6e887f3051843b7a17a"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - case-insensitive containers cookie hspec-core html-conduit - http-types HUnit monad-control network persistent pretty-show text - time transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit - lifted-base text wai xml-conduit yesod-core yesod-form - ]; - homepage = "http://www.yesodweb.com"; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -188600,24 +189534,6 @@ self: { }) {}; "yesod-websockets" = callPackage - ({ mkDerivation, async, base, conduit, enclosed-exceptions - , monad-control, transformers, wai, wai-websockets, websockets - , yesod-core - }: - mkDerivation { - pname = "yesod-websockets"; - version = "0.2.4"; - sha256 = "7067115f0e7e282879718798bba627ab967eb38a419fc2180cc6b58259ea9adc"; - libraryHaskellDepends = [ - async base conduit enclosed-exceptions monad-control transformers - wai wai-websockets websockets yesod-core - ]; - homepage = "https://github.com/yesodweb/yesod"; - description = "WebSockets support for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-websockets_0_2_4_1" = callPackage ({ mkDerivation, async, base, conduit, enclosed-exceptions , monad-control, transformers, wai, wai-websockets, websockets , yesod-core @@ -188633,7 +189549,6 @@ self: { homepage = "https://github.com/yesodweb/yesod"; description = "WebSockets support for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-websockets-extra" = callPackage @@ -188750,7 +189665,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi_0_13_3" = callPackage + "yi_0_13_5" = callPackage ({ mkDerivation, base, microlens-platform, mtl , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell @@ -188758,8 +189673,8 @@ self: { }: mkDerivation { pname = "yi"; - version = "0.13.3"; - sha256 = "e6caf353d17a18378a6a31a90f8b4130eab7ea51d548218d620e9037b0a01036"; + version = "0.13.5"; + sha256 = "902341a7927ee1d255d44286e46dc46b6c4282026c52c1c571d3999cf3a7259f"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; @@ -188806,8 +189721,8 @@ self: { }: mkDerivation { pname = "yi-core"; - version = "0.13.3"; - sha256 = "41f2ace2aa9cdbcc8392ac007c5c94a2785a659acd50d8fb5b3a87a9f296948c"; + version = "0.13.5"; + sha256 = "b84b49f40b7cf9801a3d7fcf0bf11f4e828ecfc7cd20800d8b2f46fd596e8829"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state dyre exceptions filepath hashable @@ -188849,8 +189764,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.13.3"; - sha256 = "8da397739c5b448aa825f69bb2f0d085c68091540cc6e80fa09d384acc8a1cfd"; + version = "0.13.5"; + sha256 = "f2cf5d62e161d7edd1c664874daa5acdc2ec70d7e9b6cc7f688d2d02963272b0"; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl oo-prototypes pango pointedlist text transformers-base yi-core @@ -188868,8 +189783,8 @@ self: { }: mkDerivation { pname = "yi-frontend-vty"; - version = "0.13.3"; - sha256 = "3dd96a09085b7ad5375e9038af38fef7cb72c1c3dd9c7941fbe40d4ae43f5002"; + version = "0.13.5"; + sha256 = "5be74cdfd2e0ca9d0a8af5895013f8fee86e55e2a6484f66253f761090a137b3"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist stm text vty yi-core yi-language @@ -188897,15 +189812,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-fuzzy-open_0_13_3" = callPackage + "yi-fuzzy-open_0_13_5" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory , filepath, mtl, text, transformers-base, vector, yi-core , yi-language, yi-rope }: mkDerivation { pname = "yi-fuzzy-open"; - version = "0.13.3"; - sha256 = "51f827d2d9deec703a0450f90aed40d2084379fc3ab59d51d13b444f316e893c"; + version = "0.13.5"; + sha256 = "a71c3fd14598bb153cb64d45cfa60c40c4e97e9ed74e422c6fac566330ed9e2d"; libraryHaskellDepends = [ base binary containers data-default directory filepath mtl text transformers-base vector yi-core yi-language yi-rope @@ -188934,8 +189849,8 @@ self: { }: mkDerivation { pname = "yi-ireader"; - version = "0.13.3"; - sha256 = "7f8f3985386f3a64ad4de36c93b81183a08f9c0d5d9fbe4acfc47ac2a19cb2c7"; + version = "0.13.5"; + sha256 = "0ffe75cb958387aa4512cd07a40a25df4a68d2109b2d5530208ee291e03d7b48"; libraryHaskellDepends = [ base binary bytestring containers data-default microlens-platform text yi-core yi-language yi-rope @@ -188951,8 +189866,8 @@ self: { }: mkDerivation { pname = "yi-keymap-cua"; - version = "0.13.3"; - sha256 = "ba7836bd5192212baa9b3ae5c7a839953be08be67aa5199068f472f9a24f5a54"; + version = "0.13.5"; + sha256 = "d49e00c8097e23d6626b58e6cfa875f76a3a215524d29bb11fef09f91f4d57c5"; libraryHaskellDepends = [ base microlens-platform text yi-core yi-keymap-emacs yi-rope ]; @@ -188969,8 +189884,8 @@ self: { }: mkDerivation { pname = "yi-keymap-emacs"; - version = "0.13.3"; - sha256 = "3b2ee411a67904f011c6f5f9ac7739d7c4571c4a0c8deaef82aaeb44176cd1b2"; + version = "0.13.5"; + sha256 = "8019d069cc6f81a5c13b5429fd60db008ec224cc3df55c6384a0067edeeb0416"; libraryHaskellDepends = [ base containers filepath Hclip microlens-platform mtl oo-prototypes semigroups text transformers-base yi-core yi-language yi-misc-modes @@ -188991,8 +189906,8 @@ self: { }: mkDerivation { pname = "yi-keymap-vim"; - version = "0.13.3"; - sha256 = "e81caeb7866e485a88ede2b88cfe7f6fbbc6ea9cd21424502d11150df64211b4"; + version = "0.13.5"; + sha256 = "c37a48f0915f4a1584ae684e227102bed334f64ceec851547b2789e645c74907"; libraryHaskellDepends = [ attoparsec base binary containers data-default directory filepath Hclip microlens-platform mtl oo-prototypes pointedlist safe @@ -189037,7 +189952,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-language_0_13_3" = callPackage + "yi-language_0_13_5" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, hashable, microlens-platform, oo-prototypes , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec @@ -189046,8 +189961,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.13.3"; - sha256 = "06d3c328777bed0fb1c0ab8a7fabfed6603fa6cfc4d50f3195c85e9bae99cc5f"; + version = "0.13.5"; + sha256 = "d599c10c37cc829dba86c9e35da6d58a6e84c99aaab18a5a8418d4baab22fcfd"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -189067,18 +189982,19 @@ self: { }) {}; "yi-misc-modes" = callPackage - ({ mkDerivation, array, base, binary, data-default, filepath + ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, semigroups, text, yi-core, yi-language , yi-rope }: mkDerivation { pname = "yi-misc-modes"; - version = "0.13.3"; - sha256 = "94993c405dccbc2aa4f5077096560c68219414a2d747f84a195b4fd556f7e63e"; + version = "0.13.5"; + sha256 = "5889c2011813f37d58311a52714c5d8f165e6a0640b7af4752190d9d3db921a9"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform semigroups text yi-core yi-language yi-rope ]; + libraryToolDepends = [ alex ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor miscellaneous modes"; license = stdenv.lib.licenses.gpl2; @@ -189086,20 +190002,21 @@ self: { }) {}; "yi-mode-haskell" = callPackage - ({ mkDerivation, array, base, binary, containers, data-default - , filepath, hashable, hspec, microlens-platform, pointedlist - , QuickCheck, regex-base, regex-tdfa, template-haskell, text - , transformers-base, unordered-containers, yi-core, yi-language - , yi-rope + ({ mkDerivation, alex, array, base, binary, containers + , data-default, filepath, hashable, hspec, microlens-platform + , pointedlist, QuickCheck, regex-base, regex-tdfa, template-haskell + , text, transformers-base, unordered-containers, yi-core + , yi-language, yi-rope }: mkDerivation { pname = "yi-mode-haskell"; - version = "0.13.3"; - sha256 = "438ff92a24aef5e3cb7a8aa0046014b8f40927f046a612f830a20fb2ef9a6fde"; + version = "0.13.5"; + sha256 = "4323b34b6ae45391072300d9ba8350df8237fc5984fa4ad962bcfd20f2046f99"; libraryHaskellDepends = [ array base binary data-default microlens-platform text yi-core yi-language yi-rope ]; + libraryToolDepends = [ alex ]; testHaskellDepends = [ array base binary containers data-default filepath hashable hspec microlens-platform pointedlist QuickCheck regex-base regex-tdfa @@ -189113,17 +190030,19 @@ self: { }) {}; "yi-mode-javascript" = callPackage - ({ mkDerivation, array, base, binary, data-default, dlist, filepath - , microlens-platform, mtl, text, yi-core, yi-language, yi-rope + ({ mkDerivation, alex, array, base, binary, data-default, dlist + , filepath, microlens-platform, mtl, text, yi-core, yi-language + , yi-rope }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.13.3"; - sha256 = "1a24664cf2d65732b5575bd4ab3bc92d3897a3c6af4bc93296945429b5c974f3"; + version = "0.13.5"; + sha256 = "156db2b03fb06ce12bb6e17a0b07c7acdac42a29734b714860777e234c86381c"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope ]; + libraryToolDepends = [ alex ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor javascript mode"; license = stdenv.lib.licenses.gpl2; @@ -189189,8 +190108,8 @@ self: { }: mkDerivation { pname = "yi-snippet"; - version = "0.13.3"; - sha256 = "0373adb2e93de479995cc64299106a3fb2ba2dbfb5abb87d811ef13f47a39077"; + version = "0.13.5"; + sha256 = "f3b67c88c01a6c190013870ae7dd371ccc77f619c73247effb9c3e2d36a6ab13"; libraryHaskellDepends = [ base binary containers data-default free lens mtl text vector yi-core yi-rope From 7f1d74d43b4699d0c98825ecb59e1fc462ebf7b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 4 Dec 2016 20:43:50 +0100 Subject: [PATCH 1498/1749] haskell-brick: update overrides with regard to vty --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 700f9d0dbb2d..1ce125e4164d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -512,7 +512,7 @@ self: super: { # https://ghc.haskell.org/trac/ghc/ticket/9625 vty = dontCheck super.vty; - vty_5_13 = dontCheck super.vty_5_13; + vty_5_14 = dontCheck super.vty_5_14; # https://github.com/vincenthz/hs-crypto-pubkey/issues/20 crypto-pubkey = dontCheck super.crypto-pubkey; @@ -1128,6 +1128,6 @@ self: super: { barrier = doJailbreak super.barrier; # requires vty 5.13 - brick = super.brick.overrideScope (self: super: { vty = self.vty_5_13; }); + brick = super.brick.overrideScope (self: super: { vty = self.vty_5_14; }); } From 3e092a19f3aa6bdb5ae9e12dc994c0b48ae64369 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2016 18:04:24 +0100 Subject: [PATCH 1499/1749] haskell-math-functions: test suite fails sporadically --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1ce125e4164d..f07d6628e4bc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1057,6 +1057,9 @@ self: super: { doCheck = false; }); + # https://github.com/bos/math-functions/issues/25 + math-functions = dontCheck super.math-functions; + # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version # is hard because of transitive dependencies, so we just disable tests. http-api-data_0_3_3 = dontCheck super.http-api-data_0_3_3; From f135c9fde7ba9a8922ebcf847b59b4bb7717f074 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2016 22:25:17 +0100 Subject: [PATCH 1500/1749] configuration-hackage2nix.yaml: maintain hledger packages to ensure they build --- .../haskell-modules/configuration-hackage2nix.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 220b7bc8dc21..d99253eb6650 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2045,7 +2045,12 @@ package-maintainers: - funcmp - git-annex - hackage-db + - hledger + - hledger-diff - hledger-interest + - hledger-irr + - hledger-ui + - hledger-web - hopenssl - hsdns - hsemail @@ -4444,7 +4449,6 @@ dont-distribute-packages: HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] From 1e14698a5828a09e8b2b3195e537dfcee3f4d3f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 8 Dec 2016 11:51:30 +0100 Subject: [PATCH 1501/1749] haskell-Cabal: update latest version to 1.24.2.0 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f07d6628e4bc..1198b60101d8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -10,7 +10,7 @@ self: super: { ghcjs-base = null; # Some packages need a non-core version of Cabal. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; }); # Link statically to avoid runtime dependency on GHC. jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 9710d139f8a4..564ce3c04ecb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -37,10 +37,10 @@ self: super: { xhtml = null; # Enable latest version of cabal-install. - cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; }); + cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; }); # Build jailbreak-cabal with the latest version of Cabal. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_1_0; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; }; Extra = appendPatch super.Extra (pkgs.fetchpatch { url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch"; From 80c35f6f3dc666df91205b71283aa488cc342a77 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2016 22:02:01 +0100 Subject: [PATCH 1502/1749] cabal-install: always use the latest version by default --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index d99253eb6650..099735eb769e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -263,7 +263,6 @@ default-package-overrides: - cabal-dependency-licenses ==0.1.2.0 - cabal-file-th ==0.2.4 - cabal-helper ==0.7.2.0 - - cabal-install ==1.24.0.1 - cabal-rpm ==0.10.1 - cabal-sort ==0.0.5.3 - cabal-src ==0.3.0.2 From 64afb52f6cf3c07eeba8ad88a0643ca53c9ab007 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Dec 2016 14:37:56 +0100 Subject: [PATCH 1503/1749] git-annex: fix sha hash for the new version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1198b60101d8..5c575c362050 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -53,7 +53,7 @@ self: super: { src = pkgs.fetchFromGitHub { owner = "joeyh"; repo = "git-annex"; - sha256 = "0yy4fdk0sp19hc838j82sls68l5wnrhr55zzs0gbqnagna77cxhd"; + sha256 = "1a87kllzxmjwkz5arq4c3bp7qfkabn0arbli6s6i68fkgm19s4gr"; rev = drv.version; }; })).overrideScope (self: super: { From 69c09c47e65ac220d9306687feb79544aeb2567a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Dec 2016 15:22:07 +0100 Subject: [PATCH 1504/1749] stack: version 1.3.x needs aeson 1.x to compile --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5c575c362050..0feb7b0c47a4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -994,13 +994,14 @@ self: super: { ''; }); - # https://github.com/commercialhaskell/stack/issues/2263 + # The most current version needs some packages to build that are not in LTS 7.x. stack = super.stack.overrideScope (self: super: { http-client = self.http-client_0_5_4; http-client-tls = self.http-client-tls_0_3_3; http-conduit = self.http-conduit_2_2_3; optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0; criterion = super.criterion.override { inherit (super) optparse-applicative; }; + aeson = self.aeson_1_0_2_1; }); # The latest Hoogle needs versions not yet in LTS Haskell 7.x. From acbbf6a3cc1489b4fd1989872e6a2a5b72809df7 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 12 Dec 2016 16:54:28 -0500 Subject: [PATCH 1505/1749] Fixup haskell-src-exts version --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0feb7b0c47a4..eee8f9df457d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -819,7 +819,7 @@ self: super: { ln -s $lispdir $out/share/emacs/site-lisp ''; })).override { - haskell-src-exts = self.haskell-src-exts_1_19_0; + haskell-src-exts = self.haskell-src-exts_1_19_1; }; # # Make elisp files available at a location where people expect it. @@ -833,7 +833,7 @@ self: super: { ''; doCheck = false; # https://github.com/chrisdone/hindent/issues/299 })).override { - haskell-src-exts = self.haskell-src-exts_1_19_0; + haskell-src-exts = self.haskell-src-exts_1_19_1; }; # https://github.com/yesodweb/Shelly.hs/issues/106 @@ -1005,7 +1005,7 @@ self: super: { }); # The latest Hoogle needs versions not yet in LTS Haskell 7.x. - hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_0; }; + hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; }; # To be in sync with Hoogle. lambdabot-haskell-plugins = (overrideCabal super.lambdabot-haskell-plugins (drv: { @@ -1024,7 +1024,7 @@ self: super: { }; # Needs new version. - haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_0; }; + haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_1; }; # Test suite fails a QuickCheck property. optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0; From 1edf95167aeca72f2c0f60b9ef46dceccd1bf1cb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 14 Dec 2016 09:35:10 -0500 Subject: [PATCH 1506/1749] subversion: 1.8.16 -> 1.8.17 --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 1fbedcaf9d7e..eddbc0e56dd6 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -104,8 +104,8 @@ let in { subversion18 = common { - version = "1.8.16"; - sha256 = "0imkxn25n6sbcgfldrx4z29npjprb1lxjm5fb89q4297161nx3zi"; + version = "1.8.17"; + sha256 = "1450fkj1jmxyphqn6cd95z1ykwsabajm9jw4i412qpwss8w9a4fy"; }; subversion19 = common { From b217c0a99ba22371b2a73821a8e127892f2e24d4 Mon Sep 17 00:00:00 2001 From: Maarten Hoogendoorn Date: Wed, 14 Dec 2016 15:46:45 +0100 Subject: [PATCH 1507/1749] yarn: init at 0.17.8 (#20635) --- pkgs/development/node-packages/node-env.nix | 109 +- .../node-packages/node-packages-v4.nix | 973 +++++++++++++++--- .../node-packages/node-packages-v6.nix | 604 +++++++++-- .../node-packages/node-packages.json | 1 + pkgs/top-level/node-packages.json | 1 + 5 files changed, 1374 insertions(+), 314 deletions(-) diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 389ccae2fe52..414f60420af2 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -8,19 +8,19 @@ let # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise tarWrapper = runCommand "tarWrapper" {} '' mkdir -p $out/bin - + cat > $out/bin/tar < package.json < \"Yarn\"

"; + homepage = "https://github.com/yarnpkg/yarn#readme"; + license = "BSD-2-Clause"; + }; + production = true; + }; } \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 6ece606398ac..2132aff9dd03 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -868,13 +868,13 @@ let sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a"; }; }; - "moment-2.16.0" = { + "moment-2.17.0" = { name = "moment"; packageName = "moment"; - version = "2.16.0"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz"; - sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; + url = "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz"; + sha1 = "a4c292e02aac5ddefb29a6eed24f51938dd3b74f"; }; }; "ms-rest-1.15.2" = { @@ -1129,13 +1129,13 @@ let sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26"; }; }; - "xpath.js-1.0.6" = { + "xpath.js-1.0.7" = { name = "xpath.js"; packageName = "xpath.js"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.6.tgz"; - sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90"; + url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz"; + sha1 = "7e94627f541276cbc6a6b02b5d35e9418565b3e4"; }; }; "base64url-2.0.0" = { @@ -1894,13 +1894,13 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "async-2.1.2" = { + "async-2.1.4" = { name = "async"; packageName = "async"; - version = "2.1.2"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz"; - sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; + url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz"; + sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"; }; }; "lodash-4.17.2" = { @@ -2947,13 +2947,13 @@ let sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; }; }; - "graceful-fs-4.1.10" = { + "graceful-fs-4.1.11" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.10"; + version = "4.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz"; - sha1 = "f2d720c22092f743228775c75e3612632501f131"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; + sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; "parse-json-2.2.0" = { @@ -3163,13 +3163,13 @@ let sha1 = "03939a622582a812cc202320a0b9a56c9b815849"; }; }; - "browser-pack-6.0.1" = { + "browser-pack-6.0.2" = { name = "browser-pack"; packageName = "browser-pack"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.1.tgz"; - sha1 = "779887c792eaa1f64a46a22c8f1051cdcd96755f"; + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz"; + sha1 = "f86cd6cef4f5300c8e63e07a4d512f65fbff4531"; }; }; "browser-resolve-1.11.2" = { @@ -4450,13 +4450,13 @@ let sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc"; }; }; - "numeral-1.5.3" = { + "numeral-1.5.5" = { name = "numeral"; packageName = "numeral"; - version = "1.5.3"; + version = "1.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/numeral/-/numeral-1.5.3.tgz"; - sha1 = "a4c3eba68239580509f818267c77243bce43ff62"; + url = "https://registry.npmjs.org/numeral/-/numeral-1.5.5.tgz"; + sha1 = "b7515d64533626124e9196cfc68c8fd5b2dee208"; }; }; "open-0.0.5" = { @@ -9440,13 +9440,13 @@ let sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d"; }; }; - "prettyjson-1.1.3" = { + "prettyjson-1.2.0" = { name = "prettyjson"; packageName = "prettyjson"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.1.3.tgz"; - sha1 = "d0787f732c9c3a566f4165fa4f1176fd67e6b263"; + url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.0.tgz"; + sha1 = "2a109cdf14c957896bbad8b77ef5de5db2c691bf"; }; }; "shush-1.0.0" = { @@ -14220,13 +14220,13 @@ let sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; }; }; - "buffer-crc32-0.2.6" = { + "buffer-crc32-0.2.13" = { name = "buffer-crc32"; packageName = "buffer-crc32"; - version = "0.2.6"; + version = "0.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.6.tgz"; - sha1 = "612b318074fc6c4c30504b297247a1f91641253b"; + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; }; }; "fresh-0.1.0" = { @@ -16681,13 +16681,13 @@ let sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; }; }; - "commoner-0.10.4" = { + "commoner-0.10.8" = { name = "commoner"; packageName = "commoner"; - version = "0.10.4"; + version = "0.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/commoner/-/commoner-0.10.4.tgz"; - sha1 = "98f3333dd3ad399596bb2d384a783bb7213d68f8"; + url = "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz"; + sha1 = "34fc3672cd24393e8bb47e70caa0293811f4f2c5"; }; }; "jstransform-10.1.0" = { @@ -16699,6 +16699,15 @@ let sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; }; }; + "iconv-lite-0.4.15" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; + sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; + }; + }; "private-0.1.6" = { name = "private"; packageName = "private"; @@ -16708,31 +16717,31 @@ let sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1"; }; }; - "recast-0.10.43" = { + "recast-0.11.17" = { name = "recast"; packageName = "recast"; - version = "0.10.43"; + version = "0.11.17"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.10.43.tgz"; - sha1 = "b95d50f6d60761a5f6252e15d80678168491ce7f"; + url = "https://registry.npmjs.org/recast/-/recast-0.11.17.tgz"; + sha1 = "67e829df49ef8ea822381cc516d305411e60bad8"; }; }; - "esprima-fb-15001.1001.0-dev-harmony-fb" = { - name = "esprima-fb"; - packageName = "esprima-fb"; - version = "15001.1001.0-dev-harmony-fb"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz"; - sha1 = "43beb57ec26e8cf237d3dd8b33e42533577f2659"; - }; - }; - "ast-types-0.8.15" = { + "ast-types-0.9.2" = { name = "ast-types"; packageName = "ast-types"; - version = "0.8.15"; + version = "0.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.8.15.tgz"; - sha1 = "8eef0827f04dff0ec8857ba925abe3fea6194e52"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.2.tgz"; + sha1 = "2cc19979d15c655108bf565323b8e7ee38751f6b"; + }; + }; + "esprima-3.1.1" = { + name = "esprima"; + packageName = "esprima"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.1.tgz"; + sha1 = "02dbcc5ac3ece81070377f99158ec742ab5dda06"; }; }; "base62-0.1.1" = { @@ -17636,6 +17645,15 @@ let sha1 = "a8a93e0bfb7581ac199c4f001a5525a724ce696d"; }; }; + "async-2.1.2" = { + name = "async"; + packageName = "async"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz"; + sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; + }; + }; "fields-0.1.24" = { name = "fields"; packageName = "fields"; @@ -17663,6 +17681,15 @@ let sha1 = "83736a15ae5f48711b625153e98012f2de659e69"; }; }; + "moment-2.16.0" = { + name = "moment"; + packageName = "moment"; + version = "2.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz"; + sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; + }; + }; "node-appc-0.2.39" = { name = "node-appc"; packageName = "node-appc"; @@ -18410,13 +18437,13 @@ let sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; }; }; - "tmp-0.0.30" = { + "tmp-0.0.31" = { name = "tmp"; packageName = "tmp"; - version = "0.0.30"; + version = "0.0.31"; src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz"; - sha1 = "72419d4a8be7d6ce75148fd8b324e593a711c2ed"; + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; + sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; }; }; "follow-redirects-0.0.3" = { @@ -18644,6 +18671,150 @@ let sha1 = "e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f"; }; }; + "babel-runtime-6.18.0" = { + name = "babel-runtime"; + packageName = "babel-runtime"; + version = "6.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz"; + sha1 = "0f4177ffd98492ef13b9f823e9994a02584c9078"; + }; + }; + "death-1.0.0" = { + name = "death"; + packageName = "death"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/death/-/death-1.0.0.tgz"; + sha1 = "4d46e15488d4b636b699f0671b04632d752fd2de"; + }; + }; + "detect-indent-4.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; + sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; + }; + }; + "invariant-2.2.2" = { + name = "invariant"; + packageName = "invariant"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"; + sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; + }; + }; + "is-ci-1.0.10" = { + name = "is-ci"; + packageName = "is-ci"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz"; + sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; + }; + }; + "leven-2.0.0" = { + name = "leven"; + packageName = "leven"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-2.0.0.tgz"; + sha1 = "74c45744439550da185801912829f61d22071bc1"; + }; + }; + "node-emoji-1.4.1" = { + name = "node-emoji"; + packageName = "node-emoji"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.4.1.tgz"; + sha1 = "c9fa0cf91094335bcb967a6f42b2305c15af2ebc"; + }; + }; + "object-path-0.11.3" = { + name = "object-path"; + packageName = "object-path"; + version = "0.11.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object-path/-/object-path-0.11.3.tgz"; + sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554"; + }; + }; + "proper-lockfile-1.2.0" = { + name = "proper-lockfile"; + packageName = "proper-lockfile"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-1.2.0.tgz"; + sha1 = "ceff5dd89d3e5f10fb75e1e8e76bc75801a59c34"; + }; + }; + "request-capture-har-1.1.4" = { + name = "request-capture-har"; + packageName = "request-capture-har"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.1.4.tgz"; + sha1 = "e6ad76eb8e7a1714553fdbeef32cd4518e4e2013"; + }; + }; + "roadrunner-1.1.0" = { + name = "roadrunner"; + packageName = "roadrunner"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/roadrunner/-/roadrunner-1.1.0.tgz"; + sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e"; + }; + }; + "regenerator-runtime-0.9.6" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz"; + sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; + }; + }; + "loose-envify-1.3.0" = { + name = "loose-envify"; + packageName = "loose-envify"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz"; + sha1 = "6b26248c42f6d4fa4b0d8542f78edfcde35642a8"; + }; + }; + "ci-info-1.0.0" = { + name = "ci-info"; + packageName = "ci-info"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz"; + sha1 = "dc5285f2b4e251821683681c381c3388f46ec534"; + }; + }; + "string.prototype.codepointat-0.2.0" = { + name = "string.prototype.codepointat"; + packageName = "string.prototype.codepointat"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz"; + sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78"; + }; + }; + "err-code-1.1.1" = { + name = "err-code"; + packageName = "err-code"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/err-code/-/err-code-1.1.1.tgz"; + sha1 = "739d71b6851f24d050ea18c79a5b722420771d59"; + }; + }; }; in { @@ -18809,7 +18980,7 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.16.0" + sources."moment-2.17.0" sources."ms-rest-1.15.2" (sources."ms-rest-azure-1.15.2" // { dependencies = [ @@ -18871,7 +19042,7 @@ in sources."date-utils-1.2.21" sources."jws-3.1.4" sources."xmldom-0.1.22" - sources."xpath.js-1.0.6" + sources."xpath.js-1.0.7" sources."base64url-2.0.0" sources."jwa-1.1.4" sources."safe-buffer-5.0.1" @@ -18949,7 +19120,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.1.2" + sources."async-2.1.4" ]; }) (sources."har-validator-2.0.6" // { @@ -19076,7 +19247,7 @@ in sources."bower-logger-0.2.1" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" ]; }) sources."lodash-4.2.1" @@ -19151,12 +19322,12 @@ in sources."pinkie-2.0.4" (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" ]; }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" ]; }) sources."parse-json-2.2.0" @@ -19176,12 +19347,12 @@ in sources."natives-1.1.0" (sources."jsonfile-2.4.0" // { dependencies = [ - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" ]; }) (sources."klaw-1.3.1" // { dependencies = [ - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" ]; }) sources."path-is-absolute-1.0.1" @@ -19225,7 +19396,7 @@ in dependencies = [ sources."JSONStream-1.2.1" sources."assert-1.3.0" - sources."browser-pack-6.0.1" + sources."browser-pack-6.0.2" sources."browser-resolve-1.11.2" sources."browserify-zlib-0.1.4" sources."buffer-4.9.1" @@ -19494,7 +19665,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -19510,7 +19681,7 @@ in sources."clivas-0.1.4" sources."inquirer-0.8.5" sources."network-address-0.0.5" - sources."numeral-1.5.3" + sources."numeral-1.5.5" sources."open-0.0.5" (sources."optimist-0.6.1" // { dependencies = [ @@ -19907,7 +20078,7 @@ in sources."browserify-13.1.0" sources."JSONStream-1.2.1" sources."assert-1.3.0" - sources."browser-pack-6.0.1" + sources."browser-pack-6.0.2" sources."browser-resolve-1.11.2" sources."browserify-zlib-0.1.4" (sources."buffer-4.9.1" // { @@ -20108,7 +20279,7 @@ in sources."mute-stream-0.0.6" sources."json-parse-helpfulerror-1.0.3" sources."normalize-package-data-2.3.5" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."jju-1.3.0" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" @@ -20270,7 +20441,7 @@ in ]; }) sources."node-uuid-1.4.7" - (sources."async-2.1.2" // { + (sources."async-2.1.4" // { dependencies = [ sources."lodash-4.17.2" ]; @@ -20828,7 +20999,7 @@ in sources."path-exists-2.1.0" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -20937,7 +21108,7 @@ in sources."flat-cache-1.2.1" sources."circular-json-0.3.1" sources."del-2.2.2" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."write-0.2.1" sources."globby-5.0.0" sources."is-path-cwd-1.0.0" @@ -21083,7 +21254,7 @@ in sources."object-assign-3.0.0" sources."optimist-0.6.1" sources."path-is-absolute-1.0.1" - (sources."prettyjson-1.1.3" // { + (sources."prettyjson-1.2.0" // { dependencies = [ sources."colors-1.1.2" sources."minimist-1.2.0" @@ -21161,7 +21332,7 @@ in sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.7.0" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."readable-stream-2.2.2" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" @@ -21563,7 +21734,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -22064,7 +22235,7 @@ in ]; }) sources."glob-7.1.1" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."http-proxy-1.15.2" sources."isbinaryfile-3.0.1" sources."lodash-3.10.1" @@ -22553,7 +22724,7 @@ in sources."isarray-0.0.1" ]; }) - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."gulp-sourcemaps-1.6.0" sources."is-valid-glob-0.3.0" sources."lazystream-1.0.0" @@ -22740,7 +22911,7 @@ in sources."nijs-0.0.23" sources."chownr-1.0.1" sources."concat-stream-1.5.2" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."mkdirp-0.5.1" sources."normalize-package-data-2.3.5" (sources."npm-package-arg-4.2.0" // { @@ -22906,7 +23077,7 @@ in dependencies = [ sources."fstream-1.0.10" sources."glob-7.1.1" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."minimatch-3.0.3" sources."mkdirp-0.5.1" sources."nopt-3.0.6" @@ -23134,7 +23305,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -23479,7 +23650,7 @@ in sources."concat-map-0.0.1" sources."block-stream-0.0.9" sources."fstream-1.0.10" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."debug-2.2.0" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" @@ -23563,7 +23734,7 @@ in sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.7.0" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."readable-stream-2.2.2" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" @@ -23881,7 +24052,7 @@ in sources."cookie-signature-1.0.6" sources."vary-1.1.0" sources."moment-timezone-0.5.9" - sources."moment-2.16.0" + sources."moment-2.17.0" sources."accepts-1.3.3" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -23906,7 +24077,7 @@ in sources."destroy-1.0.4" sources."mime-1.3.4" sources."stream-consume-0.1.0" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" @@ -24105,7 +24276,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.1.2" + sources."async-2.1.4" ]; }) sources."har-validator-2.0.6" @@ -24326,7 +24497,7 @@ in sources."range-parser-0.0.4" sources."mkdirp-0.3.5" sources."cookie-0.0.5" - sources."buffer-crc32-0.2.6" + sources."buffer-crc32-0.2.13" sources."fresh-0.1.0" sources."methods-0.0.1" sources."send-0.1.0" @@ -24429,7 +24600,7 @@ in sources."fstream-1.0.10" sources."fstream-npm-1.2.0" sources."glob-7.1.1" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -24937,7 +25108,7 @@ in sources."fstream-1.0.10" sources."fstream-npm-1.2.0" sources."glob-7.1.1" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -25322,7 +25493,7 @@ in sources."destroy-1.0.4" sources."mime-1.3.4" sources."glob-6.0.4" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" (sources."handlebars-4.0.6" // { dependencies = [ sources."async-1.5.2" @@ -25456,7 +25627,7 @@ in sources."dtrace-provider-0.8.0" sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" - sources."moment-2.16.0" + sources."moment-2.17.0" sources."nan-2.4.0" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -25568,7 +25739,7 @@ in sources."keypress-0.2.1" sources."mime-1.3.4" sources."network-address-1.1.0" - sources."numeral-1.5.3" + sources."numeral-1.5.5" sources."open-0.0.5" (sources."optimist-0.6.1" // { dependencies = [ @@ -25679,7 +25850,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -26148,7 +26319,7 @@ in sources."minimist-0.0.8" sources."fd-slicer-1.0.1" sources."pend-1.2.0" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" @@ -26185,7 +26356,7 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.1.2" + sources."async-2.1.4" sources."lodash-4.17.2" sources."mime-db-1.25.0" sources."assert-plus-0.2.0" @@ -26254,22 +26425,21 @@ in sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c"; }; dependencies = [ - sources."commoner-0.10.4" + sources."commoner-0.10.8" (sources."jstransform-10.1.0" // { dependencies = [ - sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."source-map-0.1.31" ]; }) sources."commander-2.9.0" sources."detective-4.3.2" sources."glob-5.0.15" - sources."graceful-fs-4.1.10" - sources."iconv-lite-0.4.13" + sources."graceful-fs-4.1.11" + sources."iconv-lite-0.4.15" sources."mkdirp-0.5.1" sources."private-0.1.6" sources."q-1.4.1" - sources."recast-0.10.43" + sources."recast-0.11.17" sources."graceful-readlink-1.0.1" sources."acorn-3.3.0" sources."defined-1.0.0" @@ -26283,10 +26453,11 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."minimist-0.0.8" - sources."esprima-fb-15001.1001.0-dev-harmony-fb" + sources."ast-types-0.9.2" + sources."esprima-3.1.1" sources."source-map-0.5.6" - sources."ast-types-0.8.15" sources."base62-0.1.1" + sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."amdefine-1.0.1" ]; buildInputs = globalBuildInputs; @@ -26677,7 +26848,7 @@ in sources."dtrace-provider-0.8.0" sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" - sources."moment-2.16.0" + sources."moment-2.17.0" sources."nan-2.4.0" sources."ncp-2.0.0" sources."rimraf-2.4.5" @@ -26757,7 +26928,7 @@ in sources."readdirp-2.1.0" sources."colors-1.0.3" sources."graceful-readlink-1.0.1" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."minimatch-3.0.3" sources."readable-stream-2.2.2" sources."set-immediate-shim-1.0.1" @@ -27505,7 +27676,7 @@ in sources."minimatch-3.0.3" ]; }) - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -27841,7 +28012,7 @@ in sources."kew-0.7.0" ]; }) - sources."tmp-0.0.30" + sources."tmp-0.0.31" sources."follow-redirects-0.0.3" (sources."config-chain-1.1.11" // { dependencies = [ @@ -27881,7 +28052,7 @@ in sources."minimist-0.0.8" sources."fd-slicer-1.0.1" sources."pend-1.2.0" - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."jsonfile-2.4.0" sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" @@ -27916,7 +28087,7 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.1.2" + sources."async-2.1.4" sources."lodash-4.17.2" sources."mime-db-1.25.0" sources."assert-plus-0.2.0" @@ -28023,7 +28194,7 @@ in sources."source-map-0.4.4" ]; }) - sources."graceful-fs-4.1.10" + sources."graceful-fs-4.1.11" sources."big.js-3.1.3" sources."emojis-list-2.1.0" sources."json5-0.5.0" @@ -28296,4 +28467,219 @@ in }; production = true; }; + yarn = nodeEnv.buildNodePackage { + name = "yarn"; + packageName = "yarn"; + version = "0.17.8"; + src = fetchurl { + url = "https://registry.npmjs.org/yarn/-/yarn-0.17.8.tgz"; + sha1 = "6a95d19aaeb891810618937db98a2080683cbbb4"; + }; + dependencies = [ + sources."babel-runtime-6.18.0" + sources."bytes-2.4.0" + sources."camelcase-3.0.0" + sources."chalk-1.1.3" + sources."cmd-shim-2.0.2" + sources."commander-2.9.0" + sources."death-1.0.0" + sources."debug-2.3.3" + sources."defaults-1.0.3" + sources."detect-indent-4.0.0" + sources."diff-2.2.3" + sources."ini-1.3.4" + sources."inquirer-1.2.3" + sources."invariant-2.2.2" + sources."is-builtin-module-1.0.0" + sources."is-ci-1.0.10" + sources."leven-2.0.0" + sources."loud-rejection-1.6.0" + sources."minimatch-3.0.3" + sources."mkdirp-0.5.1" + sources."node-emoji-1.4.1" + sources."node-gyp-3.4.0" + sources."object-path-0.11.3" + sources."proper-lockfile-1.2.0" + sources."read-1.0.7" + sources."repeating-2.0.1" + sources."request-2.79.0" + sources."request-capture-har-1.1.4" + sources."rimraf-2.5.4" + sources."roadrunner-1.1.0" + sources."semver-5.3.0" + sources."strip-bom-2.0.0" + sources."tar-2.2.1" + sources."tar-stream-1.5.2" + sources."user-home-2.0.0" + sources."validate-npm-package-license-3.0.1" + sources."core-js-2.4.1" + sources."regenerator-runtime-0.9.6" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."graceful-fs-4.1.11" + sources."graceful-readlink-1.0.1" + sources."ms-0.7.2" + sources."clone-1.0.2" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."cli-width-2.1.0" + sources."external-editor-1.1.1" + sources."figures-1.7.0" + sources."lodash-4.17.2" + sources."mute-stream-0.0.6" + sources."pinkie-promise-2.0.1" + sources."run-async-2.2.0" + sources."rx-4.1.0" + sources."string-width-1.0.2" + sources."through-2.3.8" + sources."restore-cursor-1.0.1" + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + sources."extend-3.0.0" + sources."spawn-sync-1.0.15" + sources."tmp-0.0.29" + sources."concat-stream-1.5.2" + sources."os-shim-0.1.3" + sources."inherits-2.0.3" + sources."typedarray-0.0.6" + sources."readable-stream-2.0.6" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."os-tmpdir-1.0.2" + sources."object-assign-4.1.0" + sources."pinkie-2.0.4" + sources."is-promise-2.1.0" + sources."code-point-at-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."loose-envify-1.3.0" + sources."js-tokens-2.0.0" + sources."builtin-modules-1.1.1" + sources."ci-info-1.0.0" + sources."currently-unhandled-0.4.1" + sources."signal-exit-3.0.1" + sources."array-find-index-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."minimist-0.0.8" + sources."string.prototype.codepointat-0.2.0" + sources."fstream-1.0.10" + sources."glob-7.1.1" + sources."nopt-3.0.6" + sources."npmlog-3.1.2" + sources."osenv-0.1.3" + sources."path-array-1.0.1" + sources."which-1.2.12" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."abbrev-1.0.9" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."aproba-1.0.4" + sources."has-color-0.1.7" + sources."has-unicode-2.0.1" + sources."wide-align-1.1.0" + sources."os-homedir-1.0.2" + sources."array-index-1.0.0" + sources."es6-symbol-3.1.0" + sources."d-0.1.1" + sources."es5-ext-0.10.12" + sources."es6-iterator-2.0.0" + sources."isexe-1.1.2" + sources."err-code-1.1.1" + sources."retry-0.10.0" + sources."is-finite-1.0.2" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."forever-agent-0.6.1" + sources."form-data-2.1.2" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.13" + sources."oauth-sign-0.8.2" + sources."qs-6.3.0" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."uuid-3.0.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."is-my-json-valid-2.15.0" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.25.0" + sources."punycode-1.4.1" + sources."is-utf8-0.2.1" + sources."block-stream-0.0.9" + sources."bl-1.1.2" + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "

\"Yarn\"

"; + homepage = "https://github.com/yarnpkg/yarn#readme"; + license = "BSD-2-Clause"; + }; + production = true; + }; } \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 9fc9dcf2d7b8..8c1c9515926c 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -62,4 +62,5 @@ , "webdrvr" , "webpack" , "wring" +, "yarn" ] diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 9cb059ca136f..88d28bdcbc44 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -183,6 +183,7 @@ , "wscat" , "wu" , "x509" +, "yarn" , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } , { "mongoose": "3.6.x" } , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" } From ebd85b632af4992307111b400143820802b494c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 9 Dec 2016 08:30:17 +0100 Subject: [PATCH 1508/1749] ferm: reload rules on updates instead of restart --- nixos/modules/services/networking/ferm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/ferm.nix b/nixos/modules/services/networking/ferm.nix index 6271e82541f4..8933e166f59f 100644 --- a/nixos/modules/services/networking/ferm.nix +++ b/nixos/modules/services/networking/ferm.nix @@ -51,6 +51,7 @@ in { before = [ "network-pre.target" ]; wants = [ "network-pre.target" ]; wantedBy = [ "multi-user.target" ]; + reloadIfChanged = true; serviceConfig = { Type="oneshot"; RemainAfterExit = "yes"; From a1892edcee7da13fb4dda1a2e6fc22b9d904671b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 8 Dec 2016 11:37:08 +0100 Subject: [PATCH 1509/1749] genimage: init at 9 Genimage is a tool to generate filesystem images from directory trees. --- pkgs/tools/filesystems/genimage/default.nix | 29 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/filesystems/genimage/default.nix diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix new file mode 100644 index 000000000000..b808573aa5b8 --- /dev/null +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, libconfuse }: + +stdenv.mkDerivation rec { + name = "genimage-${version}"; + version = "9"; + + src = fetchurl { + url = "http://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz"; + sha256 = "0y4h8x8lqxam8m90rdfq8cg5137kvilxr3d1qzddpx7nxpvmmwv9"; + }; + + buildInputs = [ pkgconfig libconfuse ]; + + postInstall = '' + # As there is no manpage or built-in --help, add the README file for + # documentation. + docdir="$out/share/doc/genimage" + mkdir -p "$docdir" + cp -v README "$docdir" + ''; + + meta = with stdenv.lib; { + homepage = https://git.pengutronix.de/cgit/genimage; + description = "Generate filesystem images from directory trees"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48cf5d105bd0..e3a1a5a11fe5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1834,6 +1834,8 @@ in gengetopt = callPackage ../development/tools/misc/gengetopt { }; + genimage = callPackage ../tools/filesystems/genimage { }; + geteltorito = callPackage ../tools/misc/geteltorito { }; getmail = callPackage ../tools/networking/getmail { }; From 64d0c0ec1e82b7c5987f9f1574acf05b365966d7 Mon Sep 17 00:00:00 2001 From: schneefux Date: Wed, 14 Dec 2016 19:10:14 +0100 Subject: [PATCH 1510/1749] pythonPackages.websockets: init at 3.2 --- .../python-modules/websockets/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/websockets/default.nix diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix new file mode 100644 index 000000000000..8c66dc604077 --- /dev/null +++ b/pkgs/development/python-modules/websockets/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchurl +, buildPythonPackage +, pythonOlder +}: + +let + pname = "websockets"; + version = "3.2"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "1dah1faywsnrlqyzagb1qc1cxrq9145srkdy118yhy9s8dyq4dmm"; + }; + + disabled = pythonOlder "3.3"; + doCheck = false; # protocol tests fail + + meta = { + description = "WebSocket implementation in Python 3"; + homepage = https://github.com/aaugustin/websockets; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87cd2970fabe..e1c0c1333edb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26208,6 +26208,7 @@ in { }; }; + websockets = callPackage ../development/python-modules/websockets { }; wand = buildPythonPackage rec { name = "Wand-0.3.5"; From 0f97f71525f9158e6464a9b727a1b6472ee69006 Mon Sep 17 00:00:00 2001 From: schneefux Date: Wed, 14 Dec 2016 19:13:52 +0100 Subject: [PATCH 1511/1749] pythonPackages.discordpy: init at 0.15.1 --- .../python-modules/discordpy/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/discordpy/default.nix diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix new file mode 100644 index 000000000000..cf01ec835a7d --- /dev/null +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchurl +, buildPythonPackage +, pythonOlder +, withVoice ? true, libopus +, asyncio +, aiohttp +, websockets +, pynacl +}: + +let + pname = "discord.py"; + version = "0.15.1"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "01lgidvnwwva1i65853gaplamllym2nsk0jis2r6f1rzbamgk1yj"; + }; + + propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ]; + patchPhase = '' + substituteInPlace "requirements.txt" \ + --replace "aiohttp>=1.0.0,<1.1.0" "aiohttp" + '' + lib.optionalString withVoice '' + substituteInPlace "discord/opus.py" \ + --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'" + ''; + + disabled = pythonOlder "3.5"; + + meta = { + description = "A python wrapper for the Discord API"; + homepage = "https://discordpy.rtfd.org/"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87cd2970fabe..f61d6a896e42 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -212,6 +212,8 @@ in { ''; }; + discordpy = callPackage ../development/python-modules/discordpy { }; + h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; }; From 838a3b4294aa475f686a1d748b8979fca3a8becb Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 14 Dec 2016 13:27:03 -0800 Subject: [PATCH 1512/1749] coq_8_6: 8.6rc1 -> 8.6 --- pkgs/applications/science/logic/coq/8.6.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/coq/8.6.nix b/pkgs/applications/science/logic/coq/8.6.nix index 659034e0586e..9d3aa756aa58 100644 --- a/pkgs/applications/science/logic/coq/8.6.nix +++ b/pkgs/applications/science/logic/coq/8.6.nix @@ -12,10 +12,9 @@ }: let - version = "8.6rc${pl}"; - sha256 = { - "1" = "0wral36h39q7g2sa2z8jvjc8ggqmqsjrbs0k299n0nykmmrq1pr8"; - }."${pl}"; + # version = "8.6pl${pl}"; + version = "8.6"; + sha256 = "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f"; coq-version = "8.6"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; From 888b27467e0ecd6c39349759c11389cabe62278e Mon Sep 17 00:00:00 2001 From: schneefux Date: Tue, 13 Dec 2016 21:06:38 +0100 Subject: [PATCH 1513/1749] nextcloud: 10.0.2 -> 11.0.0 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 91ecda2e8c7b..0d5d0a46e4e5 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "10.0.2"; + version = "11.0.0"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0g0h6yyy712mpyqzxa9azqlkgiw9hplv88xv0r7lh4w4fwcai1x6"; + sha256 = "0a8lc85jihlw326w0irykw5fbwcbz2mlq0vrcsd0niygqlvcppsv"; }; installPhase = '' From 2a224c6795582068a0cb9936bcb8c34dbce340c6 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 14 Dec 2016 23:23:00 +0000 Subject: [PATCH 1514/1749] fzf: 0.15.1 -> 0.15.9 --- pkgs/tools/misc/fzf/default.nix | 4 ++-- pkgs/tools/misc/fzf/deps.nix | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 3cb5c5680386..24c10c241f22 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.15.1"; + version = "0.15.9"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0wj5nhrrgx4nkiqwjp5wpfzdyikrjv4qr5x39s5094yc4p2k30b1"; + sha256 = "0r099mk9r6f52qqhx0ifb1xa8f2isqvyza80z9mcpi5zkd96174l"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix index 985308538321..651c76e361fe 100644 --- a/pkgs/tools/misc/fzf/deps.nix +++ b/pkgs/tools/misc/fzf/deps.nix @@ -1,4 +1,14 @@ +# This file was generated by go2nix. [ + { + goPackagePath = "github.com/junegunn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/junegunn/go-isatty"; + rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8"; + sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5"; + }; + } { goPackagePath = "github.com/junegunn/go-runewidth"; fetch = { From 4bc0c87b0d170f5532351203c00466ae9af8d2ea Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 15 Dec 2016 00:27:29 +0100 Subject: [PATCH 1515/1749] xstatic-jquery-ui: 1.11.0.1 -> 1.12.0.1 --- 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 98a9c1d47db5..1910166105c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30089,11 +30089,11 @@ in { xstatic-jquery-ui = buildPythonPackage rec { name = "XStatic-jquery-ui-${version}"; - version = "1.11.0.1"; + version = "1.12.0.1"; propagatedBuildInputs = with self; [ xstatic-jquery ]; src = pkgs.fetchurl { url = "mirror://pypi/X/XStatic-jquery-ui/XStatic-jquery-ui-${version}.tar.gz"; - sha256 = "0n6sgg9jxrqfz4zg6iqdmx1isqx2aswadf7mk3fbi48dxcv1i6q9"; + sha256 = "0w7mabv6qflpd47g33j3ggp5rv17mqk0xz3bsdswcj97wqpga2l2"; }; meta = { From b035da2e4d84e7f6c158fdd64e21bb75c3cdf26f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 13 Dec 2016 13:35:22 -0600 Subject: [PATCH 1516/1749] Add vim-markdown plugin.... --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 81c8472045b7..08cdb3465c82 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1039,6 +1039,17 @@ rec { }; + vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-markdown-2016-05-19"; + src = fetchgit { + url = "git://github.com/plasticboy/vim-markdown"; + rev = "a3169545f330ec8080244c3ad755bb2211eca8a0"; + sha256 = "1ycqx280xpc5gvfx8rrnmkqlv8q8g51hgiryx6yvd9a8ci805cx1"; + }; + dependencies = []; + + }; + vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-racer-2016-10-18"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 20f6afec41fe..3809ea8fc017 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -79,6 +79,7 @@ "github:neovimhaskell/haskell-vim" "github:osyo-manga/shabadou.vim" "github:osyo-manga/vim-watchdogs" +"github:plasticboy/vim-markdown" "github:racer-rust/vim-racer" "github:raichoo/purescript-vim" "github:rhysd/vim-grammarous" From 14bf940610a399929d9e67de36a2775e38001eac Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 15 Dec 2016 00:37:19 +0100 Subject: [PATCH 1517/1749] Revert "darwin.libunwind: fix install phase" This reverts commit 76125722f0cd445cbce0fb183ae127aeb28796d0. --- .../darwin/apple-source-releases/libunwind/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix index 9fed57ed64a4..81a45d99a86e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix @@ -1,16 +1,15 @@ { stdenv, appleDerivation, dyld, osx_private_sdk }: appleDerivation { - buildPhase = ":"; + phases = [ "unpackPhase" "installPhase" ]; - # install headers only installPhase = '' mkdir -p $out/lib - make install-data-am + cp -R include $out/include ''; meta = with stdenv.lib; { - maintainers = with maintainers; [ copumpkin lnl7 ]; + maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; license = licenses.apsl20; }; From 83c7660279eef8b7e46c520846948224240390a7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 13 Dec 2016 17:00:50 -0600 Subject: [PATCH 1518/1749] shell_cmds: init at 187 fixes #11707 --- .../darwin/apple-source-releases/default.nix | 2 + .../shell_cmds/default.nix | 45 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 69dc22836453..770a466a9f5d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -40,6 +40,7 @@ let basic_cmds = "55"; adv_cmds = "163"; file_cmds = "264.1.1"; + shell_cmds = "187"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ @@ -233,6 +234,7 @@ let developer_cmds = applePackage "developer_cmds" "osx-10.11.6" "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {}; network_cmds = applePackage "network_cmds" "osx-10.11.6" "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {}; file_cmds = applePackage "file_cmds" "osx-10.11.6" "1zfxbmasps529pnfdjvc13p7ws2cfx8pidkplypkswyff0nff4wp" {}; + shell_cmds = applePackage "shell_cmds" "osx-10.11.6" "0084k271v66h4jqp7q7rmjvv7w4mvhx3aq860qs8jbd30canm86n" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix new file mode 100644 index 000000000000..f434e15794ea --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix @@ -0,0 +1,45 @@ +{ stdenv, appleDerivation, xcbuild }: + +appleDerivation rec { + buildInputs = [ xcbuild ]; + + patchPhase = '' + # NOTE: these hashes must be recalculated for each version change + + # disables: + # - su ('security/pam_appl.h' file not found) + # - find (Undefined symbol '_get_date') + # - w (Undefined symbol '_res_9_init') + substituteInPlace shell_cmds.xcodeproj/project.pbxproj \ + --replace "FCBA168714A146D000AA698B /* PBXTargetDependency */," "" \ + --replace "FCBA165914A146D000AA698B /* PBXTargetDependency */," "" \ + --replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," "" + + # disable w, test install + # get rid of permission stuff + substituteInPlace xcodescripts/install-files.sh \ + --replace 'ln -f "$BINDIR/w" "$BINDIR/uptime"' "" \ + --replace 'ln -f "$DSTROOT/bin/test" "$DSTROOT/bin/["' "" \ + --replace "-o root -g wheel -m 0755" "" \ + --replace "-o root -g wheel -m 0644" "" + ''; + + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/usr/bin + install shell_cmds-*/Build/Products/Release/* $out/usr/bin + + export DSTROOT=$out + export SRCROOT=$PWD + . xcodescripts/install-files.sh + + mv $out/usr/* $out + mv $out/private/etc $out + rmdir $out/usr $out/private + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} From 5b2e289c0a688d3c0e12693f356d550cf5308065 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Dec 2016 22:38:40 -0600 Subject: [PATCH 1519/1749] aws-sdk-cpp: Enable on Darwin systems libuuid can be provided by libossp_uuid. --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index d5d7371aebf3..755b98ad32d7 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "A C++ interface for Amazon Web Services"; homepage = https://github.com/awslabs/aws-sdk-cpp; license = lib.licenses.asl20; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3804014a1dfe..b0feec3eb928 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10748,7 +10748,7 @@ in }) else if stdenv.isLinux then utillinuxMinimal - else null; + else libossp_uuid; light = callPackage ../os-specific/linux/light { }; From ac4f27666e38505e5e1762735a7e4f0bce8a3d71 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Dec 2016 23:45:19 -0600 Subject: [PATCH 1520/1749] darwin.CoreOSMakefiles: remove MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This wasn't being used and it was causing an error when evaluating: error: attribute ‘CoreOSMakefiles’ missing, at /Users/mbauer/Projects/nixpkgs2/pkgs/os-specific/darwin/apple-source-releases/default.nix:140:71 --- .../CoreOSMakefiles/default.nix | 30 ------------------- .../darwin/apple-source-releases/default.nix | 4 --- 2 files changed, 34 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix deleted file mode 100644 index 203ca010d62a..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, appleDerivation, unifdef }: - -appleDerivation { - buildInputs = [ unifdef ]; - - phases = [ "unpackPhase" "installPhase" ]; - - preInstall = '' - substituteInPlace Makefile \ - --replace "rsync -a --exclude=.svn --exclude=.git" "cp -r" - - substituteInPlace Standard/Commands.in \ - --replace "/bin/sh" "bash" \ - --replace "/usr/bin/compress" "compress" \ - --replace "/usr/bin/gzip" "gzip" \ - --replace "/bin/pax" "pax" \ - --replace "/usr/bin/tar" "tar" \ - --replace "xcrun -find" "echo" \ - --replace '$(Install_Program_Group) -s' '$(Install_Program_Group)' \ - --replace '$(Install_Program_Mode) -s' '$(Install_Program_Mode)' - - substituteInPlace ReleaseControl/Common.make \ - --replace "/tmp" "$TMPDIR" - - substituteInPlace ReleaseControl/BSDCommon.make \ - --replace '$(shell xcrun -find -sdk $(SDKROOT) cc)' "cc" - - export DSTROOT=$out - ''; -} diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 69dc22836453..31978ae9e44c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -115,9 +115,6 @@ let "osx-10.5.8" = { adv_cmds = "119"; }; - "osx-10.5" = { - CoreOSMakeFiles = "40"; - }; "dev-tools-7.0" = { bootstrap_cmds = "93"; }; @@ -195,7 +192,6 @@ let CommonCrypto = applePackage "CommonCrypto" "osx-10.11.6" "0vllfpb8f4f97wj2vpdd7w5k9ibnsbr6ff1zslpp6q323h01n25y" {}; configd = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {}; copyfile = applePackage "copyfile" "osx-10.11.6" "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {}; - CoreOSMakefiles = applePackage "CoreOSMakefiles" "osx-10.5" "0kxp53spbn7109l7cvhi88pmfsi81lwmbws819b6wr3hm16v84f4" {}; Csu = applePackage "Csu" "osx-10.11.6" "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {}; dtrace = applePackage "dtrace" "osx-10.11.6" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wc0" {}; dyld = applePackage "dyld" "osx-10.11.6" "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {}; From e38fc7a736b3973e646f472cba477e0c3fed6d1d Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Sat, 3 Dec 2016 17:04:21 -0500 Subject: [PATCH 1521/1749] boehm-gc: 7.2g -> 7.6.0 fix #20753 --- .../libraries/boehm-gc/cygwin.patch | 108 ------------------ .../libraries/boehm-gc/default.nix | 12 +- 2 files changed, 7 insertions(+), 113 deletions(-) delete mode 100644 pkgs/development/libraries/boehm-gc/cygwin.patch diff --git a/pkgs/development/libraries/boehm-gc/cygwin.patch b/pkgs/development/libraries/boehm-gc/cygwin.patch deleted file mode 100644 index 25c6b9f06f31..000000000000 --- a/pkgs/development/libraries/boehm-gc/cygwin.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- gc-7.2/include/gc.h 2014-06-01 19:00:48.000000000 +0200 -+++ gc-7.2/include/gc.h 2015-05-27 12:55:42.248984200 +0200 -@@ -1386,7 +1386,14 @@ - /* THREAD_LOCAL_ALLOC defined and the initial allocation call is not */ - /* to GC_malloc() or GC_malloc_atomic(). */ - --#ifdef __CYGWIN32__ -+#ifdef __CYGWIN__ -+#ifdef __x86_64__ -+ extern int __data_start__[], __data_end__[], __bss_start__[], __bss_end__[]; -+#define GC_DATASTART (__data_start__ < __bss_start__ ?\ -+ (void *)__data_start__ : (void *)__bss_start__) -+#define GC_DATAEND (__data_end__ < __bss_end__ ?\ -+ (void *)__data_end__ : (void *)__bss_end__) -+#else - /* Similarly gnu-win32 DLLs need explicit initialization from the */ - /* main program, as does AIX. */ - extern int _data_start__[], _data_end__[], _bss_start__[], _bss_end__[]; -@@ -1394,6 +1401,7 @@ - (void *)_data_start__ : (void *)_bss_start__) - # define GC_DATAEND (_data_end__ > _bss_end__ ? \ - (void *)_data_end__ : (void *)_bss_end__) -+#endif - # define GC_INIT_CONF_ROOTS GC_add_roots(GC_DATASTART, GC_DATAEND); \ - GC_gcollect() /* For blacklisting. */ - /* Required at least if GC is in a DLL. And doesn't hurt. */ ---- gc-7.2/include/private/gcconfig.h 2014-06-01 19:00:48.000000000 +0200 -+++ gc-7.2/include/private/gcconfig.h 2015-05-27 12:46:01.864338700 +0200 -@@ -441,10 +441,20 @@ - # endif - # define mach_type_known - # endif --# if defined(__CYGWIN32__) || defined(__CYGWIN__) -+# if defined(__CYGWIN32__) - # define I386 - # define CYGWIN32 - # define mach_type_known -+#if defined(__CYGWIN__) -+# if defined(__LP64__) -+# define X86_64 -+# define mach_type_known -+# else -+# define I386 -+# endif -+# define CYGWIN32 -+# define mach_type_known -+#endif - # endif - # if defined(__MINGW32__) && !defined(mach_type_known) - # define I386 -@@ -511,6 +521,16 @@ - # define mach_type_known - # endif - -+#if defined(__CYGWIN__) -+# if defined(__LP64__) -+# define X86_64 -+# define mach_type_known -+# else -+# define I386 -+# endif -+# define CYGWIN32 -+# define mach_type_known -+#endif - /* Feel free to add more clauses here */ - - /* Or manually define the machine type here. A machine type is */ -@@ -2279,6 +2299,20 @@ - # define GWW_VDB - # define DATAEND /* not needed */ - # endif -+ -+# ifdef CYGWIN32 -+# define OS_TYPE "CYGWIN32" -+# define DATASTART ((ptr_t)GC_DATASTART) /* From gc.h */ -+# define DATAEND ((ptr_t)GC_DATAEND) -+# define ALIGNMENT 8 -+# undef STACK_GRAN -+# define STACK_GRAN 0x10000 -+# ifdef USE_MMAP -+# define NEED_FIND_LIMIT -+# define USE_MMAP_ANON -+# endif -+# endif -+ - # endif /* X86_64 */ - - # ifdef HEXAGON ---- gc-7.2/os_dep.c 2015-05-27 12:25:29.097698800 +0200 -+++ gc-7.2/os_dep.c 2015-05-27 12:48:23.714600800 +0200 -@@ -764,10 +764,16 @@ - /* gcc version of boehm-gc). */ - GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb) - { -+# ifdef __x86_64__ -+ PNT_TIB pTib = NtCurrentTeb(); -+ void * _tlsbase = pTib->StackBase; -+ /*void * _tlsbase = NtCurrentTeb()->pTib.StackBase;*/ -+ /*extern void * _tlsbase __asm__ ("%gs:8");*/ -+# else - void * _tlsbase; -- - __asm__ ("movl %%fs:4, %0" - : "=r" (_tlsbase)); -+# endif - sb -> mem_base = _tlsbase; - return GC_SUCCESS; - } diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index fb1f177d9695..96e41790aac8 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchurl, enableLargeConfig ? false }: +{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops, enableLargeConfig ? false }: stdenv.mkDerivation rec { - name = "boehm-gc-7.2g"; + name = "boehm-gc-7.6.0"; src = fetchurl { - url = http://www.hboehm.info/gc/gc_source/gc-7.2g.tar.gz; - sha256 = "0bvw6cc555qg5b7dgcqy3ryiw0wir79dqy0glff3hjmyy7i2jkjq"; + url = http://www.hboehm.info/gc/gc_source/gc-7.6.0.tar.gz; + sha256 = "143x7g0d0k6250ai6m2x3l4y352mzizi4wbgrmahxscv2aqjhjm1"; }; - patches = if stdenv.isCygwin then [ ./cygwin.patch ] else null; + + buildInputs = [ libatomic_ops ]; + nativeBuildInputs = [ pkgconfig ]; outputs = [ "out" "dev" "doc" ]; From bea3209d5f1f0d9f55efb4489a3a47540529a2bd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 15 Dec 2016 16:20:33 +0800 Subject: [PATCH 1522/1749] virtualbox: 5.1.8 -> 5.1.10 --- pkgs/applications/virtualization/virtualbox/update.py | 4 +++- .../virtualization/virtualbox/upstream-info.json | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/update.py b/pkgs/applications/virtualization/virtualbox/update.py index ff1b2e2fffb7..6e8bfd5c8250 100755 --- a/pkgs/applications/virtualization/virtualbox/update.py +++ b/pkgs/applications/virtualization/virtualbox/update.py @@ -1,4 +1,6 @@ -#!/usr/bin/env python3 +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p python3 + import os import re import json diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json index d861a7e79324..1b85d2b8847e 100644 --- a/pkgs/applications/virtualization/virtualbox/upstream-info.json +++ b/pkgs/applications/virtualization/virtualbox/upstream-info.json @@ -1,8 +1,8 @@ { "__NOTE": "Generated using update.py from the same directory.", - "extpack": "d28bcd01c14eb07eedd2b964d1abe4876f0a7e0e89530e7ba285a5d6267bf322", - "extpackRev": "111374", - "guest": "347fd39df6ddee8079ad41fbc038e2fb64952a40255d75292e8e49a0a0cbf657", - "main": "e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933", - "version": "5.1.8" + "extpack": "3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5", + "extpackRev": "112026", + "guest": "29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41", + "main": "98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40", + "version": "5.1.10" } From bd55e9db63cd7eb1e24609047eea71f44605d4af Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 15 Dec 2016 18:41:18 +0900 Subject: [PATCH 1523/1749] android-studio: 2.1.3 -> 2.2.3 --- .../editors/android-studio/default.nix | 24 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 4e16ceedbbbe..2e14ae339cf7 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,9 +10,15 @@ , gnutar , gzip , jdk +, fontconfig +, freetype , libpulseaudio , libX11 +, libXext +, libXi , libXrandr +, libXrender +, libXtst , makeWrapper , pciutils , pkgsi686Linux @@ -27,8 +33,8 @@ let - version = "2.1.3.0"; - build = "143.3101438"; + version = "2.2.3.0"; + build = "145.3537739"; androidStudio = stdenv.mkDerivation { name = "android-studio"; @@ -75,11 +81,23 @@ let # For Android emulator libpulseaudio libX11 + libXext + libXrender + libXtst + libXi + freetype + fontconfig ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" ''; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; - sha256 = "1xlz3ibqrm4ckw4lgbkzbxvpgg0y8hips9b54p4d15f34i0r8bvj"; + sha256 = "10fmffkvvbnmgjxb4rq7rjwnn16jp5phw6div4n7hh2ad6spf8wq"; + }; + meta = { + description = "The Official IDE for Android"; + homepage = https://developer.android.com/studio/index.html; + license = stdenv.lib.licenses.asl20; + platforms = [ "x86_64-linux" ]; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cded6273555a..200bd62dc316 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12203,7 +12203,9 @@ in # }; # }; # } - android-studio = callPackage ../applications/editors/android-studio { }; + android-studio = callPackage ../applications/editors/android-studio { + inherit (xorg) libX11 libXext libXi libXrandr libXrender libXtst; + }; antimony = qt5.callPackage ../applications/graphics/antimony {}; From 910dcdb7d2797e745a0ea11c4ccb1ca1db287847 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 15 Dec 2016 10:42:00 +0100 Subject: [PATCH 1524/1749] idea-ultimate: 2016.3 -> 2016.3.1 Signed-off-by: Vincent Demeester --- 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 b58d6816c974..dc85b5402bd1 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -208,12 +208,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2016.3"; + version = "2016.3.1"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "1sax3sjhsyvb9qfnn0gc74p3ym6j5f30mmapd4irq9fk4bsl8c31"; + sha256 = "1696gfmqi76ybgi5r84kisjx9mv0hd70hsn16banw61zy4rfllhw"; }; wmClass = "jetbrains-idea"; }; From e314e5b9304b5a9be811145bf5275163912192ba Mon Sep 17 00:00:00 2001 From: Sebastian Hagen Date: Wed, 14 Dec 2016 22:32:40 +0000 Subject: [PATCH 1525/1749] ImageMagick: Add additional mirror. The 16.09-nixpkgs source tarball Imagemagick-6.9.6-7.tar.xz source tarball is not available on any of the existing mirrors. We here add one that has it. --- pkgs/applications/graphics/ImageMagick/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 1095ff97fc5a..8030302cdcf2 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz" # the original source above removes tarballs quickly "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz" + "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz" ]; inherit (cfg) sha256; }; From cc864af9282963af7a7711961aea77e04dcf87e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 9 Dec 2016 10:48:54 +0100 Subject: [PATCH 1526/1749] bird: refactor module - syntax check before deploying configuration - remove static unnessary static uid/gid (configuration is opened as root) - add service hardening --- nixos/modules/misc/ids.nix | 2 - nixos/modules/services/networking/bird.nix | 122 ++++++++++----------- 2 files changed, 57 insertions(+), 67 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index bc69102ba394..2a9a18236e5a 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -211,7 +211,6 @@ lambdabot = 191; asterisk = 192; plex = 193; - bird = 195; grafana = 196; skydns = 197; ripple-rest = 198; @@ -470,7 +469,6 @@ #asterisk = 192; # unused plex = 193; sabnzbd = 194; - bird = 195; #grafana = 196; #unused #skydns = 197; #unused #ripple-rest = 198; #unused diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index e76cdac14ca8..174354c9eb40 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -1,76 +1,68 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkEnableOption mkIf mkOption singleton types; - inherit (pkgs) bird; - cfg = config.services.bird; + inherit (lib) mkEnableOption mkIf mkOption types; - configFile = pkgs.writeText "bird.conf" '' - ${cfg.config} - ''; -in - -{ - - ###### interface - - options = { - - services.bird = { - - enable = mkEnableOption "BIRD Internet Routing Daemon"; - - config = mkOption { - type = types.string; - description = '' - BIRD Internet Routing Daemon configuration file. - + generic = variant: + let + cfg = config.services.${variant}; + pkg = pkgs.${variant}; + birdc = if variant == "bird6" then "birdc6" else "birdc"; + configFile = pkgs.stdenv.mkDerivation { + name = "${variant}.conf"; + text = cfg.config; + preferLocalBuild = true; + buildCommand = '' + echo -n "$text" > $out + ${pkg}/bin/${variant} -d -p -c $out ''; }; - - user = mkOption { - type = types.string; - default = "bird"; - description = '' - BIRD Internet Routing Daemon user. - ''; + in { + ###### interface + options = { + services.${variant} = { + enable = mkEnableOption "BIRD Internet Routing Daemon"; + config = mkOption { + type = types.lines; + description = '' + BIRD Internet Routing Daemon configuration file. + + ''; + }; + }; }; - group = mkOption { - type = types.string; - default = "bird"; - description = '' - BIRD Internet Routing Daemon group. - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - users.extraUsers = singleton { - name = cfg.user; - description = "BIRD Internet Routing Daemon user"; - uid = config.ids.uids.bird; - group = cfg.group; - }; - - users.extraGroups = singleton { - name = cfg.group; - gid = config.ids.gids.bird; - }; - - systemd.services.bird = { - description = "BIRD Internet Routing Daemon"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${bird}/bin/bird -d -c ${configFile} -s /var/run/bird.ctl -u ${cfg.user} -g ${cfg.group}"; + ###### implementation + config = mkIf cfg.enable { + systemd.services.${variant} = { + description = "BIRD Internet Routing Daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "forking"; + Restart = "on-failure"; + ExecStart = "${pkg}/bin/${variant} -c ${configFile} -u ${variant} -g ${variant}"; + ExecReload = "${pkg}/bin/${birdc} configure"; + ExecStop = "${pkg}/bin/${birdc} down"; + CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID" + # see bird/sysdep/linux/syspriv.h + "CAP_NET_BIND_SERVICE" "CAP_NET_BROADCAST" "CAP_NET_ADMIN" "CAP_NET_RAW" ]; + ProtectSystem = "full"; + ProtectHome = "yes"; + SystemCallFilter="~@cpu-emulation @debug @keyring @module @mount @obsolete @raw-io"; + MemoryDenyWriteExecute = "yes"; + }; + }; + users = { + extraUsers.${variant} = { + description = "BIRD Internet Routing Daemon user"; + group = "${variant}"; + }; + extraGroups.${variant} = {}; + }; }; }; - }; + + inherit (config.services) bird bird6; +in { + imports = [(generic "bird") (generic "bird6")]; } From 35399f93d6d379a01225fd3860582e915b0de45a Mon Sep 17 00:00:00 2001 From: David Terry Date: Thu, 15 Dec 2016 12:04:48 +0100 Subject: [PATCH 1527/1749] vscode: 1.6.1 -> 1.7.2 --- pkgs/applications/editors/vscode/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index f7983f713850..f125e8d4d5d9 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,20 +2,20 @@ makeWrapper, libXScrnSaver }: let - version = "1.6.1"; - rev = "9e4e44c19e393803e2b05fe2323cf4ed7e36880e"; + version = "1.7.2"; + rev = "7ba55c5860b152d999dda59393ca3ebeb1b5c85f"; - sha256 = if stdenv.system == "i686-linux" then "1aks84siflpjbd2s9y1f0vvvf3nas4f50cimjf25lijxzjxrlivy" - else if stdenv.system == "x86_64-linux" then "05kbi081ih64fadj4k74grkk9ca3wga6ybwgs5ld0bal4ilw1q6i" - else if stdenv.system == "x86_64-darwin" then "00p2m8b0l3pkf5k74szw6kcql3j1fjnv3rwnhy24wfkg4b4ah2x9" + sha256 = if stdenv.system == "i686-linux" then "0n49c6m53vbmhvrb8q0lxqa77r7kivn4n542k8y62bii8hi19ixc" + else if stdenv.system == "x86_64-linux" then "0l3n20rvgrxk2j9962wqmprjz7lnvldkp0yw26yfxl99yvrph68f" + else if stdenv.system == "x86_64-darwin" then "1chl84scngpxdmcmzbciiz50j459xdcjbpcv4vpm5061gfp5qnh9" else throw "Unsupported system: ${stdenv.system}"; urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/"; urlStr = if stdenv.system == "i686-linux" then - urlBase + "code-stable-code_${version}-1476372351_i386.tar.gz" + urlBase + "code-stable-code_${version}-1479767514_i386.tar.gz" else if stdenv.system == "x86_64-linux" then - urlBase + "code-stable-code_${version}-1476373175_amd64.tar.gz" + urlBase + "code-stable-code_${version}-1479766213_amd64.tar.gz" else if stdenv.system == "x86_64-darwin" then urlBase + "VSCode-darwin-stable.zip" else throw "Unsupported system: ${stdenv.system}"; From 067171a61f2e106ca0b567dcd41ac203f90fc54a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 10 Dec 2016 21:44:00 +0100 Subject: [PATCH 1528/1749] man-pages: fix conflict with shadow-utils --- pkgs/data/documentation/man-pages/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 0661e6e12578..f739479ac0a9 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { }; makeFlags = [ "MANDIR=$(out)/share/man" ]; + postInstall = '' + # conflict with shadow-utils + rm $out/share/man/man5/passwd.5 \ + $out/share/man/man3/getspnam.3 + ''; outputDocdev = "out"; meta = with stdenv.lib; { From 9aa6c95d5a5e2221459c0153e2628ec09d69f9ac Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Thu, 15 Dec 2016 12:28:15 +0100 Subject: [PATCH 1529/1749] vagrant: 1.8.7 -> 1.9.1 --- pkgs/development/tools/vagrant/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 40e42d478612..39c7ca77f8f6 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -2,7 +2,7 @@ , libxml2, libxslt, makeWrapper, p7zip, xar, gzip, cpio }: let - version = "1.8.7"; + version = "1.9.1"; rake = buildRubyGem { inherit ruby; gemName = "rake"; @@ -17,9 +17,9 @@ let else "system ${stdenv.system} not supported"; sha256 = { - "x86_64-linux" = "10c77b643b73dd3ad7a45a89d8ab95b58b79dc10e0cf6e760fe24abc436b2fdb"; - "i686-linux" = "9d2a70f34ab65d8d2cb013917f221835432aa63cd4ef781c9fd1404cfcfe7898"; - "x86_64-darwin" = "14d68f599a620cf421838ed037f0a1c4467e1b67475deeff62330a21fda4937b"; + "x86_64-linux" = "0l1if9c4s4wkbi8k00pl7x00lil21izrd8wb9nv2b5q4gqidc1nh"; + "i686-linux" = "1789wjwcpgw3mljl49c8v5kycisay684gyalkkvd06928423y9zb"; + "x86_64-darwin" = "1xrfq1a0xyifkhhjnpm6wsnms9w8c9q5rd2qqn4sm5npl7viy68p"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = builtins.replaceStrings ["-linux"] [""] stdenv.system; @@ -122,12 +122,10 @@ in stdenv.mkDerivation rec { preFixup = '' # 'hide' the template file from shebang-patching - chmod -x "$out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable" chmod -x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh" ''; postFixup = '' - chmod +x "$out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable" chmod +x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh" '' + (stdenv.lib.optionalString stdenv.isDarwin '' From 7a586794d4378d7a6432192700a4706083d58388 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Dec 2016 13:06:05 +0100 Subject: [PATCH 1530/1749] make-tarball.nix: Fix running as root MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since Nix now runs builds in a user namespace with uid == 0, this triggered the message warning: the group ‘nixbld’ specified in ‘build-users-group’ does not exist which make-tarball.nix turns into a fatal error. So clear build-users-group. http://hydra.nixos.org/build/44817408 --- pkgs/top-level/make-tarball.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 88f027157968..a69e7019c874 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -35,6 +35,7 @@ releaseTools.sourceTarball rec { export NIX_DB_DIR=$TMPDIR export NIX_STATE_DIR=$TMPDIR export NIX_PATH=nixpkgs=$TMPDIR/barf.nix + opts=(--option build-users-group "") nix-store --init echo 'abort "Illegal use of in Nixpkgs."' > $TMPDIR/barf.nix @@ -68,7 +69,8 @@ releaseTools.sourceTarball rec { nix-env -f . \ --show-trace --argstr system "$platform" \ - -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log + -qa --drv-path --system-filter \* --system \ + "''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log if [ -s eval-warnings.log ]; then echo "Nixpkgs on $platform evaluated with warnings, aborting" @@ -78,7 +80,8 @@ releaseTools.sourceTarball rec { nix-env -f . \ --show-trace --argstr system "$platform" \ - -qa --drv-path --system-filter \* --system --meta --xml > /dev/null + -qa --drv-path --system-filter \* --system --meta --xml \ + "''${opts[@]}" > /dev/null stopNest done From ef65353c73bccbedb60603725ca230fd1d4fc2ae Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 15 Dec 2016 15:33:26 +0100 Subject: [PATCH 1531/1749] Revert "aws-sdk-cpp: Enable on Darwin systems" This reverts commit 5b2e289c0a688d3c0e12693f356d550cf5308065. --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 755b98ad32d7..d5d7371aebf3 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "A C++ interface for Amazon Web Services"; homepage = https://github.com/awslabs/aws-sdk-cpp; license = lib.licenses.asl20; - platforms = lib.platforms.unix; + platforms = lib.platforms.linux; maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1b95bf2d347..8c293e77aa1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10774,7 +10774,7 @@ in }) else if stdenv.isLinux then utillinuxMinimal - else libossp_uuid; + else null; light = callPackage ../os-specific/linux/light { }; From dc0c7104ea2412c39dc1199ac48688a44136ac84 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 14 Dec 2016 20:11:09 +0100 Subject: [PATCH 1532/1749] chrony: 2.4 -> 2.4.1 --- pkgs/tools/networking/chrony/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index d405d08e0abd..1e2b48207f5e 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "2.4"; + version = "2.4.1"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "07rrys5axrz4grfy7fj3ds0r9ny1qcwiswsb2318jciklb6yf14d"; + sha256 = "1q5nxl19fdppwpxancff5dc9crgma8f24zww7ag4bd15yq79xm8g"; }; buildInputs = [ readline texinfo nss nspr ] ++ stdenv.lib.optional stdenv.isLinux libcap; From 6dbdbdec69471104d368d4eb5f48060d335de559 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 15 Dec 2016 16:01:03 +0100 Subject: [PATCH 1533/1749] chromium pepper flash plugin: 23.0.0.207 -> 24.0.0.186 Fixes https://github.com/NixOS/nixpkgs/issues/21119, fixes https://github.com/NixOS/nixpkgs/issues/21169 --- pkgs/applications/networking/browsers/chromium/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index bad888bff52e..c1c18828fb42 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "23.0.0.207"; + version = "24.0.0.186"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1spwv06rynaw45pdll6hzsq6zbz1q10bf7dx4zz25gh8x3sl9l6a"; + sha256 = "1pwayhnfjvb6gal5msw0k8rv4h6jvl0mpfsi0jqlka00cnyfjqpd"; stripRoot = false; }; From 6fc5f8d4f3c98fd276573c8fd35f652c3e66b645 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 15 Dec 2016 15:13:10 +0000 Subject: [PATCH 1534/1749] terraform: 0.7.13 -> 0.8.1 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 119e33e4d1e3..78e167cc0e9b 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.13"; + version = "0.8.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "0s23gc9rlnsg6x8llxnnw30b9c5kndy73jimrfxpqb4mha7mjn5n"; + sha256 = "1fgnivhn6hrxpwwajl80vj2w81lv6vypprlbgif8m0z0na7p8956"; }; postInstall = '' From b4005bbac0530c711a7bed56722ba63a0883d9f7 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 10 Dec 2016 01:00:29 +0100 Subject: [PATCH 1535/1749] whisper: upgrade to the same version as the other graphite components Without this we get the following Python exception when trying to fetch a graph in the graphite web app: File "/nix/store/nj62jqk2xmp5c3h93pfnlqn66qj1kkvs-python-2.7.12-env/lib/python2.7/site-packages/opt/graphite/webapp/graphite/storage.py", line 335, in fetch return whisper.fetch(self.fs_path, startTime, endTime, now) TypeError: fetch() takes at most 3 arguments (4 given) Fixes #21032. --- pkgs/top-level/python-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1910166105c0..6d8db851ad88 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -35,6 +35,8 @@ let buildPythonApplication = args: buildPythonPackage ({namePrefix="";} // args ); + graphiteVersion = "0.9.15"; + in { inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; @@ -27764,11 +27766,11 @@ in { whisper = buildPythonPackage rec { name = "whisper-${version}"; - version = "0.9.12"; + version = graphiteVersion; src = pkgs.fetchurl { url = "mirror://pypi/w/whisper/${name}.tar.gz"; - sha256 = "0eca66449d6ceb29e2ab5457b01618e0fe525710dd130a286a18282d849ae5b2"; + sha256 = "1chkphxwnwvy2cs7jc2h2i0lqqvi9jx6vqj3ly88lwk7m35r4ss2"; }; # error: invalid command 'test' @@ -27783,7 +27785,7 @@ in { carbon = buildPythonPackage rec { name = "carbon-${version}"; - version = "0.9.15"; + version = graphiteVersion; src = pkgs.fetchurl { url = "mirror://pypi/c/carbon/${name}.tar.gz"; @@ -28016,7 +28018,7 @@ in { graphite_web = buildPythonPackage rec { name = "graphite-web-${version}"; disabled = isPy3k; - version = "0.9.15"; + version = graphiteVersion; src = pkgs.fetchurl rec { url = "mirror://pypi/g/graphite-web/${name}.tar.gz"; From fba65373419d56aa7aef12062f84873ed7790a2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Thu, 15 Dec 2016 17:13:44 +0100 Subject: [PATCH 1536/1749] doc: correct typo (#21176) --- nixos/doc/manual/man-nixos-rebuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index d01e2e060bde..f74788353e67 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -68,7 +68,7 @@ desired operation. It must be one of the following: Build and activate the new configuration, and make it the boot default. That is, the configuration is added to the GRUB - boot menu as the default meny entry, so that subsequent reboots + boot menu as the default menu entry, so that subsequent reboots will boot the system into the new configuration. Previous configurations activated with nixos-rebuild switch or nixos-rebuild boot remain From 46fc2db7dffe728e33597a5f88e03000f9c6c04a Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Thu, 15 Dec 2016 17:16:00 +0100 Subject: [PATCH 1537/1749] erlang_basho_R16: add explicit Carbon and Cocoa support --- pkgs/development/interpreters/erlang/R16B02-8-basho.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix index a4afd1e9b40c..5745ea5d98b3 100644 --- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] - ++ optional odbcSupport [ unixODBC ]; + ++ optional odbcSupport [ unixODBC ] + ++ optionals stdenv.isDarwin [ Carbon Cocoa ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in ''; From fd5dd0769c1a8c1c28ae53cf22ed29324008ec14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 15 Dec 2016 17:16:32 +0100 Subject: [PATCH 1538/1749] python27Packages.lxc: init at 2016-08-25 (#21181) --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6d8db851ad88..a8b4b5d9b53a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13904,6 +13904,27 @@ in { }; }); + lxc = buildPythonPackage (rec { + name = "python-lxc-unstable-2016-08-25"; + disabled = !isPy27; + + src = pkgs.fetchFromGitHub { + owner = "lxc"; + repo = "python2-lxc"; + rev = "0553f05d23b56b59bf3015fa5e45bfbfab9021ef"; + sha256 = "0p9kb20xvq91gx2wfs3vppb7vsp8kmd90i3q95l4nl1y4aismdn4"; + }; + + buildInputs = [ pkgs.lxc ]; + + meta = { + description = "Out of tree python 2.7 binding for liblxc"; + homepage = https://github.com/lxc/python2-lxc; + license = licenses.lgpl2; + maintainers = with maintainers; [ mic92 ]; + }; + }); + python_magic = buildPythonPackage rec { name = "python-magic-0.4.10"; From 77adcfb59f9167108c984049d71a26323b523697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 15 Dec 2016 18:05:00 +0100 Subject: [PATCH 1539/1749] rocksdb: 4.1 -> 4.13 --- pkgs/development/libraries/rocksdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 6a888ec67fd1..d3ca152a7b96 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -13,16 +13,16 @@ let in stdenv.mkDerivation rec { name = "rocksdb-${version}"; - version = "4.1"; + version = "4.13"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "v${version}"; - sha256 = "1q1h2n3v02zg711vk56rc9v54f5i31w684wqag4xcr2dv1glw0r0"; + sha256 = "1bxyykj13mw48yk108bkmxlfrp6bd95f27bysayax4lqxkgx0zzw"; }; - buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ]; + buildInputs = [ snappy google-gflags zlib bzip2 lz4 malloc ]; postPatch = '' # Hack to fix typos From 6e26fe3d57fdff0dd4fde8f34505f15230badf8d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 15 Dec 2016 18:07:54 +0100 Subject: [PATCH 1540/1749] xcbuild: add meta --- pkgs/development/tools/xcbuild/default.nix | 7 +++++++ pkgs/development/tools/xcbuild/platform.nix | 8 ++++---- pkgs/development/tools/xcbuild/wrapper.nix | 2 ++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index 1393034ff205..3a1b753bf31a 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -41,4 +41,11 @@ in stdenv.mkDerivation rec { buildInputs = [ cmake zlib libxml2 libpng ninja ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; + + meta = with stdenv.lib; { + description = "Xcode-compatible build tool"; + homepage = https://github.com/facebook/xcbuild; + platforms = platforms.unix; + maintainers = with maintainers; [ copumpkin matthewbauer ]; + }; } diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index 0b03d4120e85..34fc5b0f6202 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -19,10 +19,10 @@ let # is removed because NixPkgs only supports darwin-x86_64. Architectures = [ { - Identifier = "Standard"; - Type = "Architecture"; - Name = "Standard Architectures (64-bit Intel)"; - RealArchitectures = [ "x86_64" ]; + Identifier = "Standard"; + Type = "Architecture"; + Name = "Standard Architectures (64-bit Intel)"; + RealArchitectures = [ "x86_64" ]; ArchitectureSetting = "ARCHS_STANDARD"; } { diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index fc03c273fc58..a40a3440d682 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -64,6 +64,8 @@ stdenv.mkDerivation { --set DEVELOPER_DIR "$out" ''; + inherit (xcbuild) meta; + passthru = { raw = xcbuild; }; From d5f92a319a5b3dfeac76877c766043f0de1edb97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 15 Dec 2016 20:18:50 +0100 Subject: [PATCH 1541/1749] rocksdb: compile as shared lib --- pkgs/development/libraries/rocksdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index d3ca152a7b96..1511f12e88b3 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc"; buildFlags = [ - "static_lib" "shared_lib" ]; installFlags = [ + "install-shared" "INSTALL_PATH=\${out}" ]; From 3b763fef44c0dd945b686e0a68ee79efe58661db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 15 Dec 2016 15:04:46 +0100 Subject: [PATCH 1542/1749] nssModules: include correct systemd output fixes libnss_myhost, libnss_mymachines, libnss_resolve are located here --- nixos/modules/config/nsswitch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index f30136be44e1..45553ec05663 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -56,7 +56,7 @@ in # configured IP addresses, or ::1 and 127.0.0.2 as # fallbacks. Systemd also provides nss-mymachines to return IP # addresses of local containers. - system.nssModules = [ config.systemd.package ]; + system.nssModules = [ config.systemd.package.out ]; }; } From 182c735527c42c25cca268d491b7f7a59eff97b5 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 15 Dec 2016 14:45:46 -0500 Subject: [PATCH 1543/1749] mu: 0.9.16 -> 0.9.18 --- pkgs/tools/networking/mu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index fa1740e9d124..0cd3e15e7621 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -3,12 +3,12 @@ , gtk3, webkitgtk24x, libsoup, icu }: stdenv.mkDerivation rec { - version = "0.9.16"; + version = "0.9.18"; name = "mu-${version}"; src = fetchurl { - url = "https://github.com/djcb/mu/archive/v${version}.tar.gz"; - sha256 = "0p7hqri1r1x6750x138cc29mh81kdav2dcim26y58s8an206h25g"; + url = "https://github.com/djcb/mu/archive/${version}.tar.gz"; + sha256 = "0gfwi4dwqhsz138plryd0j935vx2i44p63jpfx85ki3l4ysmmlwd"; }; buildInputs = [ From 4714ca8b565b62856b8d34312c511178d2cf78d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 15 Dec 2016 20:48:03 +0100 Subject: [PATCH 1544/1749] kexec-tools: 2.0.12 -> 2.0.13 (#21158) also fix kexec by removing faulty hardeningFlags --- pkgs/os-specific/linux/kexectools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index cb30de44a81a..1b18fb590170 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "kexec-tools-${version}"; - version = "2.0.12"; + version = "2.0.13"; src = fetchurl { urls = [ "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz" "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz" ]; - sha256 = "03cj7w2l5fqn72xfhl4q6z0zbziwkp9bfn0gs7gaf9i44jv6gkhl"; + sha256 = "1k75p9h29xx57l1c69ravm4pg9pmriqxmwja12hgrnvi251ayjw7"; }; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" "pic" "relro" ]; buildInputs = [ zlib ]; From 147142674992c29025b50f9818d7ac104e0de223 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 15 Dec 2016 21:00:21 +0100 Subject: [PATCH 1545/1749] nixos/test-instrumentation: Fix eval of boot tests The boot tests import test-instrumentation.nix directly to create a VM image that only contains things such as the backdoor and serial console the same way as used by other NixOS VM tests. With one difference though: It doesn't need nor want to have 9p filesystems mounted, because we actually want to test an image rather than re-using most stuff from the host's store. Change tested against the boot.uefiUsb and ipv6 tests, just that it becomes clear we don't break either the tests with 9p nor the boot tests (which were already broken but now succeed). Signed-off-by: aszlig --- nixos/modules/testing/test-instrumentation.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 373bf7665240..206df50a4207 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -9,6 +9,15 @@ let kernel = config.boot.kernelPackages.kernel; in { + # This option is a dummy that if used in conjunction with + # modules/virtualisation/qemu-vm.nix gets merged with the same option defined + # there and only is declared here because some modules use + # test-instrumentation.nix but not qemu-vm.nix. + # + # One particular example are the boot tests where we want instrumentation + # within the images but not other stuff like setting up 9p filesystems. + options.virtualisation.qemu.program = mkOption { type = types.path; }; + config = { systemd.services.backdoor = From fd2ff58d160bdc452b0a83e21cdc8872c0ef4208 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 15 Dec 2016 21:19:39 +0100 Subject: [PATCH 1546/1749] unscii: init at 1.1 --- pkgs/data/fonts/unscii/default.nix | 36 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/data/fonts/unscii/default.nix diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix new file mode 100644 index 000000000000..d318f5db7a7e --- /dev/null +++ b/pkgs/data/fonts/unscii/default.nix @@ -0,0 +1,36 @@ +{stdenv, fetchurl, perl, bdftopcf, perlPackages, fontforge, SDL, SDL_image}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "unscii"; + version = "1.1"; + # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + src = fetchurl { + url = "http://pelulamu.net/${pname}/${name}-src.tar.gz"; + sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1"; + }; + buildInputs = []; + nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge + SDL SDL_image]; + preConfigure = '' + patchShebangs . + ''; + installPhase = '' + mkdir -p "$out/share/fonts"/{truetype,opentype,web,svg} + cp *.hex "$out/share/fonts/" + cp *.pcf "$out/share/fonts/" + cp *.ttf "$out/share/fonts/truetype" + cp *.otf "$out/share/fonts/opentype" + cp *.svg "$out/share/fonts/svg" + cp *.woff "$out/share/fonts/web" + ''; + meta = { + inherit version; + description = ''Bitmapped character-art-friendly Unicode fonts''; + # Basically GPL2+ with font exception — because of the Unifont-augmented + # version. The reduced version is public domain. + license = http://unifoundry.com/LICENSE.txt; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://pelulamu.net/unscii/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c293e77aa1e..d9aa7940aaf4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12094,6 +12094,8 @@ in unifont_upper = callPackage ../data/fonts/unifont_upper { }; + unscii = callPackage ../data/fonts/unscii { }; + vanilla-dmz = callPackage ../data/icons/vanilla-dmz { }; vistafonts = callPackage ../data/fonts/vista-fonts { }; From fbfb6d7c21d35ec184725fe6f0eab1534fcb4be3 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 15 Dec 2016 21:03:04 +0100 Subject: [PATCH 1547/1749] perlPackages.locallib: 2.000017 -> 2.000019 --- 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 3199f65f9559..9843253c4438 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7407,10 +7407,10 @@ let self = _self // overrides; _self = with self; { }; locallib = buildPerlPackage rec { - name = "local-lib-2.000017"; + name = "local-lib-2.000019"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "05607zxpb0jqvxn0cw064pnwsvbajw7k2pmzlisffadihg11m6ps"; + sha256 = "008b9kgvcs9vjvj7ifg0f1s7i7446ff2441c575vhrwn15x35b9n"; }; meta = { description = "Create and use a local lib/ for perl modules with PERL5LIB"; From 921a6f8b560b7febcc3d07213a834ae3dec75a47 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 15 Dec 2016 21:22:39 +0100 Subject: [PATCH 1548/1749] parallel: 20161022 -> 20161122 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d74f27700302..4bc346d41f8b 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20161022"; + name = "parallel-20161122"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1mz82chm5qav6h64rcckxzabr7w4ma0sjx61xav85x0swgcbjdsr"; + sha256 = "0z5c4r35d926ac04ilaivx67cmflr1rsvmjb2ci7hmab948m0ng2"; }; nativeBuildInputs = [ makeWrapper ]; From 1152b97925cd0c14367826201318752ddaa21859 Mon Sep 17 00:00:00 2001 From: David Terry Date: Thu, 15 Dec 2016 21:47:31 +0100 Subject: [PATCH 1549/1749] vscode: 1.7.2 -> 1.8.0 --- pkgs/applications/editors/vscode/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index f125e8d4d5d9..689a1537b691 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,20 +2,20 @@ makeWrapper, libXScrnSaver }: let - version = "1.7.2"; - rev = "7ba55c5860b152d999dda59393ca3ebeb1b5c85f"; + version = "1.8.0"; + rev = "38746938a4ab94f2f57d9e1309c51fd6fb37553d"; - sha256 = if stdenv.system == "i686-linux" then "0n49c6m53vbmhvrb8q0lxqa77r7kivn4n542k8y62bii8hi19ixc" - else if stdenv.system == "x86_64-linux" then "0l3n20rvgrxk2j9962wqmprjz7lnvldkp0yw26yfxl99yvrph68f" - else if stdenv.system == "x86_64-darwin" then "1chl84scngpxdmcmzbciiz50j459xdcjbpcv4vpm5061gfp5qnh9" + sha256 = if stdenv.system == "i686-linux" then "0p7r1i71v2ab4dzlwh43hqih958a31cqskf64ds4vgc35x2mfjcq" + else if stdenv.system == "x86_64-linux" then "1k15701jskk7w5kwzlzfri96vvw7fcinyfqqafls8nms8h5csv76" + else if stdenv.system == "x86_64-darwin" then "12fqz62gs2wcg2wwx1k6gv2gqil9c54yq254vk3rqdf82q9zyapk" else throw "Unsupported system: ${stdenv.system}"; urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/"; urlStr = if stdenv.system == "i686-linux" then - urlBase + "code-stable-code_${version}-1479767514_i386.tar.gz" + urlBase + "code-stable-code_${version}-1481650382_i386.tar.gz" else if stdenv.system == "x86_64-linux" then - urlBase + "code-stable-code_${version}-1479766213_amd64.tar.gz" + urlBase + "code-stable-code_${version}-1481651903_amd64.tar.gz" else if stdenv.system == "x86_64-darwin" then urlBase + "VSCode-darwin-stable.zip" else throw "Unsupported system: ${stdenv.system}"; From b44e52b1345f39932555b8bc3ecf8f35d50b319d Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 15 Dec 2016 22:18:29 +0100 Subject: [PATCH 1550/1749] languagetool: Add myself as a maintainer --- pkgs/tools/text/languagetool/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index d2929ab90f42..383e9cf72c35 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -25,7 +25,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://languagetool.org"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ + edwtjo + jgeerds + ]; descrption = "A proofreading program for English, French German, Polish, and more"; }; } From 63d930878b721f5775399209e8a3e78b4237c324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 15 Dec 2016 22:42:50 +0100 Subject: [PATCH 1551/1749] travis: also evaluate nixpkgs-unstable --- .travis.yml | 2 +- maintainers/scripts/travis-nox-review-pr.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1fa01f7b7811..802af69834d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ matrix: - os: linux sudo: false script: - - ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball + - ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable - ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual - os: linux sudo: required diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index 5fc932f10d0e..649798ec76b0 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -38,6 +38,12 @@ while test -n "$1"; do nix-build $TRAVIS_BUILD_DIR/pkgs/top-level/release.nix --attr tarball --show-trace ;; + nixpkgs-unstable) + echo "=== Checking nixpkgs unstable job" + + nix-instantiate $TRAVIS_BUILD_DIR/pkgs/top-level/release.nix --attr unstable --show-trace + ;; + nixpkgs-lint) echo "=== Checking nixpkgs lint" From 2e7105467b22292eca1fc37c2c8019e6aacc7051 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 17 Nov 2016 09:52:12 -0200 Subject: [PATCH 1552/1749] lxqt: better organize system packages Split packages in three categories, all of them going into the system package list: - pre-requisite packages - core packages - optional packages Add a new configuration option 'environment.lxqt.excludePackages' to specify optional LXQt packages that should be excluded from system packages. Add 'gvfs' as a pre-requisite package, needed by 'pcmanfm-qt' to handle virtual places, like "Computer" and "Network". --- .../services/x11/desktop-managers/lxqt.nix | 66 +++++++------------ pkgs/desktops/lxqt/default.nix | 62 +++++++++++++++++ 2 files changed, 86 insertions(+), 42 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index c385e74dbb2f..89ad2882363d 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -4,6 +4,14 @@ with lib; let + # Remove packages of ys from xs, based on their names + removePackagesByName = xs: ys: + let + pkgName = drv: (builtins.parseDrvName drv.name).name; + ysNames = map pkgName ys; + in + filter (x: !(builtins.elem (pkgName x) ysNames)) xs; + xcfg = config.services.xserver; cfg = xcfg.desktopManager.lxqt; @@ -18,8 +26,14 @@ in description = "Enable the LXQt desktop manager"; }; - }; + environment.lxqt.excludePackages = mkOption { + default = []; + example = literalExample "[ pkgs.lxqt.qterminal ]"; + type = types.listOf types.package; + description = "Which LXQt packages to exclude from the default environment"; + }; + }; config = mkIf (xcfg.enable && cfg.enable) { @@ -31,47 +45,12 @@ in ''; }; - environment.systemPackages = [ - pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel - pkgs.kde5.libkscreen # provides plugins for screen management software - pkgs.kde5.oxygen-icons5 # default icon theme - pkgs.libfm - pkgs.libfm-extra - pkgs.lxmenu-data - pkgs.lxqt.compton-conf - pkgs.lxqt.libfm-qt - pkgs.lxqt.liblxqt - pkgs.lxqt.libqtxdg - pkgs.lxqt.libsysstat - pkgs.lxqt.lximage-qt - pkgs.lxqt.lxqt-about - pkgs.lxqt.lxqt-admin - pkgs.lxqt.lxqt-common - pkgs.lxqt.lxqt-config - pkgs.lxqt.lxqt-globalkeys - pkgs.lxqt.lxqt-l10n - pkgs.lxqt.lxqt-notificationd - pkgs.lxqt.lxqt-openssh-askpass - pkgs.lxqt.lxqt-panel - pkgs.lxqt.lxqt-policykit - pkgs.lxqt.lxqt-powermanagement - pkgs.lxqt.lxqt-qtplugin - pkgs.lxqt.lxqt-runner - pkgs.lxqt.lxqt-session - pkgs.lxqt.lxqt-sudo - pkgs.lxqt.obconf-qt - pkgs.lxqt.pavucontrol-qt - pkgs.lxqt.pcmanfm-qt - pkgs.lxqt.qlipper - pkgs.lxqt.qps - pkgs.lxqt.qterminal - pkgs.lxqt.qtermwidget - pkgs.lxqt.screengrab - pkgs.menu-cache - pkgs.openbox # default window manager - pkgs.qt5.qtsvg # provides QT5 plugins for svg icons - pkgs.xscreensaver - ]; + environment.systemPackages = + pkgs.lxqt.preRequisitePackages ++ + pkgs.lxqt.corePackages ++ + (removePackagesByName + pkgs.lxqt.optionalPackages + config.environment.lxqt.excludePackages); # Link some extra directories in /run/current-system/software/share environment.pathsToLink = [ @@ -80,5 +59,8 @@ in "/share/lxqt" ]; + environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ]; + }; + } diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 76cde64494a3..d5f5194c48e4 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -63,6 +63,68 @@ let screengrab = callPackage ./optional/screengrab { }; qlipper = callPackage ./optional/qlipper { }; + preRequisitePackages = [ + pkgs.gvfs # virtual file systems support for PCManFM-QT + pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel + pkgs.kde5.libkscreen # provides plugins for screen management software + pkgs.libfm + pkgs.libfm-extra + pkgs.lxmenu-data + pkgs.menu-cache + pkgs.openbox # default window manager + pkgs.qt5.qtsvg # provides QT5 plugins for svg icons + ]; + + corePackages = [ + ### BASE + libqtxdg + libsysstat + liblxqt + + ### CORE 1 + libfm-qt + lxqt-about + lxqt-admin + lxqt-common + lxqt-config + lxqt-globalkeys + lxqt-l10n + lxqt-notificationd + lxqt-openssh-askpass + lxqt-policykit + lxqt-powermanagement + lxqt-qtplugin + lxqt-session + lxqt-sudo + pavucontrol-qt + + ### CORE 2 + lxqt-panel + lxqt-runner + pcmanfm-qt + ]; + + optionalPackages = [ + ### LXQt project + qterminal + compton-conf + obconf-qt + lximage-qt + + ### QtDesktop project + qps + screengrab + + ### Qlipper + qlipper + + ### Default icon theme + pkgs.kde5.oxygen-icons5 + + ### Screen saver + pkgs.xscreensaver + ]; + }; in self From a94af71da71ebc4a52c002891d813cf2689fc950 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 15 Dec 2016 16:43:38 -0500 Subject: [PATCH 1553/1749] linux stdenv: Fix assert that broke tests...and hydra --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 7063d7bfcb6a..26dfee252303 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -180,7 +180,7 @@ rec { allPackages = assert false; null; platform = assert false; null; - crossSystem = assert false; null; + crossSystem = null; config = assert false; null; }).bootstrapTools; From f92544fe12dc0cc9d5141132b2ed0298bb8c0f9c Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 15 Dec 2016 22:47:07 +0100 Subject: [PATCH 1554/1749] falcon: Fix typo in derivation name (closes #21112) --- pkgs/development/interpreters/falcon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index bed5b0ef0b35..4c4a4a0c8947 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }: stdenv.mkDerivation rec { - name = "faclon-${version}"; + name = "falcon-${version}"; version = "2013-09-19"; src = fetchFromGitHub { From 670256dc399ab637fa94df9a90fb13f275c39f8a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 15 Dec 2016 17:05:39 -0500 Subject: [PATCH 1555/1749] linux stdenv: Rename the `bootstrap` directory to `bootstrap-files` --- .../{bootstrap => bootstrap-files}/armv5tel.nix | 0 .../linux/{bootstrap => bootstrap-files}/armv6l.nix | 0 .../linux/{bootstrap => bootstrap-files}/armv7l.nix | 0 .../linux/{bootstrap => bootstrap-files}/i686.nix | 0 .../{bootstrap => bootstrap-files}/loongson2f.nix | 0 .../linux/{bootstrap => bootstrap-files}/x86_64.nix | 0 pkgs/stdenv/linux/default.nix | 12 ++++++------ 7 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/armv5tel.nix (100%) rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/armv6l.nix (100%) rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/armv7l.nix (100%) rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/i686.nix (100%) rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/loongson2f.nix (100%) rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/x86_64.nix (100%) diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap/armv5tel.nix rename to pkgs/stdenv/linux/bootstrap-files/armv5tel.nix diff --git a/pkgs/stdenv/linux/bootstrap/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap/armv6l.nix rename to pkgs/stdenv/linux/bootstrap-files/armv6l.nix diff --git a/pkgs/stdenv/linux/bootstrap/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap/armv7l.nix rename to pkgs/stdenv/linux/bootstrap-files/armv7l.nix diff --git a/pkgs/stdenv/linux/bootstrap/i686.nix b/pkgs/stdenv/linux/bootstrap-files/i686.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap/i686.nix rename to pkgs/stdenv/linux/bootstrap-files/i686.nix diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f.nix b/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap/loongson2f.nix rename to pkgs/stdenv/linux/bootstrap-files/loongson2f.nix diff --git a/pkgs/stdenv/linux/bootstrap/x86_64.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap/x86_64.nix rename to pkgs/stdenv/linux/bootstrap-files/x86_64.nix diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 34196359f525..a39ff61a8b54 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -7,12 +7,12 @@ , system, platform, crossSystem, config , bootstrapFiles ? - if system == "i686-linux" then import ./bootstrap/i686.nix - else if system == "x86_64-linux" then import ./bootstrap/x86_64.nix - else if system == "armv5tel-linux" then import ./bootstrap/armv5tel.nix - else if system == "armv6l-linux" then import ./bootstrap/armv6l.nix - else if system == "armv7l-linux" then import ./bootstrap/armv7l.nix - else if system == "mips64el-linux" then import ./bootstrap/loongson2f.nix + if system == "i686-linux" then import ./bootstrap-files/i686.nix + else if system == "x86_64-linux" then import ./bootstrap-files/x86_64.nix + else if system == "armv5tel-linux" then import ./bootstrap-files/armv5tel.nix + else if system == "armv6l-linux" then import ./bootstrap-files/armv6l.nix + else if system == "armv7l-linux" then import ./bootstrap-files/armv7l.nix + else if system == "mips64el-linux" then import ./bootstrap-files/loongson2f.nix else abort "unsupported platform for the pure Linux stdenv" }: From 7960a1b1b8fa1ca097bee2971fbbc18bda3dcadd Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 15 Dec 2016 17:09:29 -0500 Subject: [PATCH 1556/1749] linux stdenv: Avoid `assert false` On one hand, don't want to pass garbage that affects hash, on the other hand footguns are bad. Now, factored out the derivation so only need to pass in what is used. --- pkgs/stdenv/linux/bootstrap-tools/default.nix | 18 ++++++++++++++++++ .../scripts/unpack-bootstrap-tools.sh | 0 pkgs/stdenv/linux/default.nix | 17 +---------------- pkgs/stdenv/linux/make-bootstrap-tools.nix | 11 +---------- 4 files changed, 20 insertions(+), 26 deletions(-) create mode 100644 pkgs/stdenv/linux/bootstrap-tools/default.nix rename pkgs/stdenv/linux/{ => bootstrap-tools}/scripts/unpack-bootstrap-tools.sh (100%) diff --git a/pkgs/stdenv/linux/bootstrap-tools/default.nix b/pkgs/stdenv/linux/bootstrap-tools/default.nix new file mode 100644 index 000000000000..6118585d545f --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-tools/default.nix @@ -0,0 +1,18 @@ +{ system, bootstrapFiles }: + +derivation { + name = "bootstrap-tools"; + + builder = bootstrapFiles.busybox; + + args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ]; + + tarball = bootstrapFiles.bootstrapTools; + + inherit system; + + # Needed by the GCC wrapper. + langC = true; + langCC = true; + isGNU = true; +} diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh similarity index 100% rename from pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh rename to pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index a39ff61a8b54..9900fc6dd3d5 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -37,22 +37,7 @@ rec { # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...). - bootstrapTools = derivation { - name = "bootstrap-tools"; - - builder = bootstrapFiles.busybox; - - args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ]; - - tarball = bootstrapFiles.bootstrapTools; - - inherit system; - - # Needed by the GCC wrapper. - langC = true; - langCC = true; - isGNU = true; - }; + bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; }; # This function builds the various standard environments used during diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 26dfee252303..e13fb88eff0b 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -173,16 +173,7 @@ rec { bootstrapTools = "${build}/on-server/bootstrap-tools.tar.xz"; }; - bootstrapTools = (import ./default.nix { - inherit system bootstrapFiles; - - lib = assert false; null; - allPackages = assert false; null; - - platform = assert false; null; - crossSystem = null; - config = assert false; null; - }).bootstrapTools; + bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; }; test = derivation { name = "test-bootstrap-tools"; From 19fbe80c3d1f3b5888a3f78f2df2af07355ea498 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 15 Dec 2016 17:09:46 -0500 Subject: [PATCH 1557/1749] top-level: avoid another `assert false` while we're at it --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 +- pkgs/top-level/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index bd581f71a436..c862eb141a8c 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -334,7 +334,7 @@ in rec { # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it test-pkgs = import test-pkgspath { inherit system; - stdenv = args: let + stdenvFunc = args: let args' = args // { inherit bootstrapFiles; }; in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stdenvDarwin; }; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 31c51215676b..658f149908c7 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -25,7 +25,7 @@ , # The standard environment for building packages, or rather a function # providing it. See below for the arguments given to that function. - stdenv ? assert false; null + stdenvFunc ? import ../stdenv , crossSystem ? null , platform ? assert false; null @@ -76,7 +76,7 @@ in let inherit lib nixpkgsFun; } // newArgs); - stdenv = (args.stdenv or (import ../stdenv)) { + stdenv = stdenvFunc { inherit lib allPackages system platform crossSystem config; }; From eb7ea181f1368063c33b65db51605f43b1e42654 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 14 Dec 2016 07:38:51 -0500 Subject: [PATCH 1558/1749] jasper: 1.900.28 -> 2.0.6 --- pkgs/development/libraries/jasper/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 9568d9bbb3bc..cf5c264fc8d8 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, fetchpatch, libjpeg, autoreconfHook }: +{ stdenv, fetchurl, fetchpatch, libjpeg, cmake }: stdenv.mkDerivation rec { - name = "jasper-1.900.28"; + name = "jasper-2.0.6"; src = fetchurl { # You can find this code on Github at https://github.com/mdadams/jasper # however note at https://www.ece.uvic.ca/~frodo/jasper/#download # not all tagged releases are for distribution. url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz"; - sha256 = "0nsiblsfpfa0dahsk6hw9cd18fp9c8sk1z5hdp19m33c0bf92ip9"; + sha256 = "0g6fl8rrbspa9vpswixmpxrg71l19kqgc2b5cak7vmwxphj01wbk"; }; # newer reconf to recognize a multiout flag - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ libjpeg ]; configureFlags = "--enable-shared"; @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + moveToOutput bin "$bin" + ''; + meta = { homepage = https://www.ece.uvic.ca/~frodo/jasper/; description = "JPEG2000 Library"; From ca6463ef90400e2185b9370e9a92aef76d63dfa6 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 14 Dec 2016 07:59:31 -0500 Subject: [PATCH 1559/1749] sqlite: 3.15.0 -> 3.15.2 for null pointer dereference https://sqlite.org/releaselog/3_15_2.html --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index c557de1f39f1..8161d3bfa1fd 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.15.0"; + name = "sqlite-3.15.2"; src = fetchurl { - url = "http://sqlite.org/2016/sqlite-autoconf-3150000.tar.gz"; - sha256 = "09zdipkrvavlbw9dj4kwnii0z1b20rljn9fmfxz6scx0njljs5kp"; + url = "http://sqlite.org/2016/sqlite-autoconf-3150200.tar.gz"; + sha256 = "0j9i1zrwxc7dfd6xr3xagal3incrlalsrk96havnas1qp5im1cq7"; }; outputs = [ "bin" "dev" "out" ]; From 971ae27526f7b955058807ff7fb10b9e97fbae25 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 14 Dec 2016 17:13:18 -0500 Subject: [PATCH 1560/1749] perlPackages.DBDmysql: 4.039 -> 4.041 for CVE-2016-1251 --- pkgs/development/perl-modules/DBD-mysql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index 0e1db7e234d3..7302516d5429 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, DBI, mysql }: buildPerlPackage rec { - name = "DBD-mysql-4.039"; + name = "DBD-mysql-4.041"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz"; - sha256 = "0k4p3bjdbmxm2amb0qiiwmn8v83zrjkz5qp84xdjrg8k5v9aj0hn"; + url = "mirror://cpan/authors/id/M/MI/MICHIELB/${name}.tar.gz"; + sha256 = "0h4h6zwzj8fwh9ljb8svnsa0a3ch4p10hp59kpdibdb4qh8xwxs7"; }; buildInputs = [ mysql.lib ] ; From 4fa52379842ac8f845aca64766d148127e3496eb Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 14 Dec 2016 17:36:22 -0500 Subject: [PATCH 1561/1749] libgsf: 1.14.36 -> 1.14.41 for CVE-2016-9888 --- pkgs/development/libraries/libgsf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 25d1ceb40bdb..a22b99be8da9 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -4,11 +4,11 @@ with { inherit (stdenv.lib) optionals; }; stdenv.mkDerivation rec { - name = "libgsf-1.14.36"; + name = "libgsf-1.14.41"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "0h19ssxzz0cmznwga2xy55kjibm24mwxqarnpd0w7xy0hrzm1dvi"; + sha256 = "1lq87wnrsjbjafpk3c8xwd56gqx319fhck9xkg2da88hd9c9h2qm"; }; nativeBuildInputs = [ pkgconfig intltool ]; From 5cbb0f7fbf8e44b57bb816b5a2fc3a1891c4438a Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 14 Dec 2016 17:52:09 -0500 Subject: [PATCH 1562/1749] unzip: patch for CVE-2014-9913 and CVE-2016-9844 --- .../tools/archivers/unzip/CVE-2014-9913.patch | 29 +++++++++++++++++++ .../tools/archivers/unzip/CVE-2016-9844.patch | 28 ++++++++++++++++++ pkgs/tools/archivers/unzip/default.nix | 2 ++ 3 files changed, 59 insertions(+) create mode 100644 pkgs/tools/archivers/unzip/CVE-2014-9913.patch create mode 100644 pkgs/tools/archivers/unzip/CVE-2016-9844.patch diff --git a/pkgs/tools/archivers/unzip/CVE-2014-9913.patch b/pkgs/tools/archivers/unzip/CVE-2014-9913.patch new file mode 100644 index 000000000000..a5675f4fb7c0 --- /dev/null +++ b/pkgs/tools/archivers/unzip/CVE-2014-9913.patch @@ -0,0 +1,29 @@ +From: "Steven M. Schweda" +Subject: Fix CVE-2014-9913, buffer overflow in unzip +Bug: https://sourceforge.net/p/infozip/bugs/27/ +Bug-Debian: https://bugs.debian.org/847485 +Bug-Ubuntu: https://launchpad.net/bugs/387350 +X-Debian-version: 6.0-21 + +--- a/list.c ++++ b/list.c +@@ -339,7 +339,18 @@ + G.crec.compression_method == ENHDEFLATED) { + methbuf[5] = dtype[(G.crec.general_purpose_bit_flag>>1) & 3]; + } else if (methnum >= NUM_METHODS) { +- sprintf(&methbuf[4], "%03u", G.crec.compression_method); ++ /* 2013-02-26 SMS. ++ * http://sourceforge.net/p/infozip/bugs/27/ CVE-2014-9913. ++ * Unexpectedly large compression methods overflow ++ * &methbuf[]. Use the old, three-digit decimal format ++ * for values which fit. Otherwise, sacrifice the ++ * colon, and use four-digit hexadecimal. ++ */ ++ if (G.crec.compression_method <= 999) { ++ sprintf( &methbuf[ 4], "%03u", G.crec.compression_method); ++ } else { ++ sprintf( &methbuf[ 3], "%04X", G.crec.compression_method); ++ } + } + + #if 0 /* GRR/Euro: add this? */ diff --git a/pkgs/tools/archivers/unzip/CVE-2016-9844.patch b/pkgs/tools/archivers/unzip/CVE-2016-9844.patch new file mode 100644 index 000000000000..52d07987b333 --- /dev/null +++ b/pkgs/tools/archivers/unzip/CVE-2016-9844.patch @@ -0,0 +1,28 @@ +From: "Steven M. Schweda" +Subject: Fix CVE-2016-9844, buffer overflow in zipinfo +Bug-Debian: https://bugs.debian.org/847486 +Bug-Ubuntu: https://launchpad.net/bugs/1643750 +X-Debian-version: 6.0-21 + +--- a/zipinfo.c ++++ b/zipinfo.c +@@ -1921,7 +1921,18 @@ + ush dnum=(ush)((G.crec.general_purpose_bit_flag>>1) & 3); + methbuf[3] = dtype[dnum]; + } else if (methnum >= NUM_METHODS) { /* unknown */ +- sprintf(&methbuf[1], "%03u", G.crec.compression_method); ++ /* 2016-12-05 SMS. ++ * https://launchpad.net/bugs/1643750 ++ * Unexpectedly large compression methods overflow ++ * &methbuf[]. Use the old, three-digit decimal format ++ * for values which fit. Otherwise, sacrifice the "u", ++ * and use four-digit hexadecimal. ++ */ ++ if (G.crec.compression_method <= 999) { ++ sprintf( &methbuf[ 1], "%03u", G.crec.compression_method); ++ } else { ++ sprintf( &methbuf[ 0], "%04X", G.crec.compression_method); ++ } + } + + for (k = 0; k < 15; ++k) diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index da0983fc0970..b9fa760c019b 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { ./CVE-2014-9636.diff ./CVE-2015-7696.diff ./CVE-2015-7697.diff + ./CVE-2014-9913.patch + ./CVE-2016-9844.patch ] ++ stdenv.lib.optional enableNLS (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1"; From 503c57237fa68140059d99fe8f6f12a7efe522a5 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 14 Dec 2016 18:03:38 -0500 Subject: [PATCH 1563/1749] go_1_6: 1.6.3 -> 1.6.4 for DoS vector --- pkgs/development/compilers/go/1.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index 38b114d8d070..db6573417bf4 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -15,11 +15,11 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "https://github.com/golang/go/archive/go${version}.tar.gz"; - sha256 = "1plakydixx0xrp0z3n8ahnwg66psn31791dh56yl4ry41phq0axm"; + sha256 = "1212pijypippg3sq9c9645kskq4ib73y1f8cv0ka6n279smk0mq9"; }; # perl is used for testing go vet From 8800ea7617ab3899b2ed74c8c96849de1f0cf711 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 14 Dec 2016 18:07:52 -0500 Subject: [PATCH 1564/1749] zabbix22: 2.2.2 -> 2.2.16 for CVE-2016-4338 CVE-2016-9140 --- pkgs/servers/monitoring/zabbix/2.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 10375b9b1c1d..6429d3fae53f 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -10,12 +10,12 @@ assert enableJabber -> minmay != null; let - version = "2.2.2"; + version = "2.2.16"; branch = "2.2"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "1gmjbjmajdllzd7akihb5kg4l2gf0ii9c16fq8mlla37sshzj3p0"; + sha256 = "0hc0y3p8p6pxri7w3n311ry3m5hb440kgwwkiqlihbhsq73xiz1w"; }; preConfigure = From 891e391cdbb90f10927a8b22329130051366f603 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 15 Dec 2016 15:59:25 +0100 Subject: [PATCH 1565/1749] go: 1.7.3 -> 1.7.4 --- pkgs/development/compilers/go/1.7.nix | 4 +-- .../development/compilers/go/cacert-1.7.patch | 36 +++++++++---------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index 72665cd09354..16de9b0edbf5 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "0dcappkx4ichl249swwdyk7l078ajng0gl6a885va85z8m1jnvbs"; + sha256 = "1ks3xph20afrfp3vqs1sjnkpjb0lgxblv8706wa3iiyg7rka4axv"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/cacert-1.7.patch b/pkgs/development/compilers/go/cacert-1.7.patch index 0fe9ff8cc239..57f09c975d9c 100644 --- a/pkgs/development/compilers/go/cacert-1.7.patch +++ b/pkgs/development/compilers/go/cacert-1.7.patch @@ -24,26 +24,18 @@ index a4b33c7..9700b75 100644 var data C.CFDataRef = nil err := C.FetchPEMRoots(&data) diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go -index 78de56c..05eada4 100644 +index 59b303d..d4a34ac 100644 --- a/src/crypto/x509/root_darwin.go +++ b/src/crypto/x509/root_darwin.go -@@ -6,20 +6,31 @@ - - package x509 - --import "os/exec" -+import ( -+ "io/ioutil" -+ "os" -+ "os/exec" -+) - - func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { - return nil, nil - } +@@ -28,16 +28,25 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + // The linker will not include these unused functions in binaries built with cgo enabled. func execSecurityRoots() (*CertPool, error) { -+ roots := NewCertPool() ++ var ( ++ mu sync.Mutex ++ roots = NewCertPool() ++ ) ++ + if file := os.Getenv("SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { @@ -51,16 +43,20 @@ index 78de56c..05eada4 100644 + return roots, nil + } + } ++ cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain") data, err := cmd.Output() if err != nil { return nil, err } -- roots := NewCertPool() - roots.AppendCertsFromPEM(data) - return roots, nil - } +- var ( +- mu sync.Mutex +- roots = NewCertPool() +- ) + add := func(cert *Certificate) { + mu.Lock() + defer mu.Unlock() diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go index 7bcb3d6..3986e1a 100644 --- a/src/crypto/x509/root_unix.go From 4af2328e5cbf0835caf95e9a753f42c1d1d4592b Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 15 Dec 2016 23:52:34 +0100 Subject: [PATCH 1566/1749] discord: Fix missing desktop entry (closes #21045) --- .../instant-messengers/discord/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index aaabb4ab111b..8387d2f7c380 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, makeDesktopItem , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf , glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango , systemd, libXScrnSaver }: -let version = "0.0.11"; in +stdenv.mkDerivation rec { -stdenv.mkDerivation { - - name = "discord-${version}"; + pname = "discord"; + version = "0.0.11"; + name = "${pname}-${version}"; src = fetchurl { - url = "https://cdn-canary.discordapp.com/apps/linux/${version}/discord-canary-${version}.tar.gz"; + url = "https://cdn-canary.discordapp.com/apps/linux/${version}/${pname}-canary-${version}.tar.gz"; sha256 = "1lk53vm14vr5pb8xxcx6hinpc2mkdns2xxv0bfzxvlmhfr6d6y18"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { ]; installPhase = '' - mkdir -p $out/bin + mkdir -p $out/{bin,share/pixmaps} mv * $out # Copying how adobe-reader does it, @@ -33,11 +33,22 @@ stdenv.mkDerivation { $out/DiscordCanary ln -s $out/DiscordCanary $out/bin/ + ln -s $out/discord.png $out/share/pixmaps # Putting udev in the path won't work :( ln -s ${systemd.lib}/lib/libudev.so.1 $out + ln -s "${desktopItem}/share/applications" $out/share/ ''; + desktopItem = makeDesktopItem { + name = pname; + exec = "DiscordCanary"; + icon = pname; + desktopName = "Discord Canary"; + genericName = meta.description; + categories = "Network;InstantMessaging;"; + }; + meta = with stdenv.lib; { description = "All-in-one voice and text chat for gamers that’s free, secure, and works on both your desktop and phone"; homepage = "https://discordapp.com/"; From 994b243dd33a478b14a643d80d3aaa80ac843abb Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 15 Dec 2016 17:47:57 -0500 Subject: [PATCH 1567/1749] elpa-packages: 2016-12-15 --- .../editors/emacs-modes/elpa-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 4d9d903c7d6e..9118344f0245 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -619,10 +619,10 @@ el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.1.2"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.1.2.tar"; - sha256 = "1cav55nx1045c3xasi5d76yyqi68ygp9dpqv9bazrqgcpsmw6y8b"; + url = "https://elpa.gnu.org/packages/el-search-1.2.tar"; + sha256 = "0sz78kn9nx390aq5wqz174p8ppw987rzsh892ly166qz4ikwys5a"; }; packageRequires = [ emacs stream ]; meta = { @@ -1364,10 +1364,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20161118"; + version = "20161214"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20161118.tar"; - sha256 = "1w9g8r08kaiw9f4fjsj0hbffzq85rj734j5lxvbaafbnz7dbklk1"; + url = "https://elpa.gnu.org/packages/org-20161214.tar"; + sha256 = "0pa9d0l6axif5wlzi7lvxl0fpjwwvc79cy9d37z7md4hxyjdvwzm"; }; packageRequires = []; meta = { From c5e64ba4c8b9058aa1041e398e13e990ed37e22f Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 15 Dec 2016 17:48:32 -0500 Subject: [PATCH 1568/1749] melpa-packages: 2016-12-15 Removals: - cursor-in-brackets: github account no longer exists - dummy-h-mode: github account no longer exists - general-close: removed from melpa - judge-indent: github account no longer exists --- .../editors/emacs-modes/melpa-generated.nix | 783 +++++++++--------- 1 file changed, 402 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 4f027897c2cc..b61f26446a96 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -737,8 +737,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "c6d330c9ea574e659e3e40698db85b59dd154bcf"; - sha256 = "0n3wz9jpn2nyb35dykfyqaphkya63l06a9prnmaba4yydic3n6d0"; + rev = "fa4a79892e1097db28dce7ba4058e68998228ddd"; + sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -754,12 +754,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20161210.1838"; + version = "20161213.2320"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "c6d330c9ea574e659e3e40698db85b59dd154bcf"; - sha256 = "0n3wz9jpn2nyb35dykfyqaphkya63l06a9prnmaba4yydic3n6d0"; + rev = "fa4a79892e1097db28dce7ba4058e68998228ddd"; + sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -1261,8 +1261,8 @@ src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "2427786228f13f5893a8513d4837d14d1a1b375f"; - sha256 = "0jwdgpinz4as7npg7fhqycy6892p6i5g0gp5dd0n2n5r40gh620n"; + rev = "7b7c2d03e10968c6726f8a59ab25fcac0c147fba"; + sha256 = "06nglpfz4xvjgkfxx1g1vhcm846kfb56pqxv3a8l0rd0fqyaziyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1444,12 +1444,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20160322.0"; + version = "20161213.1359"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "f75173f4cb86259503ff4950e450e3fa7a37a808"; - sha256 = "00s6z6f9nlqw528ppbwsglh9wshw8cpg2g102ywdsl28bwy3wvgj"; + rev = "d8fcdc769d6b6b0729943b7dee2c85cf8ca3551b"; + sha256 = "0660kfhaf7q82a5zp48938z7ddl47mhdwa3rfk1xzbh84xbd9hc2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1528,12 +1528,12 @@ all-ext = callPackage ({ all, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "all-ext"; - version = "20160604.1501"; + version = "20161214.2250"; src = fetchFromGitHub { owner = "rubikitch"; repo = "all-ext"; - rev = "2639955833132451679feae8a54ca157c1d864ce"; - sha256 = "0g5g0nhq76v8jbhs38si6abwn4zv9qh7jl87qhhy3in8s1inswzf"; + rev = "a441c10ef99df2a639dfd9e8892cb6080db40730"; + sha256 = "1fvha7gkr0ll6dnpp7rb5v6w11i03rbd74g18fd8x0vdi6lw7j10"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/all-ext"; @@ -1642,12 +1642,12 @@ ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ample-theme"; - version = "20161207.614"; + version = "20161213.912"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "ample-theme"; - rev = "ab3bdaa99dda8ac86a8be44162ac0f2374392950"; - sha256 = "1ncwzjh46df89zsh8y0nprdv2wb06aq6swfc7byi0ghcbd8x3jv7"; + rev = "8fbae3a9965f933c487f4cfdf2d881753d9feeb1"; + sha256 = "0knzfxdncb1x41zqknv70p62zwr4k5nxf8l108x9w043drxc10lw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme"; @@ -2822,12 +2822,12 @@ atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: melpaBuild { pname = "atomic-chrome"; - version = "20161114.409"; + version = "20161213.730"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "atomic-chrome"; - rev = "62fa0dc6167bd65185ec5138bac5c60acdda2875"; - sha256 = "117a10vns47wnhihblb66ngn581ngqbhbanwhakfc5kd4xflqcaz"; + rev = "1b96d563c5d435baf8dfa9cdae5ef38ce34629b9"; + sha256 = "0caiv0snjxj0f1p0rx18r1w4nbsk8shrin2dr2ddg54mpxzf8r98"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; @@ -2906,12 +2906,12 @@ aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aurel"; - version = "20161023.122"; + version = "20161214.825"; src = fetchFromGitHub { owner = "alezost"; repo = "aurel"; - rev = "a77e8afd1cc34a1f042be7b1c34a17eb699d826a"; - sha256 = "0r4z97n99gh62yn21b2zzs4bc85hwbnyi4x1gllyrrmmb6qjg1lr"; + rev = "122c10cf6359b6d353d7ac4e1cb9776f285853ee"; + sha256 = "0i9ganx0n0dmy9p8xgd6mk0qxzw99y893f3nl61dah4yrcmlhcg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel"; @@ -5835,12 +5835,12 @@ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bui"; - version = "20161122.946"; + version = "20161213.735"; src = fetchFromGitHub { owner = "alezost"; repo = "bui.el"; - rev = "65884653411b116029680d6c3154edd0eb9e5e9a"; - sha256 = "1xiy7q79zbqyf0phq97zgkprj0j577xbnh24zh3fbs9i6nbiv46x"; + rev = "b8f2fcfcdf4eff7fb502e75f25a2e6d974c3ca01"; + sha256 = "1s7iigrdbdgavigssi2j82dky6cjahnrsnq9m9i5nvczj5xjdnpq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; @@ -6841,7 +6841,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11919"; + rev = "11922"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -7024,12 +7024,12 @@ chee = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "chee"; - version = "20161105.1306"; + version = "20161212.1525"; src = fetchFromGitHub { owner = "eikek"; repo = "chee"; - rev = "04d2104286ca6b92dcc28e448eeadfcc8fb7b548"; - sha256 = "0lwp2hh8rxg1f98hzpdrz91snwryp9fqin9sch1vnyxywfp3g9kc"; + rev = "979279d9b15a1885b0e0c3143a9e422f98c11b9c"; + sha256 = "0jp4ivzbdpk4wzhj4qy4fr7zn45plnfmirl0ylrb4hiwqd7kwbd8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee"; @@ -7546,12 +7546,12 @@ ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ciel"; - version = "20161211.1946"; + version = "20161213.2141"; src = fetchFromGitHub { owner = "cs14095"; repo = "ciel.el"; - rev = "d8bf0d2829485886daddf8d4b11322a1ed7a0fc5"; - sha256 = "1glswbpnvvngzahcn9jdy0jamr72xfcqaman6iqkgzxwj2kf84bn"; + rev = "bf0c83ff06e229a15aabfa132237b7d4a05abcbe"; + sha256 = "1967vgfmi0asa7zwhzwpp63hhckp4wcmdxwbpi7rixhqp521cp7k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel"; @@ -7696,7 +7696,7 @@ version = "20161004.253"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "289430"; + rev = "289815"; sha256 = "1vbngm8xf7i8f3140y0dk704vagcws6is9waj9qsy6yg0vxmqp0y"; }; recipeFile = fetchurl { @@ -8082,12 +8082,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20161121.311"; + version = "20161215.49"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "116278521899f205a067c47621d97e4968aacb71"; - sha256 = "0s4cvymjxriw8zkzg0msvy9crrf0lrqg1gij2m5x2cvjhr60a0hi"; + rev = "fe76682dba2b8b231c664d2e0903a791996d89a1"; + sha256 = "01qvw35wsjlydfdcymy81vcv07j5rmh4zrsy17v6q09n7sz4kg8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8107,8 +8107,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "116278521899f205a067c47621d97e4968aacb71"; - sha256 = "0s4cvymjxriw8zkzg0msvy9crrf0lrqg1gij2m5x2cvjhr60a0hi"; + rev = "fe76682dba2b8b231c664d2e0903a791996d89a1"; + sha256 = "01qvw35wsjlydfdcymy81vcv07j5rmh4zrsy17v6q09n7sz4kg8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8250,12 +8250,12 @@ clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clues-theme"; - version = "20161210.1752"; + version = "20161213.327"; src = fetchFromGitHub { owner = "jasonm23"; repo = "emacs-clues-theme"; - rev = "16c05f6dbe7125358f8456110f237d68263e987a"; - sha256 = "1lxd6wgg0d7nwg0rsj5fz0c3wwap567vwd7bfa2xj22z0b6cn49c"; + rev = "abd61f2b7f3e98de58ca26e6d1230e70c6406cc7"; + sha256 = "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf43125306df445ac829c2edb98dd608bc1407de/recipes/clues-theme"; @@ -8338,8 +8338,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "3874843f0f5be9d53001517b3697e0d092f0e845"; - sha256 = "1qnnba479wb065yq1xg6jaddvmix1cdy39d2wg4n704dks9pyp8f"; + rev = "517c7cca8c856546a93454cf0cf98fe6bad3f856"; + sha256 = "0hami0cq0sqakh98qw39iyv93jdpwxi0j2frc37az9y2zimbbcwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9709,8 +9709,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "c6d330c9ea574e659e3e40698db85b59dd154bcf"; - sha256 = "0n3wz9jpn2nyb35dykfyqaphkya63l06a9prnmaba4yydic3n6d0"; + rev = "fa4a79892e1097db28dce7ba4058e68998228ddd"; + sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -9879,12 +9879,12 @@ company-statistics = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-statistics"; - version = "20151126.1246"; + version = "20161213.159"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-statistics"; - rev = "906d8137224c1a5bd1dc913940e0d32ffecf5523"; - sha256 = "0c98kfg7gimjx9cf8dmbk9mdsrybhphshrdl8dhif3zqvn6gxyd7"; + rev = "36d9692da9172c3ad1e1a46d66ffa9346a44b212"; + sha256 = "05br3ikxad7gm7h6327yfwdfap6bbg68fbybsx967a31yv4rxhvm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2/recipes/company-statistics"; @@ -10340,12 +10340,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20161211.1126"; + version = "20161213.439"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991"; - sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2"; + rev = "c2c0e2d7bd79a0c7cb8a6df98d2a87a0891730d8"; + sha256 = "19v6l6xfhyxnmq7ajc0f4qac1ns5wjl9l78sfpa39jn6cm9wbyy5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11188,27 +11188,6 @@ license = lib.licenses.free; }; }) {}; - cursor-in-brackets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "cursor-in-brackets"; - version = "20160603.416"; - src = fetchFromGitHub { - owner = "yascentur"; - repo = "cursor-in-brackets-el"; - rev = "3c085913eff08eddcc8fa4ed6438d60da59d7bc2"; - sha256 = "06q46hmspgq1g3dkpim3fnz1gnzpqywwqcg5yism2lc6qj4zmanm"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5862f7a24b3c213505277ad44a64d8dd402119eb/recipes/cursor-in-brackets"; - sha256 = "1p4p0v7x4i4i2z56dw4xf1phckanrwjciifi0zqba36xd4zxgx8f"; - name = "cursor-in-brackets"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/cursor-in-brackets"; - license = lib.licenses.free; - }; - }) {}; cursor-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cursor-test"; @@ -11500,12 +11479,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20161128.545"; + version = "20161214.703"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "daf31ca666a2b82d305b60255234b84d70b8d037"; - sha256 = "1172qv32z80nafcmj4b60bv678ab565w9smpsdpvravrp5z4sdca"; + rev = "a984cded7522b2cdad7f33542d3b5cb9ad095860"; + sha256 = "0dhnm3f7dd9wdbpsvnwc0hh1sa6cd48r8sw49f70pf76z58iss53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11836,12 +11815,12 @@ date-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "date-at-point"; - version = "20150108.418"; + version = "20150308.543"; src = fetchFromGitHub { owner = "alezost"; repo = "date-at-point.el"; - rev = "65733210479812a70a6dd5978ba0e2a4a6fcd08b"; - sha256 = "0l4z9rjla4xvm2hmp07xil69q1cg0v8iff0ya41svaqr944qf7hf"; + rev = "38df823d05df08ec0748a4185113fae5f99090e9"; + sha256 = "024jx6q0dik4w2wb8nrk1q73asvjgrsl5mslns0ci3zsya343rch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6dbeddd236f312fac1d5542dfd2edf81df8fad2/recipes/date-at-point"; @@ -12029,8 +12008,8 @@ src = fetchFromGitHub { owner = "alezost"; repo = "debpaste.el"; - rev = "038f0ff7824f4e3dd455e2232eeca70fa8abcec5"; - sha256 = "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb"; + rev = "6f2a400665062468ebd03a2ce1de2a73d9084958"; + sha256 = "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13098bae76a3386689a9bf9c12f25b9a9b15145c/recipes/debpaste"; @@ -13973,12 +13952,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20161123.2356"; + version = "20161214.532"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "074156c4cc5e71fcd9dc4bfb68792403acfdaa16"; - sha256 = "0shsh1rj01a6bcr6sm073p60spy61vqnr8nhkcfa6lh2ccigxv43"; + rev = "9ecfa0b16d86998c380f08f82743c4dce9accf5e"; + sha256 = "0783v9qf06gy7miw80x1lf1z59yhcmiilprpcjdlf3fyvvym56a7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -14532,12 +14511,12 @@ drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "drupal-mode"; - version = "20160915.245"; + version = "20161215.414"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; - rev = "eec2e557d769f3379e6c208334650f3041d28d54"; - sha256 = "0c3s5l5msc1npjxdix6lr0467vgxil29ha39q3cwq60kbvrcdbgq"; + rev = "dea5a8da789e5c707fa6c63cd400282ea7205a14"; + sha256 = "1zxsa6fapbxa5yfpawivjmav9i80j9752bc6gmpq7ilzsnd67h0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; @@ -14576,7 +14555,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1773793"; + rev = "1774435"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -14656,12 +14635,12 @@ ducpel = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ducpel"; - version = "20140418.2216"; + version = "20140702.454"; src = fetchFromGitHub { owner = "alezost"; repo = "ducpel"; - rev = "4a1671fc45ab92d44dee85a1a223122d5a43cb32"; - sha256 = "1ixb78dv66lmqlbv4zl5ysvv1xqafvqh1h5cfdv03jdkqlfk34jz"; + rev = "b53b935ab95c02b82ccf38f63c89e39e99477a55"; + sha256 = "07cgwkfi69xjjxx9hs5rdblsil1h3bpbx9k7hwyv1dg3ivihm04s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d64adac965e1dac0f29dab9a587cd6ce9c3bb3a/recipes/ducpel"; @@ -14695,27 +14674,6 @@ license = lib.licenses.free; }; }) {}; - dummy-h-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "dummy-h-mode"; - version = "20160603.417"; - src = fetchFromGitHub { - owner = "yascentur"; - repo = "dummy-h-mode-el"; - rev = "2bc896f0e3bd3c976c4bb4cdf8056065bf39f50e"; - sha256 = "1xkfwg1awb3ikb9i71xdbnbb94y3p2qd1fhnbx6kzfs0kmsiv5k9"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/dummy-h-mode"; - sha256 = "10lzfzq7md6s28w2zzlhswn3d6765g4vqzyjn2q5ms8pd2i4b4in"; - name = "dummy-h-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/dummy-h-mode"; - license = lib.licenses.free; - }; - }) {}; dummyparens = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dummyparens"; @@ -14761,11 +14719,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20161108.348"; + version = "20161213.651"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "befb5c650dfd"; - sha256 = "154bm7l1ra3l9lj9l1x21qi7f57k46kg24hyalrbawjw3q8c5np2"; + rev = "20a2166c8210"; + sha256 = "0gz0aiks3f53lqvnrnb33a1clq52ipd3i3miymvkkgspnz3vl12p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -15660,12 +15618,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20161211.2144"; + version = "20161212.1946"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "19e81d24f33da40cd414142e44a55957ac9be83d"; - sha256 = "1xcfyqnannnm6myv7pn2gjwnlq7rq4zciiykj5fs9kziaf4qggnp"; + rev = "0e89a891eeffe942d71b93f7792958b38ea1ecf3"; + sha256 = "09k3rqlwwssmqgynaww3ddfvgvarbsaspgr2c2xzbp9l5gg3rr4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15820,8 +15778,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "87b279f0e1ea1754215eceef007c8736d4bd9dfd"; - sha256 = "1zjy8zmsh6n535cazmkrr081rmjaigkqxx134sam474dzbmcybdc"; + rev = "636c5bca8faf9e116e8447cf73646257a85f1bfc"; + sha256 = "1a7vlqwyh2c2qfdir52l2f62g53jcign6q65z66rkdqcdizmjqw7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -15898,12 +15856,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20161205.1432"; + version = "20161214.1102"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "0805f4b15419bb92641bf09735be9bc2c72a3838"; - sha256 = "07d26n946j19v0swx89d53mdsw1w3ar85ickswhj5fz1m3g9r4fc"; + rev = "d85717bd24ec32c41cceaee2defc0957f2f0b4d3"; + sha256 = "0z3mw1i5iwmnjd2qqsyw0ka159dalrfsviv1lbi0ff4x0sqxsd5q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -18615,8 +18573,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "b47d104994c6f11301f23b0675ed5f06f3e25922"; - sha256 = "06498ydjw27wvyaxrc6fxf1z3ymw5cgy553ij2p1s9d4b78czlm0"; + rev = "37933d48e1569bdf538686d8a1f82e7be4125ed5"; + sha256 = "0h7jm42xj22jb512lsbjjd7gddgx4dh0711kblz3qazkm0ngw0ds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19797,12 +19755,12 @@ evil-extra-operator = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-extra-operator"; - version = "20160406.2322"; + version = "20161212.2003"; src = fetchFromGitHub { owner = "Dewdrops"; repo = "evil-extra-operator"; - rev = "96d611b557876caefbc64731ad2d0385edbb0c23"; - sha256 = "10vwyrg833imja3ak9fx0zackdjwlcncl7wm9dym3kjs6qf2rvv0"; + rev = "e16a9b36f9901254da9af8a73871061616410fc3"; + sha256 = "116srvfck3b244shxm9cmw3yvpprjgr840fvcv6jwwpfaphafxw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0b157c3adf8a2899c4dd2ce98e8a81e4f403a3/recipes/evil-extra-operator"; @@ -20049,12 +20007,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20161123.1318"; + version = "20161213.2138"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "124ac33859cb5f0d7928b5de62e5b40159f84478"; - sha256 = "1lhgxb2fsl66c0a2afn56h4rqs2x2v7ijskzv95ag7i0zmjgrfds"; + rev = "c8796e3c611cd8ca55e80a0487b93c4b0551d45c"; + sha256 = "16xs6aj3ws6skhvqfda2i7y1gj0gg20yra99hpnkz05f4gcpjfmh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -23021,6 +22979,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-objc-clang"; + version = "20161214.509"; + src = fetchFromGitHub { + owner = "GyazSquare"; + repo = "flycheck-objc-clang"; + rev = "3140e4c74dbaa10e6f8edd794144d07399a8fda8"; + sha256 = "0zzb03qxfs5wky40hzmldkzq5gn4c7qknkd5ra2lghzj0az6n9ld"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; + sha256 = "07mzwd04a69d7xpkjmhfmf95j69h6accnf9bb9br7jb1hi9vdalp"; + name = "flycheck-objc-clang"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-objc-clang"; + license = lib.licenses.free; + }; + }) {}; flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }: melpaBuild { pname = "flycheck-ocaml"; @@ -23336,6 +23315,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-swift3"; + version = "20161214.501"; + src = fetchFromGitHub { + owner = "GyazSquare"; + repo = "flycheck-swift3"; + rev = "846b3045d018a13cadb8a8bfde83587802d7e1a2"; + sha256 = "06wzsi3lw938mc8sz06jxyclxpvrlyjgvs9998kpiyhz752sgfsw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; + sha256 = "05yfrn42svcvdkr8mx16ii8llhzn33lxdawksjqiqg671s6fgdpa"; + name = "flycheck-swift3"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-swift3"; + license = lib.licenses.free; + }; + }) {}; flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: melpaBuild { pname = "flycheck-tip"; @@ -24575,12 +24575,12 @@ forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forth-mode"; - version = "20161207.1442"; + version = "20161214.1236"; src = fetchFromGitHub { owner = "larsbrinkhoff"; repo = "forth-mode"; - rev = "0bbf7992d618a84f823b21de5eb36a7cb081e35f"; - sha256 = "0566l9zrz8hsmjcywn7851rgrrjq2qfhnlkbcwgn0n0q98x95hq0"; + rev = "ccb14b4a477e13353ced9658b8e7adfe90bbcd15"; + sha256 = "1g0dmrlqlwp6zaaixcksns2gzw7nsk4lk138qmfw5l6mvazjy4sk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode"; @@ -24914,8 +24914,8 @@ version = "20161123.2000"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "aa5334420c42399d929cc6506a6b71c724c47df1"; - sha256 = "19i5c5v0d1h12jkwbbg47p1n8a99ic7hl5avi8xndsm958aghcdl"; + rev = "20a98a38fb23d61bf92bb25b2062f0d07f7af91d"; + sha256 = "0wai0z3zf2blmr9f6sfawq9977n2shf4m42771grn65mgmldlzha"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -25259,12 +25259,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "20161201.1330"; + version = "20161214.650"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "04fd7b24c705e1ea1c8b3b8e4ff178ed7ecc6d12"; - sha256 = "1jsfgm57i928wgn4540m48jady61i7k0bka1mw1i462m3wc62nba"; + rev = "6b805aea456f7a899066f3caa7f17bfc3d199cee"; + sha256 = "05gzdlz5nwz2vd7f7xk9abpv2ifn1w5djcz19v1qh7xyarickszq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -25361,27 +25361,6 @@ license = lib.licenses.free; }; }) {}; - general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "general-close"; - version = "20161208.1021"; - src = fetchFromGitHub { - owner = "emacs-berlin"; - repo = "general-close"; - rev = "aab9b0bdb147ccae2b8b49a8bd2f1ad05f435909"; - sha256 = "122lm7yh5nf6s6pf64fmsqvr4aqidbjx7vsizxpwjk1i47hj48q3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close"; - sha256 = "17v0aprfvxbygx5517a8hrl88qm5lb9k7523yd0ps5p9l5x96964"; - name = "general-close"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/general-close"; - license = lib.licenses.free; - }; - }) {}; genrnc = callPackage ({ concurrent, deferred, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "genrnc"; @@ -25826,12 +25805,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20161206.1703"; + version = "20161214.519"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "6a4bb25b621b69b0ae564a572b89ed31e22f780d"; - sha256 = "19va83m1b80fy4naq1kl03jm0h2s1ym6d3y86nr4swly676pd2dw"; + rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb"; + sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27542,12 +27521,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20161201.1112"; + version = "20161213.1524"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "b5c807e3033ca8173cb48e8ef22f6cafc55244ba"; - sha256 = "1i53iqcnq4bk29n7yj90n9m4g7qzdxp51c5mdgyvkdlwy3mry3i9"; + rev = "45a5351755f12668ca9a0b63f1d1c906431157f6"; + sha256 = "07ympvkvhbbfk7nrzr801qnqyh92nqs050cy4b0y22c3c52i6k6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -28908,12 +28887,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20161209.753"; + version = "20161212.2159"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "98f97e06d7754d1451a5764db3b0e19b71ec3ca2"; - sha256 = "11a62n30204d7mqirl5gzzw4rigrf5c8v6j88rs3i5x3x4zn342a"; + rev = "3d0e7df0b11bc19a81fb557856821e9fcd38ef85"; + sha256 = "0a2ww6jw315r7v06s1s65mvsyzna9glsgilpywlhzcci44621jw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -28996,8 +28975,8 @@ src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "323524bd65d59f11d1a940a46a60448da85a2a63"; - sha256 = "1bmkn6hn02fichylmr5pla3lbhixcn6h1znp77dg5j80npzb27yw"; + rev = "997107a53abd3bda06d52e7021c87527c5747389"; + sha256 = "1fj2s5jfbaw948kww64k8ksxa6pxfpb30fx93x182bq6sl8fqlwg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -29118,12 +29097,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20161202.236"; + version = "20161213.2242"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "3193f2a408d76c36db588ec85191b0dc22fa21a6"; - sha256 = "1qysjyd7c05iylwfxmvqjwq9pkp8yxrhmsnki6i8dpypjlbji997"; + rev = "58dc08b8b8e6ea0c809052e082c867e05acef16a"; + sha256 = "0cf3h0lkya6rsmg60qzbiz63vp8lm7nd4xlxym44hpp75nw06mgb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -29412,12 +29391,12 @@ helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-codesearch"; - version = "20160831.1742"; + version = "20161214.548"; src = fetchFromGitHub { owner = "youngker"; repo = "helm-codesearch.el"; - rev = "ff192dfcfbc737b7803cee1b87518c488aec0807"; - sha256 = "05xxnpqfppqyxncj4dddr0x02ji7yh4rj3q5przmm6v98kkdh6fa"; + rev = "e80e76e492f626659b88dbe362b11aa0a3b0a116"; + sha256 = "16njr3xcvpzg4x6qq2pwk80pca9pxhc6vjvfy3dzy4hi9nxryrs6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; @@ -29475,12 +29454,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20161212.408"; + version = "20161213.1754"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "98f97e06d7754d1451a5764db3b0e19b71ec3ca2"; - sha256 = "11a62n30204d7mqirl5gzzw4rigrf5c8v6j88rs3i5x3x4zn342a"; + rev = "3d0e7df0b11bc19a81fb557856821e9fcd38ef85"; + sha256 = "0a2ww6jw315r7v06s1s65mvsyzna9glsgilpywlhzcci44621jw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -30881,12 +30860,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20161008.45"; + version = "20161213.2311"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "bc14d326fe892c902c55d093cccefb0fefde29b9"; - sha256 = "1gkyk8cj55n5dxhhvflqvf14gcbg5i6pj329j04nnmk5kdn0crni"; + rev = "10531b2634559ea2179f2530423beaac815e9a38"; + sha256 = "1bh9cvkp5gr8ykmy8fr94appkhpqx9hicqyj6ahvi2ykgb50ib4c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -32043,12 +32022,12 @@ highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-indent-guides"; - version = "20161118.1050"; + version = "20161214.1619"; src = fetchFromGitHub { owner = "DarthFennec"; repo = "highlight-indent-guides"; - rev = "759ff84afba940b1a35c484b54da9478f8aa15fb"; - sha256 = "0rqn1yc1daxpax2qv42x72411ipj49y4s1j7abgkqh2g7fvrbdwa"; + rev = "a1eeb2e50ca51b5b2e3a5cd190d2f1d79cf6ad28"; + sha256 = "0bm5lqdvy0g2q7hd621vdc78430rk4fjbd94a6dj5wjh8vpcw7vd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides"; @@ -32189,12 +32168,12 @@ highlight-stages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-stages"; - version = "20161212.241"; + version = "20161212.657"; src = fetchFromGitHub { owner = "zk-phi"; repo = "highlight-stages"; - rev = "d2c4f78ca9fc696da05fa05e3731c9a130a578da"; - sha256 = "1sl419f957q9c04lm10i4jawqz28mymyaiwvk4dwh1x1iqa37qsw"; + rev = "87c476f8ca0474912af41680a8de243c0c8d5b46"; + sha256 = "1s7hxv4vpbrpk4makdjn3589flddgfy35scyd3kac629fbqiiz79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46884aa6588f55d6f688477a5e9f528f57673131/recipes/highlight-stages"; @@ -34325,8 +34304,8 @@ src = fetchFromGitHub { owner = "alezost"; repo = "imenus.el"; - rev = "ee1bbd2228dbb86df2865dc9004d375421b171ba"; - sha256 = "1y57xp0w0c6hg3gn4f1l3612a18li4gwhfa4dy18fy94gr54ycpx"; + rev = "c24bc3a5b3bb942afcdf2dfb568968cf836ddafc"; + sha256 = "1p6b7wvzf63dca446gpxm90pmbh9f7r097hbhwj2jmm2i9j5d0lg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc571105a8d7e2ea85391812f1fa639787fa7563/recipes/imenus"; @@ -34697,10 +34676,10 @@ }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20161210.837"; + version = "20161213.646"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "1d2n5yyrm904f22s8d4wqk66p646c7yx4rpsymp9cfgjvwlbar96"; + sha256 = "0d3qf6vlz8qbxm8i2f3qqj005mmkr35k2xr9jr1hwvwm30jrwy4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+"; @@ -35009,12 +34988,12 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20161123.101"; + version = "20161214.515"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; - rev = "36ed2533f3c9cc22a9b54c3e8814a4e2885d0177"; - sha256 = "03yajiq3ifn9kiwrdx6zxlvycgisxm96yhalk5baysbicp6nh31r"; + rev = "f4a31271362fd3610a83f6c93ea52581c1ffb3c5"; + sha256 = "0n4p02yf7faajwnrdinphbqc6akq657cndh7h5k7bgsakykflja2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; @@ -35362,10 +35341,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20161210.1812"; + version = "20161213.1957"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "01y1r0drfhjq87ip1mai4p47ivhc0gvfman8p9g6fqbywskdnnxm"; + sha256 = "1pmp9r48m62zq4r5xbwjm1h2rhlgb5ibfs27gkw5i5lcr2pvvsz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -35588,12 +35567,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20161210.333"; + version = "20161213.719"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991"; - sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2"; + rev = "abdbfa790074632800a449b190a8fc8d0770c738"; + sha256 = "0g54crkziiw7ll1kifqg3shw9k50rnqvpdkf1w6zk3c2v4h40yll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -35609,12 +35588,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20161202.236"; + version = "20161213.2242"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "3193f2a408d76c36db588ec85191b0dc22fa21a6"; - sha256 = "1qysjyd7c05iylwfxmvqjwq9pkp8yxrhmsnki6i8dpypjlbji997"; + rev = "58dc08b8b8e6ea0c809052e082c867e05acef16a"; + sha256 = "0cf3h0lkya6rsmg60qzbiz63vp8lm7nd4xlxym44hpp75nw06mgb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -35672,12 +35651,12 @@ ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "20160517.1349"; + version = "20161213.439"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991"; - sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2"; + rev = "abdbfa790074632800a449b190a8fc8d0770c738"; + sha256 = "0g54crkziiw7ll1kifqg3shw9k50rnqvpdkf1w6zk3c2v4h40yll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -35732,6 +35711,27 @@ license = lib.licenses.free; }; }) {}; + ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-rich"; + version = "20161213.302"; + src = fetchFromGitHub { + owner = "yevgnen"; + repo = "ivy-rich"; + rev = "92d7312059f8c1f055f3336580ae77437038b472"; + sha256 = "098xsg2yggfv1b931yw4r87l8rqmgxbib5ca8bgvr3nafxfya6la"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; + sha256 = "0knkqc403gch4dp1q114h64cwwisxwnsxjqbl3cnidlwkn7lzk7m"; + name = "ivy-rich"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-rich"; + license = lib.licenses.free; + }; + }) {}; ivy-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-xcdoc"; @@ -36591,12 +36591,12 @@ js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; - version = "20161117.1413"; + version = "20161212.2125"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "35660f93fb624c130c8795a742bad6ff9e2dd5bd"; - sha256 = "18j0a6c7ashsbc1vsfj686pjc23igcgpvnwjrkhj0mm9afg918rq"; + rev = "067d52cd5f1f30634b7f332b33d0ee181594508f"; + sha256 = "08k8pcswk8d31mqnld0pk3jawskxjzc4sa1mh15jqpli9phym0va"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; @@ -36630,6 +36630,27 @@ license = lib.licenses.free; }; }) {}; + js-format = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: + melpaBuild { + pname = "js-format"; + version = "20161215.33"; + src = fetchFromGitHub { + owner = "futurist"; + repo = "js-format.el"; + rev = "dc5078de6bfdab3b23b0c5a4cbea4b96066c762e"; + sha256 = "1b67nv9m30243pwarjqbvd3xwbcxgms21qdlgljpq7pjbjfh26yf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6deaa93f7deaba9f5f36f1963522b6dc5c673a/recipes/js-format"; + sha256 = "112zqb3q1gjlaa9zkmhx7vamh0g97dwp9j55215i1sx66lmp18iq"; + name = "js-format"; + }; + packageRequires = [ emacs js2-mode ]; + meta = { + homepage = "https://melpa.org/#/js-format"; + license = lib.licenses.free; + }; + }) {}; js-import = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "js-import"; @@ -36696,12 +36717,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20161208.1415"; + version = "20161212.1716"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "6f2d51bd723126f82b491b5e2515356018a48849"; - sha256 = "0bnbfbii0gq6rai4r62c9yaw6q1hlkiw038x0g2skmhnwm24ciiq"; + rev = "90e37cdfdec06c7127cbb35f03a341c9d39cc2d5"; + sha256 = "1m40hsfybqkplhwcn5b2kgm6czgdfiv7bp155fng7j045nmc8jgw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -36964,27 +36985,6 @@ license = lib.licenses.free; }; }) {}; - judge-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "judge-indent"; - version = "20160609.622"; - src = fetchFromGitHub { - owner = "yascentur"; - repo = "judge-indent-el"; - rev = "f76c012284abc296681167d7b33d5e61f3ac7cec"; - sha256 = "0547jy339ql31wym066pi79k520agdq062xblyvj0bi91j0rqld3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/73fb2c31f6af63145aae7c449bfde1bbb00e1100/recipes/judge-indent"; - sha256 = "1gakdhnlxfq8knnykqdw4bizb5y67m8xhi07zannd7bsfwi4k6rh"; - name = "judge-indent"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/judge-indent"; - license = lib.licenses.free; - }; - }) {}; julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-mode"; @@ -37529,12 +37529,12 @@ keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keymap-utils"; - version = "20161211.1015"; + version = "20161212.957"; src = fetchFromGitHub { owner = "tarsius"; repo = "keymap-utils"; - rev = "8c88aa025201d4d890ab4eb51ce20d3c1ad20454"; - sha256 = "19pjxhi4vp1xb7q9wrknvypylrnx052c9r3s0kl65wqasiqmrans"; + rev = "a4f6ff724eeade5612c01c6f6bf401f264687793"; + sha256 = "0jgmw8798g3ikhwnic3fbbjld0hj8fvg50q6x78pngf78ws92mkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; @@ -37764,8 +37764,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "a58a88c506472302eee373b689cc297f64e42476"; - sha256 = "0sgfl1d7dc7xppz6y9jchyl0dsx6jinjza7r1ak0ij5m32070zm7"; + rev = "76138882e7fb7c609ae8f8f83d60d1ff1c11b64f"; + sha256 = "1gq3wnf2rwm5gcf1kvz3vxhsnsymhnnh17vn9l0n42dy9r2jn50a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -37781,12 +37781,12 @@ kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kiwix"; - version = "20161211.513"; + version = "20161215.535"; src = fetchFromGitHub { owner = "stardiviner"; repo = "kiwix.el"; - rev = "34851315ae9df84107f99236a0312ca4408838b6"; - sha256 = "19jlrhrm1aciw20a52ljjzx3g17izkznxhg6j9q920v72dwm2z0m"; + rev = "6fb8354e1770e752ae4eb3b79d5b873f65682904"; + sha256 = "02k0pvax9gf8gx9gcgm6zv25pvn4962c8zipp1sn5ik7i8z4fcwq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix"; @@ -38702,8 +38702,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "64653b77c1d1a61f7e968d50fc1ffb1c03711b5d"; - sha256 = "0296fbnbl3rvrk1x8xbaq7y14jz3qvr1wkrqb5fx30bfjjfk3zc9"; + rev = "96ca72844dab04a5330e0f33d95a18544b7ba369"; + sha256 = "1nzixvacppw37z5vfxp5ggg58ppqxrw86xhf2x4mfyyk9vs7jgg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -39015,12 +39015,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20161211.1128"; + version = "20161212.1048"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "b50c07af1ee414c73b4dd53d6ca19ca4e473763a"; - sha256 = "0i5zgrym9bh1b584qwh3npw4383s9arbs71xckp28di9w249sm4v"; + rev = "8e4f8c6545520cbb206588bc2989b5f942e95089"; + sha256 = "0h09niqzzcc42sjrdr56n4ayddv9798naiwi7ws9w45nrpghz9b5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -39328,12 +39328,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20161125.2208"; + version = "20161212.1937"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "469ed0ccf146deab8c2ebbb162be7be31709da0a"; - sha256 = "1qv6v27fjfq0h3i7d2nry752r9fwqf5llilngy5l3yimqddm2k4d"; + rev = "cec5ce8bbfc04ec36c09e349b707f5941c9883b5"; + sha256 = "075jdy3mpn90kc894lcppmznp78k1csxf3acrrkxm3r6gncf4vkg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -39415,8 +39415,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "f00c869d13d6af87f02ebf0bc5b682d5260436c6"; - sha256 = "0667v43kd1ld764550s0qjki71iv4bp02nmdywbwfv60l76f5swl"; + rev = "152f85e176aa00afd6dde8544d6735151a019991"; + sha256 = "16jvypkrrnnabxva089k8fy23fvr405jka1bw0a47mlgrdfxan04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -39992,12 +39992,12 @@ magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "magic-filetype"; - version = "20161209.1826"; + version = "20161214.1017"; src = fetchFromGitHub { owner = "zonuexe"; repo = "magic-filetype.el"; - rev = "3a5b86370cd495622be0200220405f48ea2aadc1"; - sha256 = "1dw4r21c45l51l49n6jddn479kx2rmf27xm69cg1fp9xvadxqcd6"; + rev = "9a20137474697063898902b43a40423daa4eb64d"; + sha256 = "1r16qlm2pqcph0zwy3fhzdjywdrfcwvldqk809vbhw71qkq4a54i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6027c5a66386f7140305a4cde12d66da4dfa09/recipes/magic-filetype"; @@ -40013,12 +40013,12 @@ magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magic-latex-buffer"; - version = "20160212.603"; + version = "20161214.1726"; src = fetchFromGitHub { owner = "zk-phi"; repo = "magic-latex-buffer"; - rev = "21c5030996bcd773b32b6fdd5990a64fcc3255f3"; - sha256 = "1gmhb8g1pl4qqk1d32hlvmhx2jqfsn3hkc4lkzhgk1n3qzfrq4hf"; + rev = "572bc5d9054ba5a7e78abd333141722be9013a1f"; + sha256 = "0hmmsn1i2izasfpgmz2p0zi1fhj96yym2vz6m7yb0gxd2ijhk1jw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/07e240ebe71d389d314c4a27bbcfe1f88b215c3b/recipes/magic-latex-buffer"; @@ -40034,12 +40034,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20161210.737"; + version = "20161214.1516"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "6a4bb25b621b69b0ae564a572b89ed31e22f780d"; - sha256 = "19va83m1b80fy4naq1kl03jm0h2s1ym6d3y86nr4swly676pd2dw"; + rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb"; + sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -40209,12 +40209,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20161207.613"; + version = "20161214.519"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "6a4bb25b621b69b0ae564a572b89ed31e22f780d"; - sha256 = "19va83m1b80fy4naq1kl03jm0h2s1ym6d3y86nr4swly676pd2dw"; + rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb"; + sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -40423,8 +40423,8 @@ src = fetchFromGitHub { owner = "alezost"; repo = "make-color.el"; - rev = "a1b34e95ccd3ebee4fba1489ab613d0b3078026d"; - sha256 = "1ky3scyjb69wi76xg6a8qx4ja6lr6mk530bv5gmhj7fxbq8b3x5c"; + rev = "5ca1383ca9228bca82120b238bdc119f302b75c0"; + sha256 = "1wmpy1d966zzxwar2ng825zlch5fwsslsi1706ss9v7zl7i9wggd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb765469c65589ae9d7dbc420a8edcf44c3be5d1/recipes/make-color"; @@ -40867,12 +40867,12 @@ markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }: melpaBuild { pname = "markdown-toc"; - version = "20160727.908"; + version = "20161214.1011"; src = fetchFromGitHub { owner = "ardumont"; repo = "markdown-toc"; - rev = "297bb643e222ec2f95a23403723e45eaf4a1dcd2"; - sha256 = "0vk6zrxpinmzmgx74k1kc9kw6slb3j1z0lk4cyhcpxd202dm1bmw"; + rev = "c7a526c0cd2c3b2ecc7b36458c762e0a0b55909e"; + sha256 = "1j35pmm9rk7zk5j6x0fzglx09hbm8csf07f0pc9fkvvyh1nqskxf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc"; @@ -41159,12 +41159,12 @@ maxframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "maxframe"; - version = "20140916.754"; + version = "20161213.1734"; src = fetchFromGitHub { owner = "rmm5t"; repo = "maxframe.el"; - rev = "174e3a0f3a716e904eba15e659096a99976ee39a"; - sha256 = "0g9kpsg6623nmxnshj49q8k952xybrkmqqy6m892m8wnm22pjdz1"; + rev = "50dc78c7b33959c10d5f6da00c338d4611467c36"; + sha256 = "1qz3q63g0zh5xhsxcqm37swcdpliii15cqfbbvm0jjyd9kfysblw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7944652cb7a7bf45f16e86ea379a104d31861e76/recipes/maxframe"; @@ -41492,12 +41492,12 @@ mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "mentor"; - version = "20161211.1946"; + version = "20161212.1342"; src = fetchFromGitHub { owner = "skangas"; repo = "mentor"; - rev = "f53dac51a29f67e31f1fb82702b19d158cc6fa22"; - sha256 = "0qqapsp4gpkrj3faii7qbfssddl3vqfmwqcy259s7f896kzwaaky"; + rev = "c0cf0fcac1a2bbc9887e15bed00dce10fcb6ecab"; + sha256 = "1v2dqwbfwf21az6qpqxd5bskspampp3mdhdzy7vsmfd50gq3jb5l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor"; @@ -42315,12 +42315,12 @@ mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "mocha"; - version = "20160818.1456"; + version = "20161214.839"; src = fetchFromGitHub { owner = "scottaj"; repo = "mocha.el"; - rev = "7a658c112220d759fccb1c16e49f3712d8bb1af7"; - sha256 = "0gwgq5iq7lazy596hsld0yib88r1wv57wb92rjga79vbmg5pi1nq"; + rev = "23831bab8290a90e9253b648176d99385a438568"; + sha256 = "0v8d0605c31x1crjhgr73x5372rhxlrbap29j0j3zlbv0shd39v7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha"; @@ -42645,12 +42645,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20161206.1333"; + version = "20161215.347"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "47afc7419ddd26462ad6e66e122b244c334da0b9"; - sha256 = "1bkfqlfag62mixd933d1ryvnbaq3ny2bgbqbagqbrgprl7558577"; + rev = "241f7a218d7697efe47ac2fc7751717a1c47ef5c"; + sha256 = "1fgadbbvsh78xq3gg203jc7c93b3ypmxsnncx0kpq3rhd96ym730"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -42958,8 +42958,8 @@ src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "fdfe0d73b72682022c76dd7dfe04b0d63d524779"; - sha256 = "108cicmggkzrvrjkja1f0n2gnqfnisiq7wsakgscfpxjsmyszhsg"; + rev = "4767ce2f2b6a63f1f139daea6e98bc7a564d5e4e"; + sha256 = "1azx128zsr7mlg2k538483c3qi1zmm8cc4z8sk06534wnx7wxs88"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc"; @@ -44323,12 +44323,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20161124.739"; + version = "20161214.2346"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "c5e15a42f0a95b8c675c739903ee4aa24ad41b8e"; - sha256 = "1hrh1h1dxwfsylwc03kj6yp5g7a85b53jahkvzyjyzmnnylw3zpw"; + rev = "cfef6036b69d53a83689694f5f257e5aaaeef265"; + sha256 = "0bbhvldxid7g4jg6pp9ywcf0xipbf9y2wqbg3pr7g45sbl3i7zz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -44621,8 +44621,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "05f907787fdc1903af0366d72cf6c30e9835182d"; - sha256 = "1mb9kbd1qdqmfljjqgam3ivd5iap315fmw8hihl6afrnw42281rv"; + rev = "5278bb7c16c227d64551fc6578cb1b1b22f3b036"; + sha256 = "11f3fk1w40ynjzabs9rmzjzbwlkr91bhc5a0wk6m9pmm9lmshl6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -44743,12 +44743,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20161210.929"; + version = "20161212.956"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "403e62a1f434664c9e9477d574f18ced258359fa"; - sha256 = "0p0xz6vj3qv3wx9bwg6syi6alw223zc0l2h95bgcx2pi40da94w0"; + rev = "0421f2c8aba7d369135d9e7e0d181d0da8c08d8c"; + sha256 = "1vk4cz12r0aw1rapf9k2g730ak5q8b5rpylhwsr819ixyr9zpz7a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -44887,11 +44887,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20161117.425"; + version = "20161215.457"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "71f1228a518f08e94dc1ea4e2147f80d3484c615"; - sha256 = "0mc0pmykw0a9yz61jsfpj3gk83hv5d8zhjnvwvjgkwm5akaidf8f"; + rev = "5de84d07526d330a46e50d955bdfeed8f629637d"; + sha256 = "0zz3xg9v8g9vj4lwdx4phwr54ky49bws2amm1cq7yijwzgj2qbjk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -47471,8 +47471,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "93b43e4bb486bc1b1d2e432ac74299e06a8d3526"; - sha256 = "16wmgjsr8wvic8dkfr0qbnwhm0h5zhkqpl79qi3q21wam58f263v"; + rev = "901d2470ddc862b07a2cbf30d3b0e5fed997030b"; + sha256 = "0absbqlgghp3znlq0pkw4261f3liv5hcn8ydfi66ar6rx2awp92w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -47491,8 +47491,8 @@ version = "20161126.239"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "93b43e4bb486bc1b1d2e432ac74299e06a8d3526"; - sha256 = "16wmgjsr8wvic8dkfr0qbnwhm0h5zhkqpl79qi3q21wam58f263v"; + rev = "901d2470ddc862b07a2cbf30d3b0e5fed997030b"; + sha256 = "0absbqlgghp3znlq0pkw4261f3liv5hcn8ydfi66ar6rx2awp92w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -49932,8 +49932,8 @@ src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "01cf9c8a90ddb09e8e6e08c1346419989c8a0e52"; - sha256 = "0jqvhr4infzhcl60q8nagdz4z7rk1c29b0cv5x8bzx8wlnnbwh1b"; + rev = "9e1ce1dfb5e0958d5fbff62ed09357db14082a38"; + sha256 = "1nq99i2piyd06yc0vsxkrfxsnj0yza3i9rdglvfaic9vnpf5riz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -50786,12 +50786,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20161119.505"; + version = "20161214.243"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "2ab3c6b86527811794235309df6055b4a302aa76"; - sha256 = "11nzz7z9ck8g7xam75ljiw0qhk48zhbxzhfw5jzfz3ql04ws7bml"; + rev = "28eaf5e56e18be4bab1639ce2c31b64bd2828746"; + sha256 = "1y4l21f81xc1bz9w0jm7vyab00k402zjlbdgki618sas9bk4rfdk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -51206,12 +51206,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20161205.1642"; + version = "20161213.806"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "f2dc941cef948fd35947c9f0f6fa2e9ad10e174d"; - sha256 = "11vk2di9r6059ymb1j9qvi3gxcyk4fpl7ni7pap9hyhxf3gayknh"; + rev = "cca3fe0fdbabb9f8256fef948972e5d5d823dd69"; + sha256 = "11xdjdlvld9xnvwbaglc57n17v56p8jqd2qb6cqz3i1cvqhpfm8y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -51917,8 +51917,8 @@ version = "20160827.857"; src = fetchgit { url = "git://git.savannah.gnu.org/gettext.git"; - rev = "94737a1be1a1d68f7e032ceac9cc2ed770f36196"; - sha256 = "0f87ghm106c1f8jngcjzxg0fmdp087p4dh2yhdhaln7rd8x4zl6y"; + rev = "89b77b3e3229c3df9c67de17fdef1086422fe6cc"; + sha256 = "1sbdk6ijak2p1wkm9cbgvvml2hx1kc7ny9p0z9zfw9lz9mrwckdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; @@ -52969,12 +52969,12 @@ projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20161122.728"; + version = "20161215.443"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "ab07ade902e0a432aa8396664bcc2c9ec7829958"; - sha256 = "08j07j4j9nz95g571y7fvv5943y6fv8zhk5n694j6vavvh5ip4v8"; + rev = "7717fb86c1959e936f13cf2407f1ffd1c9c18e7f"; + sha256 = "1ycz38bgdgcb57i4l52lqza3ffy9pva8lxicz6adk8vfx2bl85rc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -53351,8 +53351,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "277a8b65805aceeefc1764947616430994e05bdf"; - sha256 = "0ykx4wgi58hgndpn5ifrn6kgmm57gx8h7np1b31mml4n7si2bsfi"; + rev = "83d681ee2caef1feb009656417830f846382d8ba"; + sha256 = "12a94bxkg18mfv9a4pkqzyjiinm1b9wflbk9ib3ialmdadrmjdda"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -53368,12 +53368,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psc-ide"; - version = "20161204.958"; + version = "20161212.1626"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "59766a43a2cdf6f44ba9fa038f9997963f191e1c"; - sha256 = "0aam1vwlidfsqpdnv2s642pzdqngjb4j6lm5ms8fm1q589fc8vys"; + rev = "30ec730fdf887579df7bed9f43b2fc25be2c9307"; + sha256 = "1znprm47539g5jbygqr9ln1m7y37vgx46rhax13fm4cxgsm657vc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; @@ -54085,8 +54085,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "3a94b38b26b5f4191ffe8c67e1db272a2570489c"; - sha256 = "001c068s56qr1vkmli0mxc985drb5vwcln7fzs605kjlvfh0mwjr"; + rev = "ea4273cdff22cb5c0bc5fd8a408cd03b454c43bf"; + sha256 = "18kb7ia9wm9j3iyfhklvb56x0kw1zawa5q80z3vmmfx381v33wj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -54438,12 +54438,12 @@ quelpa-use-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, quelpa, use-package }: melpaBuild { pname = "quelpa-use-package"; - version = "20150805.328"; + version = "20161212.1038"; src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa-use-package"; - rev = "d18b55508ceaeb894f5db3d775f5c1b27e4be81b"; - sha256 = "00wnvyw2daiwwd1jyq1ag5jsws8k8jxs3lsj73dagbvqnlywmkm6"; + rev = "f276555d6bead02a0d869149f03a545d4d4265ad"; + sha256 = "0cmpfjkwx5mpiyssyglfnrfkfg7c4qr01b598z50vc1lyg6198i1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b581e411ef5ea3954acc2cd997c87b3b86777333/recipes/quelpa-use-package"; @@ -55597,8 +55597,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "8cf6e816720cd7a8fe147a6f412d0300be015a76"; - sha256 = "1ic32q9dcrfpn8zb5bmf21iklhrr3va54kmdpy3iyyvkxs8ipcyb"; + rev = "1a1df16146118d3e4cdfa1730eb7616550b2c4a4"; + sha256 = "1qvbi0iwbvkyc1wq5kv5jh1lkvmmq56bh53ww921z3fhsvrgkqmj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -56821,12 +56821,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20161126.1011"; + version = "20161214.1014"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "9063198b8c19995b3d1fce8c441e1244ada0b987"; - sha256 = "03b8ajpx7vjkyn6amgrfx90v4pp3020fhq6qvb4h6s3hqsmgfzmz"; + rev = "66e1d804e53ccbc5bcdcd9d67c77566a08de4b4f"; + sha256 = "1761658vaav6x6b7j2izbprjm3rs3b8jvqkanwjcmhhhfp4ymwxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -56887,7 +56887,7 @@ version = "20161115.2259"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57064"; + rev = "57085"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -56967,7 +56967,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57064"; + rev = "57085"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -58902,8 +58902,8 @@ src = fetchFromGitHub { owner = "alezost"; repo = "shift-number.el"; - rev = "e59840cb7fb142b21e8b1e30b95dc3b4688dca65"; - sha256 = "0dlwcifw5mlski0mbvqqgmpb0jgf5i67x04s8yab1sq9rr07is57"; + rev = "4ea4c2a2ece26e208980e6d2f0939271bca751aa"; + sha256 = "1fqrsr4j2axmxnvznz9zyy8giywnia23i6a8xi1f8lx924xg3cr6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b06be6b25078ddfabc1ef1145c817552f679c41c/recipes/shift-number"; @@ -58944,8 +58944,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "structured-haskell-mode"; - rev = "dde5104ee28e1c63ca9fbc37c969f8e319b4b903"; - sha256 = "0g5qpnxzr9qmgzvsld5mg94rb28xb8kd1a02q045r6zlmv1zx7lp"; + rev = "39b1070cf52b3f134f386b40cc7dfc2d0d30d5b8"; + sha256 = "067s1zwgr5kzxshcnyh96y8jz2j93bqp2fr0a5460fi27pnhyyl0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm"; @@ -59144,12 +59144,12 @@ sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sicp"; - version = "20151130.757"; + version = "20161215.428"; src = fetchFromGitHub { owner = "webframp"; repo = "sicp-info"; - rev = "7d060136bf4582fa74e4aa7cb924d856eea270f4"; - sha256 = "102ssiz4sp7y816s1iy8i98c314jbn3sy0v87b0qgpgjiq913ffq"; + rev = "c1a6af5719fc8872d40bcf8b41e02745eefd9808"; + sha256 = "0vq8mkdh7bk5vbf74dln86a3dmlba2iiaxiim8n553qnpm4ln0ay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/sicp"; @@ -60521,22 +60521,22 @@ license = lib.licenses.free; }; }) {}; - smeargle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + smeargle = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smeargle"; - version = "20151013.2242"; + version = "20161212.1558"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-smeargle"; - rev = "67466d5214a681430db8cb59a2a1bca771ff0024"; - sha256 = "1smv91ggvaw37597ilvhra8cnj4p71n6v5pfazii8k85kvs6x460"; + rev = "0665b1ff5109731898bc4a0ca6d939933b804777"; + sha256 = "0p0kxmjdr02l9injlyyrnnzqdbb7mirz1xx79c3lw1rgpalf0jnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5b985b24a23499454dc61bf071073df325de571/recipes/smeargle"; sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd"; name = "smeargle"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/smeargle"; license = lib.licenses.free; @@ -61723,12 +61723,12 @@ spu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, signal, timp }: melpaBuild { pname = "spu"; - version = "20160515.157"; + version = "20161213.1924"; src = fetchFromGitHub { owner = "mola-T"; repo = "SPU"; - rev = "a7dadda5566f5f8d785e8f9540cfcbbfb58eb47d"; - sha256 = "0ng8q1k5kwqk01h4yzqnqgv2q7hb6qvh7rdhlvncwdh68y6bdgbl"; + rev = "41eec86b595816e3852e8ad1a8e07e51a27fd065"; + sha256 = "1j77h761vf74y9sfjpidgaznail95hsg9akjs55sz1xiyy7hkgyw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2ef1e83c924d5411b47a931432f129db95ff2c/recipes/spu"; @@ -62363,12 +62363,12 @@ string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-inflection"; - version = "20161211.649"; + version = "20161213.1737"; src = fetchFromGitHub { owner = "akicho8"; repo = "string-inflection"; - rev = "0a26739a513f16bc368e0cf86ed7f4352b493fe8"; - sha256 = "12wg1zlw1l850csxi74aqycnsjxzniigd2a8gm6dy5bi2dwb7kjs"; + rev = "af1fb965784eff308d6b4031dc2ef5f6961cd38a"; + sha256 = "017rq1vll53i4xs1l24insjkfvr7nlq6l9g7gjmgnd8g9ck6jqg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection"; @@ -62610,12 +62610,12 @@ sublimity = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sublimity"; - version = "20160822.1856"; + version = "20161214.2032"; src = fetchFromGitHub { owner = "zk-phi"; repo = "sublimity"; - rev = "f692af1ba045146f568ee36009a78b79e9cfe21f"; - sha256 = "035cb27a5i5ixlrqbh4a0srw3z9k054z32dzls851775rz91dks5"; + rev = "02a477004b8807984b5f752fa225f1e7bb6f90ab"; + sha256 = "1dc3kkq931nwa7p26dgrdgqhi110h6ilmch00300gh0m0wx9031d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1e78cd1e5366a9b6d04237e9bf6a7e73424be52/recipes/sublimity"; @@ -63126,12 +63126,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20161208.857"; + version = "20161213.719"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "bb4814a6a6bd52042afd8dcbd99a29fe880aa991"; - sha256 = "07sgqqzkbczcq6ds6jqfmmv2900jhm08wgcg7nm4y657wfjd6rz2"; + rev = "2bc1d7bd8d0f12d5b6b821a0ffa698e6564d865a"; + sha256 = "0z5hdhb6bgqk2qax59xin8vig2kksmrxf6vyk412kbpa17sm71zm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -63435,6 +63435,27 @@ license = lib.licenses.free; }; }) {}; + syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "syntactic-close"; + version = "20161213.735"; + src = fetchFromGitHub { + owner = "emacs-berlin"; + repo = "syntactic-close"; + rev = "e03d1c8d09825377fcb6ae271c60a554f4d7a000"; + sha256 = "0l1ymn6ld15rvpkrz1pyq79c72y4rpc9wz99wfc791r30dqgvj2d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; + sha256 = "19lrzxxyzdj1nrzdgzandjz3b8b4pw7akbv86yf0mdf023d9as1f"; + name = "syntactic-close"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/syntactic-close"; + license = lib.licenses.free; + }; + }) {}; syntactic-sugar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syntactic-sugar"; @@ -63835,12 +63856,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20160915.2124"; + version = "20161213.739"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "85ee42a8e19b913865387d6662d41177fb0803ce"; - sha256 = "1d98rjbgw99ai0dg67xyf1dycqb7pbdj9pwv0d45fflyjnrlrcgq"; + rev = "2e66c3045e46621d4e01959628c398283b423c72"; + sha256 = "0abs0h9xhjv1bnpdv4r3ki4cgwak56v92c8lzcj879rqwskpvssy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -64280,8 +64301,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "3f4794d39aa87163cb96a43fa48635a0a6f16b95"; - sha256 = "1zglja6lmid3hldykn7gs5xnmn080m06c1idpxgbggzjh7bvl246"; + rev = "de94445e6c4bea4a1342bdf5a093f9104f0884b6"; + sha256 = "1q5i30lqfr0ah0rj581mn4qhi3ap45wsdfczggwyydscdaxzv8wi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -64301,8 +64322,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "3f4794d39aa87163cb96a43fa48635a0a6f16b95"; - sha256 = "1zglja6lmid3hldykn7gs5xnmn080m06c1idpxgbggzjh7bvl246"; + rev = "de94445e6c4bea4a1342bdf5a093f9104f0884b6"; + sha256 = "1q5i30lqfr0ah0rj581mn4qhi3ap45wsdfczggwyydscdaxzv8wi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -64752,8 +64773,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "60611917cf309d2a25b9cd8f8b5631784b07323d"; - sha256 = "11y20g86s2n0lhkjw38lvv4kki2kq6ywgy4qm3na9m2sbw2p6khw"; + rev = "0d9b713b173f35ce02552b2f4372899440a99b25"; + sha256 = "0rld7j1j5i3f5y9yarg9liabmf597c8yz9bw3jax0azfi5ls6lvm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -65016,12 +65037,12 @@ tiny-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tiny-menu"; - version = "20160606.1711"; + version = "20161213.435"; src = fetchFromGitHub { owner = "aaronbieber"; repo = "tiny-menu.el"; - rev = "9820cff69d3b605813f609a0db8e6c860bfb9c72"; - sha256 = "1l3cz16lnq5rw57m4j0x29j6nkrcxnz2ppar5xnpwlcaf600wqki"; + rev = "f1fc844f514f57fd93602ff5e00c6125b0e93254"; + sha256 = "125ckmfsvzacd5icsnldcbfl4rkxpfal6qfindy80i84vk0qw47g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82700c97ca40130e7508c151f60220d3f23bf23c/recipes/tiny-menu"; @@ -68144,12 +68165,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20161209.1521"; + version = "20161212.1531"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "5e7e812e0ef025b72dfb9adbcb751695e777873e"; - sha256 = "0c9x0w7hc3h1x1p0m3vzb3gq16vdlsswc3qxxslfxmnykzbqc4hv"; + rev = "dda6c57fa58ef19cfd1be199a791a3e35096b5cf"; + sha256 = "0cdplbyglzfd62j12dmjsxywsx5w22v6x05rvqrvjljm2n9jpz95"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -69790,12 +69811,12 @@ x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x86-lookup"; - version = "20161030.1736"; + version = "20161215.448"; src = fetchFromGitHub { owner = "skeeto"; repo = "x86-lookup"; - rev = "208810ea93214491e6e2329cdbf81de85437939a"; - sha256 = "0whhi05mg7xirzfcz7fzn4hkqq0qbrhqi77myrgdhwgs123cd9bj"; + rev = "544a1ad4e8551c60e58e6c431470b6ef4ce7c5cb"; + sha256 = "1w2fhi5x0amjyzzdndp9lvm6i279pcjjs6zfhssly2lbxw4dpaky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup"; @@ -70588,12 +70609,12 @@ yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yang-mode"; - version = "20161212.213"; + version = "20161213.1247"; src = fetchFromGitHub { owner = "mbj4668"; repo = "yang-mode"; - rev = "f37745cda52d161761fcfe2fed792faa909b6fce"; - sha256 = "1c6l8kbd01mlzkjwri0ma81ldz68fjgn1rb5ibi67r8kcisfzb50"; + rev = "351a17bfd4b78616cf740fc1c7148bc1d85b63a4"; + sha256 = "14hrr4ix77g795b4xhdwwqkgpbbb3axpim1r4yl1bv9jbbkqllx5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; @@ -70794,11 +70815,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20161008.2359"; + version = "20161214.2131"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "564510b9caca"; - sha256 = "1k5q65di0b4mlhmjxi7vfn369lh02vybm0dmb5sir7j3vg8c5347"; + rev = "5428250c886a"; + sha256 = "0q1b0wpdfdghp6hchc59jgkyra5qqqdam47q7g2ni4ym8nlhwd3c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -71033,12 +71054,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20161208.2137"; + version = "20161213.324"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "eb0bafac9d3208daba5a3f744514a463ffd0e131"; - sha256 = "1h4y7lxdcss3c219lr6wd30af32n850w77q6xlys8qrb9l71f1vk"; + rev = "f63e357ee845d95a26f48b1001c9168a0e3fefa1"; + sha256 = "1jhl9bi9qvkrdfvnrcfjims2gf11jlhp0pnxb3l9xxn2ys344lj8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -71095,12 +71116,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20161209.632"; + version = "20161212.1151"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "af231794425255d436690c9c31bceb2052251210"; - sha256 = "1xnhcxf5d0gn8lhapjg7b289bqpf8w0d2mp76ksb8rsvx4r0bdbw"; + rev = "e2e58a4aabb2b8973b318f5ad1013150f8d06678"; + sha256 = "1jnjiypm2zarfws1w5ql1c9d6zgl47cjnr8zq5lk0raxwx968lqc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; From 01d5fda8c1128e84339e380050fedae19c171b18 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 15 Dec 2016 17:54:40 -0500 Subject: [PATCH 1569/1749] melpa-stable-packages: 2016-12-15 Removals: - dummy-h-mode: github account no longer exists - judge-indent: github account no longer exists --- .../emacs-modes/melpa-stable-generated.nix | 180 +++++++++++------- 1 file changed, 111 insertions(+), 69 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 2d33ce39736e..6d3ec36277c7 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -2809,12 +2809,12 @@ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bui"; - version = "1.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "alezost"; repo = "bui.el"; - rev = "c08d91b2d314b52c9ca5c2d5be7a7b2367b68162"; - sha256 = "104q089cyy0m0hkdnvblss884npc4bv5xf03qr35x3s3573lxh4a"; + rev = "70ea295ec04cb34e383dc7d62927452410876999"; + sha256 = "1whpln3zibqxnszvrm9chsaaxxxfb0kg3vvfy6j4drrjy5ah2vky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; @@ -3933,12 +3933,12 @@ clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clues-theme"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "jasonm23"; repo = "emacs-clues-theme"; - rev = "16c05f6dbe7125358f8456110f237d68263e987a"; - sha256 = "1lxd6wgg0d7nwg0rsj5fz0c3wwap567vwd7bfa2xj22z0b6cn49c"; + rev = "abd61f2b7f3e98de58ca26e6d1230e70c6406cc7"; + sha256 = "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf43125306df445ac829c2edb98dd608bc1407de/recipes/clues-theme"; @@ -5698,6 +5698,27 @@ license = lib.licenses.free; }; }) {}; + debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: + melpaBuild { + pname = "debpaste"; + version = "0.1.5"; + src = fetchFromGitHub { + owner = "alezost"; + repo = "debpaste.el"; + rev = "6f2a400665062468ebd03a2ce1de2a73d9084958"; + sha256 = "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/13098bae76a3386689a9bf9c12f25b9a9b15145c/recipes/debpaste"; + sha256 = "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw"; + name = "debpaste"; + }; + packageRequires = [ xml-rpc ]; + meta = { + homepage = "https://melpa.org/#/debpaste"; + license = lib.licenses.free; + }; + }) {}; decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decide"; @@ -6774,35 +6795,14 @@ license = lib.licenses.free; }; }) {}; - dummy-h-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "dummy-h-mode"; - version = "1.0.1"; - src = fetchFromGitHub { - owner = "yascentur"; - repo = "dummy-h-mode-el"; - rev = "27ad0991abb53e65d0402ef6c378075e4be0ed2d"; - sha256 = "033yqc19xxirbva65lz8hnwxj7pn7fx7dlnf70kq71iqclqa4v25"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/dummy-h-mode"; - sha256 = "10lzfzq7md6s28w2zzlhswn3d6765g4vqzyjn2q5ms8pd2i4b4in"; - name = "dummy-h-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/dummy-h-mode"; - license = lib.licenses.free; - }; - }) {}; dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; version = "0.7"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "befb5c650dfd"; - sha256 = "154bm7l1ra3l9lj9l1x21qi7f57k46kg24hyalrbawjw3q8c5np2"; + rev = "20a2166c8210"; + sha256 = "0gz0aiks3f53lqvnrnb33a1clq52ipd3i3miymvkkgspnz3vl12p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -8874,12 +8874,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.1.6"; + version = "19.2"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "2b41d8f318b7e5ec139d42fd2f01a132699be839"; - sha256 = "120dqi8h2fwqfmh9g2nmkf153zlglzw9kkddz57xqvqq5arcs72y"; + rev = "3473ecd83a7bbe7e0bebb865f25dddb93e3bf10f"; + sha256 = "06pr4ydrqpp1skx85zjb1an4kvzv6vacb771vy71k54j7w6lh9hk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -10955,6 +10955,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-objc-clang"; + version = "1.0.2"; + src = fetchFromGitHub { + owner = "GyazSquare"; + repo = "flycheck-objc-clang"; + rev = "3140e4c74dbaa10e6f8edd794144d07399a8fda8"; + sha256 = "0zzb03qxfs5wky40hzmldkzq5gn4c7qknkd5ra2lghzj0az6n9ld"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; + sha256 = "07mzwd04a69d7xpkjmhfmf95j69h6accnf9bb9br7jb1hi9vdalp"; + name = "flycheck-objc-clang"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-objc-clang"; + license = lib.licenses.free; + }; + }) {}; flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }: melpaBuild { pname = "flycheck-ocaml"; @@ -11102,6 +11123,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-swift3"; + version = "1.0.5"; + src = fetchFromGitHub { + owner = "GyazSquare"; + repo = "flycheck-swift3"; + rev = "846b3045d018a13cadb8a8bfde83587802d7e1a2"; + sha256 = "06wzsi3lw938mc8sz06jxyclxpvrlyjgvs9998kpiyhz752sgfsw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; + sha256 = "05yfrn42svcvdkr8mx16ii8llhzn33lxdawksjqiqg671s6fgdpa"; + name = "flycheck-swift3"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-swift3"; + license = lib.licenses.free; + }; + }) {}; flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: melpaBuild { pname = "flycheck-tip"; @@ -18064,27 +18106,6 @@ license = lib.licenses.free; }; }) {}; - judge-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "judge-indent"; - version = "1.1.2"; - src = fetchFromGitHub { - owner = "yascentur"; - repo = "judge-indent-el"; - rev = "4cf8c8d3375f4d655b909a415cc4fa8d235a657a"; - sha256 = "11wybxrl2lny6vbf7qrxyf9wxw88ppvbrlfcd65paalrna2hn46h"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/73fb2c31f6af63145aae7c449bfde1bbb00e1100/recipes/judge-indent"; - sha256 = "1gakdhnlxfq8knnykqdw4bizb5y67m8xhi07zannd7bsfwi4k6rh"; - name = "judge-indent"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/judge-indent"; - license = lib.licenses.free; - }; - }) {}; jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }: melpaBuild { pname = "jump"; @@ -19376,12 +19397,12 @@ magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "magic-filetype"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "zonuexe"; repo = "magic-filetype.el"; - rev = "9a2f069e9b3dfff8e9a5fe3cbd4bc8abe1dc86a0"; - sha256 = "1dzrj4xyrr5d9kisq8khzr2yvrhwff0l676g237sc3v4hg3ch8sr"; + rev = "0dfe3d9e0e22c7b06e34c8338f110e337306e3fd"; + sha256 = "1yjn2w0ykczhlj4q3dnfw2z4q66201dn3jz31yw7hh8bxjlsvwfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6027c5a66386f7140305a4cde12d66da4dfa09/recipes/magic-filetype"; @@ -20726,12 +20747,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "47afc7419ddd26462ad6e66e122b244c334da0b9"; - sha256 = "1bkfqlfag62mixd933d1ryvnbaq3ny2bgbqbagqbrgprl7558577"; + rev = "fc5822fcb11c3c6af67b5fb152f92c3e6e3c49d3"; + sha256 = "0r81jdwfmgzivfpkxqr425qajgw3dzzs8y2v5lsiwl1d5z8rz52a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -28589,22 +28610,22 @@ license = lib.licenses.free; }; }) {}; - smeargle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + smeargle = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smeargle"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-smeargle"; - rev = "fe0494bb859ea51800d6e7ae7d9eda2fe98e0097"; - sha256 = "1pcpg3lalbrc24z3vwcaysps8dbdzmncdgqdd5ig6yk2a9wyj9ng"; + rev = "0665b1ff5109731898bc4a0ca6d939933b804777"; + sha256 = "0p0kxmjdr02l9injlyyrnnzqdbb7mirz1xx79c3lw1rgpalf0jnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5b985b24a23499454dc61bf071073df325de571/recipes/smeargle"; sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd"; name = "smeargle"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/smeargle"; license = lib.licenses.free; @@ -29322,6 +29343,27 @@ license = lib.licenses.free; }; }) {}; + string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "string-inflection"; + version = "1.0.4"; + src = fetchFromGitHub { + owner = "akicho8"; + repo = "string-inflection"; + rev = "af1fb965784eff308d6b4031dc2ef5f6961cd38a"; + sha256 = "017rq1vll53i4xs1l24insjkfvr7nlq6l9g7gjmgnd8g9ck6jqg0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection"; + sha256 = "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2"; + name = "string-inflection"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/string-inflection"; + license = lib.licenses.free; + }; + }) {}; string-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }: melpaBuild { pname = "string-utils"; @@ -32876,12 +32918,12 @@ yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yang-mode"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "mbj4668"; repo = "yang-mode"; - rev = "f37745cda52d161761fcfe2fed792faa909b6fce"; - sha256 = "1c6l8kbd01mlzkjwri0ma81ldz68fjgn1rb5ibi67r8kcisfzb50"; + rev = "351a17bfd4b78616cf740fc1c7148bc1d85b63a4"; + sha256 = "14hrr4ix77g795b4xhdwwqkgpbbb3axpim1r4yl1bv9jbbkqllx5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; @@ -32962,8 +33004,8 @@ version = "1.78"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "564510b9caca"; - sha256 = "1k5q65di0b4mlhmjxi7vfn369lh02vybm0dmb5sir7j3vg8c5347"; + rev = "5428250c886a"; + sha256 = "0q1b0wpdfdghp6hchc59jgkyra5qqqdam47q7g2ni4ym8nlhwd3c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; From 8cd481b5fd687fee21ec8f19375399d12c3da969 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 15 Dec 2016 17:48:14 -0500 Subject: [PATCH 1570/1749] org-packages: 2016-12-15 --- .../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 0b2ec7c2fd86..438abd8afedf 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 = "20161118"; + version = "20161214"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20161118.tar"; - sha256 = "1lk2j93zcaamj2m2720nxsza7j35054kg72w35w9z1bbiqmv2haj"; + url = "http://orgmode.org/elpa/org-20161214.tar"; + sha256 = "1x3wvagx7437xr4lawxr24kivb661997bncq2w9iz3fkg9rrr73m"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20161118"; + version = "20161214"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20161118.tar"; - sha256 = "1la8qw18akqc4p7p0qi675xm3r149vwazzjc2gkik97p12ip83z7"; + url = "http://orgmode.org/elpa/org-plus-contrib-20161214.tar"; + sha256 = "1rc3p1cys15i9vnll946w5hlckmmbgkw22yw98mna9cwqdpc387c"; }; packageRequires = []; meta = { From 2bcdc8c913a685fb39d7ef2c55af1072e1165575 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Fri, 16 Dec 2016 00:31:06 +0100 Subject: [PATCH 1571/1749] pythonPackages.virtualenvwrapper: Fix post install (closes #21168) --- pkgs/top-level/python-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8b4b5d9b53a..6401f931fd73 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26105,11 +26105,12 @@ in { local wrapped="$out/bin/.$file-wrapped" mv "$wrapper" "$wrapped" - cat > "$wrapper" <<- EOF - export PATH="$PATH:\$PATH" - export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)" - source "$wrapped" - EOF + # WARNING: Don't indent the lines below because that would break EOF + cat > "$wrapper" << EOF +export PATH="$PATH:\$PATH" +export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)" +source "$wrapped" +EOF chmod -x "$wrapped" chmod +x "$wrapper" From e0e1bdc25c46abdeec359560b8ec1f7b10521cf3 Mon Sep 17 00:00:00 2001 From: Tom Saeger Date: Thu, 15 Dec 2016 17:41:22 -0600 Subject: [PATCH 1572/1749] Fixup description of ripgrep. --- pkgs/tools/text/ripgrep/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 3c2ef2e9533a..bcf9312e9515 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -16,7 +16,7 @@ buildRustPackage rec { depsSha256 = "10f7pkgaxwizl7kzhkry7wx1rgm9wsybwkk92myc29s7sqir2mx4"; meta = with stdenv.lib; { - description = "An untility that combines the usability of The Silver Searcher with the raw speed of grep"; + description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; homepage = https://github.com/BurntSushi/ripgrep; license = with licenses; [ unlicense ]; maintainers = [ maintainers.tailhook ]; From 1b6e2b9a191fb28ffbb4f99f2aa92ceb109b05f8 Mon Sep 17 00:00:00 2001 From: Paul Liu Date: Fri, 16 Dec 2016 01:30:50 -0800 Subject: [PATCH 1573/1749] Fix netpbm installation for OS X (#21194) * Update meta.platform to linux ++ darwin for netpbm --- pkgs/tools/graphics/netpbm/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 3c724ccc2b83..d0381e912511 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { substituteInPlace "config.mk" \ --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \ --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk + echo "NETPBMLIBTYPE = dylib" >> config.mk + echo "NETPBMLIBSUFFIX = dylib" >> config.mk ''; preBuild = '' @@ -56,6 +60,6 @@ stdenv.mkDerivation rec { homepage = http://netpbm.sourceforge.net/; description = "Toolkit for manipulation of graphic images"; license = "GPL,free"; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } From f3108c5bd2d2a3059d5c5deb6eb0d8dfeb5b96fa Mon Sep 17 00:00:00 2001 From: Luis Pedro Coelho Date: Fri, 16 Dec 2016 11:22:06 +0100 Subject: [PATCH 1574/1749] pythonPackages.natbib: fix for Python 3.5 (#21114) pathlib is part of the standard library starting in version 3.5. --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6401f931fd73..a00259366478 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8254,8 +8254,9 @@ in { pytestflakes pytestpep8 mock - pathlib - ]; + ] + # pathlib was made part of standard library in 3.5: + ++ (optionals (pythonOlder "3.4") [ pathlib ]); meta = { description = "Natural sorting for python"; From be24f1d364cf678150b03c90bca58147d15d6311 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 16 Dec 2016 04:32:28 -0600 Subject: [PATCH 1575/1749] musl: 1.1.11 -> 1.1.15, add security patch. (#21023) --- pkgs/os-specific/linux/musl/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index ae0c7703de61..dd12a18dc82d 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.11"; + version = "1.1.15"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "0grmmah3d9wajii26010plpinv3cbiq3kfqsblgn84kv3fjnv7mv"; + sha256 = "1ymhxkskivzph0q34zadwfglc5gyahqajm7chqqn2zraxv3lgr4p"; }; enableParallelBuilding = true; @@ -22,6 +22,15 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--enable-static" + "--disable-gcc-wrapper" + ]; + + patches = [ + # CVE-2016-8859: http://www.openwall.com/lists/oss-security/2016/10/19/1 + (fetchpatch { + url = "https://git.musl-libc.org/cgit/musl/patch/?id=c3edc06d1e1360f3570db9155d6b318ae0d0f0f7"; + sha256 = "15ih0aj27lz4sgq8r5jndc3qy5gz3ciraavrqpp0vw8h5wjcsb9v"; + }) ]; dontDisableStatic = true; From dec91d3b191d42a83887629b541c3a6d874ca7d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Fri, 16 Dec 2016 11:36:05 +0100 Subject: [PATCH 1576/1749] gem-config: add postgresql buildInput for sequel_pg (#20981) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 26925de8db42..b889ae60d639 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -164,6 +164,10 @@ in ''; } else {}; + sequel_pg = attrs: { + buildInputs = [ postgresql ]; + }; + snappy = attrs: { buildInputs = [ args.snappy ]; }; From 8b9ced01812056887a8ea0af9d6d44752b910ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 16 Dec 2016 12:01:00 +0100 Subject: [PATCH 1577/1749] rocksdb: build also static lib for rocksdb-haskell --- pkgs/development/libraries/rocksdb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 1511f12e88b3..a8f8ab31d1c2 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -37,10 +37,12 @@ stdenv.mkDerivation rec { buildFlags = [ "shared_lib" + "static_lib" ]; installFlags = [ "install-shared" + "install-static" "INSTALL_PATH=\${out}" ]; From a4586f87dcee247bd7ede15b2114782cefd8f2dd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 14 Dec 2016 22:09:35 +0100 Subject: [PATCH 1578/1749] wireguard: 20161129 -> 20161209 --- pkgs/os-specific/linux/wireguard/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 2e2bb82d1331..e1b17f8f9fcd 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -4,13 +4,13 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1"; let - name = "wireguard-experimental-${version}"; + name = "wireguard-${version}"; - version = "0.0.20161129"; + version = "0.0.20161209"; src = fetchurl { - url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-${version}.tar.xz"; - sha256 = "1dyik704aixq38n71alpr4r8dxh7ipy7mgwbbccipsdadbjy7p3v"; + url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; + sha256 = "11n8dq8a8w0qj8xg5np9w02kmk14hn5hphv2h4bjw9hs8yxvkaya"; }; meta = with stdenv.lib; { From 3fc60ec351d660caa43c456b84ef41ce0156d1c9 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 6 Dec 2016 21:53:10 +0100 Subject: [PATCH 1579/1749] remove mutt-kz: deprecated in favor of neomutt Removed reference in all-packages.nix. Fixes #20952. --- .../mailreaders/mutt-kz/default.nix | 64 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 66 deletions(-) delete mode 100644 pkgs/applications/networking/mailreaders/mutt-kz/default.nix diff --git a/pkgs/applications/networking/mailreaders/mutt-kz/default.nix b/pkgs/applications/networking/mailreaders/mutt-kz/default.nix deleted file mode 100644 index 5cd0ef9f7a44..000000000000 --- a/pkgs/applications/networking/mailreaders/mutt-kz/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchurl, ncurses, which, perl, autoreconfHook, autoconf, automake, notmuch -, sslSupport ? true -, imapSupport ? true -, headerCache ? true -, saslSupport ? true -, gpgmeSupport ? true -, gdbm ? null -, openssl ? null -, cyrus_sasl ? null -, gpgme ? null -}: - -assert headerCache -> gdbm != null; -assert sslSupport -> openssl != null; -assert saslSupport -> cyrus_sasl != null; -assert gpgmeSupport -> gpgme != null; - -let - version = "1.5.23.1"; -in -stdenv.mkDerivation rec { - name = "mutt-kz-${version}"; - - src = fetchurl { - url = "https://github.com/karelzak/mutt-kz/archive/v${version}.tar.gz"; - sha256 = "01k4hrf8x2100pcqnrm61mm1x0pqi2kr3rx22k5hwvbs1wh8zyhz"; - }; - - buildInputs = with stdenv.lib; - [ ncurses which perl autoreconfHook autoconf automake notmuch] - ++ optional headerCache gdbm - ++ optional sslSupport openssl - ++ optional saslSupport cyrus_sasl - ++ optional gpgmeSupport gpgme; - -configureFlags = [ - "--with-mailpath=" "--enable-smtp" - - # This allows calls with "-d N", that output debug info into ~/.muttdebug* - "--enable-debug" - - "--enable-pop" "--enable-imap" - - "--enable-notmuch" - - # The next allows building mutt without having anything setgid - # set by the installer, and removing the need for the group 'mail' - # I set the value 'mailbox' because it is a default in the configure script - "--with-homespool=mailbox" - (if headerCache then "--enable-hcache" else "--disable-hcache") - (if sslSupport then "--with-ssl" else "--without-ssl") - (if imapSupport then "--enable-imap" else "--disable-imap") - (if saslSupport then "--with-sasl" else "--without-sasl") - (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme") - ]; - - meta = with stdenv.lib; { - description = "A small but very powerful text-based mail client, forked to support notmuch"; - homepage = https://github.com/karelzak/mutt-kz/; - license = stdenv.lib.licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ magnetophon ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9aa7940aaf4..d33d9b744241 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14025,8 +14025,6 @@ in withSidebar = true; }; - mutt-kz = callPackage ../applications/networking/mailreaders/mutt-kz { }; - neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; notion = callPackage ../applications/window-managers/notion { }; From 52c34f626ca54b8d664dbba925bd5cfc959f9dc7 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 16 Dec 2016 12:19:59 +0100 Subject: [PATCH 1580/1749] liquibase: improve external jar integration (#20818) This replaces the upstream wrapper script with one tailored for nixpkgs. We gain the ability to selectively enable/disable jdbc backends. --- .../tools/database/liquibase/default.nix | 45 +++++++++++++++---- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 5305297a27af..b49719ae0b96 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -1,4 +1,13 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ stdenv, fetchurl, writeText, jre, makeWrapper, fetchMavenArtifact +, mysqlSupport ? true, mysql_jdbc ? null }: + +assert mysqlSupport -> mysql_jdbc != null; + +with stdenv.lib; +let + extraJars = optional mysqlSupport mysql_jdbc; + +in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -16,18 +25,38 @@ stdenv.mkDerivation rec { tar xfz ${src} ''; - installPhase = '' - mkdir -p $out/{bin,lib,sdk} - mv ./* $out/ - wrapProgram $out/liquibase --prefix PATH ":" ${jre}/bin --set LIQUIBASE_HOME $out; - ln -s $out/liquibase $out/bin/liquibase + installPhase = + let addJars = dir: '' + for jar in ${dir}/*.jar; do + CP="\$CP":"\$jar" + done + ''; + in '' + mkdir -p $out/{bin,lib,sdk} + mv ./* $out/ + + # we provide our own script + rm $out/liquibase + + # there’s a lot of escaping, but I’m not sure how to improve that + cat > $out/bin/liquibase < Date: Fri, 16 Dec 2016 12:40:41 +0100 Subject: [PATCH 1581/1749] grsecurity: 4.8.14-201612110933 -> 4.8.15-201612151923 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index b6121fbd1b41..7a6ce4533e9e 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.14"; + version = "4.8.15"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ksszmlgb6cwqx90rn0cavg1n6xvhwn9nragwl7sha11hpbl9qw1"; + sha256 = "1vlgacsdcww333n9vm2pmdfkcpkjhavrh1aalrr7p6vj2c4jc18n"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 5562608effaa..74cf8d156afd 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -95,9 +95,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.14"; - grrev = "201612110933"; - sha256 = "1sm4nr9g5vpwlhm6a567arrjyrfr77bzjspbafg5nfjlbj7apkym"; + { kver = "4.8.15"; + grrev = "201612151923"; + sha256 = "1di4v0b0sn7ibg9vrn8w7d5vjxd2mdlxdmqsnyd6xyn8g00fra89"; }; # This patch relaxes grsec constraints on the location of usermode helpers, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d33d9b744241..af9dfa610f39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11252,7 +11252,6 @@ in inherit (lib) overrideDerivation; kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix { kernelPatches = with self.kernelPatches; [ - kernelPatches.multithreaded_rsapubkey bridge_stp_helper modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") From 38ea64e86793342b1384a71ae07f0088d9cd891f Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 16 Dec 2016 12:42:54 +0100 Subject: [PATCH 1582/1749] qemu_test: Make chown() calls to the store a no-op The "misc" NixOS test is using Nix to query the store and it tries to change the ownership of it while doing so. This fails if Nix is not in a seccomp-sandboxed userid namespace, so let's make chown() a no-op when applied to store paths. Fixes the misc test (and possibly future tests) on older Nix versions. Signed-off-by: aszlig --- .../qemu/force-uid0-on-9p.patch | 53 ++++++++++++++----- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch index 90269961fdf3..9578d595129f 100644 --- a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch +++ b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch @@ -1,8 +1,32 @@ diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c -index 845675e..43fa036 100644 +index 3f271fc..dc273f4 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c -@@ -128,6 +128,8 @@ static int local_lstat(FsContext *fs_ctx, V9fsPath *fs_path, struct stat *stbuf) +@@ -45,6 +45,23 @@ + + #define VIRTFS_META_DIR ".virtfs_metadata" + ++static int is_in_store_path(const char *path) ++{ ++ static char *store_path = NULL; ++ int store_path_len = -1; ++ ++ if (store_path_len == -1) { ++ if ((store_path = getenv("NIX_STORE")) != NULL) ++ store_path_len = strlen(store_path); ++ else ++ store_path_len = 0; ++ } ++ ++ if (store_path_len > 0) ++ return strncmp(path, store_path, strlen(store_path)) == 0; ++ return 0; ++} ++ + static char *local_mapped_attr_path(FsContext *ctx, const char *path) + { + int dirlen; +@@ -128,6 +145,8 @@ static int local_lstat(FsContext *fs_ctx, V9fsPath *fs_path, struct stat *stbuf) if (err) { goto err_out; } @@ -11,24 +35,19 @@ index 845675e..43fa036 100644 if (fs_ctx->export_flags & V9FS_SM_MAPPED) { /* Actual credentials are part of extended attrs */ uid_t tmp_uid; -@@ -462,6 +464,16 @@ static ssize_t local_pwritev(FsContext *ctx, V9fsFidOpenState *fs, +@@ -462,6 +481,11 @@ static ssize_t local_pwritev(FsContext *ctx, V9fsFidOpenState *fs, return ret; } -+static int maybe_chmod(const char *path, mode_t mode) ++static inline int maybe_chmod(const char *path, mode_t mode) +{ -+ static char *store_path = NULL; -+ if (store_path == NULL) -+ store_path = getenv("NIX_STORE"); -+ if (strncmp(path, store_path, strlen(store_path)) != 0) -+ return chmod(path, mode); -+ return 0; ++ return is_in_store_path(path) ? 0 : chmod(path, mode); +} + static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp) { char *buffer; -@@ -477,7 +489,7 @@ static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp) +@@ -477,7 +501,7 @@ static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp) } else if ((fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) || (fs_ctx->export_flags & V9FS_SM_NONE)) { buffer = rpath(fs_ctx, path); @@ -37,7 +56,7 @@ index 845675e..43fa036 100644 g_free(buffer); } return ret; -@@ -621,6 +633,8 @@ static int local_fstat(FsContext *fs_ctx, int fid_type, +@@ -621,6 +645,8 @@ static int local_fstat(FsContext *fs_ctx, int fid_type, if (err) { return err; } @@ -46,3 +65,13 @@ index 845675e..43fa036 100644 if (fs_ctx->export_flags & V9FS_SM_MAPPED) { /* Actual credentials are part of extended attrs */ uid_t tmp_uid; +@@ -916,7 +942,8 @@ static int local_chown(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp) + (fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) || + (fs_ctx->export_flags & V9FS_SM_NONE)) { + buffer = rpath(fs_ctx, path); +- ret = lchown(buffer, credp->fc_uid, credp->fc_gid); ++ ret = is_in_store_path(buffer) ++ ? 0 : lchown(buffer, credp->fc_uid, credp->fc_gid); + g_free(buffer); + } else if (fs_ctx->export_flags & V9FS_SM_MAPPED) { + buffer = rpath(fs_ctx, path); From cb9ff3f7f927db88b51c78995cff302e7b01f3ce Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 16 Dec 2016 08:16:22 -0500 Subject: [PATCH 1583/1749] linux: 4.4.38 -> 4.4.39 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index baf011a1b8e3..6eb6e4663e97 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.38"; + version = "4.4.39"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "19hn51cpyvq3igilm0xw4ivbmdah5ryah6rpkwgqly351djrxvbp"; + sha256 = "188ij72z05sbzrn438r9awpf2pvpv8p2iykfcxs2kxibn23c2jw6"; }; kernelPatches = args.kernelPatches; From 0e8e4a08f35187285105a4a586fe2eec727a552a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 16 Dec 2016 08:16:45 -0500 Subject: [PATCH 1584/1749] linux: 4.8.14 -> 4.8.15 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index b6121fbd1b41..7a6ce4533e9e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.14"; + version = "4.8.15"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ksszmlgb6cwqx90rn0cavg1n6xvhwn9nragwl7sha11hpbl9qw1"; + sha256 = "1vlgacsdcww333n9vm2pmdfkcpkjhavrh1aalrr7p6vj2c4jc18n"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af9dfa610f39..81af1cc29159 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11028,7 +11028,6 @@ in linux_4_8 = callPackage ../os-specific/linux/kernel/linux-4.8.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.multithreaded_rsapubkey # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md # when adding a new linux version # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking From a5a98290b75ce692fd6bbd5d6ba95702d141832c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 16 Dec 2016 08:57:08 -0500 Subject: [PATCH 1585/1749] docker: 1.12.3 -> 1.12.5 --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 921558a2d12e..088dddb3de7e 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -11,13 +11,13 @@ with lib; stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.12.3"; + version = "1.12.5"; src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "0jifd35h22lgh36w1j2k97pgndjh5sppr3cwndlv0saf9618wx5k"; + sha256 = "1hnxmh2j1vm8714f7jwjrslkqkd1ry25g5wq76aqlpsz5fh2kqb0"; }; buildInputs = [ From 664cc49b1929b5f71816663744ee39662a68f92f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 16 Dec 2016 17:26:21 +0300 Subject: [PATCH 1586/1749] gbenchmark: init at 1.1.0 --- .../libraries/gbenchmark/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/gbenchmark/default.nix diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix new file mode 100644 index 000000000000..8f532ae8e0b6 --- /dev/null +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -0,0 +1,25 @@ +{ stdenv, callPackage, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "gbenchmark-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "benchmark"; + rev = "v${version}"; + sha256 = "1y7k73kyxx1jlph23csnhdac76px6ghhwwxbcf0133m4rg0wmpn5"; + }; + + buildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A microbenchmark support library"; + homepage = "https://github.com/google/benchmark"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81af1cc29159..6e782cd3cdde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2043,6 +2043,7 @@ in gtest = callPackage ../development/libraries/gtest {}; gmock = callPackage ../development/libraries/gmock {}; + gbenchmark = callPackage ../development/libraries/gbenchmark {}; gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; From 3d1206dfcc4a5a8927e7bfd83039c4a725abd120 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 16 Dec 2016 15:50:06 +0100 Subject: [PATCH 1587/1749] ragel: add stable version, default to stable --- .../tools/parsing/ragel/default.nix | 64 ++++++++++++------- pkgs/top-level/all-packages.nix | 7 +- 2 files changed, 44 insertions(+), 27 deletions(-) diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index e54d4c540fe2..05546da67f01 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -1,30 +1,46 @@ -{stdenv, fetchurl, transfig, tex , ghostscript, colm, build-manual ? false +{ stdenv, fetchurl, transfig, tex, ghostscript, colm +, build-manual ? false }: -stdenv.mkDerivation rec { - name = "ragel-${version}"; - version = "7.0.0.9"; +let + generic = { version, sha256 }: + stdenv.mkDerivation rec { + name = "ragel-${version}"; - src = fetchurl { - url = "http://www.colm.net/files/ragel/${name}.tar.gz"; + src = fetchurl { + url = "http://www.colm.net/files/ragel/${name}.tar.gz"; + inherit sha256; + }; + + buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ]; + + preConfigure = stdenv.lib.optional build-manual '' + sed -i "s/build_manual=no/build_manual=yes/g" DIST + ''; + + configureFlags = [ "--with-colm=${colm}" ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = http://www.complang.org/ragel; + description = "State machine compiler"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ pSub ]; + }; + }; + +in + +{ + ragelStable = generic { + version = "6.9"; + sha256 = "02k6rwh8cr95f1p5sjjr3wa6dilg06572xz1v71dk8awmc7vw1vf"; + }; + + ragelDev = generic { + version = "7.0.0.9"; sha256 = "1w2jhfg3fxl15gcmm7z3jbi6splgc83mmwcfbp08lfc8sg2wmrmr"; }; - - buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ]; - - preConfigure = stdenv.lib.optional build-manual '' - sed -i "s/build_manual=no/build_manual=yes/g" DIST - ''; - - configureFlags = [ "--with-colm=${colm}" ]; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = http://www.complang.org/ragel; - description = "State machine compiler"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ pSub ]; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e782cd3cdde..6d1dbc3c607c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6438,10 +6438,11 @@ in luaBindings = config.radare.luaBindings or false; }; + ragel = ragelStable; - ragel = callPackage ../development/tools/parsing/ragel { - tex = texlive.combined.scheme-small; - }; + inherit (callPackages ../development/tools/parsing/ragel { + tex = texlive.combined.scheme-small; + }) ragelStable ragelDev; hammer = callPackage ../development/tools/parsing/hammer { }; From 60d29f526d2b18f415803c69f7a8619048cfebb7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 16 Dec 2016 15:51:31 +0100 Subject: [PATCH 1588/1749] rmilter: 1.8.5 -> 1.10.0 --- pkgs/servers/mail/rmilter/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix index 5c41f84c6836..e0e5fd45b7f2 100644 --- a/pkgs/servers/mail/rmilter/default.nix +++ b/pkgs/servers/mail/rmilter/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, bison, flex, openssl, pcre, libmilter, opendkim, - libmemcached }: +{ stdenv, fetchFromGitHub, cmake, bison, flex, pkgconfig, openssl, pcre +, libmilter, opendkim, libmemcached, glib }: let patchedLibmilter = stdenv.lib.overrideDerivation libmilter (_ : { patches = libmilter.patches ++ [ ./fd-passing-libmilter.patch ]; @@ -8,17 +8,17 @@ in stdenv.mkDerivation rec { name = "rmilter-${version}"; - version = "1.8.5"; + version = "1.10.0"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rmilter"; rev = version; - sha256 = "1bfql9v243iw3v87kjgwcx4xxw7g5nv1rsi9gk8p7xg5mzrhi3bn"; + sha256 = "1gbp6jah88l6xqgflim01ycyp63l733bgir65fxnnrmifj1qzymh"; }; - nativeBuildInputs = [ bison cmake flex ]; - buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim]; + nativeBuildInputs = [ bison cmake flex pkgconfig ]; + buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim glib ]; meta = with stdenv.lib; { homepage = "https://github.com/vstakhov/rmilter"; From f97bfcec9991d45a95398c29c038b416f54da9f2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 16 Dec 2016 15:51:59 +0100 Subject: [PATCH 1589/1749] rspamd: 1.2.7 -> 1.4.1 --- pkgs/servers/mail/rspamd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index c978c9566a35..692227b5094c 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, cmake, perl -, file, glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite }: +, file, glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel }: let libmagic = file; # libmagic provided by file package ATM in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.2.7"; + version = "1.4.1"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rspamd"; rev = version; - sha256 = "0wr9lndg5fpsrjknm828zj0zy7zvdqrak9bdr6pga3bnq6xabbik"; + sha256 = "19hy9qr9lv17br2algig95d64zzdyly7n6c3z8fanwcpk35sgrhr"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite]; + buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite ragel ]; postPatch = '' substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local" "/etc/rspamd/rspamd.conf.local" From 1946e872c04079f25e30ed9b3fa9e09f9f9e661c Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Fri, 16 Dec 2016 14:21:07 +0200 Subject: [PATCH 1590/1749] flow: 0.36.0 -> 0.37.1 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 1b59285674c4..d6164ef2e4e0 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.36.0"; + version = "0.37.1"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1371dcn2dy13pm8mb43p61xb2qlyylkiq1hwr0x42lhv1gwdlcnw"; + sha256 = "1n3pc3nfh7bcaard7y2fy7hjq4k6777wp9xv50r3zg4454mgbmsy"; }; installPhase = '' From e5cefadef7995b3eafacaf6f1f9099da0f7ccf79 Mon Sep 17 00:00:00 2001 From: michael bishop Date: Fri, 16 Dec 2016 12:58:40 -0400 Subject: [PATCH 1591/1749] fix indentation in several nixos option descriptions --- nixos/modules/config/gnu.nix | 10 ++++----- nixos/modules/config/i18n.nix | 2 +- nixos/modules/programs/mosh.nix | 16 +++++++------- .../modules/services/networking/wireguard.nix | 21 ++++++++++++------- .../generations-dir/generations-dir.nix | 4 ++-- 5 files changed, 29 insertions(+), 24 deletions(-) diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix index f8c35b440d12..ef48ccb7b4fe 100644 --- a/nixos/modules/config/gnu.nix +++ b/nixos/modules/config/gnu.nix @@ -7,11 +7,11 @@ with lib; gnu = mkOption { type = types.bool; default = false; - description = - '' When enabled, GNU software is chosen by default whenever a there is - a choice between GNU and non-GNU software (e.g., GNU lsh - vs. OpenSSH). - ''; + description = '' + When enabled, GNU software is chosen by default whenever a there is + a choice between GNU and non-GNU software (e.g., GNU lsh + vs. OpenSSH). + ''; }; }; diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index d7fd38ebed9a..799f0793c74f 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -46,7 +46,7 @@ in default = with pkgs.kbdKeymaps; [ dvp neo ]; defaultText = ''with pkgs.kbdKeymaps; [ dvp neo ]''; description = '' - List of additional packages that provide console fonts, keymaps and + List of additional packages that provide console fonts, keymaps and other resources. ''; }; diff --git a/nixos/modules/programs/mosh.nix b/nixos/modules/programs/mosh.nix index b478f8e180fa..1c29eddf01d6 100644 --- a/nixos/modules/programs/mosh.nix +++ b/nixos/modules/programs/mosh.nix @@ -9,14 +9,14 @@ let in { options.programs.mosh = { - enable = mkOption { - description = '' - Whether to enable mosh. Note, this will open ports in your firewall! - ''; - default = false; - example = true; - type = lib.types.bool; - }; + enable = mkOption { + description = '' + Whether to enable mosh. Note, this will open ports in your firewall! + ''; + default = false; + example = true; + type = lib.types.bool; + }; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 52dd5502147e..368d89e2e32e 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -31,18 +31,22 @@ let default = null; example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I="; type = with types; nullOr str; - description = ''base64 preshared key generated by wg genpsk. Optional, - and may be omitted. This option adds an additional layer of - symmetric-key cryptography to be mixed into the already existing - public-key cryptography, for post-quantum resistance.''; + description = '' + base64 preshared key generated by wg genpsk. Optional, + and may be omitted. This option adds an additional layer of + symmetric-key cryptography to be mixed into the already existing + public-key cryptography, for post-quantum resistance. + ''; }; listenPort = mkOption { default = null; type = with types; nullOr int; example = 51820; - description = ''16-bit port for listening. Optional; if not specified, - automatically generated based on interface name.''; + description = '' + 16-bit port for listening. Optional; if not specified, + automatically generated based on interface name. + ''; }; preSetup = mkOption { @@ -51,8 +55,9 @@ let '']; default = []; type = with types; listOf str; - description = ''A list of commands called at the start of the interface - setup.''; + description = '' + A list of commands called at the start of the interface setup. + ''; }; postSetup = mkOption { diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix index 6153578612c1..f8a00784034a 100644 --- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix +++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix @@ -44,10 +44,10 @@ in copyKernels = mkOption { default = false; type = types.bool; - description = " + description = '' Whether copy the necessary boot files into /boot, so /nix/store is not needed by the boot loader. - "; + ''; }; }; From 1eb9fe36962e5b198f8e4bc0c0c4268e1599a382 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Fri, 16 Dec 2016 12:38:44 -0500 Subject: [PATCH 1592/1749] awscli, boto{core,3}: update to 1.11.30, 1.4.87, and 1.4.2, respectively These packages like being updated together which is why I put all three of them into the same commit. --- pkgs/top-level/python-packages.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a00259366478..cccd50422beb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1488,13 +1488,13 @@ in { awscli = buildPythonPackage rec { name = "awscli-${version}"; - version = "1.11.10"; + version = "1.11.30"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/a/awscli/${name}.tar.gz"; - sha256 = "174lfpai5cga1ml2bwswjil6h544m57js9ki7hqkr9gdbpa8pyrk"; + sha256 = "07km02wnjbaf745cs8j6zlwk9c2561l82zvr23a6d3qzs8wwxicf"; }; # No tests included @@ -1508,6 +1508,7 @@ in { colorama_3_3 docutils rsa + pyyaml pkgs.groff pkgs.less ]; @@ -2990,13 +2991,13 @@ in { boto3 = buildPythonPackage rec { name = "boto3-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = pkgs.fetchFromGitHub { owner = "boto"; repo = "boto3"; rev = version; - sha256 = "19ij6cs2n3p5fgipbrq1dybq2sjjvlhg9n5a5sv9wi95x9wqi5wb"; + sha256 = "19hzxqr7ba07b3zg2wsrz6ic3g7pq50rrcp4616flfgny5vw42j3"; }; propagatedBuildInputs = [ self.botocore self.jmespath self.s3transfer ] ++ @@ -3027,12 +3028,12 @@ in { }; botocore = buildPythonPackage rec { - version = "1.4.67"; # This version is required by awscli + version = "1.4.87"; # This version is required by awscli name = "botocore-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/b/botocore/${name}.tar.gz"; - sha256 = "15fh3ng33mcbhm76pk9qqglf342qj471gfcqxv0nrl9f8sn3v60q"; + sha256 = "0fga1zjffsn2h50hbw7s4lcv6zwz5dcjgvjncl5y392mhivlrika"; }; propagatedBuildInputs = From 656cc3acafcb30e3503f4d3e39694ca996c66015 Mon Sep 17 00:00:00 2001 From: michael bishop Date: Fri, 16 Dec 2016 15:19:14 -0400 Subject: [PATCH 1593/1749] fix 2 xml errors in the description of boot.loader.grub.efiInstallAsRemovable --- nixos/modules/system/boot/loader/grub/grub.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 294fc1988e9f..b5bb26fb8d20 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -361,7 +361,7 @@ in example = true; type = types.bool; description = '' - Whether to invoke grub-install with + Whether to invoke grub-install with --removable. Unless you turn this on, GRUB will install itself somewhere in @@ -391,6 +391,7 @@ in You simply dislike the idea of depending on NVRAM state to make your drive bootable + ''; }; From 415c9ff90b4aa9f6452f618e60aa948ab94a93fb Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Sun, 4 Dec 2016 22:02:49 +0100 Subject: [PATCH 1594/1749] nixos/keystone: init at liberty version This commit introduces a nixos module for the Openstack Keystone service. It also provides a optional bootstrap step that creates some basic initial resources (tenants, endpoints,...). The provided test starts Keystone by enabling bootstrapping and checks if user creation works well. This commit is based on initial works made by domenkozar. --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../virtualisation/openstack/keystone.nix | 191 ++++++++++++++++++ nixos/tests/keystone.nix | 53 +++++ 4 files changed, 247 insertions(+) create mode 100644 nixos/modules/virtualisation/openstack/keystone.nix create mode 100644 nixos/tests/keystone.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 2a9a18236e5a..707057711831 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -280,6 +280,7 @@ stanchion = 262; riak-cs = 263; infinoted = 264; + keystone = 265; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -530,6 +531,7 @@ stanchion = 262; riak-cs = 263; infinoted = 264; + keystone = 265; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4032df9fb91a..cd12fe4f9b36 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -631,4 +631,5 @@ ./virtualisation/vmware-guest.nix ./virtualisation/xen-dom0.nix ./virtualisation/xe-guest-utilities.nix + ./virtualisation/openstack/keystone.nix ] diff --git a/nixos/modules/virtualisation/openstack/keystone.nix b/nixos/modules/virtualisation/openstack/keystone.nix new file mode 100644 index 000000000000..30bdb8690462 --- /dev/null +++ b/nixos/modules/virtualisation/openstack/keystone.nix @@ -0,0 +1,191 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.virtualisation.openstack.keystone; + keystoneConf = pkgs.writeText "keystone.conf" '' + [DEFAULT] + admin_token = ${cfg.adminToken} + policy_file=${cfg.package}/etc/policy.json + + [database] + connection = ${cfg.databaseConnection} + + [paste_deploy] + config_file = ${cfg.package}/etc/keystone-paste.ini + + ${cfg.extraConfig} + ''; +in { + options.virtualisation.openstack.keystone = { + package = mkOption { + type = types.package; + example = literalExample "pkgs.keystone"; + description = '' + Keystone package to use. + ''; + }; + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enable Keystone, the OpenStack Identity Service + ''; + }; + + extraConfig = mkOption { + default = ""; + type = types.lines; + description = '' + Additional text appended to keystone.conf, + the main Keystone configuration file. + ''; + }; + + adminToken = mkOption { + type = types.str; + default = "mySuperToken"; + description = '' + This is the admin token used to boostrap keystone, + ie. to provision first resources. + ''; + }; + + bootstrap = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Bootstrap the Keystone service by creating the service + tenant, an admin account and a public endpoint. This options + provides a ready-to-use admin account. This is only done at + the first Keystone execution by the systemd post start. + + Note this option is a helper for setting up development or + testing environments. + ''; + }; + + endpointPublic = mkOption { + type = types.str; + default = "http://localhost:5000/v2.0"; + description = '' + The public identity endpoint. The link + create keystone endpoint provides more informations + about that. + ''; + }; + + adminUsername = mkOption { + type = types.str; + default = "admin"; + description = '' + A keystone admin username. + ''; + }; + + adminPassword = mkOption { + type = types.str; + default = "admin"; + description = '' + The keystone admin user's password. + ''; + }; + + adminTenant = mkOption { + type = types.str; + default = "admin"; + description = '' + A keystone admin tenant name. + ''; + }; + }; + + databaseConnection = mkOption { + type = types.str; + default = mysql://keystone:keystone@localhost/keystone; + description = '' + The SQLAlchemy connection string to use to connect to the + Keystone database. + ''; + }; + }; + + config = mkIf cfg.enable { + # Note: when changing the default, make it conditional on + # ‘system.stateVersion’ to maintain compatibility with existing + # systems! + virtualisation.openstack.keystone.package = mkDefault pkgs.keystone; + + users.extraUsers = [{ + name = "keystone"; + group = "keystone"; + uid = config.ids.uids.keystone; + }]; + users.extraGroups = [{ + name = "keystone"; + gid = config.ids.gids.keystone; + }]; + + systemd.services.keystone-all = { + description = "OpenStack Keystone Daemon"; + packages = [ mysql ]; + after = [ "network.target"]; + path = [ cfg.package pkgs.mysql pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -m 755 -p /var/lib/keystone + # Initialise the database + ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} db_sync + # Set up the keystone's PKI infrastructure + ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} pki_setup --keystone-user keystone --keystone-group keystone + ''; + postStart = optionalString cfg.bootstrap.enable '' + set -eu + # Wait until the keystone is available for use + count=0 + while ! curl --fail -s http://localhost:35357/v2.0 > /dev/null + do + if [ $count -eq 30 ] + then + echo "Tried 30 times, giving up..." + exit 1 + fi + + echo "Keystone not yet started. Waiting for 1 second..." + count=$((count++)) + sleep 1 + done + + # We use the service token to create a first admin user + export OS_SERVICE_ENDPOINT=http://localhost:35357/v2.0 + export OS_SERVICE_TOKEN=${cfg.adminToken} + + # If the tenant service doesn't exist, we consider + # keystone is not initialized + if ! keystone tenant-get service + then + keystone tenant-create --name service + keystone tenant-create --name ${cfg.bootstrap.adminTenant} + keystone user-create --name ${cfg.bootstrap.adminUsername} --tenant ${cfg.bootstrap.adminTenant} --pass ${cfg.bootstrap.adminPassword} + keystone role-create --name admin + keystone role-create --name Member + keystone user-role-add --tenant ${cfg.bootstrap.adminTenant} --user ${cfg.bootstrap.adminUsername} --role admin + keystone service-create --type identity --name keystone + ID=$(keystone service-get keystone | awk '/ id / { print $4 }') + keystone endpoint-create --region RegionOne --service $ID --publicurl ${cfg.bootstrap.endpointPublic} --adminurl http://localhost:35357/v2.0 --internalurl http://localhost:5000/v2.0 + fi + ''; + serviceConfig = { + PermissionsStartOnly = true; # preStart must be run as root + TimeoutStartSec = "600"; # 10min for initial db migrations + User = "keystone"; + Group = "keystone"; + ExecStart = "${cfg.package}/bin/keystone-all --config-file=${keystoneConf}"; + }; + }; + }; +} diff --git a/nixos/tests/keystone.nix b/nixos/tests/keystone.nix new file mode 100644 index 000000000000..15e86db381fb --- /dev/null +++ b/nixos/tests/keystone.nix @@ -0,0 +1,53 @@ +{ system ? builtins.currentSystem }: + +with import ../lib/testing.nix { inherit system; }; +with pkgs.lib; + +let + createKeystoneDb = pkgs.writeText "create-keystone-db.sql" '' + create database keystone; + GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY 'keystone'; + GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY 'keystone'; + ''; + # The admin keystone account + adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=admin OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack"; + # The created demo keystone account + demoOpenstackCmd = "OS_TENANT_NAME=demo OS_USERNAME=demo OS_PASSWORD=demo OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack"; + +in makeTest { + machine = + { config, pkgs, ... }: + { + services.mysql.enable = true; + services.mysql.initialScript = createKeystoneDb; + + virtualisation = { + openstack.keystone.enable = true; + openstack.keystone.bootstrap.enable = true; + + memorySize = 2096; + diskSize = 4 * 1024; + }; + + environment.systemPackages = with pkgs.pythonPackages; with pkgs; [ + openstackclient + ]; + }; + + testScript = + '' + $machine->waitForUnit("keystone-all.service"); + + # Verify that admin ccount is working + $machine->succeed("${adminOpenstackCmd} token issue"); + + # Try to create a new user + $machine->succeed("${adminOpenstackCmd} project create --domain default --description 'Demo Project' demo"); + $machine->succeed("${adminOpenstackCmd} user create --domain default --password demo demo"); + $machine->succeed("${adminOpenstackCmd} role create user"); + $machine->succeed("${adminOpenstackCmd} role add --project demo --user demo user"); + + # Verify this new account is working + $machine->succeed("${demoOpenstackCmd} token issue"); + ''; +} From a932f68d9c2a020e04b49f225310decf39bb34d0 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Sat, 10 Dec 2016 23:14:50 +0100 Subject: [PATCH 1595/1749] nixos/keystone: secrets can be read from files A secret can be stored in a file. It is written at runtime in the configuration file. Note it is also possible to write them in the nix store for dev purposes. --- .../virtualisation/openstack/common.nix | 54 ++++++++++++++++ .../virtualisation/openstack/keystone.nix | 63 ++++++++++++++----- nixos/tests/keystone.nix | 36 +++++++++-- 3 files changed, 131 insertions(+), 22 deletions(-) create mode 100644 nixos/modules/virtualisation/openstack/common.nix diff --git a/nixos/modules/virtualisation/openstack/common.nix b/nixos/modules/virtualisation/openstack/common.nix new file mode 100644 index 000000000000..3fce54a2fa59 --- /dev/null +++ b/nixos/modules/virtualisation/openstack/common.nix @@ -0,0 +1,54 @@ +{ lib }: + +with lib; + +rec { + # A shell script string helper to get the value of a secret at + # runtime. + getSecret = secretOption: + if secretOption.storage == "fromFile" + then ''$(cat ${secretOption.value})'' + else ''${secretOption.value}''; + + + # A shell script string help to replace at runtime in a file the + # pattern of a secret by its value. + replaceSecret = secretOption: filename: '' + sed -i "s/${secretOption.pattern}/${getSecret secretOption}/g" ${filename} + ''; + + # This generates an option that can be used to declare secrets which + # can be stored in the nix store, or not. A pattern is written in + # the nix store to represent the secret. The pattern can + # then be overwritten with the value of the secret at runtime. + mkSecretOption = {name, description ? ""}: + mkOption { + description = description; + type = types.submodule ({ + options = { + pattern = mkOption { + type = types.str; + default = "##${name}##"; + description = "The pattern that represent the secret."; + }; + storage = mkOption { + type = types.enum [ "fromNixStore" "fromFile" ]; + description = '' + Choose the way the password is provisionned. If + fromNixStore is used, the value is the password and it is + written in the nix store. If fromFile is used, the value + is a path from where the password will be read at + runtime. This is generally used with + deployment keys of Nixops. + '';}; + value = mkOption { + type = types.str; + description = '' + If the storage is fromNixStore, the value is the password itself, + otherwise it is a path to the file that contains the password. + ''; + }; + };}); + }; +} diff --git a/nixos/modules/virtualisation/openstack/keystone.nix b/nixos/modules/virtualisation/openstack/keystone.nix index 30bdb8690462..e32c5a4cae1b 100644 --- a/nixos/modules/virtualisation/openstack/keystone.nix +++ b/nixos/modules/virtualisation/openstack/keystone.nix @@ -1,22 +1,25 @@ { config, lib, pkgs, ... }: -with lib; +with lib; with import ./common.nix {inherit lib;}; let cfg = config.virtualisation.openstack.keystone; - keystoneConf = pkgs.writeText "keystone.conf" '' + keystoneConfTpl = pkgs.writeText "keystone.conf" '' [DEFAULT] - admin_token = ${cfg.adminToken} + admin_token = ${cfg.adminToken.pattern} policy_file=${cfg.package}/etc/policy.json [database] - connection = ${cfg.databaseConnection} + + connection = "mysql://${cfg.database.user}:${cfg.database.password.pattern}@${cfg.database.host}/${cfg.database.name}" [paste_deploy] config_file = ${cfg.package}/etc/keystone-paste.ini ${cfg.extraConfig} ''; + keystoneConf = "/var/lib/keystone/keystone.conf"; + in { options.virtualisation.openstack.keystone = { package = mkOption { @@ -44,9 +47,8 @@ in { ''; }; - adminToken = mkOption { - type = types.str; - default = "mySuperToken"; + adminToken = mkSecretOption { + name = "adminToken"; description = '' This is the admin token used to boostrap keystone, ie. to provision first resources. @@ -87,9 +89,8 @@ in { ''; }; - adminPassword = mkOption { - type = types.str; - default = "admin"; + adminPassword = mkSecretOption { + name = "keystoneAdminPassword"; description = '' The keystone admin user's password. ''; @@ -104,13 +105,34 @@ in { }; }; - databaseConnection = mkOption { + database = { + host = mkOption { type = types.str; - default = mysql://keystone:keystone@localhost/keystone; + default = "localhost"; description = '' - The SQLAlchemy connection string to use to connect to the - Keystone database. + Host of the database. ''; + }; + + name = mkOption { + type = types.str; + default = "keystone"; + description = '' + Name of the existing database. + ''; + }; + + user = mkOption { + type = types.str; + default = "keystone"; + description = '' + The database user. The user must exist and has access to + the specified database. + ''; + }; + password = mkSecretOption { + name = "mysqlPassword"; + description = "The database user's password";}; }; }; @@ -132,12 +154,19 @@ in { systemd.services.keystone-all = { description = "OpenStack Keystone Daemon"; - packages = [ mysql ]; after = [ "network.target"]; path = [ cfg.package pkgs.mysql pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ]; wantedBy = [ "multi-user.target" ]; preStart = '' mkdir -m 755 -p /var/lib/keystone + + cp ${keystoneConfTpl} ${keystoneConf}; + chown keystone:keystone ${keystoneConf}; + chmod 640 ${keystoneConf} + + ${replaceSecret cfg.database.password keystoneConf} + ${replaceSecret cfg.adminToken keystoneConf} + # Initialise the database ${cfg.package}/bin/keystone-manage --config-file=${keystoneConf} db_sync # Set up the keystone's PKI infrastructure @@ -162,7 +191,7 @@ in { # We use the service token to create a first admin user export OS_SERVICE_ENDPOINT=http://localhost:35357/v2.0 - export OS_SERVICE_TOKEN=${cfg.adminToken} + export OS_SERVICE_TOKEN=${getSecret cfg.adminToken} # If the tenant service doesn't exist, we consider # keystone is not initialized @@ -170,7 +199,7 @@ in { then keystone tenant-create --name service keystone tenant-create --name ${cfg.bootstrap.adminTenant} - keystone user-create --name ${cfg.bootstrap.adminUsername} --tenant ${cfg.bootstrap.adminTenant} --pass ${cfg.bootstrap.adminPassword} + keystone user-create --name ${cfg.bootstrap.adminUsername} --tenant ${cfg.bootstrap.adminTenant} --pass ${getSecret cfg.bootstrap.adminPassword} keystone role-create --name admin keystone role-create --name Member keystone user-role-add --tenant ${cfg.bootstrap.adminTenant} --user ${cfg.bootstrap.adminUsername} --role admin diff --git a/nixos/tests/keystone.nix b/nixos/tests/keystone.nix index 15e86db381fb..872d6c0784bf 100644 --- a/nixos/tests/keystone.nix +++ b/nixos/tests/keystone.nix @@ -4,13 +4,17 @@ with import ../lib/testing.nix { inherit system; }; with pkgs.lib; let + keystoneMysqlPassword = "keystoneMysqlPassword"; + keystoneMysqlPasswordFile = "/var/run/keystoneMysqlPassword"; + keystoneAdminPassword = "keystoneAdminPassword"; + createKeystoneDb = pkgs.writeText "create-keystone-db.sql" '' create database keystone; - GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY 'keystone'; - GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY 'keystone'; + GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY '${keystoneMysqlPassword}'; + GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY '${keystoneMysqlPassword}'; ''; # The admin keystone account - adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=admin OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack"; + adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=${keystoneAdminPassword} OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack"; # The created demo keystone account demoOpenstackCmd = "OS_TENANT_NAME=demo OS_USERNAME=demo OS_PASSWORD=demo OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack"; @@ -18,12 +22,34 @@ in makeTest { machine = { config, pkgs, ... }: { + # This is to simulate nixops deployment process. + # https://nixos.org/nixops/manual/#opt-deployment.keys + boot.postBootCommands = "echo ${keystoneMysqlPassword} > ${keystoneMysqlPasswordFile}"; + services.mysql.enable = true; services.mysql.initialScript = createKeystoneDb; virtualisation = { - openstack.keystone.enable = true; - openstack.keystone.bootstrap.enable = true; + + openstack.keystone = { + enable = true; + # Check if we can get the secret from a file + database.password = { + value = keystoneMysqlPasswordFile; + storage = "fromFile"; + }; + adminToken = { + value = "adminToken"; + storage = "fromNixStore"; + }; + + bootstrap.enable = true; + # Check if we can get the secret from the store + bootstrap.adminPassword = { + value = keystoneAdminPassword; + storage = "fromNixStore"; + }; + }; memorySize = 2096; diskSize = 4 * 1024; From 086e5d09a1f364b427ed27817c44dd563180eb28 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Thu, 15 Dec 2016 13:24:03 +0100 Subject: [PATCH 1596/1749] nixos/keystone: add test in release.nix --- nixos/release.nix | 1 + nixos/tests/keystone.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/nixos/release.nix b/nixos/release.nix index 683e09f431f1..366eecf773e2 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -258,6 +258,7 @@ in rec { tests.kde5 = callTest tests/kde5.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {}; + tests.keystone = callTest tests/keystone.nix {}; tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; }); tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; }; #tests.lightdm = callTest tests/lightdm.nix {}; diff --git a/nixos/tests/keystone.nix b/nixos/tests/keystone.nix index 872d6c0784bf..358e352f776f 100644 --- a/nixos/tests/keystone.nix +++ b/nixos/tests/keystone.nix @@ -19,6 +19,9 @@ let demoOpenstackCmd = "OS_TENANT_NAME=demo OS_USERNAME=demo OS_PASSWORD=demo OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack"; in makeTest { + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lewo ]; + }; machine = { config, pkgs, ... }: { From d0250ad884bf66f635f23fe38dc114bb6e822d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 16 Dec 2016 21:18:20 +0100 Subject: [PATCH 1597/1749] Haskell generic builder: enable parallel builds for GHC 8.0.2 This reverts https://github.com/NixOS/nixpkgs/pull/4554 --- pkgs/development/haskell-modules/generic-builder.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 6c75c1f35507..f91bd474c6fd 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -114,6 +114,7 @@ let (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla")) (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic")) (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests")) + (optionalString (versionOlder "8.0.1" ghc.version) "--ghc-option=-j$NIX_BUILD_CORES") ] ++ optionals isGhcjs [ "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" "--ghcjs" From 06fbf5cb77bf577ad837042b0106de0a57b5107f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Lehel?= Date: Fri, 16 Dec 2016 22:34:37 +0100 Subject: [PATCH 1598/1749] vivaldi: 1.5.658.44-1 -> 1.6.689.34-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 2eb91b06ac3f..24aa94b04739 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -10,16 +10,16 @@ }: let - version = "1.5"; - build = "658.44-1"; + version = "1.6"; + build = "689.34-1"; fullVersion = "stable_${version}.${build}"; info = if stdenv.is64bit then { arch = "amd64"; - sha256 = "02zb9pw8h7gm0hlhk95bn8fz14x68ax2jz8g7bgzppyryq8xlg6l"; + sha256 = "0wn98nzlhppmm3g797kiqr9bxxff8l7l110f1w1fnfl93d325hrm"; } else { arch = "i386"; - sha256 = "1cwpmdsv4rrr13d1x017rms7cjp5zh3vpz3b44ar49ip6zj6j0a8"; + sha256 = "0agybibfwk5n1gxi8g4rbvvmlq5963df5arz4fyi4a1hcayllaz0"; }; in stdenv.mkDerivation rec { From ebe67d69d021e8970c717ac05195c07bae33b270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 16 Dec 2016 22:28:58 +0100 Subject: [PATCH 1599/1749] collectd service: change /var/lib/collectd perms: 700 -> 755 The collectd service runs as an unprivileged user by default, so it does not leak more information to its data directory than any user can obtain elsewhere by other means. If people are running it as root and are worried about information leak, we can add collectd group and set perms to 750. CC @offlinehacker. Fixes #21198. --- nixos/modules/services/monitoring/collectd.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index 01c6fb817669..641da60e9adc 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -108,7 +108,8 @@ in { }; preStart = '' - mkdir -m 0700 -p ${cfg.dataDir} + mkdir -p ${cfg.dataDir} + chmod 755 ${cfg.dataDir} install -D /dev/null ${cfg.pidFile} if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user} ${cfg.dataDir}; From 8f3e3d2576427b12fc632f1bdcf8548a3d3306c7 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Thu, 15 Dec 2016 20:01:01 +0100 Subject: [PATCH 1600/1749] ior: init at 3.0.1 --- pkgs/tools/system/ior/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/system/ior/default.nix diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix new file mode 100644 index 000000000000..6b294931851d --- /dev/null +++ b/pkgs/tools/system/ior/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, openmpi, automake, autoconf, perl }: + +let + version = "3.0.1"; + sha256 = "039rh4z3lsj4vqjsqgakk0b7dkrdrkkzj0p1cjikpc9gn36zpghc"; +in + +stdenv.mkDerivation rec { + name = "ior-${version}"; + + src = fetchurl { + url = "https://github.com/LLNL/ior/archive/${version}.tar.gz"; + inherit sha256; + }; + + buildInputs = [ openmpi automake autoconf perl ]; + + enableParallelBuilding = true; + + preConfigure = "./bootstrap"; + + meta = with stdenv.lib; { + homepage = "http://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/"; + description = "Parallel file system I/O performance test"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ bzizou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c293e77aa1e..ee37ddb17c8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2246,6 +2246,8 @@ in ioping = callPackage ../tools/system/ioping { }; iops = callPackage ../tools/system/iops { }; + + ior = callPackage ../tools/system/ior { }; iodine = callPackage ../tools/networking/iodine { }; From 3d94be77ddf56b43cfd897437c73ff888d891de4 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 16 Dec 2016 23:33:23 +0100 Subject: [PATCH 1601/1749] openshift: 1.3.1 -> 1.3.2 --- .../networking/cluster/openshift/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index e4307c9aabc6..403457bb4a61 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,9 +1,11 @@ { stdenv, fetchFromGitHub, go, which }: let - version = "1.3.1"; - versionMajor = "1"; - versionMinor = "3"; + version = "1.3.2"; + ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); + versionMajor = ver 0; + versionMinor = ver 1; + versionPatch = ver 2; in stdenv.mkDerivation rec { name = "openshift-origin-${version}"; @@ -13,7 +15,7 @@ stdenv.mkDerivation rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "1kxa1k38hvi1vg52p82mmkmp9k4bbbm2pryzapsxwga7d8x4bnbh"; + sha256 = "0zw8zb9c6icigcq6y47ppnjnqyghk2kril07bapbddvgnvbbfp6m"; }; buildInputs = [ go which ]; @@ -43,7 +45,7 @@ stdenv.mkDerivation rec { description = "Build, deploy, and manage your applications with Docker and Kubernetes"; license = licenses.asl20; homepage = http://www.openshift.org; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [offline bachp]; platforms = platforms.linux; }; } From 993cbf8acb9da679bb8bca00eacada6d83ed6994 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 16 Dec 2016 20:40:17 +0100 Subject: [PATCH 1602/1749] uxrvtd: Fix clipboard --- nixos/modules/services/x11/urxvtd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix index ab47f4547aea..be36efaa5897 100644 --- a/nixos/modules/services/x11/urxvtd.nix +++ b/nixos/modules/services/x11/urxvtd.nix @@ -32,6 +32,7 @@ in { services.urxvtd = { description = "urxvt terminal daemon"; + path = [ pkgs.xsel ]; serviceConfig = { ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd -o"; Environment = "RXVT_SOCKET=%t/urxvtd-socket"; From 1590461887333e2fda46f4bd74aef3785b253089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 14 Dec 2016 23:49:14 +0100 Subject: [PATCH 1603/1749] ntp: make timesyncd the new default - most nixos user only require time synchronisation, while ntpd implements a battery-included ntp server (1,215 LOCs of C-Code vs 64,302) - timesyncd support ntp server per interface (if configured through dhcp for instance) - timesyncd is already included in the systemd package, switching to it would save a little disk space (1,5M) --- nixos/modules/config/networking.nix | 12 ++++++++++ nixos/modules/services/networking/chrony.nix | 4 ++-- nixos/modules/services/networking/ntpd.nix | 10 +++----- .../modules/services/networking/openntpd.nix | 2 +- nixos/modules/system/boot/networkd.nix | 3 --- nixos/modules/system/boot/timesyncd.nix | 23 +++++++++++-------- .../virtualisation/google-compute-image.nix | 2 +- .../virtualisation/parallels-guest.nix | 2 +- nixos/modules/virtualisation/qemu-vm.nix | 2 +- nixos/modules/virtualisation/xen-domU.nix | 2 +- 10 files changed, 36 insertions(+), 26 deletions(-) diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index fdc782b0579e..adc05f602314 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -84,6 +84,18 @@ in ''; }; + networking.timeServers = mkOption { + default = [ + "0.nixos.pool.ntp.org" + "1.nixos.pool.ntp.org" + "2.nixos.pool.ntp.org" + "3.nixos.pool.ntp.org" + ]; + description = '' + The set of NTP servers from which to synchronise. + ''; + }; + networking.proxy = { default = lib.mkOption { diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix index d40865ebbd5b..f2ff11633b1b 100644 --- a/nixos/modules/services/networking/chrony.nix +++ b/nixos/modules/services/networking/chrony.nix @@ -31,7 +31,7 @@ in }; servers = mkOption { - default = config.services.ntp.servers; + default = config.networking.timeServers; description = '' The set of NTP servers from which to synchronise. ''; @@ -102,7 +102,7 @@ in home = stateDir; }; - systemd.services.ntpd.enable = mkForce false; + systemd.services.timesyncd.enable = mkForce false; systemd.services.chronyd = { description = "chrony NTP daemon"; diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix index c8a085679280..88e6dbf22b9e 100644 --- a/nixos/modules/services/networking/ntpd.nix +++ b/nixos/modules/services/networking/ntpd.nix @@ -34,7 +34,7 @@ in services.ntp = { enable = mkOption { - default = !config.boot.isContainer; + default = false; description = '' Whether to synchronise your machine's time using the NTP protocol. @@ -42,12 +42,7 @@ in }; servers = mkOption { - default = [ - "0.nixos.pool.ntp.org" - "1.nixos.pool.ntp.org" - "2.nixos.pool.ntp.org" - "3.nixos.pool.ntp.org" - ]; + default = config.networking.timeServers; description = '' The set of NTP servers from which to synchronise. ''; @@ -70,6 +65,7 @@ in # Make tools such as ntpq available in the system path. environment.systemPackages = [ pkgs.ntp ]; + services.timesyncd.enable = mkForce false; users.extraUsers = singleton { name = ntpUser; diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix index a8625fa2fa91..13a1b5258ce0 100644 --- a/nixos/modules/services/networking/openntpd.nix +++ b/nixos/modules/services/networking/openntpd.nix @@ -49,7 +49,7 @@ in ###### implementation config = mkIf cfg.enable { - services.ntp.enable = mkForce false; + services.timesyncd.enable = mkForce false; # Add ntpctl to the environment for status checking environment.systemPackages = [ package ]; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 8c139a94c0c8..e5ec70d8690b 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -687,8 +687,5 @@ in }; services.resolved.enable = mkDefault true; - services.timesyncd.enable = mkDefault config.services.ntp.enable; - }; - } diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index cba965b1cd2b..f643723ab141 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -6,14 +6,21 @@ with lib; options = { - services.timesyncd.enable = mkOption { - default = false; - type = types.bool; - description = '' - Enables the systemd NTP client daemon. - ''; + services.timesyncd = { + enable = mkOption { + default = !config.boot.isContainer; + type = types.bool; + description = '' + Enables the systemd NTP client daemon. + ''; + }; + servers = mkOption { + default = config.networking.timeServers; + description = '' + The set of NTP servers from which to synchronise. + ''; + }; }; - }; config = mkIf config.services.timesyncd.enable { @@ -30,8 +37,6 @@ with lib; NTP=${concatStringsSep " " config.services.ntp.servers} ''; - systemd.services.ntpd.enable = false; - users.extraUsers.systemd-timesync.uid = config.ids.uids.systemd-timesync; users.extraGroups.systemd-timesync.gid = config.ids.gids.systemd-timesync; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 90dbd3b6d632..0e6825c3f5da 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -125,7 +125,7 @@ in 169.254.169.254 metadata.google.internal metadata ''; - services.ntp.servers = [ "metadata.google.internal" ]; + networking.timeServers = [ "metadata.google.internal" ]; networking.usePredictableInterfaceNames = false; diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix index 204ab0b0df67..bd85973ee561 100644 --- a/nixos/modules/virtualisation/parallels-guest.nix +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -57,7 +57,7 @@ in boot.kernelModules = [ "prl_tg" "prl_eth" "prl_fs" "prl_fs_freeze" "acpi_memhotplug" ]; - services.ntp.enable = false; + services.timesyncd.enable = false; systemd.services.prltoolsd = { description = "Parallels Tools' service"; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 263bbf785833..05fe13ba7c71 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -478,7 +478,7 @@ in boot.initrd.luks.devices = mkVMOverride {}; # Don't run ntpd in the guest. It should get the correct time from KVM. - services.ntp.enable = false; + services.timesyncd.enable = false; system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; } '' diff --git a/nixos/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix index 2db3190ad139..8dd0d1dbfd2c 100644 --- a/nixos/modules/virtualisation/xen-domU.nix +++ b/nixos/modules/virtualisation/xen-domU.nix @@ -18,5 +18,5 @@ services.syslogd.tty = "hvc0"; # Don't run ntpd, since we should get the correct time from Dom0. - services.ntp.enable = false; + services.timesyncd.enable = false; } From 9cc0eff1cf218f737f9ce5a05f099f734a2f7bcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Lehel?= Date: Sat, 17 Dec 2016 00:04:20 +0100 Subject: [PATCH 1604/1749] vivaldi: add libxcb to buildInputs, seems to be required now --- pkgs/applications/networking/browsers/vivaldi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 24aa94b04739..0531a58f0a23 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = - [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE + [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr From cda47275f4c40064907ca08c9d7beabd496859b5 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 17 Dec 2016 00:13:47 +0100 Subject: [PATCH 1605/1749] rustRegistry: 2016-12-03 -> 2016-12-16 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index ef6dee3e3f7d..29fbac38bd0e 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-12-03"; - rev = "94e482dd6667aa239e5b3b8590fc9bfa0c1fd376"; - sha256 = "0k300vhc0m8a0165pikl6rvyz0w20dnlacpb9b4jjl7gfixynlmz"; + version = "2016-12-16"; + rev = "1da5a7d0cd31d72324481760067bde5cf2e07be5"; + sha256 = "0kbh3aq738sqns8w6yfia17fwrk98g6m763wqsqwhnrg2ndqrp8d"; src = fetchFromGitHub { inherit rev; From 2077a60c2f179afa7d608adac4a9248cff86a80f Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 17 Dec 2016 00:16:40 +0100 Subject: [PATCH 1606/1749] ripgrep: 0.2.1 -> 0.3.2 --- pkgs/tools/text/ripgrep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 3c2ef2e9533a..3890044d3b11 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ripgrep-${version}"; - version = "0.2.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = "${version}"; - sha256 = "0whw6hqjkf6sysrfv931jaia2hqhy8m9aa5rxax1kygm4snz4j85"; + sha256 = "15j68bkkxpbh9c05f8l7j0y33da01y28kpg781lc0234h45535f3"; }; - depsSha256 = "10f7pkgaxwizl7kzhkry7wx1rgm9wsybwkk92myc29s7sqir2mx4"; + depsSha256 = "142h6pcf2mr4i7dg7di4299c18aqn0yvk9nr1mxnkb7wjcmrvcfg"; meta = with stdenv.lib; { description = "An untility that combines the usability of The Silver Searcher with the raw speed of grep"; From 54f460a585036832ba165b9a77f121effc086692 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Fri, 16 Dec 2016 22:42:11 -0500 Subject: [PATCH 1607/1749] cpp-ethereum: fix description metadata --- pkgs/applications/misc/cpp-ethereum/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index 3cc334c6765b..150c900ba9fb 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - decription = "Ethereum C++ client"; + description = "Ethereum C++ client"; homepage = https://github.com/ethereum/cpp-ethereum; license = licenses.gpl3; maintainers = with maintainers; [ artuuge ]; From 3af715af900298476bea9f487429b1941130d0ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 17 Dec 2016 11:40:34 +0100 Subject: [PATCH 1608/1749] Revert "fix 2 xml errors in the description of boot.loader.grub.efiInstallAsRemovable" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 656cc3acafcb30e3503f4d3e39694ca996c66015 because it causes building the manual to fail: $ nixos-rebuild build ... building path(s) ‘/nix/store/s9y5z78z5pssvmixcmv9ix13gs8xj87f-manual-olinkdb’ Writing /nix/store/s9y5z78z5pssvmixcmv9ix13gs8xj87f-manual-olinkdb/manual.db for book(book-nixos-manual) ./man-pages.xml:625: element para: Relax-NG validity error : Did not expect element para there ./man-pages.xml:3: element variablelist: Relax-NG validity error : Element refsection has extra content: variablelist ./man-pages.xml:29: element refsection: Relax-NG validity error : Element refentry has extra content: refsection ./man-pages.xml:3: element reference: Relax-NG validity error : Element reference failed to validate content ./man-pages.xml fails to validate CC @cleverca22, @Mic92 --- nixos/modules/system/boot/loader/grub/grub.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index b5bb26fb8d20..294fc1988e9f 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -361,7 +361,7 @@ in example = true; type = types.bool; description = '' - Whether to invoke grub-install with + Whether to invoke grub-install with --removable. Unless you turn this on, GRUB will install itself somewhere in @@ -391,7 +391,6 @@ in You simply dislike the idea of depending on NVRAM state to make your drive bootable - ''; }; From 32becd8ddff3686377cd128278e5e796aa47687e Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 17 Dec 2016 12:40:14 +0100 Subject: [PATCH 1609/1749] poppler: 0.49.0 -> 0.50.0 --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index edcbc18fa130..d3a51acd33aa 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -8,8 +8,8 @@ }: let # beware: updates often break cups-filters build - version = "0.49.0"; - sha256 = "17x7nc6c0bk4s95nzq4i1qzbl419p76c40pwkksdvp233q75yj0l"; + version = "0.50.0"; + sha256 = "0dmwnh59m75vhii6dw63x8l0qa0ha733pb8bdqzr7lw9nwc37jf9"; in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; From 280d0cf20f4089df930fbcf037a9c85f5c89e303 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 17 Dec 2016 12:59:56 +0100 Subject: [PATCH 1610/1749] wireshark: 2.2.2 -> 2.2.3 --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index e2806b3d342f..637f2cdca9cb 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt4 != null; with stdenv.lib; let - version = "2.2.2"; + version = "2.2.3"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2"; - sha256 = "1csm035ayfzn1xzzsmzcjk2ixx39d70aykr4nh0a88chk9gfzb7r"; + sha256 = "0fsrvl6sp772g2q2j24h10h9lfda6q67x7wahjjm8849i2gciflp"; }; buildInputs = [ From 0063c8acb4a5de8d90c0cbadf54ce337bd921e76 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Dec 2016 15:04:59 +0300 Subject: [PATCH 1611/1749] p7zip: add setup hook --- pkgs/tools/archivers/p7zip/default.nix | 2 ++ pkgs/tools/archivers/p7zip/setup-hook.sh | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 pkgs/tools/archivers/p7zip/setup-hook.sh diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 1af3f53ade91..2b61b5b2679f 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + setupHook = ./setup-hook.sh; + meta = { homepage = http://p7zip.sourceforge.net/; description = "A port of the 7-zip archiver"; diff --git a/pkgs/tools/archivers/p7zip/setup-hook.sh b/pkgs/tools/archivers/p7zip/setup-hook.sh new file mode 100644 index 000000000000..4dc88f07c0bd --- /dev/null +++ b/pkgs/tools/archivers/p7zip/setup-hook.sh @@ -0,0 +1,5 @@ +unpackCmdHooks+=(_try7zip) +_try7zip() { + if ! [[ "$curSrc" =~ \.7z$ ]]; then return 1; fi + 7z x "$curSrc" +} From 60903f7320cdfc517a23ce80a0c21a31d4a2eee9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Dec 2016 15:04:44 +0300 Subject: [PATCH 1612/1749] gzdoom: 2015-05-07 -> 2.2.0 --- pkgs/games/gzdoom/default.nix | 53 +++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 332c2fbeff14..9e6cc48b435c 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,34 +1,51 @@ -{stdenv, fetchFromGitHub, cmake, fmod, mesa, SDL2}: +{ stdenv, fetchFromGitHub, cmake, zdoom +, openal, fluidsynth, soundfont-fluid, mesa_noglu, SDL2 +, bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }: -stdenv.mkDerivation { - name = "gzdoom-2015-05-07"; - src = fetchFromGitHub{ +stdenv.mkDerivation rec { + name = "gzdoom-${version}"; + version = "2.2.0"; + + src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; - rev = "a59824cd8897dea5dd452c31be1328415478f990"; - sha256 = "1lg9dk5prn2bjmyznq941a862alljvfgbb42whbpg0vw9vhpikak"; + rev = "g${version}"; + sha256 = "0xxgd8fa29pcdir1xah5cvx41bfy76p4dydpp13mf44p9pr29hrb"; }; - buildInputs = [ cmake fmod mesa SDL2 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ + SDL2 mesa_noglu openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123 + game-music-emu + ]; - cmakeFlags = [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]; + enableParallelBuilding = true; - preConfigure='' - sed s@gzdoom.pk3@$out/share/gzdoom.pk3@ -i src/version.h + NIX_CFLAGS_LINK = [ "-lopenal" "-lfluidsynth" ]; + + preConfigure = '' + sed -i \ + -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \ + -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \ + src/sound/music_fluidsynth_mididevice.cpp ''; installPhase = '' - mkdir -p $out/bin - cp gzdoom $out/bin - mkdir -p $out/share - cp gzdoom.pk3 $out/share + install -Dm755 gzdoom "$out/lib/gzdoom/gzdoom" + for i in *.pk3; do + install -Dm644 "$i" "$out/lib/gzdoom/$i" + done + mkdir $out/bin + ln -s $out/lib/gzdoom/gzdoom $out/bin/gzdoom ''; - meta = { - homepage = https://github.com/coelckers/gzdoom; + meta = with stdenv.lib; { + homepage = "https://github.com/coelckers/gzdoom"; description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.lassulus ]; + # Doom source license, MAME license + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = with maintainers; [ lassulus ]; }; } From 1cc9d9ef2ce80dee5c8f2ef9f8ae20ae76337d73 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Dec 2016 15:05:45 +0300 Subject: [PATCH 1613/1749] zdoom: 2.7.1 -> 2.8.1 --- pkgs/games/zdoom/default.nix | 73 ++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 28 deletions(-) diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix index ce25f3efda3f..4aca0e0114dc 100644 --- a/pkgs/games/zdoom/default.nix +++ b/pkgs/games/zdoom/default.nix @@ -1,40 +1,57 @@ -{ stdenv, fetchFromGitHub, cmake, fmod, mesa, SDL }: +{ stdenv, fetchurl, p7zip, cmake +, SDL2, openal, fluidsynth, soundfont-fluid, bzip2, zlib, libjpeg, game-music-emu +, libsndfile, mpg123 }: -stdenv.mkDerivation { - name = "zdoom-2.7.1"; - src = fetchFromGitHub { - #url = "https://github.com/rheit/zdoom"; - owner = "rheit"; - repo = "zdoom"; - rev = "2.7.1"; - sha256 = "00bx4sgl9j1dyih7yysfq4ah6msxw8580g53p99jfym34ky5ppkh"; +stdenv.mkDerivation rec { + name = "zdoom-${version}"; + majorVersion = "2.8"; + version = "${majorVersion}.1"; + + src = fetchurl { + url = "https://zdoom.org/files/zdoom/${majorVersion}/zdoom-${version}-src.7z"; + sha256 = "0453fqrh9l00xwphfxni5qkf9y134n3s1mr1dvi5cbkxcva7j8bq"; }; - buildInputs = [ cmake fmod mesa SDL ]; - - cmakeFlags = [ - "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" - "-DSDL_INCLUDE_DIR=${SDL.dev}/include" + nativeBuildInputs = [ p7zip cmake ]; + buildInputs = [ + SDL2 openal fluidsynth bzip2 zlib libjpeg game-music-emu libsndfile mpg123 ]; - NIX_CFLAGS_COMPILE = [ "-I ${SDL.dev}/include/SDL" ]; - - preConfigure = '' - sed s@zdoom.pk3@$out/share/zdoom.pk3@ -i src/version.h - ''; + cmakeFlags = [ + "-DFORCE_INTERNAL_GME=OFF" + "-DGME_INCLUDE_DIR=${game-music-emu}/include" + "-DGME_LIBRARIES=${game-music-emu}/lib/libgme.so" + ]; - installPhase = '' - mkdir -p $out/bin - cp zdoom $out/bin - mkdir -p $out/share - cp zdoom.pk3 $out/share + sourceRoot = "."; + + enableParallelBuilding = true; + + NIX_CFLAGS_LINK = [ "-lopenal" "-lfluidsynth" ]; + + preConfigure = '' + sed -i \ + -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \ + -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \ + src/sound/music_fluidsynth_mididevice.cpp ''; - meta = { - homepage = http://zdoom.org/; + installPhase = '' + install -Dm755 zdoom "$out/lib/zdoom/zdoom" + for i in *.pk3; do + install -Dm644 "$i" "$out/lib/zdoom/$i" + done + mkdir -p $out/bin + ln -s $out/lib/zdoom/zdoom $out/bin/zdoom + ''; + + meta = with stdenv.lib; { + homepage = "http://zdoom.org/"; description = "Enhanced port of the official DOOM source code"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.lassulus ]; + # Doom source license, MAME license + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = with maintainer;s [ lassulus ]; }; } From dca2e720bc2882edfa6589abe2fea0392e200519 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Dec 2016 15:31:45 +0300 Subject: [PATCH 1614/1749] zandronum: bundle fmod, fix libraries --- pkgs/games/zandronum/default.nix | 30 ++++++++++-------- pkgs/games/zandronum/fmod.nix | 52 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 70 insertions(+), 13 deletions(-) create mode 100644 pkgs/games/zandronum/fmod.nix diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index 39c1ea6b7469..7b4185594189 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -1,9 +1,11 @@ -{ stdenv, lib, fetchhg, cmake, pkgconfig, makeWrapper -, SDL, mesa, bzip2, zlib, fmod, libjpeg, fluidsynth, openssl, sqlite-amalgamation +{ stdenv, lib, fetchhg, cmake, pkgconfig, makeWrapper, callPackage +, soundfont-fluid, SDL, mesa, bzip2, zlib, libjpeg, fluidsynth, openssl, sqlite-amalgamation, gtk2 , serverOnly ? false }: -let suffix = lib.optionalString serverOnly "-server"; +let + suffix = lib.optionalString serverOnly "-server"; + fmod = callPackage ./fmod.nix { }; # FIXME: drop binary package when upstream fixes their protocol versioning in stdenv.mkDerivation { @@ -18,7 +20,7 @@ in stdenv.mkDerivation { # I have no idea why would SDL and libjpeg be needed for the server part! # But they are. buildInputs = [ openssl bzip2 zlib SDL libjpeg ] - ++ lib.optionals (!serverOnly) [ mesa fmod fluidsynth ]; + ++ lib.optionals (!serverOnly) [ mesa fmod fluidsynth gtk2 ]; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; @@ -26,6 +28,11 @@ in stdenv.mkDerivation { ln -s ${sqlite-amalgamation}/* sqlite/ sed -ie 's| restrict| _restrict|g' dumb/include/dumb.h \ dumb/src/it/*.c + '' + lib.optionalString serverOnly '' + sed -i \ + -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \ + -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \ + src/sound/music_fluidsynth_mididevice.cpp ''; cmakeFlags = @@ -39,27 +46,26 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin - mkdir -p $out/share/zandronum + mkdir -p $out/lib/zandronum cp zandronum${suffix} \ - zandronum.pk3 \ - skulltag_actors.pk3 \ + *.pk3 \ ${lib.optionalString (!serverOnly) "liboutput_sdl.so"} \ - $out/share/zandronum + $out/lib/zandronum # For some reason, while symlinks work for binary version, they don't for source one. - makeWrapper $out/share/zandronum/zandronum${suffix} $out/bin/zandronum${suffix} + makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix} ''; postFixup = lib.optionalString (!serverOnly) '' - patchelf --set-rpath $(patchelf --print-rpath $out/share/zandronum/zandronum):$out/share/zandronum \ - $out/share/zandronum/zandronum + patchelf --set-rpath $(patchelf --print-rpath $out/lib/zandronum/zandronum):$out/lib/zandronum \ + $out/lib/zandronum/zandronum ''; meta = with stdenv.lib; { homepage = http://zandronum.com/; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; maintainers = with maintainers; [ lassulus ]; - license = stdenv.lib.licenses.unfree; + license = licenses.unfreeRedistributable; platforms = platforms.linux; }; } diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix new file mode 100644 index 000000000000..b45ec24ca6bd --- /dev/null +++ b/pkgs/games/zandronum/fmod.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl }: + +assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux"); +let + bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64"; + + libPath = stdenv.lib.makeLibraryPath + [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc.lib}/lib64"; + patchLib = x: "patchelf --set-rpath ${libPath} ${x}"; + + src = + (if (bits == "64") then + fetchurl { + url = "http://zandronum.com/essentials/fmod/fmodapi42416linux64.tar.gz"; + sha256 = "0hkwlzchzzgd7fanqznbv5bs53z2qy8iiv9l2y77l4sg1jwmlm6y"; + } + else + fetchurl { + url = "http://zandronum.com/essentials/fmod/fmodapi42416linux.tar.gz"; + sha256 = "13diw3ax2slkr99mwyjyc62b8awc30k0z08cvkpk2p3i1j6f85m5"; + } + ); +in +stdenv.mkDerivation rec { + inherit src; + + name = "fmod-${version}"; + version = "4.24.16"; + + dontStrip = true; + dontPatchELF = true; + dontBuild = true; + + makeFlags = [ "DESTLIBDIR=$(out)/lib" "DESTHDRDIR=$(out)/include" ]; + + preInstall = '' + mkdir -p $out/lib + ''; + + postInstall = '' + mv $out/lib/libfmodex${bits}-${version}.so $out/lib/libfmodex.so + mv $out/lib/libfmodexp${bits}-${version}.so $out/lib/libfmodexp.so + ''; + + meta = with stdenv.lib; { + description = "Programming library and toolkit for the creation and playback of interactive audio"; + homepage = "http://www.fmod.org/"; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.lassulus ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 910df7d74af7..e632e2a795bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16124,7 +16124,6 @@ in xsokoban = callPackage ../games/xsokoban { }; zandronum = callPackage ../games/zandronum { - fmod = fmod42416; cmake = cmake_2_8; }; From 18d42e1aa526cb9a28b1f4e4907665abf050c039 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Dec 2016 15:32:08 +0300 Subject: [PATCH 1615/1749] fmod: remove --- pkgs/development/libraries/fmod/4.24.16.nix | 52 --------------------- pkgs/development/libraries/fmod/default.nix | 41 ---------------- pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 97 deletions(-) delete mode 100644 pkgs/development/libraries/fmod/4.24.16.nix delete mode 100644 pkgs/development/libraries/fmod/default.nix diff --git a/pkgs/development/libraries/fmod/4.24.16.nix b/pkgs/development/libraries/fmod/4.24.16.nix deleted file mode 100644 index b45ec24ca6bd..000000000000 --- a/pkgs/development/libraries/fmod/4.24.16.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl }: - -assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux"); -let - bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64"; - - libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc.lib}/lib64"; - patchLib = x: "patchelf --set-rpath ${libPath} ${x}"; - - src = - (if (bits == "64") then - fetchurl { - url = "http://zandronum.com/essentials/fmod/fmodapi42416linux64.tar.gz"; - sha256 = "0hkwlzchzzgd7fanqznbv5bs53z2qy8iiv9l2y77l4sg1jwmlm6y"; - } - else - fetchurl { - url = "http://zandronum.com/essentials/fmod/fmodapi42416linux.tar.gz"; - sha256 = "13diw3ax2slkr99mwyjyc62b8awc30k0z08cvkpk2p3i1j6f85m5"; - } - ); -in -stdenv.mkDerivation rec { - inherit src; - - name = "fmod-${version}"; - version = "4.24.16"; - - dontStrip = true; - dontPatchELF = true; - dontBuild = true; - - makeFlags = [ "DESTLIBDIR=$(out)/lib" "DESTHDRDIR=$(out)/include" ]; - - preInstall = '' - mkdir -p $out/lib - ''; - - postInstall = '' - mv $out/lib/libfmodex${bits}-${version}.so $out/lib/libfmodex.so - mv $out/lib/libfmodexp${bits}-${version}.so $out/lib/libfmodexp.so - ''; - - meta = with stdenv.lib; { - description = "Programming library and toolkit for the creation and playback of interactive audio"; - homepage = "http://www.fmod.org/"; - license = licenses.unfreeRedistributable; - platforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.lassulus ]; - }; -} diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix deleted file mode 100644 index af9460195401..000000000000 --- a/pkgs/development/libraries/fmod/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl }: - -assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux"); -let - bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64"; - - libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc.lib}/lib64"; - patchLib = x: "patchelf --set-rpath ${libPath} ${x}"; -in -stdenv.mkDerivation rec { - name = "fmod-${version}"; - version = "4.44.41"; - - src = fetchurl { - url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi44441linux.tar.gz"; - sha256 = "0qjvbhx9g6ijv542n6w3ryv20f74p1qx6bbllda9hl14683z8r8p"; - }; - - dontStrip = true; - dontBuild = true; - - installPhase = '' - mkdir -p $out/lib $out/include/fmodex - - cd api/inc && cp * $out/include/fmodex && cd ../lib - cp libfmodex${bits}-${version}.so $out/lib/libfmodex.so - cp libfmodexL${bits}-${version}.so $out/lib/libfmodexL.so - - ${patchLib "$out/lib/libfmodex.so"} - ${patchLib "$out/lib/libfmodexL.so"} - ''; - - meta = { - description = "Programming library and toolkit for the creation and playback of interactive audio"; - homepage = "http://www.fmod.org/"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e632e2a795bd..68491795b422 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7012,10 +7012,6 @@ in fltk13 = callPackage ../development/libraries/fltk { }; fltk = self.fltk13; - fmod = callPackage ../development/libraries/fmod { }; - - fmod42416 = callPackage ../development/libraries/fmod/4.24.16.nix { }; - fplll = callPackage ../development/libraries/fplll {}; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; From 1141aa1faab51c010f22f4cce68a2bf6faed508d Mon Sep 17 00:00:00 2001 From: Zero King Date: Sat, 17 Dec 2016 13:59:09 +0000 Subject: [PATCH 1616/1749] coreutils: 8.25 -> 8.26 --- pkgs/tools/misc/coreutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 8f09a677b8e9..ec6be06ede37 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -13,11 +13,11 @@ with lib; let self = stdenv.mkDerivation rec { - name = "coreutils-8.25"; + name = "coreutils-8.26"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "11yfrnb94xzmvi4lhclkcmkqsbhww64wf234ya1aacjvg82prrii"; + sha256 = "13lspazc7xkviy93qz7ks9jv4sldvgmwpq36ghrbrqpq93br8phm"; }; # FIXME needs gcc 4.9 in bootstrap tools From 45c1c50dddc76ed8f205c7d23ea7e1418fc67055 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 17 Dec 2016 15:12:00 +0100 Subject: [PATCH 1617/1749] pythonPackages.pytest_29: disable tests temporarily --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cccd50422beb..efa74c775d47 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4881,6 +4881,9 @@ in { url = "mirror://pypi/p/pytest/${name}.tar.gz"; sha256 = "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j"; }; + + # Disabled temporarily because of Hydra issue with namespaces + doCheck = false; }; pytest_30 = self.pytest_27.override rec { From d49e0d5fa5c245ab4e8675ba7fd286d848484fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 16 Nov 2016 21:47:11 +0000 Subject: [PATCH 1618/1749] networkd: allow to supply own unit files Networkd units can contain secrets. In future also wireguard vpn will be supported by networkd. To avoid leakage of private keys, those could be then also put outside of the /nix/store Having a writeable /etc/systemd/network also allows to quick fix network issues, when upgrading `nixos-rebuild switch` would require network on its own (due updates). --- nixos/modules/system/boot/networkd.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index e5ec70d8690b..86237ea6ac7c 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -606,6 +606,10 @@ let ''; }; + unitFiles = map (name: { + target = "systemd/network/${name}"; + source = "${cfg.units.${name}.unit}/${name}"; + }) (attrNames cfg.units); in { @@ -657,17 +661,15 @@ in systemd.additionalUpstreamSystemUnits = [ "systemd-networkd.service" "systemd-networkd-wait-online.service" ]; - systemd.network.units = - mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links + systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks; - environment.etc."systemd/network".source = - generateUnits "network" cfg.units [] []; + environment.etc = unitFiles; systemd.services.systemd-networkd = { wantedBy = [ "multi-user.target" ]; - restartTriggers = [ config.environment.etc."systemd/network".source ]; + restartTriggers = map (f: f.source) (unitFiles); }; systemd.services.systemd-networkd-wait-online = { From 579051fe66f3c41615309c17f96153e6dac0e10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 17 Dec 2016 12:03:40 +0100 Subject: [PATCH 1619/1749] networkd: add extraConfig to all units networkd options are always correct or up to date. This option allows to by pass type checking. It is also easier to write because examples can be just copy and paste from manpages. --- nixos/modules/system/boot/networkd.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 86237ea6ac7c..b828ad53dc58 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -165,6 +165,11 @@ let ''; }; + extraConfig = mkOption { + default = ""; + type = types.lines; + description = "Extra configuration append to unit"; + }; }; linkOptions = commonNetworkOptions // { @@ -515,6 +520,8 @@ let '' [Link] ${attrsToSection def.linkConfig} + + ${def.extraConfig} ''; }; @@ -565,6 +572,7 @@ let ${attrsToSection def.bondConfig} ''} + ${def.extraConfig} ''; }; @@ -603,6 +611,7 @@ let ${attrsToSection x.routeConfig} '')} + ${def.extraConfig} ''; }; From 88f49a00925fd93cedc221000656b10d07f29d7f Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 17 Dec 2016 14:48:25 +0100 Subject: [PATCH 1620/1749] vimiv: 0.7.2 -> 0.7.3 Bugfix release with the following fixes: * Fix thumbnail creation for input files with dot * Use native python to generate list of external commands * Do not use commandline arguments in test mode * Catch broken symlinks in the library and filter them So everything but the last item is essentially what we had in fixes.patch, hence we cane remove it. Signed-off-by: aszlig --- pkgs/applications/graphics/vimiv/default.nix | 6 +- pkgs/applications/graphics/vimiv/fixes.patch | 128 ------------------- 2 files changed, 2 insertions(+), 132 deletions(-) delete mode 100644 pkgs/applications/graphics/vimiv/fixes.patch diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index bb8437153cad..39db1dd1f6d8 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { name = "vimiv"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "karlch"; repo = "vimiv"; rev = "v${version}"; - sha256 = "1g97ms84xk4ci4crq9wdc3744jnrqkq2qz9sg69lhm9sr5f68bw4"; + sha256 = "18dn81n8hcrqhrqfida34qz7a0ar9rz2rrmzsvyp54zc6nyvv1cn"; }; testimages = fetchFromGitHub { @@ -23,8 +23,6 @@ python3Packages.buildPythonApplication rec { sha256 = "0a3aybzpms0381dz9japhm4c7j5klhmw91prcac6zaww6x34nmxb"; }; - patches = [ ./fixes.patch ]; - postPatch = '' patchShebangs scripts/install_icons.sh sed -i -e 's,/usr,,g' -e '/setup\.py/d' Makefile scripts/install_icons.sh diff --git a/pkgs/applications/graphics/vimiv/fixes.patch b/pkgs/applications/graphics/vimiv/fixes.patch deleted file mode 100644 index 09c06e43058a..000000000000 --- a/pkgs/applications/graphics/vimiv/fixes.patch +++ /dev/null @@ -1,128 +0,0 @@ -Patch submitted upstream at https://github.com/karlch/vimiv/pull/32 - -diff --git a/tests/main_test.py b/tests/main_test.py -index a1870e7..2edc86d 100644 ---- a/tests/main_test.py -+++ b/tests/main_test.py -@@ -15,7 +15,7 @@ class MainTest(TestCase): - - def test_main_until_quit(self): - """Run through vimiv main once.""" -- v_main.main(True) -+ v_main.main([], True) - - - if __name__ == '__main__': -diff --git a/vimiv/helpers.py b/vimiv/helpers.py -index 22f0115..bfaf016 100644 ---- a/vimiv/helpers.py -+++ b/vimiv/helpers.py -@@ -3,7 +3,6 @@ - """Wrappers around standard library functions used in vimiv.""" - - import os --from subprocess import Popen, PIPE - from gi import require_version - require_version('Gtk', '3.0') - from gi.repository import Gtk -@@ -20,17 +19,17 @@ scrolltypes["K"] = (Gtk.ScrollType.START, False) - scrolltypes["L"] = (Gtk.ScrollType.END, True) - - # A list of all external commands --external_commands = [] --try: -- p = Popen('echo $PATH | tr \':\' \'\n\' | xargs -n 1 ls -1', -- stdout=PIPE, stderr=PIPE, shell=True) -- out, err = p.communicate() -- out = out.decode('utf-8').split() -- for cmd in sorted(list(set(out))): -- external_commands.append("!" + cmd) --except: -- external_commands = [] --external_commands = tuple(external_commands) -+pathenv = os.environ.get('PATH') -+if pathenv is not None: -+ executables = set() -+ for path in pathenv.split(':'): -+ try: -+ executables |= set(["!" + e for e in os.listdir(path)]) -+ except OSError: -+ continue -+ external_commands = tuple(sorted(list(executables))) -+else: -+ external_commands = () - - - def listdir_wrapper(path, show_hidden=False): -diff --git a/vimiv/imageactions.py b/vimiv/imageactions.py -index d92eb73..b9bc986 100644 ---- a/vimiv/imageactions.py -+++ b/vimiv/imageactions.py -@@ -157,8 +157,8 @@ class Thumbnails: - # Correct name - thumb_ext = ".thumbnail_%dx%d" % (self.thumbsize[0], - self.thumbsize[1]) -- outfile_ext = infile.split(".")[0] + thumb_ext + ".png" -- outfile_base = os.path.basename(outfile_ext) -+ infile_base = os.path.basename(infile) -+ outfile_base = infile_base.split(".")[0] + thumb_ext + ".png" - outfile = os.path.join(self.directory, outfile_base) - # Only if they aren't cached already - if outfile_base not in self.thumbnails: -diff --git a/vimiv/main.py b/vimiv/main.py -index a0e38cf..39f7407 100644 ---- a/vimiv/main.py -+++ b/vimiv/main.py -@@ -27,7 +27,7 @@ from vimiv.mark import Mark - from vimiv.information import Information - - --def main(running_tests=False): -+def main(arguments, running_tests=False): - """Starting point for vimiv. - - Args: -@@ -36,7 +36,7 @@ def main(running_tests=False): - parser = get_args() - parse_dirs() - settings = parse_config() -- settings = parse_args(parser, settings) -+ settings = parse_args(parser, settings, arguments) - - args = settings["GENERAL"]["paths"] - -diff --git a/vimiv/parser.py b/vimiv/parser.py -index 874a538..9d5afce 100644 ---- a/vimiv/parser.py -+++ b/vimiv/parser.py -@@ -56,7 +56,7 @@ def get_args(): - return parser - - --def parse_args(parser, settings, arguments=None): -+def parse_args(parser, settings, arguments): - """Parse the arguments and return the modified settings. - - Args: -@@ -66,10 +66,7 @@ def parse_args(parser, settings, arguments=None): - - Return: Modified settings after parsing the arguments. - """ -- if arguments: -- args = parser.parse_args(arguments) -- else: -- args = parser.parse_args() -+ args = parser.parse_args(arguments) - if args.show_version: - information = Information() - print(information.get_version()) -diff --git a/vimiv/vimiv b/vimiv/vimiv -index 5497e08..57f34f1 100755 ---- a/vimiv/vimiv -+++ b/vimiv/vimiv -@@ -5,4 +5,4 @@ import sys - import vimiv - - if __name__ == '__main__': -- sys.exit(vimiv.main.main()) -+ sys.exit(vimiv.main.main(sys.argv)) From 8bfe3d784655083c5c7e73d0f09bb6a2239d359e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 17 Dec 2016 15:47:03 +0100 Subject: [PATCH 1621/1749] pythonPackages.pytest: disabled tests for all pytest versions --- 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 b5a6525df22c..b648b850c315 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4848,6 +4848,9 @@ in { sha256 = "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm"; }; + # Disabled temporarily because of Hydra issue with namespaces + doCheck = false; + preCheck = '' # don't test bash builtins rm testing/test_argcomplete.py @@ -4881,9 +4884,6 @@ in { url = "mirror://pypi/p/pytest/${name}.tar.gz"; sha256 = "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j"; }; - - # Disabled temporarily because of Hydra issue with namespaces - doCheck = false; }; pytest_30 = self.pytest_27.override rec { From 987aac77945e2bee070723c9758f8173e9e7e974 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 1 Sep 2016 17:00:20 +0800 Subject: [PATCH 1622/1749] /etc/hosts and /etc/nsswitch.conf cleanups fixes #18183 --- nixos/modules/config/nsswitch.nix | 40 +++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 45553ec05663..3f96cea22706 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -10,9 +10,21 @@ let inherit (config.services.samba) nsswins; ldap = (config.users.ldap.enable && config.users.ldap.nsswitch); -in + hostArray = [ "files" "mymachines" ] + ++ optionals nssmdns [ "mdns_minimal [!UNAVAIL=return]" ] + ++ optionals nsswins [ "wins" ] + ++ [ "dns" ] + ++ optionals nssmdns [ "mdns" ] + ++ ["myhostname" ]; -{ + passwdArray = [ "files" ] + ++ optionals ldap [ "ldap" ] + ++ [ "mymachines" ]; + + shadowArray = [ "files" ] + ++ optionals ldap [ "ldap" ]; + +in { options = { # NSS modules. Hacky! @@ -39,17 +51,19 @@ in # Name Service Switch configuration file. Required by the C # library. !!! Factor out the mdns stuff. The avahi module # should define an option used by this module. - environment.etc."nsswitch.conf".text = - '' - passwd: files ${optionalString ldap "ldap"} - group: files ${optionalString ldap "ldap"} - shadow: files ${optionalString ldap "ldap"} - hosts: files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} ${optionalString nsswins "wins"} myhostname mymachines - networks: files dns - ethers: files - services: files - protocols: files - ''; + environment.etc."nsswitch.conf".text = '' + passwd: ${concatStringsSep " " passwdArray} + group: ${concatStringsSep " " passwdArray} + shadow: ${concatStringsSep " " shadowArray} + + hosts: ${concatStringsSep " " hostArray} + networks: files + + ethers: files + services: files + protocols: files + rpc: files + ''; # Systemd provides nss-myhostname to ensure that our hostname # always resolves to a valid IP address. It returns all locally From f281ce8c2905c16ed34d31073024f14c109e9b1d Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 17 Dec 2016 15:31:11 +0100 Subject: [PATCH 1623/1749] universal-ctags: 2016-07-06 -> 2016-12-17 --- .../development/tools/misc/universal-ctags/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 9adaa3689973..b4710cc84060 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "universal-ctags-${version}"; - version = "2016-07-06"; + version = "2016-12-17"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; - rev = "44a325a9db23063b231f6f041af9aaf19320d9b9"; - sha256 = "11vq901h121ckqgw52k9x7way3q38b7jd08vr1n2sjz7kxh0zdd0"; + rev = "3093f73e81cddbea5d122dccd4fd9a6323ebbbd3"; + sha256 = "091359v3p865d39gchpc1x5qplf1s1y4nsph344ng5x1nkx44qsi"; }; buildInputs = [ autoreconfHook pkgconfig ]; @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { sed -i 's|/usr/bin/env perl|${perl}/bin/perl|' misc/optlib2c ''; + doCheck = true; + + checkFlags = "units"; + meta = with stdenv.lib; { description = "A maintained ctags implementation"; homepage = "https://ctags.io/"; From b899b8945fedc181e13e257e6f299e2344c2479a Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 17 Dec 2016 16:39:42 +0100 Subject: [PATCH 1624/1749] nano: 2.7.1 -> 2.7.2 --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 341b8063f66f..738476b98e2e 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -12,10 +12,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "1kapx0fyp0a0pvsdd1n59pm3acrimdrp7ciglg098wqxhdlvwp6z"; + sha256 = "1hlhwgvzdgkc7k74fbbn49hn6vmvzqr7h8gclgl7r1c6qrrny0bp"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; buildInputs = [ ncurses ]; From 09855fe2e5a878ff1f4eaf2142aad906638914b4 Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Sat, 17 Dec 2016 15:16:07 +0000 Subject: [PATCH 1625/1749] profile-cleaner: 2.35 -> 2.36 fixes #21237 --- pkgs/tools/misc/profile-cleaner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index a55485953a81..4ee33df716b6 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite }: +{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc }: stdenv.mkDerivation rec { - version = "2.35"; + version = "2.36"; name = "profile-cleaner-${version}"; src = fetchFromGitHub { owner = "graysky2"; repo = "profile-cleaner"; rev = "v${version}"; - sha256 = "0gashrzhpgcy98zsyc6b3awfp15j1x0nq82h60kvfjbs6xxzvszh"; + sha256 = "0vm4ca99dyr6i0sfjsr0w06i0rbmqf40kp37h04bk4c8yassq1zq"; }; buildInputs = [ makeWrapper ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' PREFIX=\"\" DESTDIR=$out make install wrapProgram $out/bin/profile-cleaner \ - --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite ]}" + --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite bc ]}" ''; meta = { From fa80bf7b0dda2d3380e7a3b0741c31c387837a8a Mon Sep 17 00:00:00 2001 From: ikervagyok Date: Sat, 17 Dec 2016 16:53:27 +0100 Subject: [PATCH 1626/1749] packagekit: add 'enableNixBackend' as an option (#21157) * packagekit: disable nix-backend Packagekit fails to build on my machines, as long as it's nix-backend is enabled * packagekit: add 'enableNixBackend' as an option --- pkgs/tools/package-management/packagekit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 68d13f7f17fa..180395571b22 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, lib , intltool, glib, pkgconfig, polkit, python, sqlite, systemd , gobjectIntrospection, vala_0_23, gtk_doc, autoreconfHook, autoconf-archive -, nix, boost +# TODO: set enableNixBackend to true, as soon as it builds +, nix, enableNixBackend ? false, boost , enableCommandNotFound ? false , enableBashCompletion ? false, bash-completion ? null }: @@ -28,7 +29,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-systemd" - "--enable-nix" "--disable-dummy" "--disable-cron" "--disable-introspection" @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { "--with-dbus-sys=$(out)/etc/dbus-1/system.d" "--with-systemdsystemunitdir=$(out)/lib/systemd/system/" ] + ++ lib.optional enableNixBackend "--enable-nix" ++ lib.optional (!enableBashCompletion) "--disable-bash-completion" ++ lib.optional (!enableCommandNotFound) "--disable-command-not-found"; From dda462922e7e72c466f09c49791dec9e48c7e2ab Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Sat, 17 Dec 2016 16:16:55 +0000 Subject: [PATCH 1627/1749] libmesode: init at 0.9.1 This library is a fork of ``libstrophe'' and is needed if the ``profanity'' XMPP client is to have TLS support. TLS support has been added to ``profanity'' since version 5.0. --- .../libraries/libmesode/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/libmesode/default.nix diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix new file mode 100644 index 000000000000..8e684f7af1f2 --- /dev/null +++ b/pkgs/development/libraries/libmesode/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, expat, pkgconfig, check }: + +stdenv.mkDerivation rec { + name = "libmesode-${version}"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "boothj5"; + repo = "libmesode"; + rev = version; + sha256 = "1zb1x422zkpnxrz9d2b7pmi8ms60lbw49yh78mydqfypsmj2iyfh"; + }; + + buildInputs = [ autoreconfHook openssl expat libtool pkgconfig check ]; + + dontDisableStatic = true; + + doCheck = true; + + meta = { + description = "Fork of libstrophe (https://github.com/strophe/libstrophe) for use with Profanity XMPP Client"; + longDescription = '' + Reasons for forking: + + - Remove Windows support + - Support only one XML Parser implementation (expat) + - Support only one SSL implementation (OpenSSL) + + This simplifies maintenance of the library when used in Profanity. + Whilst Profanity will run against libstrophe, libmesode provides extra + TLS functionality such as manual SSL certificate verification. + ''; + homepage = http://github.com/boothj5/libmesode/; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03436dc5e946..237c3393db12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2596,6 +2596,8 @@ in libmbim = callPackage ../development/libraries/libmbim { }; libmongo-client = callPackage ../development/libraries/libmongo-client { }; + + libmesode = callPackage ../development/libraries/libmesode { }; libnabo = callPackage ../development/libraries/libnabo { }; From 900ded32f4b5ff1ad36cbf46db59cf2fd88232bc Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Sat, 17 Dec 2016 16:34:20 +0000 Subject: [PATCH 1628/1749] profanity: 0.4.7 -> 0.5.0 From the changelog: - Plugins API supporting C and Python plugins - SSL certificate verification (requires libmesode) (/tls) - HTTP file upload (xep-0363) (/sendfile) - Blocking command (xep-0191) (/blocked) - Allow auto extended away (/autoaway) - Include last acitvity in initial presence (xep-0256) (/lastactivity) - Last Activity (xep-0012) (/lastactivity) - Ability to run command scripts (/script) - Account startscript property to execute a command script on connect (/account) - Export roster to CSV file (/export) - Support for GTK tray icons (/tray) - User specified text triggers for chat room notifications (/notify) - Per chat room notification options (/notify) - Many new roster panel display options (/roster) - Time format preferences per window type (/time) - Edit, prepend and append to room subject (/subject) - Autoping timeout preference (/autoping) - Window navigation by window title (/win) - Window closing by window title (/close) - Account theme setting (/account) - Allow sending XMPP stanzas in xmlconsole window (/xmlconsole) - Configure level of room message notifications in console window (/console) - Check ~/.config/profanity/inputrc for readline settings - Custom readline functions for navigation key bindings - Autocomplete command arguments when no characters entered --- .../instant-messengers/profanity/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index ac4776c20722..e556eeb72834 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, automake, autoconf, pkgconfig, glib, openssl, expat -, ncurses, libotr, curl, libstrophe, readline, libuuid +{ stdenv, fetchurl, pkgconfig, glib, openssl, expat, libmesode +, ncurses, libotr, curl, readline, libuuid , autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null , notifySupport ? false, libnotify ? null, gdk_pixbuf ? null @@ -12,21 +12,19 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "profanity-${version}"; - version = "0.4.7"; + version = "0.5.0"; src = fetchurl { url = "http://www.profanity.im/profanity-${version}.tar.gz"; - sha256 = "1p8ixvxacvf63r6lnf6iwlyz4pgiyp6widna1h2l2jg8kw14wb5h"; + sha256 = "0s4njc4rcaii51qw1najxa0fa8bb2fnas00z47y94wdbdsmfhfvq"; }; buildInputs = [ - automake autoconf pkgconfig readline libuuid - glib openssl expat ncurses libotr curl libstrophe + pkgconfig readline libuuid libmesode + glib openssl expat ncurses libotr curl ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] ++ optionals notifySupport [ libnotify gdk_pixbuf ]; - preConfigure = "sh bootstrap.sh"; - meta = { description = "A console based XMPP client"; longDescription = '' From f75f0ac1f4ba1e9d2de141ae113f1818191ca0de Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 17 Dec 2016 19:04:48 +0100 Subject: [PATCH 1629/1749] teamviewer: 11.0.57095 -> 12.0.71510 --- .../applications/networking/remote/teamviewer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index be685118e1f0..288fa4383610 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "11.0.57095"; + version = "12.0.71510"; src = fetchurl { # There is a 64-bit package, but it has no differences apart from Debian dependencies. # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason. url = "http://download.teamviewer.com/download/teamviewer_${version}_i386.deb"; - sha256 = "0gdqy6b3np8ndlrq5cwgsys6ad529904133za51r20cj528n7rx3"; + sha256 = "0f2qc2rpxk7zsyfxlsfr5gwbs9vhnzc3z7ib677pnr99bz06hbqp"; }; unpackPhase = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin - ln -s $out/share/teamviewer/tv_bin/desktop/teamviewer-teamviewer*.desktop $out/share/applications + ln -s $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop $out/share/applications ln -s /var/lib/teamviewer $out/share/teamviewer/config ln -s /var/log/teamviewer $out/share/teamviewer/logfiles ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { sed -i "/TV_LD64_PATH=.*/d" script/tvw_config ''} - sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/teamviewer-*.desktop + sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/com.teamviewer.*.desktop for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/*; do echo "patching $i" From f8fdf3dcb375fec0003a7814a78188f6d2b45897 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 17 Dec 2016 19:06:00 +0100 Subject: [PATCH 1630/1749] perl-Math-BigInt: 1.999802 -> 1.999806 --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9843253c4438..6799afb8384c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7792,15 +7792,14 @@ let self = _self // overrides; _self = with self; { }; MathBigInt = buildPerlPackage rec { - name = "Math-BigInt-1.999802"; + name = "Math-BigInt-1.999806"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "a44ceb255a76b7f455ef41f4f12e8923fe3662255853c4d0f3ad1f77b9eaa491"; + sha256 = "9b62b2fcfeed5ef42d375778e4ec3b469cab0002b5dc247906dc99f5786fa1fc"; }; meta = { description = "Arbitrary size integer/float math package"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; From 8d593f2610aa9a02808f4b94dcabd2bd937a80ac Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 17 Dec 2016 19:06:20 +0100 Subject: [PATCH 1631/1749] perl-Math-BigRat: 0.260805 -> 0.2611 --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6799afb8384c..7338acd49b9d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7816,16 +7816,15 @@ let self = _self // overrides; _self = with self; { }; MathBigRat = buildPerlPackage rec { - name = "Math-BigRat-0.260805"; + name = "Math-BigRat-0.2611"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "9e41be24272e262fadc1921c7f51ff218384c92e5628cb53bf62b3026710fd41"; + sha256 = "a8a033d0ccac9ac641c73867d71f2455ecb2339984cd964b1e3cfb2859e9fd81"; }; propagatedBuildInputs = [ MathBigInt ]; meta = { description = "Arbitrary big rational numbers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; From cdb7d9f22b7b23ec9b29e2e9b6d6da5bc99ed9ea Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 17 Dec 2016 19:06:38 +0100 Subject: [PATCH 1632/1749] perl-bignum: 0.44 -> 0.47 --- 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 7338acd49b9d..5bc0e81106b6 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.44"; + name = "bignum-0.47"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "e32048bfc77788f1407e0b2bf54e0aba44d9e5e2743d2013b3afd6a630bed06f"; + sha256 = "b084eac6d676d2acc4d60deed58e6e31b2f572b7b0be1aec9b93be92bad8261a"; }; buildInputs = [ MathBigInt MathBigRat ]; meta = { From ffb90e8c4fc0c8ed2d0fb817e5dafbded1c5a6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 17 Dec 2016 20:28:20 +0100 Subject: [PATCH 1633/1749] Revert "Merge pull request #21234 from l2dy/coreutils-up" This reverts commit ee28ea0e919088f953a2202a1e756146d3ab508c, reversing changes made to f281ce8c2905c16ed34d31073024f14c109e9b1d. Moving to staging instead. --- pkgs/tools/misc/coreutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index ec6be06ede37..8f09a677b8e9 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -13,11 +13,11 @@ with lib; let self = stdenv.mkDerivation rec { - name = "coreutils-8.26"; + name = "coreutils-8.25"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "13lspazc7xkviy93qz7ks9jv4sldvgmwpq36ghrbrqpq93br8phm"; + sha256 = "11yfrnb94xzmvi4lhclkcmkqsbhww64wf234ya1aacjvg82prrii"; }; # FIXME needs gcc 4.9 in bootstrap tools From a7347d9e9cacb5afc4feab630e199c61ce9d7c36 Mon Sep 17 00:00:00 2001 From: Alexei Boronine Date: Sun, 18 Dec 2016 04:04:56 +0800 Subject: [PATCH 1634/1749] luarocks: enable Darwin --- pkgs/development/tools/misc/luarocks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index e1741118fb0f..4da105f93035 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation { description = ''A package manager for Lua''; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } From 3cf9b5800366acff4ff3b70b1d7d3d1f3c954282 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 17 Dec 2016 15:32:48 -0500 Subject: [PATCH 1635/1749] oh-my-zsh: 2016-11-16 -> 2016-12-14 --- pkgs/shells/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 4e76c7aef335..8ae11e7e75c8 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "oh-my-zsh-${version}"; - version = "2016-11-16"; + version = "2016-12-14"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "3477ff25274fa75bd9e6110f391f6ad98ca2af72"; - sha256 = "07fvxg5jbw41j4nrs31hm0dfrwdh01gf5ik21gb4b4ddig2mjhc9"; + rev = "67dad45b38b7f0bafcaf7679da6eb4596301843b"; + sha256 = "1adgj0p4c8aq9rpkv33k8ra69922vfkjw63b666i66v6zr0s8znp"; }; phases = "installPhase"; From c2219007e87e16d46dca2ddc06bf55e71155ef94 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 17 Dec 2016 22:30:05 +0100 Subject: [PATCH 1636/1749] Revert "mysql service: specify defaultText for package option" This reverts commit 52d12b473af0dfbf7f5af1bd75ac5a5f2366f887. --- nixos/modules/services/databases/mysql.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 1180531248f9..e5e8a57f4b0e 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -53,8 +53,7 @@ in package = mkOption { type = types.package; default = pkgs.mysql; - defaultText = "pkgs.mysql"; - example = literalExample "pkgs.mysql55"; + example = literalExample "pkgs.mysql"; description = " Which MySQL derivation to use. "; From 142930113c79a7d5e7099c55e48878dcaedd8469 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 17 Dec 2016 22:30:20 +0100 Subject: [PATCH 1637/1749] Revert "mysql service: specify a default package" This reverts commit 4358d3d43938666834d3e1fd5a8ea69b49c08112. Not having a default was deliberate, see https://github.com/NixOS/nixpkgs/commit/1ce6fff4e21906a3e6cfd26fdf4372f7501541cd Thanks to @ocharles for making me aware of this. --- nixos/modules/services/databases/mysql.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index e5e8a57f4b0e..fcf1f123cfb5 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -52,7 +52,6 @@ in package = mkOption { type = types.package; - default = pkgs.mysql; example = literalExample "pkgs.mysql"; description = " Which MySQL derivation to use. From 4661689a49614043b659d66c02de7990150bc742 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Fri, 16 Dec 2016 17:41:42 +0100 Subject: [PATCH 1638/1749] stanchion: add Darwin support stanchion: make pam nullify typesafe stanchion: add Darwin support stanchion: make pam OS-checked inside of stanchion.nix stanchion: add Darwin support stanchion: remove OS-checked pam on all-packages.nix stanchion: add Darwin support --- pkgs/servers/nosql/riak-cs/stanchion.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix index 5835b7e29c93..8ea71d611ebb 100644 --- a/pkgs/servers/nosql/riak-cs/stanchion.nix +++ b/pkgs/servers/nosql/riak-cs/stanchion.nix @@ -1,11 +1,13 @@ -{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak }: +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak +, Carbon ? null, Cocoa ? null }: stdenv.mkDerivation rec { name = "stanchion-2.1.1"; buildInputs = [ - which unzip erlang pam git wget - ]; + which unzip erlang git wget + ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ] + ++ lib.optional stdenv.isLinux [ pam ]; src = fetchurl { url = "http://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz"; @@ -57,7 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { maintainers = with maintainers; [ mdaiter ]; description = "Manager for Riak CS"; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.asl20; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d1dbc3c607c..9e686a4e8500 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10293,6 +10293,7 @@ in }; stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; erlang = erlang_basho_R16B02; }; From 2fe1daf804d652962aa16e765894766365ae2909 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 18 Dec 2016 00:15:57 +0100 Subject: [PATCH 1639/1749] cython: 0.25.1 -> 0.25.2 Upstream changelog without issue numbers: * Fixes several issues with C++ template deduction. * Fixes a issue with bound method type inference. * Fixes a bug with cascaded tuple assignment. * Fixed or silenced many Clang warnings. * Fixes bug with powers of pure real complex numbers. The full changelog with issue numbers can be found here: https://github.com/cython/cython/blob/0.25.2/CHANGES.rst My main reason for updating is because there were test failures on i686-linux, although version 0.25.2 still has one test that fails. So if we're on i686-linux and on Python 2 we just fix that one little doctest. The test failure has already been reported upstream at: https://github.com/cython/cython/issues/1548 All of the failing tests (including the latter) had to do with integer representations in that long integers are suffixed by an L while the test cases weren't expecting this. Built successfully on i686-linux and x86_64-linux against Python 2.7 and Python 3.5. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b648b850c315..e3805c652ff7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4228,13 +4228,22 @@ in { cython = buildPythonPackage rec { name = "Cython-${version}"; - version = "0.25.1"; + version = "0.25.2"; src = pkgs.fetchurl { url = "mirror://pypi/C/Cython/${name}.tar.gz"; - sha256 = "e0941455769335ec5afb17dee36dc3833b7edc2ae20a8ed5806c58215e4b6669"; + sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi"; }; + # On i686-linux and Python 2.x this test fails because the result is "3L" + # instead of "3", so let's fix it in-place. + # + # Upstream issue: https://github.com/cython/cython/issues/1548 + postPatch = optionalString (stdenv.isi686 && !isPy3k) '' + sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \ + tests/run/cpdef_enums.pyx + ''; + buildInputs = with self; [ pkgs.glibcLocales pkgs.pkgconfig pkgs.gdb ]; # For testing nativeBuildInputs = with self; [ numpy pkgs.ncurses ]; From 1090a269ab4ca65e4a3be5d0fb01613b87c63b6f Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Sun, 18 Dec 2016 03:38:42 +0100 Subject: [PATCH 1640/1749] riak-cs: add Darwin support --- pkgs/servers/nosql/riak-cs/2.1.1.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix index 439af4da565b..a0df98faf360 100644 --- a/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -1,11 +1,13 @@ -{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak }: +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak +, Carbon ? null, Cocoa ? null }: stdenv.mkDerivation rec { name = "riak_cs-2.1.1"; buildInputs = [ - which unzip erlang pam git wget - ]; + which unzip erlang git wget + ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ] + ++ lib.optional stdenv.isLinux [ pam ]; src = fetchurl { url = "http://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz"; @@ -60,7 +62,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Dynamo inspired NoSQL DB by Basho with S3 compatibility"; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.asl20; maintainer = with maintainers; [ mdaiter ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2502d36dbfa..28785ede360a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10291,6 +10291,7 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; erlang = erlang_basho_R16B02; }; From ffe71cbe19508320ed9820e1b8caee732d5d9ddf Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 18 Dec 2016 04:36:54 +0100 Subject: [PATCH 1641/1749] kexec-tools: Add patch to fix build on ARM Building on ARM fails with the following error: kexec/arch/arm/phys_to_virt.o kexec/arch/arm/phys_to_virt.c kexec/arch/arm/phys_to_virt.c:3:26: fatal error: phys_to_virt.h: No such file or directory The patch I'm using is from Fedora: http://pkgs.fedoraproject.org/cgit/rpms/kexec-tools.git/tree/kexec-tools-2.0.13-fix-armv7-build-failure.patch?id=97581f1a435aafa298a4d0bbcfaf40c63a41ce92 It has been reported upstream as well: http://lists.infradead.org/pipermail/kexec/2016-September/017352.html I'm adding the patch for all architectures, so that the next person to upgrade kexec-tools doesn't forget that even while on x86. Tested building with i686-linux, x86_64-linux and armv7l-linux. Signed-off-by: aszlig --- pkgs/os-specific/linux/kexectools/arm.patch | 28 +++++++++++++++++++ pkgs/os-specific/linux/kexectools/default.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/os-specific/linux/kexectools/arm.patch diff --git a/pkgs/os-specific/linux/kexectools/arm.patch b/pkgs/os-specific/linux/kexectools/arm.patch new file mode 100644 index 000000000000..9c1d482c81ad --- /dev/null +++ b/pkgs/os-specific/linux/kexectools/arm.patch @@ -0,0 +1,28 @@ +Upstream kexec-tools 2.0.13 does not pack arm phys_to_virt.h and iomem.h, +include them here for a temporary fix + +diff -uprN kexec-tools/kexec/arch/arm/iomem.h kexec-tools.1/kexec/arch/arm/iomem.h +--- kexec-tools/kexec/arch/arm/iomem.h 1970-01-01 08:00:00.000000000 +0800 ++++ kexec-tools.1/kexec/arch/arm/iomem.h 2016-08-09 15:38:26.938594379 +0800 +@@ -0,0 +1,9 @@ ++#ifndef IOMEM_H ++#define IOMEM_H ++ ++#define SYSTEM_RAM "System RAM\n" ++#define SYSTEM_RAM_BOOT "System RAM (boot alias)\n" ++#define CRASH_KERNEL "Crash kernel\n" ++#define CRASH_KERNEL_BOOT "Crash kernel (boot alias)\n" ++ ++#endif +diff -uprN kexec-tools/kexec/arch/arm/phys_to_virt.h kexec-tools.1/kexec/arch/arm/phys_to_virt.h +--- kexec-tools/kexec/arch/arm/phys_to_virt.h 1970-01-01 08:00:00.000000000 +0800 ++++ kexec-tools.1/kexec/arch/arm/phys_to_virt.h 2016-08-09 14:50:30.104143361 +0800 +@@ -0,0 +1,8 @@ ++#ifndef PHYS_TO_VIRT_H ++#define PHYS_TO_VIRT_H ++ ++#include ++ ++extern uint64_t phys_offset; ++ ++#endif diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 1b18fb590170..cd2833617b92 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1k75p9h29xx57l1c69ravm4pg9pmriqxmwja12hgrnvi251ayjw7"; }; + patches = [ ./arm.patch ]; + hardeningDisable = [ "format" "pic" "relro" ]; buildInputs = [ zlib ]; From 4b6796868881db7e3962070c109044982ea1a2ba Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 17 Dec 2016 16:12:42 +0100 Subject: [PATCH 1642/1749] squid: 3.5.19 -> 3.5.23 Fixes CVE-2016-10002 & CVE-2016-10003. --- pkgs/servers/squid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index e12d7e9b97d0..1ba154224395 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, perl, lib, openldap, pam, db, cyrus_sasl, libcap, expat, libxml2, libtool, openssl}: stdenv.mkDerivation rec { - name = "squid-3.5.19"; + name = "squid-3.5.23"; src = fetchurl { - url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.bz2"; - sha256 = "1iy2r7r12xv0q9414rczbqbbggyyxgdmg21bynpygwkgalaz1dxx"; + url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.xz"; + sha256 = "1nqbljph2mbxjy1jzsis5vplfvvc2y6rdlxy609zx4hyyjchqk7s"; }; buildInputs = [perl openldap pam db cyrus_sasl libcap expat libxml2 libtool openssl]; From 9a30cdc464796ff00da38c73560694f5442d4959 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 17 Dec 2016 23:04:43 +0100 Subject: [PATCH 1643/1749] squid: refactor, add features, adopt --- pkgs/servers/squid/default.nix | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 1ba154224395..b64dfeda667a 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,25 +1,36 @@ -{ fetchurl, stdenv, perl, lib, openldap, pam, db, cyrus_sasl, libcap, -expat, libxml2, libtool, openssl}: +{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap +, expat, libxml2, openssl }: + stdenv.mkDerivation rec { name = "squid-3.5.23"; + src = fetchurl { url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.xz"; sha256 = "1nqbljph2mbxjy1jzsis5vplfvvc2y6rdlxy609zx4hyyjchqk7s"; }; - buildInputs = [perl openldap pam db cyrus_sasl libcap expat libxml2 - libtool openssl]; + + buildInputs = [ + perl openldap pam db cyrus_sasl libcap expat libxml2 openssl + ]; + configureFlags = [ "--enable-ipv6" "--disable-strict-error-checking" "--disable-arch-native" "--with-openssl" "--enable-ssl-crtd" + "--enable-linux-netfilter" + "--enable-storeio=ufs,aufs,diskd,rock" + "--enable-removal-policies=lru,heap" + "--enable-delay-pools" + "--enable-x-accelerator-vary" ]; - meta = { + meta = with stdenv.lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; homepage = "http://www.squid-cache.org"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ fpletz ]; }; } From eb559d2b077dfdf237d1c6d56983cb53e31a5fd5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 17 Dec 2016 23:09:07 +0100 Subject: [PATCH 1644/1749] batman-adv: 2016.4 -> 2016.5 --- pkgs/os-specific/linux/batman-adv/alfred.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 6a5dced454c0..0ee928754db7 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2016.4"; + ver = "2016.5"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0p8x8m1bdk560d64v010ck7dgm301cy7panxijczcf4p74clh835"; + sha256 = "1ln997qyknkfm7xp4vx5lm0z833ksn1gn4dyjvr3qr1pgyzvmcrp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 4fd022a418bb..c8cab86413fb 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2016.4"; + ver = "2016.5"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "1ybn2akwj29hsjps6qgvg1ncf238002d3r7fik627ig8cgmx0wi4"; + sha256 = "1saa088ggsr7bwlvnzpgjj6zqn51j0km96f4x1djhj55hwfypv87"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index ce0ef1ad1055..044469986245 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -2,14 +2,14 @@ #assert stdenv.lib.versionOlder kernel.version "3.17"; -let base = "batman-adv-2016.4"; in +let base = "batman-adv-2016.5"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "1sshl700gwfnqih95q1kp7sya71svp8px2rn14dbb790hgfkc4mw"; + sha256 = "1dqdzpxdrgqpgkc6bqfvbvx5x18bpd9y459j0iyva47lqj8gr86h"; }; hardeningDisable = [ "pic" ]; From 6486b9082098a150a55dd62ae809e08f8771f4fe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Dec 2016 00:11:32 +0100 Subject: [PATCH 1645/1749] pythonPackages.flake8: 2.6.2 -> 3.2.1 --- pkgs/top-level/python-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3805c652ff7..a53e79077326 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11074,15 +11074,17 @@ in { flake8 = buildPythonPackage rec { name = "flake8-${version}"; - version = "2.6.2"; + version = "3.2.1"; src = pkgs.fetchurl { url = "mirror://pypi/f/flake8/${name}.tar.gz"; - sha256 = "0y57hzal0j84dh9i1g1g6dc4aywvrnhy2fjmmbglpv5ajihxh713"; + sha256 = "c7c460b5aff3a2063c798a77af18ec70af3941d35a22e2e76965e3c0e0b36055"; }; - buildInputs = with self; [ nose mock ]; - propagatedBuildInputs = with self; [ pyflakes pycodestyle mccabe ]; + buildInputs = with self; [ pytest mock pytestrunner ]; + propagatedBuildInputs = with self; [ pyflakes pycodestyle mccabe ] + ++ optionals (pythonOlder "3.4") [ enum34 ] + ++ optionals (pythonOlder "3.2") [ configparser ]; meta = { description = "Code checking using pep8 and pyflakes"; From b0576a4ab960d838f1d756cc81600c870ddd171e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Dec 2016 00:11:52 +0100 Subject: [PATCH 1646/1749] pythonPackages.flake8_3: remove since it is not used in nixpkgs --- pkgs/top-level/python-packages.nix | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a53e79077326..6a9874320a04 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11094,35 +11094,6 @@ in { }; }; - flake8_3 = buildPythonPackage rec { - name = "flake8-${version}"; - version = "3.0.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/flake8/${name}.tar.gz"; - sha256 = "03cpdrjxh0fyi2qpdxbbrmxw7whiq3xr3p958gr6yzghk34i1hml"; - }; - - buildInputs = with self; [ nose mock pytestrunner pytest ]; - propagatedBuildInputs = with self; [ pyflakes mccabe_0_5 enum34 configparser pycodestyle ]; - - patches = [ - ../development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch - ]; - - # Tests fail due to missing ini file. - preCheck = '' - touch tox.ini - ''; - - meta = { - description = "Code checking using pep8 and pyflakes"; - homepage = http://pypi.python.org/pypi/flake8; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; - }; - flaky = buildPythonPackage rec { name = "flaky-${version}"; version = "3.1.0"; From 0b3629544be87ea1bba2509455bff32195fe81d0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Dec 2016 00:12:09 +0100 Subject: [PATCH 1647/1749] pythonPackages.lxml: 3.4.4 -> 3.7.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 6a9874320a04..1db6b44a8307 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13858,11 +13858,11 @@ in { lxml = buildPythonPackage ( rec { - name = "lxml-3.4.4"; + name = "lxml-3.7.0"; src = pkgs.fetchurl { url = "mirror://pypi/l/lxml/${name}.tar.gz"; - sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk"; + sha256 = "9c62eb2a1862e1ae285d7e7e3b7dc8772d387b19258086afcec143c6b7b8a5c9"; }; buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; From 47192059196f8d760edc8162570e068ce854e05a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Dec 2016 00:12:23 +0100 Subject: [PATCH 1648/1749] pythonPackages.mccabe: 0.4.0 -> 0.5.3 --- pkgs/top-level/python-packages.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1db6b44a8307..540f033f5d74 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14146,22 +14146,13 @@ in { mccabe = buildPythonPackage (rec { - name = "mccabe-0.4.0"; + name = "mccabe-0.5.3"; src = pkgs.fetchurl { url = "mirror://pypi/m/mccabe/${name}.tar.gz"; - sha256 = "0yr08a36h8lqlif10l4xcikbbig7q8f41gqywir7rrvnv3mi4aws"; + sha256 = "16293af41e7242031afd73896fef6458f4cad38201d21e28f344fff50ae1c25e"; }; - # See https://github.com/flintwork/mccabe/issues/31 - postPatch = '' - cp "${pkgs.fetchurl { - url = "https://raw.githubusercontent.com/flintwork/mccabe/" - + "e8aea16d28e92bd3c62601275762fc9c16808f6c/test_mccabe.py"; - sha256 = "0xhjxpnaxvbpi4myj9byrban7a5nrw931br9sgvfk42ayg4sn6lm"; - }}" test_mccabe.py - ''; - buildInputs = with self; [ pytestrunner pytest ]; meta = { From 540909f160cffb7df457249c8e388802f74c1d28 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Dec 2016 00:12:38 +0100 Subject: [PATCH 1649/1749] pythonPackages.pyflakes: 1.0.0 -> 1.3.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 540f033f5d74..3829a91e7a26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20043,12 +20043,13 @@ in { }; pyflakes = buildPythonPackage rec { - name = "pyflakes-${version}"; - version = "1.0.0"; + pname = "pyflakes"; + version = "1.3.0"; + name = "${pname}-${version}"; src = pkgs.fetchurl { - url = "mirror://pypi/p/pyflakes/${name}.tar.gz"; - sha256 = "f39e33a4c03beead8774f005bd3ecf0c3f2f264fa0201de965fce0aff1d34263"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "a4f93317c97a9d9ed71d6ecfe08b68e3de9fea3f4d94dcd1d9d83ccbf929bc31"; }; buildInputs = with self; [ unittest2 ]; From 311171e69cfab5e9ff640e77dce686b93af31830 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Dec 2016 00:13:20 +0100 Subject: [PATCH 1650/1749] pythonPackages.natsort: add missing dependency --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3829a91e7a26..dc9cafa3cb05 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8266,6 +8266,7 @@ in { pytestcov pytestflakes pytestpep8 + pytest mock ] # pathlib was made part of standard library in 3.5: From 810e02e945192881fcec02e803e7072807b3fc77 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Dec 2016 00:16:10 +0100 Subject: [PATCH 1651/1749] pythonPackages.pytestpep8: fix checkPhase --- pkgs/top-level/python-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dc9cafa3cb05..b1195277b727 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5058,6 +5058,13 @@ in { buildInputs = with self; [ pytest ]; propagatedBuildInputs = with self; [ pytestcache pep8 ]; + checkPhase = '' + py.test + ''; + + # Fails + doCheck = false; + meta = { license = licenses.mit; website = "https://pypi.python.org/pypi/pytest-pep8"; From 007fa632c0089175a2891fb7a375acf827df71bf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Dec 2016 00:46:07 +0100 Subject: [PATCH 1652/1749] pythonPackages.pip2nix: broken pkg_resources.VersionConflict: (pip 9.0.1 (/nix/store/5drfa1s8mh5f1y9slq82zlv65iblb942-python2.7-bootstrapped-pip-9.0.1/lib/python2.7/site-packages), Requirement.parse('pip<9,>=8')) --- 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 b1195277b727..0f06ada1c3f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23691,6 +23691,8 @@ in { }; propagatedBuildInputs = with self; [ click configobj contexter jinja2 pytest ]; + + meta.broken = true; }; pychef = buildPythonPackage rec { From 550d1458d6a6e5919b00678accb6b50245d8d2ff Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Dec 2016 00:48:07 +0100 Subject: [PATCH 1653/1749] pythonPackages.more-itertools: 2.2 -> 2.4.1 --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f06ada1c3f6..447d44cb6eb7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31037,14 +31037,15 @@ EOF more-itertools = buildPythonPackage rec { name = "more-itertools-${version}"; - version = "2.2"; + version = "2.4.1"; src = pkgs.fetchurl { url = "mirror://pypi/m/more-itertools/${name}.tar.gz"; - sha256 = "1q3wqsg44z01g7i5z6j1wc0nf5c5h8g77xny6fia2gddqw2jxrlk"; + sha256 = "95a222d01df60c888d56d86f91219bfbd47106a534e89ca7f80fb555cfbe08c1"; }; - propagatedBuildInputs = with self; [ nose ]; + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ six ]; meta = { homepage = https://more-itertools.readthedocs.org; From 3057f3e9622004637b9ff7362c5423f824579db1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Dec 2016 00:54:10 +0100 Subject: [PATCH 1654/1749] pythonPackages.skype4py: broken --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 447d44cb6eb7..578251af1f4b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24080,7 +24080,7 @@ in { # but that url does not work. This following web page points to the # download link and has some information about the package. homepage = http://pypi.python.org/pypi/Skype4Py/1.0.32.0; - + broken = true; license = "BSD"; }; }); From 508d9499b1e4a90602bf2d2cbc5c62f2aafd021f Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 18 Dec 2016 00:27:59 -0800 Subject: [PATCH 1655/1749] zdoom: Fix typo from 1cc9d9ef2ce80dee5c8f2ef9f8ae20ae76337d73 --- pkgs/games/zdoom/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix index 4aca0e0114dc..a217c7217b6e 100644 --- a/pkgs/games/zdoom/default.nix +++ b/pkgs/games/zdoom/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # Doom source license, MAME license license = licenses.unfreeRedistributable; platforms = platforms.linux; - maintainers = with maintainer;s [ lassulus ]; + maintainers = with maintainers; [ lassulus ]; }; } From e76a1f0e7ea630b3f5f282d0dccdaecc272873ca Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 18 Dec 2016 09:25:03 +0000 Subject: [PATCH 1656/1749] Revert "omake: remove 0.9.8.6-rc1" This reverts commit e672fbc6f0e0dd503f78e0c23e6de1795bf81b8f. --- .../tools/ocaml/omake/0.9.8.6-rc1.nix | 38 +++++++++++++++++++ pkgs/development/tools/ocaml/omake/warn.patch | 10 +++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/ocaml-packages.nix | 2 + 4 files changed, 52 insertions(+) create mode 100644 pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix create mode 100644 pkgs/development/tools/ocaml/omake/warn.patch diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix new file mode 100644 index 000000000000..9f318afc67d7 --- /dev/null +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, makeWrapper, ocaml, ncurses}: +let + pname = "omake"; + version = "0.9.8.6-0.rc1"; + webpage = "http://omake.metaprl.org"; +in +stdenv.mkDerivation { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; + sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13"; + }; + patchFlags = "-p0"; + patches = [ ./warn.patch ]; + + buildInputs = [ ocaml makeWrapper ncurses ]; + + phases = "unpackPhase patchPhase buildPhase"; + buildPhase = '' + make bootstrap + make PREFIX=$out all + make PREFIX=$out install + ''; +# prefixKey = "-prefix "; +# +# configureFlags = if transitional then "--transitional" else "--strict"; +# +# buildFlags = "world.opt"; + + meta = { + description = "Omake build system"; + homepage = "${webpage}"; + license = "GPL"; + platforms = ocaml.meta.platforms or []; + }; +} diff --git a/pkgs/development/tools/ocaml/omake/warn.patch b/pkgs/development/tools/ocaml/omake/warn.patch new file mode 100644 index 000000000000..4459e89d7f9c --- /dev/null +++ b/pkgs/development/tools/ocaml/omake/warn.patch @@ -0,0 +1,10 @@ +diff -p1 -aur ../omake-0.9.8.6.ori/lib/build/OCaml.om ./lib/build/OCaml.om +--- ../omake-0.9.8.6.ori/lib/build/OCaml.om 2008-03-05 01:07:25.000000000 +0000 ++++ ./lib/build/OCaml.om 2013-06-01 15:52:37.000000000 +0000 +@@ -178,3 +178,3 @@ declare OCAMLDEPFLAGS + public.OCAMLPPFLAGS = +-public.OCAMLFLAGS = -warn-error A ++public.OCAMLFLAGS = + public.OCAMLCFLAGS = -g +Seulement dans ./lib/build: OCaml.om~ +Seulement dans .: warn.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2502d36dbfa..3f5926c1879a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6376,6 +6376,8 @@ in inherit (ocamlPackages_4_02) ocaml; }; + inherit (ocamlPackages) omake_rc1; + omniorb = callPackage ../development/tools/omniorb { }; opengrok = callPackage ../development/tools/misc/opengrok { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index dc497b125e61..6e3f98c7ba2e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -649,6 +649,8 @@ let trv = callPackage ../development/tools/misc/trv { }; + omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; + verasco = callPackage ../development/tools/analysis/verasco ( if system == "x86_64-linux" then { tools = pkgs.pkgsi686Linux.stdenv.cc; } From 3c7bd996e686b8dd51020f3ac0b767098664c136 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 18 Dec 2016 09:25:24 +0000 Subject: [PATCH 1657/1749] Revert "teyjus: 2.0b2 -> 2.1" This reverts commit 7f501d7f02ed614f2159ae8b0855f33d796d6819. --- pkgs/development/compilers/teyjus/default.nix | 10 ++++----- .../compilers/teyjus/fix-lex-to-flex.patch | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index fafc58371ef9..301915b7a26b 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchzip, omake, ocaml, flex, bison }: +{ stdenv, fetchurl, omake, ocaml, flex, bison }: stdenv.mkDerivation { - name = "teyjus-2.1"; + name = "teyjus-2.0b2"; - src = fetchzip { - url = https://github.com/teyjus/teyjus/archive/v2.1.tar.gz; - sha256 = "064jqf68zpmvndgyhilmxfhnvx1bzm8avhgw82csj5wxw5ky6glz"; + src = fetchurl { + url = "https://teyjus.googlecode.com/files/teyjus-source-2.0-b2.tar.gz"; + sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052"; }; patches = [ ./fix-lex-to-flex.patch ]; diff --git a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch index 52d259bb64de..d2da1d3facca 100644 --- a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch +++ b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch @@ -1,23 +1,23 @@ ---- a/source/OMakefile 1970-01-01 00:00:01.000000000 +0000 -+++ b/source/OMakefile 2016-12-02 08:48:42.000000000 +0000 -@@ -183,18 +183,18 @@ +diff --git a/source/OMakefile b/source/OMakefile +index 6b19d84..095b8b6 100644 +--- a/source/OMakefile ++++ b/source/OMakefile +@@ -164,12 +164,17 @@ LNK_MAIN = $(FNT)/linkerfront DEP_MAIN = $(FNT)/dependfront - PAR_MAIN = $(FNT)/parsefront + ############################################################ ++# Nixpkgs specific changes ++# ++ +LEX = flex + - ############################################################ ++############################################################ # Platform specific changes # - if $(mem $(SYSNAME), Linux) - YACC = bison -by -- LEX = flex - export - if $(mem $(OSTYPE), Cygwin Win32) YACC = bison -by - LEX = flex - CC = i686-pc-mingw32-gcc + CFLAGS += -mno-cygwin INC_C[] += $(INC)/byteswap $(INC)/search export diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f5926c1879a..ece2f37a3541 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5324,7 +5324,9 @@ in lua = lua5_1; }; - teyjus = callPackage ../development/compilers/teyjus { }; + teyjus = callPackage ../development/compilers/teyjus { + omake = omake_rc1; + }; thrust = callPackage ../development/tools/thrust { gconf = pkgs.gnome2.GConf; From eb9fd3c00d82a13cd36d9b5a0264b73de9f640bd Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Sun, 18 Dec 2016 12:09:53 +0200 Subject: [PATCH 1658/1749] syncthing: 0.14.13 -> 0.14.15 --- 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 ee4bb586d552..4263b7e6f77b 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.13"; + version = "0.14.15"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0gq218f1rhzjrqh2gjyvqksa7a1agwhm8rfqf5jw58pncblrn6v4"; + sha256 = "0iq7pzb9f0vgikxxxwvrhi5rlgw9frcwy0lgvc61l6lbw3vl0rd7"; }; buildInputs = [ go ]; From feb6dbc9162719123178c2c0455a5b2b792f15d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 18 Dec 2016 11:57:35 +0100 Subject: [PATCH 1659/1749] ntp: document new default ntp service in release notes --- nixos/doc/manual/release-notes/rl-1703.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index a133630e1464..ef55ea05bcdd 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -77,6 +77,17 @@ following incompatible changes: or attribute sets as specified in parsoid's documentation. + + + + Ntpd was replaced by + systemd-timesyncd as default service to synchronize + system time with a remote NTP server. The old behavior can be restored + setting services.ntp.enable to true. + Upstream time servers for all NTP implementations are now configured using + networking.timeServers + + From c27eeeafd95b6e6f7e059f2a69ce2168c439e068 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 18 Dec 2016 11:47:12 +0100 Subject: [PATCH 1660/1749] brltty service: wait for devices to settle Otherwise it starts way too early, only to fail and having to restart until devices are available. It is less wasteful to simply wait until there's a reasonable chance of success. This is consistent with upstream. --- nixos/modules/services/hardware/brltty.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/hardware/brltty.nix b/nixos/modules/services/hardware/brltty.nix index b416ba332222..1266e8f81e5b 100644 --- a/nixos/modules/services/hardware/brltty.nix +++ b/nixos/modules/services/hardware/brltty.nix @@ -39,6 +39,8 @@ in { ProtectSystem = "full"; SystemCallArchitectures = "native"; }; + wants = [ "systemd-udev-settle.service" ]; + after = [ "local-fs.target" "systemd-udev-settle.service" ]; before = [ "sysinit.target" ]; wantedBy = [ "sysinit.target" ]; }; From 361633db3be8786df74170331526012586088816 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 18 Dec 2016 12:08:48 +0100 Subject: [PATCH 1661/1749] rmilter service: fix invalid directive RuntimeDirectoryPermissions -> RuntimeDirectoryMode Would result in warnings like "unknown lvalue" on startup --- nixos/modules/services/mail/rmilter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix index e27b38bc0e2e..8f18b929c114 100644 --- a/nixos/modules/services/mail/rmilter.nix +++ b/nixos/modules/services/mail/rmilter.nix @@ -203,7 +203,7 @@ milter_default_action = accept PermissionsStartOnly = true; Restart = "always"; RuntimeDirectory = "rmilter"; - RuntimeDirectoryPermissions="0755"; + RuntimeDirectoryMode = "0755"; }; }; From 4bef3ee35827bdd12ed1509a8d4e3d805dd14972 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Sun, 18 Dec 2016 04:29:17 +0100 Subject: [PATCH 1662/1749] gnuapl: add Darwin support --- pkgs/development/interpreters/gnu-apl/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 789f349fb163..bfb975f152a7 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { buildInputs = [ readline gettext ncurses ]; + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" + ''; + + configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + "--disable-dependency-tracking" + "--disable-silent-rules" + ]; + postInstall = '' cp -r support-files/ $out/share/doc/ find $out/share/doc/support-files -name 'Makefile*' -delete @@ -21,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/apl/; license = licenses.gpl3Plus; maintainers = [ maintainers.kovirobi ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; inherit version; longDescription = '' From b8453051b07239be537a68104838904b320c8109 Mon Sep 17 00:00:00 2001 From: Marcin Janczyk Date: Sun, 18 Dec 2016 13:15:57 +0100 Subject: [PATCH 1663/1749] keepass-keefox: 1.6.3 -> 1.6.4 --- pkgs/applications/misc/keepass-plugins/keefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/keepass-plugins/keefox/default.nix b/pkgs/applications/misc/keepass-plugins/keefox/default.nix index cb48ff22bef0..72836c17c86a 100644 --- a/pkgs/applications/misc/keepass-plugins/keefox/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keefox/default.nix @@ -1,12 +1,12 @@ { stdenv, buildEnv, fetchurl, mono, unzip }: let - version = "1.6.3"; + version = "1.6.4"; drv = stdenv.mkDerivation { name = "keefox-${version}"; src = fetchurl { url = "https://github.com/luckyrat/KeeFox/releases/download/v${version}/${version}.xpi"; - sha256 = "dc26c51a6b3690d4bec527c3732a72f67a85b804c60db5e699260552e2dd2bd9"; + sha256 = "0nj4l9ssyfwbl1pxgxvd2h9q0mqhx7i0yzm4a2xjqlqwam534d1w"; }; meta = { From e5bb5ef377982ce0629d94565788d3c74b4a9832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Dec 2016 12:42:57 +0100 Subject: [PATCH 1664/1749] mendeley: use orc package instead of its duplicate I just tested the startup due to having no account (without liborc.so it would fail). /cc @fridh, @badi, #21238. --- pkgs/applications/office/mendeley/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 9409ab3e6698..0ae0732da27f 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, dpkg, makeWrapper, which -,gcc, liborc, xorg, qt4, zlib +, gcc, orc, xorg, qt4, zlib , ...}: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; @@ -23,7 +23,7 @@ let deps = [ gcc.cc - liborc + orc qt4 xorg.libX11 zlib From 1aaedd33f1331744aadff60a09a1e190a13bf554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Dec 2016 13:22:32 +0100 Subject: [PATCH 1665/1749] liborc: remove the duplicate package Now it's unused. Close #21238. --- pkgs/development/libraries/liborc/default.nix | 17 ----------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 19 deletions(-) delete mode 100644 pkgs/development/libraries/liborc/default.nix diff --git a/pkgs/development/libraries/liborc/default.nix b/pkgs/development/libraries/liborc/default.nix deleted file mode 100644 index 2b298c97379c..000000000000 --- a/pkgs/development/libraries/liborc/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "liborc-${version}"; - version = "0.4.16"; - - src = fetchurl { - url = "http://http.debian.net/debian/pool/main/o/orc/orc_${version}.orig.tar.gz"; - sha256 = "1asq58gm87ig60ib4cs69hyqhnsirqkdlidnchhx83halbdlw3kh"; - }; - - meta = with stdenv.lib; { - homepage = https://packages.debian.org/wheezy/liborc-0.4-0; - description = "Orc is a library and set of tools for compiling and executing very simple programs that operate on arrays of data."; - license = with licenses; [ bsd2 bsd3 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebe66c3b18ee..33711f519c7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8250,8 +8250,6 @@ in libopus = callPackage ../development/libraries/libopus { }; - liborc = callPackage ../development/libraries/liborc { }; - libosinfo = callPackage ../development/libraries/libosinfo { inherit (gnome3) libsoup; }; From 2b8566f556649da57e180dabb04aa69af0618473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Dec 2016 13:31:12 +0100 Subject: [PATCH 1666/1749] release notes: grammar nitpicks in an entry /cc #21257. --- nixos/doc/manual/release-notes/rl-1703.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index ef55ea05bcdd..d8b0ae01e333 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -81,11 +81,11 @@ following incompatible changes: Ntpd was replaced by - systemd-timesyncd as default service to synchronize - system time with a remote NTP server. The old behavior can be restored + systemd-timesyncd as the default service to synchronize + system time with a remote NTP server. The old behavior can be restored by setting services.ntp.enable to true. Upstream time servers for all NTP implementations are now configured using - networking.timeServers + networking.timeServers. From 07950a24b6c3e44976cb901b1e4493439d356462 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Sun, 18 Dec 2016 14:33:03 +0200 Subject: [PATCH 1667/1749] octoprint: allow any flask version --- pkgs/applications/misc/octoprint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index fa0097272ffb..0488bb7e4b3e 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -69,6 +69,7 @@ in pythonPackages.buildPythonApplication rec { -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \ -e 's,rsa>=[^"]*,rsa,g' \ -e 's,PyYAML>=[^"]*,PyYAML,g' \ + -e 's,flask>=[^"]*,flask,g' \ setup.py ''; From 0d296076b4ee2a1e2968d3d75f16f083f95af862 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 16 Dec 2016 09:34:07 -0600 Subject: [PATCH 1668/1749] qt5.grantlee: 5.0.0 -> 5.1.0 The source location has been updated to reflect that upstream development has moved to GitHub. --- pkgs/development/libraries/grantlee/5.x.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5.x.nix index 9e697a572b94..b4aa9414163a 100644 --- a/pkgs/development/libraries/grantlee/5.x.nix +++ b/pkgs/development/libraries/grantlee/5.x.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, qtbase, qtscript, cmake }: stdenv.mkDerivation rec { - name = "grantlee-5.0.0"; + name = "grantlee-${version}"; + version = "5.1.0"; -# Upstream download server has country code firewall, so I made a mirror. src = fetchurl { - urls = [ - "http://downloads.grantlee.org/${name}.tar.gz" - "http://www.loegria.net/grantlee/${name}.tar.gz" - ]; - sha256 = "0qdifp1sg87j3869xva5ai2d6d5ph7z4b85wv1fypf2k5sljpwpa"; + url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz"; + sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq"; + name = "${name}.tar.gz"; }; buildInputs = [ qtbase qtscript ]; From 46b1cc4f7552d4766c0708ffc5670b53fd629c7a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 16 Dec 2016 11:25:50 -0600 Subject: [PATCH 1669/1749] kde5.applications: 16.08.3 -> 16.12.0 New packages: - akonadi - akonadi-contacts - akonadi-mime - kcontacts - kdegraphics-mobipocket - kmime Removed packages: - gpgmepp: now part of gpgme Notable changes: - kgpg: ported from Qt 4 and kdelibs to Qt 5 and Frameworks - okular: ported from Qt 4 and kdelibs to Qt 5 and Frameworks --- .../kde-5/applications/akonadi-contacts.nix | 19 + .../kde-5/applications/akonadi-mime.nix | 15 + pkgs/desktops/kde-5/applications/akonadi.nix | 20 + pkgs/desktops/kde-5/applications/default.nix | 9 +- pkgs/desktops/kde-5/applications/fetch.sh | 2 +- .../desktops/kde-5/applications/kcontacts.nix | 15 + ...gpgmepp.nix => kdegraphics-mobipocket.nix} | 8 +- pkgs/desktops/kde-5/applications/kgpg.nix | 18 +- pkgs/desktops/kde-5/applications/kmime.nix | 15 + pkgs/desktops/kde-5/applications/l10n.nix | 5 +- pkgs/desktops/kde-5/applications/okular.nix | 41 +- pkgs/desktops/kde-5/applications/srcs.nix | 2266 +++++++++-------- 12 files changed, 1345 insertions(+), 1088 deletions(-) create mode 100644 pkgs/desktops/kde-5/applications/akonadi-contacts.nix create mode 100644 pkgs/desktops/kde-5/applications/akonadi-mime.nix create mode 100644 pkgs/desktops/kde-5/applications/akonadi.nix create mode 100644 pkgs/desktops/kde-5/applications/kcontacts.nix rename pkgs/desktops/kde-5/applications/{gpgmepp.nix => kdegraphics-mobipocket.nix} (50%) create mode 100644 pkgs/desktops/kde-5/applications/kmime.nix diff --git a/pkgs/desktops/kde-5/applications/akonadi-contacts.nix b/pkgs/desktops/kde-5/applications/akonadi-contacts.nix new file mode 100644 index 000000000000..7acfa3a230b3 --- /dev/null +++ b/pkgs/desktops/kde-5/applications/akonadi-contacts.nix @@ -0,0 +1,19 @@ +{ + kdeApp, lib, + ecm, + akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine, + akonadi +}: + +kdeApp { + name = "akonadi-contacts"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ ecm ]; + buildInputs = [ + akonadi-mime grantlee kcontacts kio kitemmodels kmime qtwebengine + ]; + propagatedBuildInputs = [ akonadi ]; +} diff --git a/pkgs/desktops/kde-5/applications/akonadi-mime.nix b/pkgs/desktops/kde-5/applications/akonadi-mime.nix new file mode 100644 index 000000000000..26e1559c779e --- /dev/null +++ b/pkgs/desktops/kde-5/applications/akonadi-mime.nix @@ -0,0 +1,15 @@ +{ + kdeApp, lib, + ecm, + akonadi, kdbusaddons, kio, kitemmodels, kmime +}: + +kdeApp { + name = "akonadi-mime"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ ecm ]; + buildInputs = [ akonadi kdbusaddons kio kitemmodels kmime ]; +} diff --git a/pkgs/desktops/kde-5/applications/akonadi.nix b/pkgs/desktops/kde-5/applications/akonadi.nix new file mode 100644 index 000000000000..03483e5ec0d1 --- /dev/null +++ b/pkgs/desktops/kde-5/applications/akonadi.nix @@ -0,0 +1,20 @@ +{ + kdeApp, lib, + ecm, + kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes, + kio, + boost, kitemmodels +}: + +kdeApp { + name = "akonadi"; + meta = { + license = [ lib.licenses.lgpl21 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ ecm ]; + buildInputs = [ + kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio + ]; + propagatedBuildInputs = [ boost kitemmodels ]; +} diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index 91f43545b310..db255a1d5b78 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -31,6 +31,9 @@ let inherit (pkgs) attica phonon; }; + akonadi = callPackage ./akonadi.nix {}; + akonadi-contacts = callPackage ./akonadi-contacts.nix {}; + akonadi-mime = callPackage ./akonadi-mime.nix {}; ark = callPackage ./ark/default.nix {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; dolphin = callPackage ./dolphin.nix {}; @@ -39,18 +42,20 @@ let ffmpeg = pkgs.ffmpeg_2; }; filelight = callPackage ./filelight.nix {}; - gpgmepp = callPackage ./gpgmepp.nix {}; gwenview = callPackage ./gwenview.nix {}; kate = callPackage ./kate.nix {}; kdenlive = callPackage ./kdenlive.nix {}; kcalc = callPackage ./kcalc.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {}; + kcontacts = callPackage ./kcontacts.nix {}; + kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdf = callPackage ./kdf.nix {}; - kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; }; + kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; kio-extras = callPackage ./kio-extras.nix {}; + kmime = callPackage ./kmime.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh index 845548c4f5bc..eb1b1654bb87 100644 --- a/pkgs/desktops/kde-5/applications/fetch.sh +++ b/pkgs/desktops/kde-5/applications/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://ftp.ussg.iu.edu/kde/stable/applications/16.08.3/ --cut-dirs=1 -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/applications/16.12.0/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/applications/kcontacts.nix b/pkgs/desktops/kde-5/applications/kcontacts.nix new file mode 100644 index 000000000000..441d73d363d9 --- /dev/null +++ b/pkgs/desktops/kde-5/applications/kcontacts.nix @@ -0,0 +1,15 @@ +{ + kdeApp, lib, + ecm, ki18n, + kcoreaddons, kconfig, kcodecs +}: + +kdeApp { + name = "kcontacts"; + meta = { + license = [ lib.licenses.lgpl21 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ ecm ki18n ]; + buildInputs = [ kcoreaddons kconfig kcodecs ]; +} diff --git a/pkgs/desktops/kde-5/applications/gpgmepp.nix b/pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix similarity index 50% rename from pkgs/desktops/kde-5/applications/gpgmepp.nix rename to pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix index 0e5cb15029c3..984524dc1b2b 100644 --- a/pkgs/desktops/kde-5/applications/gpgmepp.nix +++ b/pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix @@ -1,15 +1,15 @@ { kdeApp, lib, ecm, - boost, gpgme + kio }: kdeApp { - name = "gpgmepp"; + name = "kdegraphics-mobipocket"; meta = { - license = with lib.licenses; [ lgpl21 bsd3 ]; + license = [ lib.licenses.gpl2Plus ]; maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ ecm ]; - propagatedBuildInputs = [ boost gpgme ]; + buildInputs = [ kio ]; } diff --git a/pkgs/desktops/kde-5/applications/kgpg.nix b/pkgs/desktops/kde-5/applications/kgpg.nix index 6717dc1511dc..cd462acdf2b0 100644 --- a/pkgs/desktops/kde-5/applications/kgpg.nix +++ b/pkgs/desktops/kde-5/applications/kgpg.nix @@ -1,17 +1,19 @@ { kdeApp, lib, - automoc4, cmake, makeWrapper, perl, pkgconfig, - boost, gpgme, kdelibs, kdepimlibs, gnupg + ecm, kdoctools, ki18n, + akonadi-contacts, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash, + kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice, + ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem }: kdeApp { name = "kgpg"; - nativeBuildInputs = [ automoc4 cmake makeWrapper perl pkgconfig ]; - buildInputs = [ boost gpgme kdelibs kdepimlibs ]; - postInstall = '' - wrapProgram "$out/bin/kgpg" \ - --prefix PATH : "${gnupg}/bin" - ''; + nativeBuildInputs = [ ecm kdoctools ki18n ]; + buildInputs = [ + akonadi-contacts gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons + kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui + kwidgetsaddons kwindowsystem + ]; meta = { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/desktops/kde-5/applications/kmime.nix b/pkgs/desktops/kde-5/applications/kmime.nix new file mode 100644 index 000000000000..d60909ec7bc9 --- /dev/null +++ b/pkgs/desktops/kde-5/applications/kmime.nix @@ -0,0 +1,15 @@ +{ + kdeApp, lib, + ecm, ki18n, + kcodecs +}: + +kdeApp { + name = "kmime"; + meta = { + license = [ lib.licenses.lgpl21 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ ecm ki18n ]; + buildInputs = [ kcodecs ]; +} diff --git a/pkgs/desktops/kde-5/applications/l10n.nix b/pkgs/desktops/kde-5/applications/l10n.nix index 9b211faf4448..f2e5f843b5d9 100644 --- a/pkgs/desktops/kde-5/applications/l10n.nix +++ b/pkgs/desktops/kde-5/applications/l10n.nix @@ -205,7 +205,7 @@ lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) { }) {}; qt5 = callPackage (kdeLocale5 "sr" { preConfigure = '' - patchShebangs 5/sr/data/resolve-sr-hybrid + patchShebangs 5/sr/cmake_modules/resolve-sr-hybrid sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt ''; }) {}; @@ -222,13 +222,10 @@ lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) { qt4 = callPackage (kdeLocale4 "ug" {}) {}; qt5 = callPackage (kdeLocale5 "ug" {}) {}; }; - # TODO: build broken in 15.11.80; re-enable in next release - /* uk = { qt4 = callPackage (kdeLocale4 "uk" {}) {}; qt5 = callPackage (kdeLocale5 "uk" {}) {}; }; - */ wa = { qt4 = callPackage (kdeLocale4 "wa" {}) {}; qt5 = callPackage (kdeLocale5 "wa" {}) {}; diff --git a/pkgs/desktops/kde-5/applications/okular.nix b/pkgs/desktops/kde-5/applications/okular.nix index 6e6f1407c558..b8780a7ccc1f 100644 --- a/pkgs/desktops/kde-5/applications/okular.nix +++ b/pkgs/desktops/kde-5/applications/okular.nix @@ -1,21 +1,30 @@ { - kdeApp, lib, - automoc4, cmake, perl, pkgconfig, kdelibs, qimageblitz, - poppler_qt4, libspectre, libkexiv2, djvulibre, libtiff, freetype, - ebook_tools + kdeApp, lib, kdeWrapper, + ecm, kdoctools, + djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion, + kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, + kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2, + libspectre, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver }: -kdeApp { - name = "okular"; - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; - buildInputs = [ - kdelibs qimageblitz poppler_qt4 libspectre libkexiv2 djvulibre libtiff - freetype ebook_tools - ]; - meta = { - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; - maintainers = [ lib.maintainers.ttuegel ]; +let + unwrapped = kdeApp { + name = "okular"; + nativeBuildInputs = [ ecm kdoctools ]; + buildInputs = [ + djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig + kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes + kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler + qca-qt5 qtdeclarative qtsvg threadweaver + ]; + meta = { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; }; +in +kdeWrapper unwrapped { + targets = [ "bin/okular" ]; } diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix index f6f13a2f2e5e..ae0140328511 100644 --- a/pkgs/desktops/kde-5/applications/srcs.nix +++ b/pkgs/desktops/kde-5/applications/srcs.nix @@ -3,2067 +3,2227 @@ { akonadi = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/akonadi-16.08.3.tar.xz"; - sha256 = "1k967l551r4kzj2hyfikr7ky8n77rhcniscw7f8a42vmdxnr5jvy"; - name = "akonadi-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/akonadi-16.12.0.tar.xz"; + sha256 = "1gqjaxq8b3mcwjm28aqc9kss4p46hga252j27vsg85pzvw58q718"; + name = "akonadi-16.12.0.tar.xz"; }; }; akonadi-calendar = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/akonadi-calendar-16.08.3.tar.xz"; - sha256 = "1wh69vns5aw2av1hfcrz0gymqv8884xl0ss0yvcg9s478l550yj9"; - name = "akonadi-calendar-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/akonadi-calendar-16.12.0.tar.xz"; + sha256 = "1y6yg4f9ayl0il074fln2496pfh6jdsr489yh25jjcs8wf52669h"; + name = "akonadi-calendar-16.12.0.tar.xz"; + }; + }; + akonadi-calendar-tools = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/akonadi-calendar-tools-16.12.0.tar.xz"; + sha256 = "0wwchjf2pisbj5hp9hfs8m2bhxgzkxf6c0rj8zv5p66lcl964iad"; + name = "akonadi-calendar-tools-16.12.0.tar.xz"; + }; + }; + akonadiconsole = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/akonadiconsole-16.12.0.tar.xz"; + sha256 = "033rx5nqkwyrshacm3bykd8w2c2dffx6wfhm26l7siicaa6kani6"; + name = "akonadiconsole-16.12.0.tar.xz"; }; }; akonadi-contacts = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/akonadi-contacts-16.08.3.tar.xz"; - sha256 = "12cdqkx7i7wahqf5zb4dxmbvzidvxw77imsjqaw0qw7jd5hnybmd"; - name = "akonadi-contacts-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/akonadi-contacts-16.12.0.tar.xz"; + sha256 = "1imiv3w78gsk33yiwpkrfzgdlcyqwrzmjid6wwbxjh52rawjvvzc"; + name = "akonadi-contacts-16.12.0.tar.xz"; + }; + }; + akonadi-import-wizard = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/akonadi-import-wizard-16.12.0.tar.xz"; + sha256 = "1nz7ca3457cmlrvmk33hphlm3q2fq3qcq36rmandsv5n1jplfcf5"; + name = "akonadi-import-wizard-16.12.0.tar.xz"; }; }; akonadi-mime = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/akonadi-mime-16.08.3.tar.xz"; - sha256 = "1jlsqlfyr1rl1ny2nyccwiqzs72fi2qzim3qg4j6749y3imi8rvx"; - name = "akonadi-mime-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/akonadi-mime-16.12.0.tar.xz"; + sha256 = "06547ixg4054lm8clyfsmkmwc8zai3w9swyw7hyjz257fd0147dr"; + name = "akonadi-mime-16.12.0.tar.xz"; }; }; akonadi-notes = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/akonadi-notes-16.08.3.tar.xz"; - sha256 = "1fmpsqywpv4p65kdlisy5z57zba34h70djcdh3ch5rmmsxz75c0s"; - name = "akonadi-notes-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/akonadi-notes-16.12.0.tar.xz"; + sha256 = "03cadn97fa1jkbpljk0764w8dwv5k1brm1iv554gmag0xky2a6in"; + name = "akonadi-notes-16.12.0.tar.xz"; }; }; akonadi-search = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/akonadi-search-16.08.3.tar.xz"; - sha256 = "1whj5vzg33nlh756n5jcw2fj6yqf7wmq4lpvsj8k7hs9gnw7vqzd"; - name = "akonadi-search-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/akonadi-search-16.12.0.tar.xz"; + sha256 = "08y7rk9i30d3kg61xfzck0a78dyrgb6jzs3w4i7rxq28z374mi2m"; + name = "akonadi-search-16.12.0.tar.xz"; + }; + }; + akregator = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/akregator-16.12.0.tar.xz"; + sha256 = "0ibls40w0wad1gkdj3djmmvdd89pia3fbykqfjwrvnxslr7zfvnl"; + name = "akregator-16.12.0.tar.xz"; }; }; analitza = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/analitza-16.08.3.tar.xz"; - sha256 = "0q9336z6468qsw1rqlifagwppwanrnpr23srqqgifwi4wh25ky7q"; - name = "analitza-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/analitza-16.12.0.tar.xz"; + sha256 = "1ws1whss7p5ijyaw7vs5lfvrisljk2b4m6iqbnr1v4n45cr27vrq"; + name = "analitza-16.12.0.tar.xz"; }; }; ark = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ark-16.08.3.tar.xz"; - sha256 = "021cjgw25zryjwmbslbnm5vg5ddgl5knxvqldrwjjhkqw2pzc4y7"; - name = "ark-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ark-16.12.0.tar.xz"; + sha256 = "0gg84p1qaamklgvyqw5pjcdm2934srkvclrvn07jdpcf8xirn51a"; + name = "ark-16.12.0.tar.xz"; }; }; artikulate = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/artikulate-16.08.3.tar.xz"; - sha256 = "0g5ya2cyjpnrzsccdqja1z6x5hh49a9r9m6c8408hv8bssigyvd1"; - name = "artikulate-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/artikulate-16.12.0.tar.xz"; + sha256 = "1ahz3kypszfc5smzdblbr47yb320p4sc28frl7b5vvbx2mj77iyi"; + name = "artikulate-16.12.0.tar.xz"; }; }; audiocd-kio = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/audiocd-kio-16.08.3.tar.xz"; - sha256 = "1d7qxp6v1g9rpjfh457hzi7h67d9550wa3fm4d4xja227zqqx63q"; - name = "audiocd-kio-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/audiocd-kio-16.12.0.tar.xz"; + sha256 = "0hl5qiafp6yqi87qncp1kgd6178jn7bh2paz4fxyc4v92w2mzlcy"; + name = "audiocd-kio-16.12.0.tar.xz"; }; }; baloo-widgets = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/baloo-widgets-16.08.3.tar.xz"; - sha256 = "04zm0jfpvnq821kcjylac7g0zlwldkvxadmrvj9qy28vh4k8wi3m"; - name = "baloo-widgets-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/baloo-widgets-16.12.0.tar.xz"; + sha256 = "06w0f54m9bw7640049gl10v6krdm5c0xlb6bjf61ay99mbyv7cgq"; + name = "baloo-widgets-16.12.0.tar.xz"; }; }; blinken = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/blinken-16.08.3.tar.xz"; - sha256 = "0r71s877dhf3ib3hwhfl3k3ldz671dw6ym3jjnavp2pl6h0wc6hv"; - name = "blinken-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/blinken-16.12.0.tar.xz"; + sha256 = "0l3l3fjhsxm13m99mvcqgnyw0vmnjvx5akaa3nyx0mfzm1y1iw4v"; + name = "blinken-16.12.0.tar.xz"; + }; + }; + blogilo = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/blogilo-16.12.0.tar.xz"; + sha256 = "0582dfznwvwc28zqzmbayypgy6kn2gq87q7j1y6q8m0lm017xgqy"; + name = "blogilo-16.12.0.tar.xz"; }; }; bomber = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/bomber-16.08.3.tar.xz"; - sha256 = "1cqdv36s1y92hk9ghvm3ha67b1j7h7srv6cig6m5rvyaxpy2gw4f"; - name = "bomber-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/bomber-16.12.0.tar.xz"; + sha256 = "0qxs0slw4q75bhakmp7di2izi3sz9niq7v0kjincis9vc2l13dd9"; + name = "bomber-16.12.0.tar.xz"; }; }; bovo = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/bovo-16.08.3.tar.xz"; - sha256 = "0z6ij7p0vckni0aa412ap8agcqrid98qif3c655m69hmw3arf6k9"; - name = "bovo-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/bovo-16.12.0.tar.xz"; + sha256 = "0cmxf4i5zpzc1lc9ggbvbd74i4ks29q915mygdam99b2bzfbq9qv"; + name = "bovo-16.12.0.tar.xz"; }; }; calendarsupport = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/calendarsupport-16.08.3.tar.xz"; - sha256 = "1r8v1sydragkf9gcvkc9rjlm9h7mah01ayw5pg8pjaxhbfsva8ad"; - name = "calendarsupport-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/calendarsupport-16.12.0.tar.xz"; + sha256 = "11jz7vl8ay4fkxifpyg4vpdw7cl9m8dj6bgbmfw8nhdf8v8m9i6v"; + name = "calendarsupport-16.12.0.tar.xz"; }; }; cantor = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/cantor-16.08.3.tar.xz"; - sha256 = "0i2sd4vp7dvqjh41rr4wv9ij1jriyj9kn69z9i0iig389gwza0n7"; - name = "cantor-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/cantor-16.12.0.tar.xz"; + sha256 = "0k1ps1dxilikm1qnfpd0fmbxsrqi5mrf2wyl07b67a3sfl7bzw98"; + name = "cantor-16.12.0.tar.xz"; }; }; cervisia = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/cervisia-16.08.3.tar.xz"; - sha256 = "14p6j8nzdjn2s4v0h5yj8r3yl89sq93z7naq2bifg7nxalazbz27"; - name = "cervisia-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/cervisia-16.12.0.tar.xz"; + sha256 = "0c8g3l0q0inyggikqlz7spb32v26lz63ghs1m2cfjagvzisiylbg"; + name = "cervisia-16.12.0.tar.xz"; }; }; dolphin = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/dolphin-16.08.3.tar.xz"; - sha256 = "0zqv75d06s7c59yx2w4dkr37mhafhwys4fqp44mpbf1x8yw1ijgx"; - name = "dolphin-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/dolphin-16.12.0.tar.xz"; + sha256 = "0dyzlpd7pj21jl4k5j6x6fbxzj7vlp7ww4z82rkld3x7kmmi4b4v"; + name = "dolphin-16.12.0.tar.xz"; }; }; dolphin-plugins = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/dolphin-plugins-16.08.3.tar.xz"; - sha256 = "05rdq5zgp8px9gii4wnnf3qpwnv4h5i621q72ain0mpvapzb3q4v"; - name = "dolphin-plugins-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/dolphin-plugins-16.12.0.tar.xz"; + sha256 = "0ab62pbvb6n47b86j1bdicahwqvcnv401872f5q08na1zybxklx3"; + name = "dolphin-plugins-16.12.0.tar.xz"; }; }; dragon = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/dragon-16.08.3.tar.xz"; - sha256 = "0s94vnr9hz5gzgs555phwl9y9m9jw0ysimv56mh8n56f6ar9za5m"; - name = "dragon-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/dragon-16.12.0.tar.xz"; + sha256 = "08sasdzd22l8mdzlb0jf780qcy374qg5ngispq78vn2x8zkyk3q2"; + name = "dragon-16.12.0.tar.xz"; }; }; eventviews = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/eventviews-16.08.3.tar.xz"; - sha256 = "1qsjmym821b7v81rxb9af30idny4zw3czzkqx3370wa6hbsma9b2"; - name = "eventviews-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/eventviews-16.12.0.tar.xz"; + sha256 = "048sgmr3ws48xmfp1h6zyrizyigp2qqhiz3lrwla39iblxi0l4sf"; + name = "eventviews-16.12.0.tar.xz"; }; }; ffmpegthumbs = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ffmpegthumbs-16.08.3.tar.xz"; - sha256 = "0j9c65kl6gh3j5g5jvjjx3hb3s5hcyzy6hz1fswp2v9sihaf7jrc"; - name = "ffmpegthumbs-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ffmpegthumbs-16.12.0.tar.xz"; + sha256 = "036py6cgkb7zismbffavk3jzjz2lzrh4jbknqrdrwli4fxsxbpi6"; + name = "ffmpegthumbs-16.12.0.tar.xz"; }; }; filelight = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/filelight-16.08.3.tar.xz"; - sha256 = "07hc63cabv237nq38x8dnjqnfpicw6czliar0yc66k37vhdxvkjh"; - name = "filelight-16.08.3.tar.xz"; - }; - }; - gpgmepp = { - version = "16.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/gpgmepp-16.08.3.tar.xz"; - sha256 = "0sda2ib5ymyzsji2v7aqdgfy6mhhfs6s3wyngb2k3q8hshv4xi5z"; - name = "gpgmepp-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/filelight-16.12.0.tar.xz"; + sha256 = "05v0db9n6s3fxn31450biij0w0vf7s4bsvfbyiy3cnf33habgz4d"; + name = "filelight-16.12.0.tar.xz"; }; }; granatier = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/granatier-16.08.3.tar.xz"; - sha256 = "07lhy7zbykhcnfyiymw6xhdpg8ng6xn0k3fca6afi16a0zk1hpnl"; - name = "granatier-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/granatier-16.12.0.tar.xz"; + sha256 = "1hzqqsdq7xj7ackc11yn966cnns82200ff7yc1wiazgivg39l8wj"; + name = "granatier-16.12.0.tar.xz"; + }; + }; + grantlee-editor = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/grantlee-editor-16.12.0.tar.xz"; + sha256 = "049fvgyri9bqm792gyyz6qx7mrriqb3gmdbd2i8zs0x1i1lxfbn7"; + name = "grantlee-editor-16.12.0.tar.xz"; }; }; grantleetheme = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/grantleetheme-16.08.3.tar.xz"; - sha256 = "1s2rz8ahm0dxij8v9czb1qcasp1igr20ipb4hc34y5ds9vmwrc7i"; - name = "grantleetheme-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/grantleetheme-16.12.0.tar.xz"; + sha256 = "07i2vidzvh9z05iz8xs08w918x7917mckfm1w5agpi4ma8iz8g4b"; + name = "grantleetheme-16.12.0.tar.xz"; }; }; gwenview = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/gwenview-16.08.3.tar.xz"; - sha256 = "122nd5chwf6mcj3d7wz0jwz9wrzw1dk5c29nb7k8kbapsrhs27x3"; - name = "gwenview-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/gwenview-16.12.0.tar.xz"; + sha256 = "0pqzqfb604qfcck2jml65aya6gyjqvx8gnl047mr04yd4x65mjnn"; + name = "gwenview-16.12.0.tar.xz"; }; }; incidenceeditor = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/incidenceeditor-16.08.3.tar.xz"; - sha256 = "03kfjkxmjjwb974gplqhwvjiw6cgvxziqzrn4jmk3di3nl954mxj"; - name = "incidenceeditor-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/incidenceeditor-16.12.0.tar.xz"; + sha256 = "1ylkxx7j2dsipcxrdj3cs142hjnz25c76q6jlpwj6p4vv7vzhvq9"; + name = "incidenceeditor-16.12.0.tar.xz"; }; }; jovie = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/jovie-16.08.3.tar.xz"; - sha256 = "1lb3qnhdc2prrbi07gwvgx0bca2w4w5zwllp547h4lgjjc69s1mv"; - name = "jovie-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/jovie-16.12.0.tar.xz"; + sha256 = "0qm853z8g620klmcay955yfc76mb8ggfdx65zrhiiq5nkfaybwkr"; + name = "jovie-16.12.0.tar.xz"; }; }; juk = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/juk-16.08.3.tar.xz"; - sha256 = "1c83nm0rr6d67666pd1fynxgsxkhlfz1y3dkfm8mvxd7hx7164x3"; - name = "juk-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/juk-16.12.0.tar.xz"; + sha256 = "05jk2gp9mcsjjdppahg3r70vjr203wf63mb5kqmdr98gfm9wfm74"; + name = "juk-16.12.0.tar.xz"; }; }; kaccessible = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kaccessible-16.08.3.tar.xz"; - sha256 = "0p2w862dkzngmryfj46xnam50gcv516igdgs8skcj9jw19gr828q"; - name = "kaccessible-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kaccessible-16.12.0.tar.xz"; + sha256 = "1mh3610my9l21cq1zyjfk991q1gi6mii0z83zwq83wyi146b42mx"; + name = "kaccessible-16.12.0.tar.xz"; }; }; kaccounts-integration = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kaccounts-integration-16.08.3.tar.xz"; - sha256 = "03cf9nb2bxzx5kq0a94y1b1jj7ypidnpkcfbixdmkwfwwybrfm0w"; - name = "kaccounts-integration-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kaccounts-integration-16.12.0.tar.xz"; + sha256 = "14v3pifz0diz3dscbyl49bp4fm2ivwdwm6hhxycv69fd221wkx5x"; + name = "kaccounts-integration-16.12.0.tar.xz"; }; }; kaccounts-providers = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kaccounts-providers-16.08.3.tar.xz"; - sha256 = "06ccw3ncliyhjwv2mv8yxmhxl161q51k740yilbgf3lz1qywn3bz"; - name = "kaccounts-providers-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kaccounts-providers-16.12.0.tar.xz"; + sha256 = "0fiq8zkaz3jyxnphi7z2r6q8xjsqlkzzjcs51akal5dm2cp1i6px"; + name = "kaccounts-providers-16.12.0.tar.xz"; + }; + }; + kaddressbook = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/kaddressbook-16.12.0.tar.xz"; + sha256 = "11hnrf1cwjnjysx8wgwnkfj0vkfv7vgv4wdrllnxj5mpx8mcw3k7"; + name = "kaddressbook-16.12.0.tar.xz"; }; }; kajongg = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kajongg-16.08.3.tar.xz"; - sha256 = "0hkc50rd8yag9dlc27fp633fn1zf0g81d605d29n96kxj03shdah"; - name = "kajongg-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kajongg-16.12.0.tar.xz"; + sha256 = "1aymlzrw331z8ch46cwpv8x1v4j8ilhz42hzji1x06rh4s0xn5k6"; + name = "kajongg-16.12.0.tar.xz"; + }; + }; + kalarm = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/kalarm-16.12.0.tar.xz"; + sha256 = "1kbrq5d854szx6nknyx2jbzmr47xajicaqgjfg59jwbb453mdbkm"; + name = "kalarm-16.12.0.tar.xz"; }; }; kalarmcal = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kalarmcal-16.08.3.tar.xz"; - sha256 = "06arrlsws3a3arsixd33dna2ghq4wywka3dmvgdl8g0cjrcm5c18"; - name = "kalarmcal-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kalarmcal-16.12.0.tar.xz"; + sha256 = "16qqk1wqyjxfjnz9jaihcj7mdn8iixvmcm1i0cjfpck0bja9sj0p"; + name = "kalarmcal-16.12.0.tar.xz"; }; }; kalgebra = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kalgebra-16.08.3.tar.xz"; - sha256 = "0g5xqwbxmrhhxmhsi1d2sllnr9sg64pa3wrlhpwcag9l4rggl902"; - name = "kalgebra-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kalgebra-16.12.0.tar.xz"; + sha256 = "0av4k54cil7jl545q5m7klwvw586hcdfpnvq95bcng8is0bnfrgs"; + name = "kalgebra-16.12.0.tar.xz"; }; }; kalzium = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kalzium-16.08.3.tar.xz"; - sha256 = "1ywhn0rmqyl9cvzg4jybhl4bvllgbaj2j0cm2pd93ssnp2ispvnp"; - name = "kalzium-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kalzium-16.12.0.tar.xz"; + sha256 = "03l8dbhhcqaz009g1lxqkq9mci3v0kqx03mxgfdsjq0pzf2hq1ah"; + name = "kalzium-16.12.0.tar.xz"; }; }; kamera = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kamera-16.08.3.tar.xz"; - sha256 = "0lx0yqj0xd5878pb3nqfj0ibs3m78s1c3hx2hayny8i00nq2vm33"; - name = "kamera-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kamera-16.12.0.tar.xz"; + sha256 = "02q8kbkwg7w2iqn76dchyqhwmx6k2a2q3dz3pn1ah0b0ildqr93n"; + name = "kamera-16.12.0.tar.xz"; }; }; kanagram = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kanagram-16.08.3.tar.xz"; - sha256 = "0bci8h83jww94yqv1i6xxznhi2r755fs29qxb85wmgcnff0bfmlj"; - name = "kanagram-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kanagram-16.12.0.tar.xz"; + sha256 = "1xsph7983qnpg0zisbrw9r18i98zdy9xrpsdhq89wz895iqrfxqn"; + name = "kanagram-16.12.0.tar.xz"; }; }; kapman = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kapman-16.08.3.tar.xz"; - sha256 = "0fb6czdgpm19hgf3dpvj1hj7hh1zq226i00hi4qdakfwxpngxrav"; - name = "kapman-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kapman-16.12.0.tar.xz"; + sha256 = "1p8h6xr7na9ihgcvc63c537kd9d4zhhvhim559dbf371cpkfm40l"; + name = "kapman-16.12.0.tar.xz"; }; }; kapptemplate = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kapptemplate-16.08.3.tar.xz"; - sha256 = "1f3zy1ffhhd3gn9pfmjf2igcka1xlik4vwmpxgb56gq5kw7y8glj"; - name = "kapptemplate-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kapptemplate-16.12.0.tar.xz"; + sha256 = "07sd32hkmw07afw65hi4rbzwvxasan01clag4z4smqscibz4dfr1"; + name = "kapptemplate-16.12.0.tar.xz"; }; }; kate = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kate-16.08.3.tar.xz"; - sha256 = "0xsfak6bb7nzik6dk840xv37ys4pz58908zx76z7i4vl6yqyyjxy"; - name = "kate-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kate-16.12.0.tar.xz"; + sha256 = "0n769wn2ja81mzhynqab034a7644nd0dcz3digqcf7hxplcjwcrz"; + name = "kate-16.12.0.tar.xz"; }; }; katomic = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/katomic-16.08.3.tar.xz"; - sha256 = "17q5gwd40vxamwbdrayfhayh2qbrm4i2y9hawx63dqdvc20ijj0z"; - name = "katomic-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/katomic-16.12.0.tar.xz"; + sha256 = "1kk7h293qcxmq8wn597xc8awnfr5pbz8gf3h6zicvcmmcl6a2v6r"; + name = "katomic-16.12.0.tar.xz"; }; }; kblackbox = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kblackbox-16.08.3.tar.xz"; - sha256 = "0vpyclqzxafjnvlkkvg9czimqr9l610vnhlw11ia032haffq4qrf"; - name = "kblackbox-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kblackbox-16.12.0.tar.xz"; + sha256 = "146x0rj6408d96aw426qcs5h43xw9dash51spys0frsrgnblm7ji"; + name = "kblackbox-16.12.0.tar.xz"; }; }; kblocks = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kblocks-16.08.3.tar.xz"; - sha256 = "1bvhs8bmz7wsc4nz4bxns7i50b2r09kbwrqfn685c39l2zv60gp0"; - name = "kblocks-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kblocks-16.12.0.tar.xz"; + sha256 = "0h60w4x003ypip5svbda88sxbyxxpjf6kxxfyxniv81hq5vag49d"; + name = "kblocks-16.12.0.tar.xz"; }; }; kblog = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kblog-16.08.3.tar.xz"; - sha256 = "19mh29xirx2rb6db5wxjd6am8wjx5mz0s0qszysrm7s9njsp2sqi"; - name = "kblog-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kblog-16.12.0.tar.xz"; + sha256 = "1ph86xkjc42m3mysg68xwfy0d364vjqlm4wsn8yx0ag0ndr34vw2"; + name = "kblog-16.12.0.tar.xz"; }; }; kbounce = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kbounce-16.08.3.tar.xz"; - sha256 = "0f2m8x2mi89y15hvlk9xzd2prgv4fwhal02avjz0b6swggrs8shg"; - name = "kbounce-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kbounce-16.12.0.tar.xz"; + sha256 = "0jr0pgdp9nmiikbrnx82ydjkh4mgv0wcqjp7fdfyh1rmcz8r02v1"; + name = "kbounce-16.12.0.tar.xz"; }; }; kbreakout = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kbreakout-16.08.3.tar.xz"; - sha256 = "1rbyracpvvi4l9hn09k1w67cjkcnnnaqwr3maqj77mzh8wbsj1d3"; - name = "kbreakout-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kbreakout-16.12.0.tar.xz"; + sha256 = "0pk2hn2bzx3cdxmilsd3rbrvajv2ysipybmd5ca3q65rf8d0l727"; + name = "kbreakout-16.12.0.tar.xz"; }; }; kbruch = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kbruch-16.08.3.tar.xz"; - sha256 = "14yvildw0aji3lrb2xfafncqkwls3jjfvcbj1hi15gp3xxxr6s4z"; - name = "kbruch-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kbruch-16.12.0.tar.xz"; + sha256 = "1q7zbixix29qcakixra11ffb6x2l64cxigxc9jw40hpggh9rki16"; + name = "kbruch-16.12.0.tar.xz"; }; }; kcachegrind = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kcachegrind-16.08.3.tar.xz"; - sha256 = "1rjipi3x2yl9yplyksw66hrnrnscld0fsb8zsmf692x7gprb9wjd"; - name = "kcachegrind-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kcachegrind-16.12.0.tar.xz"; + sha256 = "0660b13vsky54lfw42nzk136a5pdhdszqr53ahfa2966ij5dswwz"; + name = "kcachegrind-16.12.0.tar.xz"; }; }; kcalc = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kcalc-16.08.3.tar.xz"; - sha256 = "05ky1kvfk6n2qhqdwg9mlm0q5096776p8gvkh2nhzlajr4klzqdz"; - name = "kcalc-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kcalc-16.12.0.tar.xz"; + sha256 = "0vx71zv2fs0di28h1g0cvnmawjyadd7jc6z9ahf4w55ycmamxj71"; + name = "kcalc-16.12.0.tar.xz"; }; }; kcalcore = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kcalcore-16.08.3.tar.xz"; - sha256 = "024n78zj10wlr2a50gh3fshlsb1maqbix5f4i66f26j3z2d2z7gc"; - name = "kcalcore-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kcalcore-16.12.0.tar.xz"; + sha256 = "0f86yz4jrrfvf869kppmms4l3w8xwaygjqa1wqxrrmm7wsvrysd7"; + name = "kcalcore-16.12.0.tar.xz"; }; }; kcalutils = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kcalutils-16.08.3.tar.xz"; - sha256 = "1wyq6hx1hilpk480h4c9j1hgj41s21nwcmm9b178143173p2pp5z"; - name = "kcalutils-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kcalutils-16.12.0.tar.xz"; + sha256 = "088lbl9zgjbrhy0ahjmjn8qx8gd10171jprab7d083ny7crx27ik"; + name = "kcalutils-16.12.0.tar.xz"; }; }; kcharselect = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kcharselect-16.08.3.tar.xz"; - sha256 = "0wjwpqjck9k27xq1avz3l9ndi28kmcb05zvvf17jhsq9zmqr2lj8"; - name = "kcharselect-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kcharselect-16.12.0.tar.xz"; + sha256 = "1pcphx845r0kjah94n1b2j7fmrrqy4kvrhiyc40wmqp12fp0km8b"; + name = "kcharselect-16.12.0.tar.xz"; }; }; kcolorchooser = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kcolorchooser-16.08.3.tar.xz"; - sha256 = "0dk0f2xq4s85n0v3hfhiy0b3pkjvq4wz7pwc6h91kg50mm0mgjy0"; - name = "kcolorchooser-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kcolorchooser-16.12.0.tar.xz"; + sha256 = "0zdkpn0i53wv49ynwmkz0pd0yvh1f2fjkdgqrs8i4bslipp0411z"; + name = "kcolorchooser-16.12.0.tar.xz"; }; }; kcontacts = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kcontacts-16.08.3.tar.xz"; - sha256 = "01hip3p0f6br42lx89zcxmvrsqfclp0v8j7nzvrrzbdnn9x58b6w"; - name = "kcontacts-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kcontacts-16.12.0.tar.xz"; + sha256 = "1qxxh7bqadrbq28b9fmjj748az9ir6rznn179pvlr2v32ch25vrw"; + name = "kcontacts-16.12.0.tar.xz"; }; }; kcron = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kcron-16.08.3.tar.xz"; - sha256 = "16dbfil36b0kfdga118gbd1j6x7xd1x3hcc0ikhgysz8wzliaqs2"; - name = "kcron-16.08.3.tar.xz"; - }; - }; - kde-baseapps = { - version = "16.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-baseapps-16.08.3.tar.xz"; - sha256 = "18a2r2g5cz4s923p3369aam4qr00gsngk6nn4lk3k5a4qqavpsa7"; - name = "kde-baseapps-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kcron-16.12.0.tar.xz"; + sha256 = "1cqx4k384kk3g48qp9vdxd46cijzdskay3a67k7jwszinjnhqgbx"; + name = "kcron-16.12.0.tar.xz"; }; }; kdebugsettings = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdebugsettings-16.08.3.tar.xz"; - sha256 = "0jc4kciaq69wiankz5krfsj4lf0r88msnqcr10k1byjm50b4qnpb"; - name = "kdebugsettings-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdebugsettings-16.12.0.tar.xz"; + sha256 = "1nkqqcrbkwfcvnqylniqlwlay4x2ma2i7jdp0msm2yr2q743k01l"; + name = "kdebugsettings-16.12.0.tar.xz"; }; }; kde-dev-scripts = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-dev-scripts-16.08.3.tar.xz"; - sha256 = "1g3c1wlv4rr9hxx1f6xiryswqprq1wq4lrlwx3gw3dmnpxwbnzld"; - name = "kde-dev-scripts-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-dev-scripts-16.12.0.tar.xz"; + sha256 = "1qadnwi4ph4hdjzfrjfqr4idw8ky4j14mc37w7r7025mdlfbj06n"; + name = "kde-dev-scripts-16.12.0.tar.xz"; }; }; kde-dev-utils = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-dev-utils-16.08.3.tar.xz"; - sha256 = "1zzph1la4hgjqaryhm4dggsyv4gxwd0zgg5sw23v9qvp0z0hhzqf"; - name = "kde-dev-utils-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-dev-utils-16.12.0.tar.xz"; + sha256 = "039i3by9hl3h6yc1bbkf4y1bx3gxclncx69mh0z4fh5h58z5vz1r"; + name = "kde-dev-utils-16.12.0.tar.xz"; }; }; kdeedu-data = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdeedu-data-16.08.3.tar.xz"; - sha256 = "1c7svm52j05xxha4kb5zi81z5rgbj08cahpqwr8g7dszp5m8xals"; - name = "kdeedu-data-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdeedu-data-16.12.0.tar.xz"; + sha256 = "144px97jyfc258cwaqp8jw8jfnw22bnpa4p48mzxdl70p0q6maal"; + name = "kdeedu-data-16.12.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdegraphics-mobipocket-16.08.3.tar.xz"; - sha256 = "0rbinw4r0bcxmkai2hb2p8zys654jybwgxigj4337s991l5zlrvd"; - name = "kdegraphics-mobipocket-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdegraphics-mobipocket-16.12.0.tar.xz"; + sha256 = "1wpnijyvacajz96zaqa0185qwbg1ma5c1lvkzd1ww6h04dychfvi"; + name = "kdegraphics-mobipocket-16.12.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdegraphics-thumbnailers-16.08.3.tar.xz"; - sha256 = "1ygyhv20pyzfagkf25f6wshcvhyhamxxnrw075m11dg0hg3qlh9z"; - name = "kdegraphics-thumbnailers-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdegraphics-thumbnailers-16.12.0.tar.xz"; + sha256 = "1r8f1167sqnd4qd9ibgknp1w9jfbw4yr2rcyp62xi3xlp04mn9fm"; + name = "kdegraphics-thumbnailers-16.12.0.tar.xz"; }; }; kde-l10n-ar = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ar-16.08.3.tar.xz"; - sha256 = "1ka2vq86g112gvfd4j2jl8dm8hvxjrn5cd2ddcagp3fg2rxm2si7"; - name = "kde-l10n-ar-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ar-16.12.0.tar.xz"; + sha256 = "1hz9bi8z3z2vgxbmsqv8vp4pi03gg6vjnxcf1jngc7jix91iqaf4"; + name = "kde-l10n-ar-16.12.0.tar.xz"; }; }; kde-l10n-ast = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ast-16.08.3.tar.xz"; - sha256 = "02h7laxf4fsanb4scqgfrw815sj3dhvz4n17cdj8nvg4x7pydkys"; - name = "kde-l10n-ast-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ast-16.12.0.tar.xz"; + sha256 = "1kj0l96wz5j1s8kr5za9az62v7qgw1z9ig4m38hxb9635m2zrp59"; + name = "kde-l10n-ast-16.12.0.tar.xz"; }; }; kde-l10n-bg = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-bg-16.08.3.tar.xz"; - sha256 = "0crhf9i43l8p0ds9v3k8ghgxrjc4c8gxwrs7afm6lmqh3lb3miz2"; - name = "kde-l10n-bg-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-bg-16.12.0.tar.xz"; + sha256 = "0xy5icllcq56lmqrpnmyja8kycnr3njzg1adrr2dnvdhwgjm8knj"; + name = "kde-l10n-bg-16.12.0.tar.xz"; }; }; kde-l10n-bs = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-bs-16.08.3.tar.xz"; - sha256 = "1ny1pcdl0xbm40c2jlzgvlkcmy1p2l9p14n827zipbj67by8dlh0"; - name = "kde-l10n-bs-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-bs-16.12.0.tar.xz"; + sha256 = "1wrdqcargx9qfmkmk0scwvrb1x5dqcxfba1mj44biijzxmaxy6v7"; + name = "kde-l10n-bs-16.12.0.tar.xz"; }; }; kde-l10n-ca = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ca-16.08.3.tar.xz"; - sha256 = "044l2z3n5vn4zbj7nby22f7pg5qcv16yzbgikck6jfdahn56c0d0"; - name = "kde-l10n-ca-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ca-16.12.0.tar.xz"; + sha256 = "0w8k81jar52hy60cwdn5l6n3d535cyvf72rdsshs148s4hpx1naz"; + name = "kde-l10n-ca-16.12.0.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-16.08.3"; + version = "ca_valencia-16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ca@valencia-16.08.3.tar.xz"; - sha256 = "1agmp003bdkhc8jx5124cs8yw73ga6b12gppaqwxl8c9cgd09yai"; - name = "kde-l10n-ca_valencia-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ca@valencia-16.12.0.tar.xz"; + sha256 = "1raj2w8ixaxi43nh44z19xd9m2iqg5b2wrqccd8pjyip73c1la3q"; + name = "kde-l10n-ca_valencia-16.12.0.tar.xz"; }; }; kde-l10n-cs = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-cs-16.08.3.tar.xz"; - sha256 = "0li4rnpns7wvxgrg9lxzimx7lxk2cl2w0zqk9g0c8zwqrrl64d23"; - name = "kde-l10n-cs-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-cs-16.12.0.tar.xz"; + sha256 = "143h9gkb2l5h3fm6phv07x0az5i7fzs9m53xck71wpahz1z244km"; + name = "kde-l10n-cs-16.12.0.tar.xz"; }; }; kde-l10n-da = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-da-16.08.3.tar.xz"; - sha256 = "14cpwl8p2n0bfj2hbbm9fv1i8r20xfrp16iy9kdym5x4k80c5lzc"; - name = "kde-l10n-da-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-da-16.12.0.tar.xz"; + sha256 = "03p1npjikfmb3a1hgmcd14lx3x9vfvf1x3mzz25493wlwzkb5lbm"; + name = "kde-l10n-da-16.12.0.tar.xz"; }; }; kde-l10n-de = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-de-16.08.3.tar.xz"; - sha256 = "09sq6sbli9gjfkwqmcqjscbakxbnn2czb4d3pyni3v0i7x4xgmgl"; - name = "kde-l10n-de-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-de-16.12.0.tar.xz"; + sha256 = "146zb25f54ig4zkmys4wq5j057k9ajfp9jyyfqmmpch33567llb6"; + name = "kde-l10n-de-16.12.0.tar.xz"; }; }; kde-l10n-el = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-el-16.08.3.tar.xz"; - sha256 = "11vv237skajqc50dpcz0abn7xcly8a161yp56fn6zn1zdlcw4p02"; - name = "kde-l10n-el-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-el-16.12.0.tar.xz"; + sha256 = "0vcf8wi1wd358hs1ynyil2ahb26w9dp8snlszyhr63zbg9qwwic4"; + name = "kde-l10n-el-16.12.0.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-16.08.3"; + version = "en_GB-16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-en_GB-16.08.3.tar.xz"; - sha256 = "10anibggfqdp90d9jsv2n8aqk4wrgdq1pjxz60784f9bm1lq9xbx"; - name = "kde-l10n-en_GB-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-en_GB-16.12.0.tar.xz"; + sha256 = "1bvcgasl672xawfd8alwcindyj16j5p3cplqndw4z1pybnsmzgmk"; + name = "kde-l10n-en_GB-16.12.0.tar.xz"; }; }; kde-l10n-eo = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-eo-16.08.3.tar.xz"; - sha256 = "15dhramx79rh6v7891fa878dikh74cx4knisrmg50ih5fgyr8rrm"; - name = "kde-l10n-eo-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-eo-16.12.0.tar.xz"; + sha256 = "1sln4krw8l8zm3q4h7q7rhd5lf7s7rfb6n73wybxmwypawyz0qqn"; + name = "kde-l10n-eo-16.12.0.tar.xz"; }; }; kde-l10n-es = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-es-16.08.3.tar.xz"; - sha256 = "0zshw10drqgsdcdlzci7ghpcmww69dr5nc8i9fakg9jj4pfblkv5"; - name = "kde-l10n-es-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-es-16.12.0.tar.xz"; + sha256 = "1kp1ihmlkkg053bplsjbbiixp0yzidd4gidpcj9axsa74f04084w"; + name = "kde-l10n-es-16.12.0.tar.xz"; }; }; kde-l10n-et = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-et-16.08.3.tar.xz"; - sha256 = "04g4wvpmxrcma6dhw6py8xbhpxs4rsls69y98ljigd7y518ss6qa"; - name = "kde-l10n-et-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-et-16.12.0.tar.xz"; + sha256 = "0w48lirqnsgk78hkiam8cc7r7h5h4mrd7b8wssvxwbknyz33jfkz"; + name = "kde-l10n-et-16.12.0.tar.xz"; }; }; kde-l10n-eu = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-eu-16.08.3.tar.xz"; - sha256 = "1gvgmlvc2qphy16y5m9xl0v6530909jzlvxfglamdwcchcc5rhj6"; - name = "kde-l10n-eu-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-eu-16.12.0.tar.xz"; + sha256 = "0mpjr6yklvvfjhrssvn1m27gqs7r9jvdr0prp6yss8v00ij9i3ig"; + name = "kde-l10n-eu-16.12.0.tar.xz"; }; }; kde-l10n-fa = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-fa-16.08.3.tar.xz"; - sha256 = "0ph0ssqjxi6g93kzg8p888s8258zdzpyaq712zcfhjcr7zx8ld32"; - name = "kde-l10n-fa-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-fa-16.12.0.tar.xz"; + sha256 = "167lq8fnlfhrmvivzpznmv7x82izs9jdl6w4p8dg2i3801jwi9ff"; + name = "kde-l10n-fa-16.12.0.tar.xz"; }; }; kde-l10n-fi = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-fi-16.08.3.tar.xz"; - sha256 = "0b7psgnc5mv38cx4iynacpq5q8nbvfm4fn6q9lwfj6x5h57xzd59"; - name = "kde-l10n-fi-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-fi-16.12.0.tar.xz"; + sha256 = "19y8jrxfl0nh4dcrl7sdz8r9cyka3cjg0dp8cs84v5c10fab4w8l"; + name = "kde-l10n-fi-16.12.0.tar.xz"; }; }; kde-l10n-fr = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-fr-16.08.3.tar.xz"; - sha256 = "0q65wjjq4j1hg4bakbms2qamqqhqlchcbmy9fqc1aghbi3b871h8"; - name = "kde-l10n-fr-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-fr-16.12.0.tar.xz"; + sha256 = "1p487x8jsihxn7lrjmssi6i3is01498szblqn84yc8bgc7pgfdly"; + name = "kde-l10n-fr-16.12.0.tar.xz"; }; }; kde-l10n-ga = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ga-16.08.3.tar.xz"; - sha256 = "0drq7jxgdr01z75ybbalaxmr0r860f82i5ny1limnsqvmfh92p6b"; - name = "kde-l10n-ga-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ga-16.12.0.tar.xz"; + sha256 = "0avpkwmdac9c8n8l0ddssgmn2pk9lkn7zhs532ird8axv4i9ynk4"; + name = "kde-l10n-ga-16.12.0.tar.xz"; }; }; kde-l10n-gl = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-gl-16.08.3.tar.xz"; - sha256 = "0y6vj77nkinii1bfw975lyhbjzvmd7r23pn29cz3l0p3bfd3yzkd"; - name = "kde-l10n-gl-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-gl-16.12.0.tar.xz"; + sha256 = "1qdwfxgaqbymgqwmpki3zk3d5h18fmb7n62basn2yqhbj7cdpkil"; + name = "kde-l10n-gl-16.12.0.tar.xz"; }; }; kde-l10n-he = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-he-16.08.3.tar.xz"; - sha256 = "1q6q5rqvww1f29qfr3prd7fkxzvx7inf5wnzmla9kdnax7p9z3rs"; - name = "kde-l10n-he-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-he-16.12.0.tar.xz"; + sha256 = "19nkvhs7gjrcxsynraqmgvif1n5m1zmjm6j7h1zviqmwcn9zncj4"; + name = "kde-l10n-he-16.12.0.tar.xz"; }; }; kde-l10n-hi = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-hi-16.08.3.tar.xz"; - sha256 = "1qnncfg7vfw4ikcm23j1l6cmycg2m168d76h1fnznx4bdyfybblq"; - name = "kde-l10n-hi-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-hi-16.12.0.tar.xz"; + sha256 = "1m5qlc3mf9ns7ka8kmj5c2iqaqkb68hcab13hp5y5j4i7miqpp6d"; + name = "kde-l10n-hi-16.12.0.tar.xz"; }; }; kde-l10n-hr = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-hr-16.08.3.tar.xz"; - sha256 = "1kzl6fycifrmb2lil9vifas0jcczsw0aqpr2r6fjlvbw7p2zc42n"; - name = "kde-l10n-hr-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-hr-16.12.0.tar.xz"; + sha256 = "1lbf25apks10c1byy0z8zjsfqd7f07xzhpdrinxbpdsa69ln28k2"; + name = "kde-l10n-hr-16.12.0.tar.xz"; }; }; kde-l10n-hu = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-hu-16.08.3.tar.xz"; - sha256 = "0kj5ivz7xw0a79rcprjp4bra90s12421ppbipvgnllc2rcixgkki"; - name = "kde-l10n-hu-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-hu-16.12.0.tar.xz"; + sha256 = "0m2pv1zddfflpgmvab84j19b0nb7fymslqy2pzcdx6ga9f0k37gl"; + name = "kde-l10n-hu-16.12.0.tar.xz"; }; }; kde-l10n-ia = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ia-16.08.3.tar.xz"; - sha256 = "0cmv9jwbabaynx0wa1nhn9pgib60kg7b71ilcqhxnm5lqvws88pi"; - name = "kde-l10n-ia-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ia-16.12.0.tar.xz"; + sha256 = "0x6h4k29s6pqd0k6c7lv15pa6837a59g5dskfph38kjdiv8lfwvq"; + name = "kde-l10n-ia-16.12.0.tar.xz"; }; }; kde-l10n-id = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-id-16.08.3.tar.xz"; - sha256 = "1zz3237l26fz7ca33l9dvq1b8kkdi4gdzqxqslkb10q36z2gsni1"; - name = "kde-l10n-id-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-id-16.12.0.tar.xz"; + sha256 = "12ysf2q9cjfmsc00p6rdwhykbwvhzq6n5j0i296506hhmvbz2n15"; + name = "kde-l10n-id-16.12.0.tar.xz"; }; }; kde-l10n-is = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-is-16.08.3.tar.xz"; - sha256 = "1mcwg8v08dv524ahhkv3wmnmac9pf534i45za9y0wl1kkcgp8949"; - name = "kde-l10n-is-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-is-16.12.0.tar.xz"; + sha256 = "1042skag9p1d1x1yg0jr8a3k1qsbr65nrswvmi2bqxmv59ls60zz"; + name = "kde-l10n-is-16.12.0.tar.xz"; }; }; kde-l10n-it = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-it-16.08.3.tar.xz"; - sha256 = "15k52l0mq7qclb4adwvcz4bngisbj476vlphqnjhnav9nj5cm84f"; - name = "kde-l10n-it-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-it-16.12.0.tar.xz"; + sha256 = "0q44bcan48rjngc892prgqd0nyagh0wsha47hhxb9lm5cnf8kzis"; + name = "kde-l10n-it-16.12.0.tar.xz"; }; }; kde-l10n-ja = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ja-16.08.3.tar.xz"; - sha256 = "0p6nd7hlv6yvxi5y808wzjbidk1gpa2fj50i66lxzq3xl7rajli3"; - name = "kde-l10n-ja-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ja-16.12.0.tar.xz"; + sha256 = "100wlprb149vpccypw5i0f6jj3f9yb77rkifn65h8brfmiiynisa"; + name = "kde-l10n-ja-16.12.0.tar.xz"; }; }; kde-l10n-kk = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-kk-16.08.3.tar.xz"; - sha256 = "0ffnlmq2qnmcqk9h4yvl0z00x2f5yyicg1qf1jlxk9fvhbg5xpmv"; - name = "kde-l10n-kk-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-kk-16.12.0.tar.xz"; + sha256 = "045sni4cb70r94zb3vgprplr2nnpixbdx80c7cc99m2z4dd9bk01"; + name = "kde-l10n-kk-16.12.0.tar.xz"; }; }; kde-l10n-km = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-km-16.08.3.tar.xz"; - sha256 = "1ln9dc278sv9r99psy27m1qhbyaw6dzg3kwr11pbp517253ggj7j"; - name = "kde-l10n-km-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-km-16.12.0.tar.xz"; + sha256 = "025cp9xpqa1hiax5lwpbqabdcdjpkm3szcbhwf607gz51ck6l4q3"; + name = "kde-l10n-km-16.12.0.tar.xz"; }; }; kde-l10n-ko = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ko-16.08.3.tar.xz"; - sha256 = "07lbblm4aqj7jp25clz7sil9ficrbvwpd9pvpfrz530q8y74hsjf"; - name = "kde-l10n-ko-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ko-16.12.0.tar.xz"; + sha256 = "1aga8cmf2mv5746b5ix6j2ims2xp7s1mmn8dksipj0inrg9bim3b"; + name = "kde-l10n-ko-16.12.0.tar.xz"; }; }; kde-l10n-lt = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-lt-16.08.3.tar.xz"; - sha256 = "1cssd4z8dxlld61kakb6vnb5hksswl1dkr1bsxv5q622hjrp037c"; - name = "kde-l10n-lt-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-lt-16.12.0.tar.xz"; + sha256 = "1rf1rwq4gzpcifpki1dx8iw7yv9fdyqrkbg96pnp47lynbdkp63s"; + name = "kde-l10n-lt-16.12.0.tar.xz"; }; }; kde-l10n-lv = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-lv-16.08.3.tar.xz"; - sha256 = "0wnrcfgm5l3ifnywz67k186g5vh0648dhmymfcz6fmqf3ipfl4h4"; - name = "kde-l10n-lv-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-lv-16.12.0.tar.xz"; + sha256 = "0hn4c453fj3r7bscl5zr4n42cpxxxs738fc24cz34yjcxq19fgc3"; + name = "kde-l10n-lv-16.12.0.tar.xz"; }; }; kde-l10n-mr = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-mr-16.08.3.tar.xz"; - sha256 = "0kkwpn12z1f8rs91yqh8x155nbrkwgj1z5fx4kcs1nc7xyvfpbff"; - name = "kde-l10n-mr-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-mr-16.12.0.tar.xz"; + sha256 = "04jljwj8kk2h5bqxfcpwnmig457w8141q1ckk91nfv4927gq3im3"; + name = "kde-l10n-mr-16.12.0.tar.xz"; }; }; kde-l10n-nb = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nb-16.08.3.tar.xz"; - sha256 = "0070dgr1apn345a8bwgbxiz2a0andmfx54vd5pv3hgj6n9jrmq07"; - name = "kde-l10n-nb-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nb-16.12.0.tar.xz"; + sha256 = "16msjakcjlg6q9lk1bslayy1gsa2s3gf0b9gy1nkw3v09df93hv6"; + name = "kde-l10n-nb-16.12.0.tar.xz"; }; }; kde-l10n-nds = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nds-16.08.3.tar.xz"; - sha256 = "103wfwl18fmz8h184c3qcwfyh784pfzsd2dgd000xs28pcc5kc22"; - name = "kde-l10n-nds-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nds-16.12.0.tar.xz"; + sha256 = "1jfswrb3z3q39pfgv7m1jzb1nigchfdnjg26zc1wmw8n6b544yhs"; + name = "kde-l10n-nds-16.12.0.tar.xz"; }; }; kde-l10n-nl = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nl-16.08.3.tar.xz"; - sha256 = "1zjnzcpivcs26qp5h153jd1qr98dnr1f8347cb9iz79q41zjn21z"; - name = "kde-l10n-nl-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nl-16.12.0.tar.xz"; + sha256 = "1i9z5bp76gz8w58qzmgi5b90xbfar0ypjyhmnfksdzvpgd571lmq"; + name = "kde-l10n-nl-16.12.0.tar.xz"; }; }; kde-l10n-nn = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nn-16.08.3.tar.xz"; - sha256 = "1lm701iml2sfzp2dz5nlh6kflp3lfbcsdlipk9wwsqnjs3zr436y"; - name = "kde-l10n-nn-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nn-16.12.0.tar.xz"; + sha256 = "1fvva9p572fi05z2542pfyx3wjycld1ap1zqgzlmk6j28a3ifzcb"; + name = "kde-l10n-nn-16.12.0.tar.xz"; }; }; kde-l10n-pa = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pa-16.08.3.tar.xz"; - sha256 = "0j6dyfg8vw1dj226ngxd4yb2qfnj4g7c36cfmmmlfr9d8ds8xw0p"; - name = "kde-l10n-pa-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pa-16.12.0.tar.xz"; + sha256 = "0dqn7bijj6k8hp20nvh79jwzz1dnkx0py125b0isvjpakslqwf3p"; + name = "kde-l10n-pa-16.12.0.tar.xz"; }; }; kde-l10n-pl = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pl-16.08.3.tar.xz"; - sha256 = "0nr7vxw4d0z8g51zls46r3kbm0dfbry09cpmahdpk6zlgcvlg5zz"; - name = "kde-l10n-pl-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pl-16.12.0.tar.xz"; + sha256 = "1l3ja8j4pw75qzaswli8a7c0qd1ac272dblx597njcs8iqgs6y3l"; + name = "kde-l10n-pl-16.12.0.tar.xz"; }; }; kde-l10n-pt = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pt-16.08.3.tar.xz"; - sha256 = "0il1gwr9jl8z2lp9j7zb18x7kbzcv6p37kbww5l6xr3gc744fiaf"; - name = "kde-l10n-pt-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pt-16.12.0.tar.xz"; + sha256 = "0riyk5sz63sv8cfx8s25hw5l9g0052fbbq7m8srmc79hhw4w3p5h"; + name = "kde-l10n-pt-16.12.0.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-16.08.3"; + version = "pt_BR-16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pt_BR-16.08.3.tar.xz"; - sha256 = "0b5m5p19n6a9mclvhh5p2s6k0vjwspnal223ddc0xk34060f4ch7"; - name = "kde-l10n-pt_BR-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pt_BR-16.12.0.tar.xz"; + sha256 = "0a3nhv7m5jkzsw158i5fbhlxz0p1pgn6rnzdja25v8hs3jqnzcq4"; + name = "kde-l10n-pt_BR-16.12.0.tar.xz"; }; }; kde-l10n-ro = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ro-16.08.3.tar.xz"; - sha256 = "08nanwr2s37215kkik8issn9va65dxlam55lfabybvybw6b0s7x5"; - name = "kde-l10n-ro-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ro-16.12.0.tar.xz"; + sha256 = "0qs8dlcvh2366g0ifcwd7s5kg3q28bagpp8sm5zliyd79fh60mhh"; + name = "kde-l10n-ro-16.12.0.tar.xz"; }; }; kde-l10n-ru = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ru-16.08.3.tar.xz"; - sha256 = "1xbssbm3za3y0fh02j62s94vkz1nfdl37g458h1qagyawm04vwdq"; - name = "kde-l10n-ru-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ru-16.12.0.tar.xz"; + sha256 = "0mk6h5fyna5qbq97mxwfihcjfg8lv7w5r1kis505ds6icym2pkzz"; + name = "kde-l10n-ru-16.12.0.tar.xz"; }; }; kde-l10n-sk = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sk-16.08.3.tar.xz"; - sha256 = "0ixqh1xj3nqwq7nsxhk4c7d5w8n77plld4ap4brd4r188pfswvdr"; - name = "kde-l10n-sk-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sk-16.12.0.tar.xz"; + sha256 = "0qvgsjc9dbqfydg5zpygncpapw3df68yd1ham5d36v0c3k5161wi"; + name = "kde-l10n-sk-16.12.0.tar.xz"; }; }; kde-l10n-sl = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sl-16.08.3.tar.xz"; - sha256 = "0d4n5sp82jfap0cq167ybqsvyp06vla8y3clma25cyyksk9r355w"; - name = "kde-l10n-sl-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sl-16.12.0.tar.xz"; + sha256 = "15lia25c9nasp6w6y1xvnnhkxb3977rdbl4zcanla7da6ma7h8yd"; + name = "kde-l10n-sl-16.12.0.tar.xz"; }; }; kde-l10n-sr = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sr-16.08.3.tar.xz"; - sha256 = "1bb2dbkb80q2y7s9nka8x4q8cc6lqx7ddry83rp97sia1fckgn6g"; - name = "kde-l10n-sr-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sr-16.12.0.tar.xz"; + sha256 = "1irjpki6pnnkxdp49vw61caixfhkjgahdgx14cayb4zi16qsmn7p"; + name = "kde-l10n-sr-16.12.0.tar.xz"; }; }; kde-l10n-sv = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sv-16.08.3.tar.xz"; - sha256 = "1n7dj3alqf59b4n9ckhk35pw5qvlkbw70bw48b2mzsh6rm9l6njs"; - name = "kde-l10n-sv-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sv-16.12.0.tar.xz"; + sha256 = "0a9jh60bz6xjq1ckyw2v67w9sdsjdlajlcbkb3jl021l8f5hywpx"; + name = "kde-l10n-sv-16.12.0.tar.xz"; }; }; kde-l10n-tr = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-tr-16.08.3.tar.xz"; - sha256 = "0k1lwngg5v4wzc8imx33q68cdva4f61jqfibjrza4sf6la69vr6p"; - name = "kde-l10n-tr-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-tr-16.12.0.tar.xz"; + sha256 = "0i3sigwhrj36dmv2li9qqdshd3zh4p8sa9zgngfvz1942x32yi8x"; + name = "kde-l10n-tr-16.12.0.tar.xz"; }; }; kde-l10n-ug = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ug-16.08.3.tar.xz"; - sha256 = "1xi90k2ghgz9fh3lb1l7pbnmz17bi5mvyvg7dwwm3ni7q4k696lf"; - name = "kde-l10n-ug-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ug-16.12.0.tar.xz"; + sha256 = "04mw7h9pyrbfvhx3mbp16czzawbqi9kn83nakysgkyy7dri1rl4g"; + name = "kde-l10n-ug-16.12.0.tar.xz"; }; }; kde-l10n-uk = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-uk-16.08.3.tar.xz"; - sha256 = "114snhzp2v6fp7glvwbjd97byzfisp94zr2ia5np5xcpfkpww9g7"; - name = "kde-l10n-uk-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-uk-16.12.0.tar.xz"; + sha256 = "0iwzqvr677sqmgl4jdpawfnrf63k0x4xm3p29lbb2hpqnc0xmmpy"; + name = "kde-l10n-uk-16.12.0.tar.xz"; }; }; kde-l10n-wa = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-wa-16.08.3.tar.xz"; - sha256 = "1qimv935j50sb7n7x4ga10x4zkasn9yddh1drs0k5i7r02sq8nzv"; - name = "kde-l10n-wa-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-wa-16.12.0.tar.xz"; + sha256 = "057kpzn50rs625ri737kjgn9zy8vxdaxmjlhk777piq5pq6id9s1"; + name = "kde-l10n-wa-16.12.0.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-16.08.3"; + version = "zh_CN-16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-zh_CN-16.08.3.tar.xz"; - sha256 = "024y7lvjkx8djwd9qmjkj3q9ri3fbnlsxcyjr5jy5yi10ccwf9v6"; - name = "kde-l10n-zh_CN-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-zh_CN-16.12.0.tar.xz"; + sha256 = "0313ph852wygmws225534nv2ldmd5kvky3vl5nmcwg5fryc0dq7i"; + name = "kde-l10n-zh_CN-16.12.0.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-16.08.3"; + version = "zh_TW-16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-zh_TW-16.08.3.tar.xz"; - sha256 = "1m5npa3jrsc0kn3mqkp3pagix95ialpk4fikbiq44laxn7xph5yi"; - name = "kde-l10n-zh_TW-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-zh_TW-16.12.0.tar.xz"; + sha256 = "0vfj5zdwrqzd34nxja8lwk93m9hiw3dzmbkaf9k5a7cpkqwnhf5s"; + name = "kde-l10n-zh_TW-16.12.0.tar.xz"; }; }; kdelibs = { - version = "4.14.26"; + version = "4.14.27"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdelibs-4.14.26.tar.xz"; - sha256 = "043asa5i30s3j1knpshhxw1a5a1alh1b5b719gdzpm1hxgn3f79r"; - name = "kdelibs-4.14.26.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdelibs-4.14.27.tar.xz"; + sha256 = "1cngdvkpwdwbl5b40q00h9ivnpqbnjbd7kkfvsma7rlgg7wfg7xp"; + name = "kdelibs-4.14.27.tar.xz"; }; }; kdenetwork-filesharing = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdenetwork-filesharing-16.08.3.tar.xz"; - sha256 = "0zfswqxh0ng5w44hzfpsjhmnv7nf1jc3qfmfvmmlb0h1ynfdbqmy"; - name = "kdenetwork-filesharing-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdenetwork-filesharing-16.12.0.tar.xz"; + sha256 = "1icsranvsyvxrnlg9lm034i6xf247sqxdgcvrfqjw35rf047yp0d"; + name = "kdenetwork-filesharing-16.12.0.tar.xz"; }; }; kdenlive = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdenlive-16.08.3.tar.xz"; - sha256 = "0s5bdb5xxjaqb7zmvm119mc7zacagglv21dd4v6sahg0mf1qvfin"; - name = "kdenlive-16.08.3.tar.xz"; - }; - }; - kdepim = { - version = "16.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz"; - sha256 = "1l0rvi33i9hzr9c3nqzbr3cnz046ccf7s3v54mdmxfdk5x0ynkms"; - name = "kdepim-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdenlive-16.12.0.tar.xz"; + sha256 = "1qsnjya1sppn5dfx8lanxqpgakd5jgi7677wq7vvyz3v9i47zvmc"; + name = "kdenlive-16.12.0.tar.xz"; }; }; kdepim-addons = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdepim-addons-16.08.3.tar.xz"; - sha256 = "0ddhya9f6hbdakdna4hnbwiwvc1ar95jgxhr36hf6s37bxh7755l"; - name = "kdepim-addons-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdepim-addons-16.12.0.tar.xz"; + sha256 = "1a063qxmal8n5rd2a6v05zml61l52sm33574vqxybh1bnx2dpq58"; + name = "kdepim-addons-16.12.0.tar.xz"; }; }; kdepim-apps-libs = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdepim-apps-libs-16.08.3.tar.xz"; - sha256 = "1ygdmv30pzrgv3f222nv52mvc83ags9dvwl2ma4l8frb13xb1r15"; - name = "kdepim-apps-libs-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdepim-apps-libs-16.12.0.tar.xz"; + sha256 = "1zm2mnwsxk4c58dbx3ln26mz89f1d20vywiljczfzpn99rg4cvvi"; + name = "kdepim-apps-libs-16.12.0.tar.xz"; }; }; kdepim-runtime = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdepim-runtime-16.08.3.tar.xz"; - sha256 = "1q7d2c1rjli5dl162zibzhmg2q4hxxlqjp7r78amq90vhv975kc6"; - name = "kdepim-runtime-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdepim-runtime-16.12.0.tar.xz"; + sha256 = "0vkmjh0l5yzpd9rmnyc2cchwpk9ccyk79g2ii5qg6xxr46r1vmfs"; + name = "kdepim-runtime-16.12.0.tar.xz"; }; }; kde-runtime = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kde-runtime-16.08.3.tar.xz"; - sha256 = "1g5ni75byraf9268p0n74i81zb46agp9ac243m8jfzh8vdm2q5kk"; - name = "kde-runtime-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kde-runtime-16.12.0.tar.xz"; + sha256 = "1vs5q063li8jj56vwyy3wh6hfabf0xhmp6ag9mc2ns8kwcia1m6x"; + name = "kde-runtime-16.12.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdesdk-kioslaves-16.08.3.tar.xz"; - sha256 = "12q015nm9qfcscsvqrkibj1cfh651890k982sbqqdn0dm5932lnj"; - name = "kdesdk-kioslaves-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdesdk-kioslaves-16.12.0.tar.xz"; + sha256 = "19jbw3w8mg20m3f96s9bnw0wg28zxq2kgq0fs9c5rbjr8alxlyz2"; + name = "kdesdk-kioslaves-16.12.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdesdk-thumbnailers-16.08.3.tar.xz"; - sha256 = "1dy4566pdx890n60sn5v7hms2prjh674pm6gbxg1il4i4qcpfv4z"; - name = "kdesdk-thumbnailers-16.08.3.tar.xz"; - }; - }; - kdewebdev = { - version = "16.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdewebdev-16.08.3.tar.xz"; - sha256 = "0r9qsm3idfhm7aglik7whzcwjjn572gwmlcgxy2cvpn15nqa344l"; - name = "kdewebdev-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdesdk-thumbnailers-16.12.0.tar.xz"; + sha256 = "1syzfdffggs3hidykmg9y6l4nzh7wbqs4ah9vih8cgs0qr2hml9s"; + name = "kdesdk-thumbnailers-16.12.0.tar.xz"; }; }; kdf = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdf-16.08.3.tar.xz"; - sha256 = "1fkjmdwp5pnlvz2mac4zq93wnb6jj4ymj4448qbhxypncrh6sym3"; - name = "kdf-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdf-16.12.0.tar.xz"; + sha256 = "0shwr55nrjgzm6cb2cdglvkkmknppd4yl0arn38w5a56sacsczcc"; + name = "kdf-16.12.0.tar.xz"; }; }; - kdgantt2 = { - version = "16.08.3"; + kdialog = { + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdgantt2-16.08.3.tar.xz"; - sha256 = "01p3cqqhghvx42mrmxkrsm7cp23972gi86sagjw070scw71fpv0c"; - name = "kdgantt2-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdialog-16.12.0.tar.xz"; + sha256 = "0p6bf557k5ycmfaz7jrc65fp4j104c2cbv0ibamkyfrlpp1d0i1c"; + name = "kdialog-16.12.0.tar.xz"; }; }; kdiamond = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kdiamond-16.08.3.tar.xz"; - sha256 = "035m2911zbkvhydihaqbgwl7vs8z03hcsq8ph7wvnsdvd1f895ib"; - name = "kdiamond-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kdiamond-16.12.0.tar.xz"; + sha256 = "1v0k23m74hiwr3a679h4wpc1w3m6y5mnjqc66pd9m94rshz8i8k6"; + name = "kdiamond-16.12.0.tar.xz"; + }; + }; + keditbookmarks = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/keditbookmarks-16.12.0.tar.xz"; + sha256 = "1pw2snbdrndx42vxw51vss7mf52v6ys9jmkg7j6bkwp90dnlly1v"; + name = "keditbookmarks-16.12.0.tar.xz"; + }; + }; + kfilereplace = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/kfilereplace-16.12.0.tar.xz"; + sha256 = "0bcn07p1iq44pry0q771vadpi9gm9p2icbn8q5fympxf2y9smmqx"; + name = "kfilereplace-16.12.0.tar.xz"; + }; + }; + kfind = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/kfind-16.12.0.tar.xz"; + sha256 = "0i2sjcw3ah35x3w7cvhrpzrv5khwax6nazbqbwzgvfa0gwc9y8ki"; + name = "kfind-16.12.0.tar.xz"; }; }; kfloppy = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kfloppy-16.08.3.tar.xz"; - sha256 = "14y9a8nq2cdaj5r6xdqwfm6fa8w3wbx80hrps2bkxyx696hc1lkl"; - name = "kfloppy-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kfloppy-16.12.0.tar.xz"; + sha256 = "0awcayd1hffdv7dybbrv2m38q33yl26g4bs9z1yib7h4iilky3lz"; + name = "kfloppy-16.12.0.tar.xz"; }; }; kfourinline = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kfourinline-16.08.3.tar.xz"; - sha256 = "04wpswi9c7c79g4sz6cr7jrdmdfwwqr2p8kd0zs2snygcr4h3fcq"; - name = "kfourinline-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kfourinline-16.12.0.tar.xz"; + sha256 = "18l218fww9y3msmx28j42xyvgyvngj2bhdx05ji8q9x40phq8dby"; + name = "kfourinline-16.12.0.tar.xz"; }; }; kgeography = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kgeography-16.08.3.tar.xz"; - sha256 = "09hsihvvdzbr1dz8zlwy7nyjk87pl7f714k3k3b0b0wpx9swxkq0"; - name = "kgeography-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kgeography-16.12.0.tar.xz"; + sha256 = "1zcw344y2xrz2h9f37kvk0fl4c9rm5xcahqc3hranm922ki0c8v4"; + name = "kgeography-16.12.0.tar.xz"; }; }; kget = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kget-16.08.3.tar.xz"; - sha256 = "1709if0yqp0axy88v56zrchirkcjgl8q38qf0zbfng0bbbszik61"; - name = "kget-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kget-16.12.0.tar.xz"; + sha256 = "125b4knvng34cj99g45590d9ci5s0f1y3m223rxvzmn5sds2vp1k"; + name = "kget-16.12.0.tar.xz"; }; }; kgoldrunner = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kgoldrunner-16.08.3.tar.xz"; - sha256 = "03g3j1zrq3513jijnl3ih61xkpxl4mqy6mjmilq5cs745bmzkad4"; - name = "kgoldrunner-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kgoldrunner-16.12.0.tar.xz"; + sha256 = "155smz222s38ib0rrfcsfg0vi4l0iksawagwmxvnr1h51s80l5pz"; + name = "kgoldrunner-16.12.0.tar.xz"; }; }; kgpg = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kgpg-16.08.3.tar.xz"; - sha256 = "17kr13lvicv4lrl4ls4l66xh35xz60nrszwagb0qk34wcgzc090p"; - name = "kgpg-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kgpg-16.12.0.tar.xz"; + sha256 = "1jn51r4f2ixwp4qfx635jy017gls0aaz0638kfz8404zj4l523qs"; + name = "kgpg-16.12.0.tar.xz"; }; }; khangman = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/khangman-16.08.3.tar.xz"; - sha256 = "1ipkp003pp6z783qb7fzhky3kn4ccmlqijxysk7ccbsr9myfvdyk"; - name = "khangman-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/khangman-16.12.0.tar.xz"; + sha256 = "0827754548bxbhqgfykb7n97hxjszf8azrz2vi6l0vsd080q0kvf"; + name = "khangman-16.12.0.tar.xz"; }; }; khelpcenter = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/khelpcenter-16.08.3.tar.xz"; - sha256 = "13vzqjaqqzi46c9gmijhbq1i3fmk3pbkkg26mn3745m2xc6j2cvi"; - name = "khelpcenter-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/khelpcenter-16.12.0.tar.xz"; + sha256 = "015s3yj0ppba8b90h0fwwra3xqz2b21n701zd4q40rqfjhkh9p0j"; + name = "khelpcenter-16.12.0.tar.xz"; }; }; kholidays = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kholidays-16.08.3.tar.xz"; - sha256 = "0hxb2c526vw8rvfp14snvwihsqvr1l30vnzhxznl3dhm44lmvdn9"; - name = "kholidays-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kholidays-16.12.0.tar.xz"; + sha256 = "0rimmd74ls77zzmk00dxs17b9h4vj3382hiz2cl5pgf834s0ljgn"; + name = "kholidays-16.12.0.tar.xz"; }; }; kidentitymanagement = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kidentitymanagement-16.08.3.tar.xz"; - sha256 = "0vv1y0mwxlb4g5a01jgi1nizw530w0fhy0kab6syxzgmnibj6vsf"; - name = "kidentitymanagement-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kidentitymanagement-16.12.0.tar.xz"; + sha256 = "0z559af17qjcr7s2nsr0v4yvqn69svkzcqis99x329kbhza1208k"; + name = "kidentitymanagement-16.12.0.tar.xz"; }; }; kig = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kig-16.08.3.tar.xz"; - sha256 = "1ln2i322ara79f90rwrcv5xfa0cnkksyhj25h2xn9x7d5ig4by96"; - name = "kig-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kig-16.12.0.tar.xz"; + sha256 = "10svcqid4rzhq8vb4bbxhnp1dlyl4fd8w18blxvqan0qiv43332x"; + name = "kig-16.12.0.tar.xz"; }; }; kigo = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kigo-16.08.3.tar.xz"; - sha256 = "0vz7329i8pfax9nxb7xc0yws4f3mn4ms93358wvhyblbma4zaf4l"; - name = "kigo-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kigo-16.12.0.tar.xz"; + sha256 = "033jbyck21qzm9r9j7q012rbkr0bk0n2prjb70lk38wsb2ghvziw"; + name = "kigo-16.12.0.tar.xz"; }; }; killbots = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/killbots-16.08.3.tar.xz"; - sha256 = "08f9gvvy3sx7ibikgxzjawfzzznfig8dfmgmfczj56fys7rvh2y5"; - name = "killbots-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/killbots-16.12.0.tar.xz"; + sha256 = "0079fsh5yld69a3lq4ibbyhlr6kk7j2x0wylnk00jq0m886jqi4j"; + name = "killbots-16.12.0.tar.xz"; + }; + }; + kimagemapeditor = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/kimagemapeditor-16.12.0.tar.xz"; + sha256 = "1p7r9k7xrvnab83sljlgjlncdpv3z1fxskyzsihdzb3qw1da5sg9"; + name = "kimagemapeditor-16.12.0.tar.xz"; }; }; kimap = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kimap-16.08.3.tar.xz"; - sha256 = "03nl3q8cv92jpdgdg8pfhwzwlkqpcpz13p6p4q47vvmgglp63qnw"; - name = "kimap-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kimap-16.12.0.tar.xz"; + sha256 = "1sm3ifnl80wmzbxz9ybsj4xl224mg5sn43ja29sf7m0syyypfc9n"; + name = "kimap-16.12.0.tar.xz"; }; }; kio-extras = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kio-extras-16.08.3.tar.xz"; - sha256 = "1rd5ks73vqf6x4rs0qjsy0ipl6lgxgwqbwmcxar5m50b5jksl4xk"; - name = "kio-extras-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kio-extras-16.12.0.tar.xz"; + sha256 = "0g4xxzqbv5bi1msqp1vhkq04815dz4zflnlsgyimihi74mdawd3x"; + name = "kio-extras-16.12.0.tar.xz"; }; }; kiriki = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kiriki-16.08.3.tar.xz"; - sha256 = "0n37mmkq1jmdh3jlrjzmb88cnbnwzcjbp2dy6mz4f5iliv9ws54v"; - name = "kiriki-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kiriki-16.12.0.tar.xz"; + sha256 = "034fgl0qvslzyk04gnr68gcvlvynfim8bn0plgz5vd0k5w9n67kc"; + name = "kiriki-16.12.0.tar.xz"; }; }; kiten = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kiten-16.08.3.tar.xz"; - sha256 = "0qds7c62jsgf5lyx2sjhw5xxxq7qh35ccpvpc7l004g4blwb7mna"; - name = "kiten-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kiten-16.12.0.tar.xz"; + sha256 = "1s6qpzficpfm0zxs8g80xyly7wflxfxwjpr0avsn6ydzz0yj4vc7"; + name = "kiten-16.12.0.tar.xz"; }; }; kjumpingcube = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kjumpingcube-16.08.3.tar.xz"; - sha256 = "1lv6irlvfpbpbhk3vazv07frwz3y7084y3hirdjb2xih8gbsljrm"; - name = "kjumpingcube-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kjumpingcube-16.12.0.tar.xz"; + sha256 = "0japldhq8a7rfmzhlyk057iab9xnzwy1ahsp8fbdqh5xgp7yc0sq"; + name = "kjumpingcube-16.12.0.tar.xz"; }; }; kldap = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kldap-16.08.3.tar.xz"; - sha256 = "1h4czdxw0p4lakx0j0pf2v13ny5lnc56jhhjjb9ddm44b50fg4vg"; - name = "kldap-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kldap-16.12.0.tar.xz"; + sha256 = "1xz46h39clz5pqlhqfmvdiw67i7dknng5jk9907vjzp84rck8qmr"; + name = "kldap-16.12.0.tar.xz"; }; }; kleopatra = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kleopatra-16.08.3.tar.xz"; - sha256 = "0ncr4sc6qs50n1w85gf350iq9l28665is53jzbm288151zanp4dd"; - name = "kleopatra-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kleopatra-16.12.0.tar.xz"; + sha256 = "0g5crp2vwvl0bfb95ym3wj3z39vy1bzcdcqw77pw4l1k9jd334sk"; + name = "kleopatra-16.12.0.tar.xz"; }; }; klettres = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/klettres-16.08.3.tar.xz"; - sha256 = "14m1k0y1lbkqrpwnjx8020d23fmpgq0jg97hr4q8fzs4h71lpyr7"; - name = "klettres-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/klettres-16.12.0.tar.xz"; + sha256 = "1gggmllh4j5178gasc9qzbk7l453nsgmnp3gq18iymcrvjbm5r1k"; + name = "klettres-16.12.0.tar.xz"; }; }; klickety = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/klickety-16.08.3.tar.xz"; - sha256 = "0izkwi0h2mc204wsmyg5hspnnc3xa8ypdzbw1rwgsd8nxv3sphbv"; - name = "klickety-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/klickety-16.12.0.tar.xz"; + sha256 = "0xznghprfy7fl2b84dhf7yrcqwj7aa6dxyzani7q0vms6680vjrd"; + name = "klickety-16.12.0.tar.xz"; }; }; klines = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/klines-16.08.3.tar.xz"; - sha256 = "0p1pbljqp01g9ssih5aplsi97aszc68smkpilbazxfvwc4q3x1ag"; - name = "klines-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/klines-16.12.0.tar.xz"; + sha256 = "086d9cak6vx7paygl2b2vim22gnpcq290agx62z98gy4a4r0aq3x"; + name = "klines-16.12.0.tar.xz"; + }; + }; + klinkstatus = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/klinkstatus-16.12.0.tar.xz"; + sha256 = "1xr5mzhrs3jsp13587n0r3mr9z5j2fc7qr4z7c9c4za2v0qp83h7"; + name = "klinkstatus-16.12.0.tar.xz"; }; }; kmag = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kmag-16.08.3.tar.xz"; - sha256 = "0ph7zf1awj47wzvp5dq80rvx0himrk6s8qhmnjvgpm0nqyfv7xh0"; - name = "kmag-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kmag-16.12.0.tar.xz"; + sha256 = "1aihng2ippkavrlsrf9l3klpwkyql3lyy44x81ibmaw6xaa9zgjs"; + name = "kmag-16.12.0.tar.xz"; }; }; kmahjongg = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kmahjongg-16.08.3.tar.xz"; - sha256 = "0fxkbq1p174lppklvi5lzmgi3g7411nhi33fsmdmwyxbngrm4yih"; - name = "kmahjongg-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kmahjongg-16.12.0.tar.xz"; + sha256 = "1lv95cjsc0ahnxij1y7b2pdihvkcnmbq6385rlxwqmqjp2mprga7"; + name = "kmahjongg-16.12.0.tar.xz"; + }; + }; + kmail = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/kmail-16.12.0.tar.xz"; + sha256 = "0nydggfk2jndj6f7vn9far29z9n5zrmdfcfmfh7pbq5qhgdaxrzf"; + name = "kmail-16.12.0.tar.xz"; + }; + }; + kmail-account-wizard = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/kmail-account-wizard-16.12.0.tar.xz"; + sha256 = "151ixamq9910pw8q8phn3crhc250khagrimfhsg721kcl0k0ajzs"; + name = "kmail-account-wizard-16.12.0.tar.xz"; }; }; kmailtransport = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kmailtransport-16.08.3.tar.xz"; - sha256 = "08xi04xr7mjg8m2bnp42ymvn9ynv4q8y3dnql1v4225pjzmp6bkg"; - name = "kmailtransport-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kmailtransport-16.12.0.tar.xz"; + sha256 = "0hm797zk8lcq3icyddh46snx0f1n35j9vx7qg7zy77lfs9xrhh6n"; + name = "kmailtransport-16.12.0.tar.xz"; }; }; kmbox = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kmbox-16.08.3.tar.xz"; - sha256 = "0iaqq4mrfj4qqaj76i7crjriyjsk3h6rf3cisygvkkfyyb69nz17"; - name = "kmbox-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kmbox-16.12.0.tar.xz"; + sha256 = "0xmib0fpardw9f5f61mhmj04qlhh0nkq9cdp0z374r6mar29q2dj"; + name = "kmbox-16.12.0.tar.xz"; }; }; kmime = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kmime-16.08.3.tar.xz"; - sha256 = "0j9nfsmfl1sw9hz3al9smxri1hr58ygmyxawlr91iyglzswxaakb"; - name = "kmime-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kmime-16.12.0.tar.xz"; + sha256 = "0rk6ggpa1iqc6vvkx1w7v68pngxfa0xailgd0rfkb7rxvbv9zvhs"; + name = "kmime-16.12.0.tar.xz"; }; }; kmines = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kmines-16.08.3.tar.xz"; - sha256 = "0rnjdds4skxj9pxajfnybki4ikq99k5myaw80qk5dc08gnrmw4fz"; - name = "kmines-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kmines-16.12.0.tar.xz"; + sha256 = "0j15c9valn6zi0siig132ck0jl3ccq8mwi87jmv01lk3wk8wf70n"; + name = "kmines-16.12.0.tar.xz"; }; }; kmix = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kmix-16.08.3.tar.xz"; - sha256 = "1p3gcll4ywwxwphygrwqrp1565va52q8nnccyxisd3h833lqfk3k"; - name = "kmix-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kmix-16.12.0.tar.xz"; + sha256 = "0q0x0azd6qaa9fqcf4bl9q05fggb1amqdn3y4fj6y4fmybzwy2lk"; + name = "kmix-16.12.0.tar.xz"; }; }; kmousetool = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kmousetool-16.08.3.tar.xz"; - sha256 = "1iihk8jcysz49q3a5nnn0s468yca1x7chwqpvqqr694fn3wizkfg"; - name = "kmousetool-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kmousetool-16.12.0.tar.xz"; + sha256 = "08h0jpwf16xxrxijlg1lhlsixmfm8k6kby6z8m47ixd1pfj0dkxa"; + name = "kmousetool-16.12.0.tar.xz"; }; }; kmouth = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kmouth-16.08.3.tar.xz"; - sha256 = "1km072jnp5cc3ib4ja0lxd29pspi9wyhbp8bgcph5m33kw2n3cbq"; - name = "kmouth-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kmouth-16.12.0.tar.xz"; + sha256 = "1nvxd3kykb0a1kr3pk8rs4imrnv2x2cqvyg4rdj2vzrxszckcirp"; + name = "kmouth-16.12.0.tar.xz"; }; }; kmplot = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kmplot-16.08.3.tar.xz"; - sha256 = "0lv2jfg6klm3z9mpp298g1d7vxff5hdaj332pzblvp2m51sbhrdv"; - name = "kmplot-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kmplot-16.12.0.tar.xz"; + sha256 = "1wdx63cv0qyccfgr7zbp1myfyfd2prk8jfq60n240rv0ji1r7ah8"; + name = "kmplot-16.12.0.tar.xz"; }; }; knavalbattle = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/knavalbattle-16.08.3.tar.xz"; - sha256 = "1kjndhwc4l4rspygaxdr8dj9s9rj8ayq1k0z7r8v5qz2355farc8"; - name = "knavalbattle-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/knavalbattle-16.12.0.tar.xz"; + sha256 = "0wyxxhgrmn7fyh3mmanpi7ki59zlrvhwyqpjya6dxysa8v7f6bda"; + name = "knavalbattle-16.12.0.tar.xz"; }; }; knetwalk = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/knetwalk-16.08.3.tar.xz"; - sha256 = "18l80ffcavy9q7sj396qj4xw1yghljl24762ygd9q0kmmanw4h8y"; - name = "knetwalk-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/knetwalk-16.12.0.tar.xz"; + sha256 = "1xbrzp8qhvnnx85zx5gkbkv5babkgm1zzlrrjbpbgghvqz71g36h"; + name = "knetwalk-16.12.0.tar.xz"; + }; + }; + knotes = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/knotes-16.12.0.tar.xz"; + sha256 = "0rsl0d25i771r96lmp1bpq7g46jdk1jkfml0f10s3h940y73fyax"; + name = "knotes-16.12.0.tar.xz"; }; }; kolf = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kolf-16.08.3.tar.xz"; - sha256 = "15gggr983pcz44q44m1yvkbyp5kwbmpyx3ijb2yxx1bvn4d5bp85"; - name = "kolf-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kolf-16.12.0.tar.xz"; + sha256 = "12dyfv9zsh3vacakh1yh037ma4n43lqhhqcqns4cimxwqzhdmwz5"; + name = "kolf-16.12.0.tar.xz"; }; }; kollision = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kollision-16.08.3.tar.xz"; - sha256 = "18kvvl87ykkrhjikq53rgj53ap73x2wld6b4aryd4jrwmj5wby39"; - name = "kollision-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kollision-16.12.0.tar.xz"; + sha256 = "0rb83c0ab6hf6y41ll5wp41gkv05jzk4gjjb9z0iy8vbl0zgfy8b"; + name = "kollision-16.12.0.tar.xz"; }; }; kolourpaint = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kolourpaint-16.08.3.tar.xz"; - sha256 = "0igv18nrhwhylvm7nr4mfvyp2bpcgn6c3r8r61rrsl908qmv4byv"; - name = "kolourpaint-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kolourpaint-16.12.0.tar.xz"; + sha256 = "0xapdx2h1ki3lmw6413d4zi6d23ag4cqbhnf8ndk49rk3nal8mlf"; + name = "kolourpaint-16.12.0.tar.xz"; + }; + }; + kommander = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/kommander-16.12.0.tar.xz"; + sha256 = "03qx7s45dmbbz4yp3d5d0l70ihr5kw08xywirpgdn78gbrzgz5rm"; + name = "kommander-16.12.0.tar.xz"; }; }; kompare = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kompare-16.08.3.tar.xz"; - sha256 = "1ji33dhbak38w0b9dlrv1v4kh5lyp5pm2v77v0lka71l75cvc7g7"; - name = "kompare-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kompare-16.12.0.tar.xz"; + sha256 = "0yxnc7w7zzbra9n7hwv3mccxivivj9dzv8d2va110cm1h7gx5v06"; + name = "kompare-16.12.0.tar.xz"; + }; + }; + konqueror = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/konqueror-16.12.0.tar.xz"; + sha256 = "18xc0d8hryi6c80ka93n83wlyb208mk8yxvxcx5b0b76yhz642d2"; + name = "konqueror-16.12.0.tar.xz"; }; }; konquest = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/konquest-16.08.3.tar.xz"; - sha256 = "1b8fx5k6fncw82d6i8kc07qk2k4y4fwdvwlqn2pxdixp3fk1fj12"; - name = "konquest-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/konquest-16.12.0.tar.xz"; + sha256 = "0811a1649hqavgix8y7b3ngcngpxnz1gf6nf5ljydf5nlja612ai"; + name = "konquest-16.12.0.tar.xz"; }; }; konsole = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/konsole-16.08.3.tar.xz"; - sha256 = "09s8y3w2mrifpl9pfjrzf0q5fgfcdph0s8x85y7262mikwvqfx36"; - name = "konsole-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/konsole-16.12.0.tar.xz"; + sha256 = "125arsfrzh9103gpw67pb4h63zjmn4653rnqm17hvcdpibs5x7lk"; + name = "konsole-16.12.0.tar.xz"; + }; + }; + kontact = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/kontact-16.12.0.tar.xz"; + sha256 = "1ym07xfmyy60h2hf575gllhhprgx3n9q5mqqj3z444ipd5z73jhx"; + name = "kontact-16.12.0.tar.xz"; }; }; kontactinterface = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kontactinterface-16.08.3.tar.xz"; - sha256 = "1kw04ixc6blmygi3wyyk8a3qnyd0a9d85r2jql3mzhz5gczik7b8"; - name = "kontactinterface-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kontactinterface-16.12.0.tar.xz"; + sha256 = "16gw9sq1s9szw9zh1dp025qqj2al6yqf5c1yqkvp94y6kgw901gi"; + name = "kontactinterface-16.12.0.tar.xz"; }; }; kopete = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kopete-16.08.3.tar.xz"; - sha256 = "0ia43yqmb802nqjlklgpyqy5pnkp9mlr7hhic0lmgvr0jyid43pz"; - name = "kopete-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kopete-16.12.0.tar.xz"; + sha256 = "1297ixqq2g5kqvyap2md5y0nm11027sjffq47m99yrxvsb3z5v60"; + name = "kopete-16.12.0.tar.xz"; + }; + }; + korganizer = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/korganizer-16.12.0.tar.xz"; + sha256 = "1xfgklw266zv83d57g1q9yqkzwlr06bf5gg76ac9qfn6fczc5qs7"; + name = "korganizer-16.12.0.tar.xz"; }; }; kpat = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kpat-16.08.3.tar.xz"; - sha256 = "1jb7a5ii8qvaqvivbd0hn2vxn9l9s83ahrx8idnlhqj1yriyhyqa"; - name = "kpat-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kpat-16.12.0.tar.xz"; + sha256 = "00kwpv1zhrj428qbi38fcd87bzkdvq79jcj2z2wlxf496kdr73z3"; + name = "kpat-16.12.0.tar.xz"; }; }; kpimtextedit = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kpimtextedit-16.08.3.tar.xz"; - sha256 = "0bkf43i7wdyign63gwz2215dr66zfpy43f8pszif5jqzlnc84kba"; - name = "kpimtextedit-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kpimtextedit-16.12.0.tar.xz"; + sha256 = "1yj3ihl3r04av6bcw6g574ix5xq3vy7xn1bxf5lldxcs0d56485h"; + name = "kpimtextedit-16.12.0.tar.xz"; }; }; kppp = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kppp-16.08.3.tar.xz"; - sha256 = "04pszpig2dyvrprfkalxhfad3d9v5sl8sjb3r403wmvd701xbknh"; - name = "kppp-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kppp-16.12.0.tar.xz"; + sha256 = "1s760apss671855cc35r52vyrh1n65miibsr9x66fssy2dixbm8a"; + name = "kppp-16.12.0.tar.xz"; }; }; kqtquickcharts = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kqtquickcharts-16.08.3.tar.xz"; - sha256 = "1kdd0n6a8v4paya9xw8si8c60k448mrgwz163qa3w54ylxmh2xqb"; - name = "kqtquickcharts-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kqtquickcharts-16.12.0.tar.xz"; + sha256 = "170490rl9j73zw4679p5l08rxg4x9agc2xvig029maarkbymy46i"; + name = "kqtquickcharts-16.12.0.tar.xz"; }; }; krdc = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/krdc-16.08.3.tar.xz"; - sha256 = "00kvijidg387wp1wv8brhdbhc3daa06n2k2vn0cfyh18s815mwbs"; - name = "krdc-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/krdc-16.12.0.tar.xz"; + sha256 = "1n0wwb16kfhzsqxj0d1y5ms6k7i568aggrip27l8hgj3bnp1lfv9"; + name = "krdc-16.12.0.tar.xz"; }; }; kremotecontrol = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kremotecontrol-16.08.3.tar.xz"; - sha256 = "0h2cjc10s876clsap93blmgbv75vxkjlpkns7n14420mz45j7aga"; - name = "kremotecontrol-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kremotecontrol-16.12.0.tar.xz"; + sha256 = "1h2znx0vqa9i4qg4b6mdlg4i5pzif266f81wa3kkh2zqw6qiyd77"; + name = "kremotecontrol-16.12.0.tar.xz"; }; }; kreversi = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kreversi-16.08.3.tar.xz"; - sha256 = "0dpk6jnn6sqqn8xagy3dsvf6c4irir0l8pfp3xjr3s6hx3jbgqn9"; - name = "kreversi-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kreversi-16.12.0.tar.xz"; + sha256 = "01z4nwnpcbgd7y1xilwbjc803hqgzp3x89sif6zhkmcrvh17wzsd"; + name = "kreversi-16.12.0.tar.xz"; }; }; krfb = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/krfb-16.08.3.tar.xz"; - sha256 = "0kgm1wpxnjr79w2mqq6q5mg2ajzlim9c83030jdzqd5dr1y8gvdl"; - name = "krfb-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/krfb-16.12.0.tar.xz"; + sha256 = "0mdi6v4ijibr4cm0gsr5jid4qd1wi5i6bccqn1ii4v2v59pnrzyw"; + name = "krfb-16.12.0.tar.xz"; }; }; kross-interpreters = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kross-interpreters-16.08.3.tar.xz"; - sha256 = "1629b9ihg3g5d0p5a0f7igfsmwn45jlsy7gqbdmrwzlbynrbq0jv"; - name = "kross-interpreters-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kross-interpreters-16.12.0.tar.xz"; + sha256 = "1dsw0wzwnqz2hgw3s6gjs7bpvkxyqgc0nad7pj7gnhd4j68fr0h1"; + name = "kross-interpreters-16.12.0.tar.xz"; }; }; kruler = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kruler-16.08.3.tar.xz"; - sha256 = "0awhsaysqsgnvmflrz4svd2vbnmhykb6cfn2331mphv4ycyi0zyf"; - name = "kruler-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kruler-16.12.0.tar.xz"; + sha256 = "0k30cw24ygcc1rbqx5hsy46w4laha733kkcvi0axzhgfkk19wbvq"; + name = "kruler-16.12.0.tar.xz"; }; }; ksaneplugin = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ksaneplugin-16.08.3.tar.xz"; - sha256 = "0hg1xw45x6xk8q893hm72skhhm4p1v1afbvdxqasaggl6l8765xh"; - name = "ksaneplugin-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ksaneplugin-16.12.0.tar.xz"; + sha256 = "17im3pjwchlqsgf8f6ml0i23s6y8x2p5pjfwrc4giwd1v83hh02s"; + name = "ksaneplugin-16.12.0.tar.xz"; }; }; kscd = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kscd-16.08.3.tar.xz"; - sha256 = "1dyh79x5zgc20f18hysvmnfpg7f2wxjssracyihg2b8cyhzz2g70"; - name = "kscd-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kscd-16.12.0.tar.xz"; + sha256 = "0g8307qby224zhravfm350mkknhj44rjxcs04pgws3y3ra0bqzcz"; + name = "kscd-16.12.0.tar.xz"; }; }; kshisen = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kshisen-16.08.3.tar.xz"; - sha256 = "0xmjk6pij18sf3mq8hp3fmcvhqdx6l44hvk6nmp6v4y7fxw3fry4"; - name = "kshisen-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kshisen-16.12.0.tar.xz"; + sha256 = "1i2mbh1nwwpvns9nkzr7bl5gxk5v58psbw2fad0gxddbcng2sbnh"; + name = "kshisen-16.12.0.tar.xz"; }; }; ksirk = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ksirk-16.08.3.tar.xz"; - sha256 = "0bwnlfa162n6a5kxzbbxwgxj7rgpi5zqaj0arqwlq075b1kyfniq"; - name = "ksirk-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ksirk-16.12.0.tar.xz"; + sha256 = "1rzp5b35x7yiz1cyfbw80b1wzf68bd3k5ax4pl12q15h1wpcr582"; + name = "ksirk-16.12.0.tar.xz"; }; }; ksnakeduel = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ksnakeduel-16.08.3.tar.xz"; - sha256 = "1g26ip287fnlv95vmk69ji76mr8lpnjrgj855rdi64p16wxwirjp"; - name = "ksnakeduel-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ksnakeduel-16.12.0.tar.xz"; + sha256 = "12ybsl1awsz1pygpgfbzfyyql24znafmll6qcydcg07rjxld9ywq"; + name = "ksnakeduel-16.12.0.tar.xz"; }; }; kspaceduel = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kspaceduel-16.08.3.tar.xz"; - sha256 = "0ycfw4mr25apr21ffxv0pdxbrda09k4him19hck3yjkkhgwzq7a0"; - name = "kspaceduel-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kspaceduel-16.12.0.tar.xz"; + sha256 = "1rpacxbzg8rdl1hmm6nvksjj8z4cwqyh0v8javazf8ngas29bijj"; + name = "kspaceduel-16.12.0.tar.xz"; }; }; ksquares = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ksquares-16.08.3.tar.xz"; - sha256 = "1x7gj4bxq2aza2cis3br2y20nbljx4n988f70wark9ywz8hydg5z"; - name = "ksquares-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ksquares-16.12.0.tar.xz"; + sha256 = "16gd9l9bm96dv6srl11blxh15n3invh7znzxikxspjzckm3jqc5q"; + name = "ksquares-16.12.0.tar.xz"; }; }; kstars = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kstars-16.08.3.tar.xz"; - sha256 = "1a86zqbwp9vwbf1xd7j5a90krcyn2gps38g57hi8dvblx8qlfv4m"; - name = "kstars-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kstars-16.12.0.tar.xz"; + sha256 = "0j6g58xlasxa23vqc12kzl4ijaw34wncdvrsfgdzi3b9bvqy3njm"; + name = "kstars-16.12.0.tar.xz"; }; }; ksudoku = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ksudoku-16.08.3.tar.xz"; - sha256 = "0fjlw7krvi3z1aaiivzkbl2hya2fv2gwfahckfbs05vs0br288iy"; - name = "ksudoku-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ksudoku-16.12.0.tar.xz"; + sha256 = "05jak7hg3yn9dwbinhny0av5rhj1r9zzp7l79nrg8nbm52jnyy4m"; + name = "ksudoku-16.12.0.tar.xz"; }; }; ksystemlog = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ksystemlog-16.08.3.tar.xz"; - sha256 = "1c5xb9m4k5hwz5fv6hvigp12cykgcrkc95axaxhfvas0g9z226hq"; - name = "ksystemlog-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ksystemlog-16.12.0.tar.xz"; + sha256 = "0q3ca4c98a0j8d0370gaczqqs32446hyyf70kf7rxmr6f35d7y4q"; + name = "ksystemlog-16.12.0.tar.xz"; }; }; kteatime = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kteatime-16.08.3.tar.xz"; - sha256 = "0af9dvwihq3dj5zps8d9ahx6zvp9ifwhiswk6v0w887vyf5nym36"; - name = "kteatime-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kteatime-16.12.0.tar.xz"; + sha256 = "1b05ahhdmjlp3fknmbp5c050sgx8iih3j3xxp0bj998xbh975s88"; + name = "kteatime-16.12.0.tar.xz"; }; }; ktimer = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktimer-16.08.3.tar.xz"; - sha256 = "0yyc6hykfz3smznskldn192zpjli3dfjkkqp3h5akwaag2fkzds9"; - name = "ktimer-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktimer-16.12.0.tar.xz"; + sha256 = "11lb7isyr2qc2fh0ypqrs0xzfiwby94hgr4ilv0sd052kvzxwmry"; + name = "ktimer-16.12.0.tar.xz"; }; }; ktnef = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktnef-16.08.3.tar.xz"; - sha256 = "0c1zzn18gxyd6wxvwxw36jbas1hccyfyk44nxpqjfs7g1wpzzg3q"; - name = "ktnef-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktnef-16.12.0.tar.xz"; + sha256 = "0f4nkmy3rdy6kk3l83r7j404vpdgmxy3hls18j8bm5jkhv6n08rh"; + name = "ktnef-16.12.0.tar.xz"; }; }; ktouch = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktouch-16.08.3.tar.xz"; - sha256 = "0pjdj9idqizvnw3ld3kp27cx92s033kp9mv8wrf0f9rvzp4q8iny"; - name = "ktouch-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktouch-16.12.0.tar.xz"; + sha256 = "05yhrjb536v98sh8l979psd824ilj4cj3wcbbfbqkpnv0i4agxf2"; + name = "ktouch-16.12.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktp-accounts-kcm-16.08.3.tar.xz"; - sha256 = "0g3l2s3kmy4k7gkx5gvdcfvx9szr33cxj3g21qzyy0kga381gxzm"; - name = "ktp-accounts-kcm-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktp-accounts-kcm-16.12.0.tar.xz"; + sha256 = "1lwkajaj9zjk1hksx7b5x73a09kri69bq6bxsr1fwi9m47608bhm"; + name = "ktp-accounts-kcm-16.12.0.tar.xz"; }; }; ktp-approver = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktp-approver-16.08.3.tar.xz"; - sha256 = "1k4g6vidi0xxl3gijc502lzmrnk7aqvjc0gdzy0f21avbk8j7hq2"; - name = "ktp-approver-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktp-approver-16.12.0.tar.xz"; + sha256 = "124448c05cr1y6032fkqdb46n3ynyh2njxmn52zn814i797pwz6b"; + name = "ktp-approver-16.12.0.tar.xz"; }; }; ktp-auth-handler = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktp-auth-handler-16.08.3.tar.xz"; - sha256 = "1hda8xgi60avy65x8pwh76xa4h2li2awrwjnndk45zca8ysr1rnw"; - name = "ktp-auth-handler-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktp-auth-handler-16.12.0.tar.xz"; + sha256 = "0ya8q9qvq72vfp5yhb3jd2am83i42cap2yl1xykfwib0r8lmfakb"; + name = "ktp-auth-handler-16.12.0.tar.xz"; }; }; ktp-call-ui = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktp-call-ui-16.08.3.tar.xz"; - sha256 = "1ywklfiqpq1826hhl00h45cslzbfqark4l7lb86lk9m0pibzj6sd"; - name = "ktp-call-ui-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktp-call-ui-16.12.0.tar.xz"; + sha256 = "1qyiipyffhav5wxi7cjbshi9x9fam0snbdl4sqca3nly1cn1k21k"; + name = "ktp-call-ui-16.12.0.tar.xz"; }; }; ktp-common-internals = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktp-common-internals-16.08.3.tar.xz"; - sha256 = "07h6v78b70ri1g6a9axpldfq6h4r890nbr63nsd7fxp2gf2m4byp"; - name = "ktp-common-internals-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktp-common-internals-16.12.0.tar.xz"; + sha256 = "1xlfgs2gc15443vb3pyly0zbrmaliq3nvs7w25ldks8z72m6gqf6"; + name = "ktp-common-internals-16.12.0.tar.xz"; }; }; ktp-contact-list = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktp-contact-list-16.08.3.tar.xz"; - sha256 = "0xk822sr3aizlbh307vdxacalwil2ll4376wdc1dw1d8pdf1sbq2"; - name = "ktp-contact-list-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktp-contact-list-16.12.0.tar.xz"; + sha256 = "1dkndda4xhb7x76m43gbz67jc4bd50bj8mzyyvblijq6rn2a4wsr"; + name = "ktp-contact-list-16.12.0.tar.xz"; }; }; ktp-contact-runner = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktp-contact-runner-16.08.3.tar.xz"; - sha256 = "0pzf7d6v8kd6vwn4ir3b5k3l819cpb6w68q6n3p97gsmgwj1q9vg"; - name = "ktp-contact-runner-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktp-contact-runner-16.12.0.tar.xz"; + sha256 = "0754q5mxghba6imh20qk1qaxbq2c9z6qls5pybjzm71bzbwaf2wg"; + name = "ktp-contact-runner-16.12.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktp-desktop-applets-16.08.3.tar.xz"; - sha256 = "0pdr9zm4ryr176anir4v57b1qnjb3my3lp43bjs61ggrmi0164zn"; - name = "ktp-desktop-applets-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktp-desktop-applets-16.12.0.tar.xz"; + sha256 = "0jq0j9i2r9nq3i7g7qg6vnca2vyb5fhx8jcd45yml4clxg6xggjy"; + name = "ktp-desktop-applets-16.12.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktp-filetransfer-handler-16.08.3.tar.xz"; - sha256 = "1873gy2s250micc0d85g478ashzfqfs9z5qdz2fnmn7mdsmq0l7x"; - name = "ktp-filetransfer-handler-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktp-filetransfer-handler-16.12.0.tar.xz"; + sha256 = "1mfmx4jxzpz81df53b2gy8l2rrfqszqjcmjp5s30k0cyrrqiq1v1"; + name = "ktp-filetransfer-handler-16.12.0.tar.xz"; }; }; ktp-kded-module = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktp-kded-module-16.08.3.tar.xz"; - sha256 = "0ly7apbq7amzdpmhcpa1cy2v7r73pzqv02aa8w0hv8mg9akwr0rk"; - name = "ktp-kded-module-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktp-kded-module-16.12.0.tar.xz"; + sha256 = "192aynmagrmxyil9sc19r37kj28fgcyyivija8q22jwfhh7ds5w6"; + name = "ktp-kded-module-16.12.0.tar.xz"; }; }; ktp-send-file = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktp-send-file-16.08.3.tar.xz"; - sha256 = "1ql78n63m39rr5hylkyqxh1f1w7w9sf9jkj484p5nmkni3k7i6h6"; - name = "ktp-send-file-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktp-send-file-16.12.0.tar.xz"; + sha256 = "0g808dndrr2cb0xcjl643r23zxnaqnycvkinbd9783nkw9i5ak87"; + name = "ktp-send-file-16.12.0.tar.xz"; }; }; ktp-text-ui = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktp-text-ui-16.08.3.tar.xz"; - sha256 = "0p4pzcrmw2vwv1dna33ar5d3jm2lwmra9v46m2nm2wqy38q7k0b8"; - name = "ktp-text-ui-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktp-text-ui-16.12.0.tar.xz"; + sha256 = "1fhlgfs6ynkmqyjypr0922y2p32jqk3j7v08x6wxacp5aifx5i22"; + name = "ktp-text-ui-16.12.0.tar.xz"; }; }; ktuberling = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/ktuberling-16.08.3.tar.xz"; - sha256 = "11xdh4pzcy71b697agc9biwyx8h1ana1ayahqw36cckkcrs1c4mm"; - name = "ktuberling-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/ktuberling-16.12.0.tar.xz"; + sha256 = "1z0hhidjandl2bd9d9pihk16yqqyn75z6hn5sxdx5z1icpxdkara"; + name = "ktuberling-16.12.0.tar.xz"; }; }; kturtle = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kturtle-16.08.3.tar.xz"; - sha256 = "0g0c28wdmx89cgl0bf60c4gvp31xih4anabbk2cjd7ikf7ifcv47"; - name = "kturtle-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kturtle-16.12.0.tar.xz"; + sha256 = "1nxijmai4b2ddg6km2krxzrz46djazcqn4xqi6sdr2yv4rsw4467"; + name = "kturtle-16.12.0.tar.xz"; }; }; kubrick = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kubrick-16.08.3.tar.xz"; - sha256 = "127p0c023gcv3rhgraah7qg05mjqcwk519qzym1afj0rm9w40g13"; - name = "kubrick-16.08.3.tar.xz"; - }; - }; - kuser = { - version = "16.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kuser-16.08.3.tar.xz"; - sha256 = "0yhwlcq24hyn00mfjc8qqr05gy3p2h8j1ls24jdka7h5l6kwvcpq"; - name = "kuser-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kubrick-16.12.0.tar.xz"; + sha256 = "0xrfdmxr7p7m11rgpa0ag247pkr88k1l4br59k6gr92vpxghd1l0"; + name = "kubrick-16.12.0.tar.xz"; }; }; kwalletmanager = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kwalletmanager-16.08.3.tar.xz"; - sha256 = "0rii58dqw9dcs809zc70cb2vwgp7g2154sq55r67v3v0hcq2paq8"; - name = "kwalletmanager-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kwalletmanager-16.12.0.tar.xz"; + sha256 = "01w97cax7smayp536d4javjksg0l2yz1c9i39rh195gaz8wnglxy"; + name = "kwalletmanager-16.12.0.tar.xz"; + }; + }; + kwave = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/kwave-16.12.0.tar.xz"; + sha256 = "07wx614nq5dhym5dlpfvyxbh9asadxbpx6niyl5g7z4xvq2kms8f"; + name = "kwave-16.12.0.tar.xz"; }; }; kwordquiz = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/kwordquiz-16.08.3.tar.xz"; - sha256 = "13jqclk45niqi6m9wjj4hdl11ybzcs3k2hilcf2rzx88karfkvwf"; - name = "kwordquiz-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/kwordquiz-16.12.0.tar.xz"; + sha256 = "0md3a3q16xghv94hqik0jzvg1nwihagdapdn3pz0k4p8nypykz8k"; + name = "kwordquiz-16.12.0.tar.xz"; }; }; libgravatar = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libgravatar-16.08.3.tar.xz"; - sha256 = "047ipm4hsv2kmsi873rciqyfnszzz4p1f0i237zadx2bxr96fikw"; - name = "libgravatar-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libgravatar-16.12.0.tar.xz"; + sha256 = "0nwz8a2kv66b57f3032xl05mxxasvg4k7ap30smlfxlzfm1p48sc"; + name = "libgravatar-16.12.0.tar.xz"; }; }; libkcddb = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libkcddb-16.08.3.tar.xz"; - sha256 = "1jm0wzq1bknvfn1sqwwd95szjz6lpnyrxcnccmgscnl5rss1rsin"; - name = "libkcddb-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libkcddb-16.12.0.tar.xz"; + sha256 = "0f9b2gddjia47mi8rm6vb2h3nycwyiyj6fz3w7kwwv32mnbwmqsg"; + name = "libkcddb-16.12.0.tar.xz"; }; }; libkcompactdisc = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libkcompactdisc-16.08.3.tar.xz"; - sha256 = "091jg5f8v4j8a5iam2ljycizvgncwn188lym9s757p6xap9j73f4"; - name = "libkcompactdisc-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libkcompactdisc-16.12.0.tar.xz"; + sha256 = "0lh6gna28kxja9v5cmz4qnzdlzz3bnxs1x24v2nzvq4lds73rwrp"; + name = "libkcompactdisc-16.12.0.tar.xz"; }; }; libkdcraw = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libkdcraw-16.08.3.tar.xz"; - sha256 = "0svfi7cdasrx1xkmyhkzh5ynj29qn7ry3ryyylayjj1p9yrlqr2s"; - name = "libkdcraw-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libkdcraw-16.12.0.tar.xz"; + sha256 = "0pz1jll1amc42gjzdf7ic43ncd73mrp4cjhwgwmqh7aik2sjmr5m"; + name = "libkdcraw-16.12.0.tar.xz"; }; }; libkdegames = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libkdegames-16.08.3.tar.xz"; - sha256 = "0mbp69clwk6qcv79gxadjl8ka7kbhlgavp3wlpbknxldr74zrqml"; - name = "libkdegames-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libkdegames-16.12.0.tar.xz"; + sha256 = "0ql18w1gliz2k9g460fgh7pwy9r0p0narzc7bzdzv2pc4r2v7w0f"; + name = "libkdegames-16.12.0.tar.xz"; }; }; libkdepim = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libkdepim-16.08.3.tar.xz"; - sha256 = "1id6vhv6dlzyvw141kc2sawpjdqpdfq15dbnbj8hwr2g9jslyd6r"; - name = "libkdepim-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libkdepim-16.12.0.tar.xz"; + sha256 = "09q2z688kkbwiysqzxq2id77fv7sxq3vbs1q88saw8qvhhb4vs5q"; + name = "libkdepim-16.12.0.tar.xz"; }; }; libkeduvocdocument = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libkeduvocdocument-16.08.3.tar.xz"; - sha256 = "0y74gyyxxjysacr4klia7kwm7wphj82ygdxljidbmvp5bmxc8iw9"; - name = "libkeduvocdocument-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libkeduvocdocument-16.12.0.tar.xz"; + sha256 = "1kd795z0lkh1b3hgdca36l0wgac1m4g38q5igs40fjz6nakwqczk"; + name = "libkeduvocdocument-16.12.0.tar.xz"; }; }; libkexiv2 = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libkexiv2-16.08.3.tar.xz"; - sha256 = "0wlh2zxh4yzn5g1dl9ffkim5v8wi888mrfnfxw2y4yrzw65bk9yi"; - name = "libkexiv2-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libkexiv2-16.12.0.tar.xz"; + sha256 = "019lnz2d5m47xx6h48ykhd1ln9bq0wch676ddpywp4kfnlyqs2vc"; + name = "libkexiv2-16.12.0.tar.xz"; }; }; libkface = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libkface-16.08.3.tar.xz"; - sha256 = "0xln9pz4v4gihz8pg1ijmp6ifmr0b5bp5fn6mkii8cwz1x12qvg7"; - name = "libkface-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libkface-16.12.0.tar.xz"; + sha256 = "02i0qk5q0sbb2m34qg9zrm6whxm9qasi4h5k3fr110k8dwc393v7"; + name = "libkface-16.12.0.tar.xz"; }; }; libkgeomap = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libkgeomap-16.08.3.tar.xz"; - sha256 = "0rqscfd6jb1pypr8mdlc5jfn5wn4z5x553gp4nkpq37dwsgzsxm4"; - name = "libkgeomap-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libkgeomap-16.12.0.tar.xz"; + sha256 = "0n17db1jb1xbjfdmrgi57ndhp4bgwwsk26026zxh1ipqavdrpjg8"; + name = "libkgeomap-16.12.0.tar.xz"; }; }; libkipi = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libkipi-16.08.3.tar.xz"; - sha256 = "09pfsb7498bwzz1nxrmmddi7wj8a516xknzza08ls7pd6zm1y096"; - name = "libkipi-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libkipi-16.12.0.tar.xz"; + sha256 = "1pj3cpz7q1jiz2yhvk2g6fz2pwblblxj6qzlsyqs156j98ayjk6g"; + name = "libkipi-16.12.0.tar.xz"; }; }; libkleo = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libkleo-16.08.3.tar.xz"; - sha256 = "0jhhzvpgpn77qisxw0bv1zjcfwcrc7kwdffvqdnnc8hgjmvrb5c4"; - name = "libkleo-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libkleo-16.12.0.tar.xz"; + sha256 = "0g394bykb9f93f3i4r9y666n72wsbk2njc4b86n5hkw94pcgavlq"; + name = "libkleo-16.12.0.tar.xz"; }; }; libkmahjongg = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libkmahjongg-16.08.3.tar.xz"; - sha256 = "0ymzxl37dscqn90dm90y7fxgqlrjqdx2djhqgc6nfk5g50rzlwry"; - name = "libkmahjongg-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libkmahjongg-16.12.0.tar.xz"; + sha256 = "1jh3qh3833faa66jvxy28j24zr9wg1chg0rx95zpjpqg9xllqzir"; + name = "libkmahjongg-16.12.0.tar.xz"; }; }; libkomparediff2 = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libkomparediff2-16.08.3.tar.xz"; - sha256 = "019ibb277nqxygmky254p95n91kza92sb26xqrqz1mi8wvaqmi75"; - name = "libkomparediff2-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libkomparediff2-16.12.0.tar.xz"; + sha256 = "1yxgy4hpd8am6501aqz3018d4v36ipp4g393xc0mq7ygbsmb9sj3"; + name = "libkomparediff2-16.12.0.tar.xz"; }; }; libksane = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libksane-16.08.3.tar.xz"; - sha256 = "1wbvdffibifhdd7cdly7rf6kg25322xapnabylcyaz31r5qczq10"; - name = "libksane-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libksane-16.12.0.tar.xz"; + sha256 = "05m9fl22hfcd41jn2hxj9yms027rjs2gfrhsksvl80m18j6ix51b"; + name = "libksane-16.12.0.tar.xz"; }; }; libksieve = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/libksieve-16.08.3.tar.xz"; - sha256 = "0yi7x90k923v350bvsan7k40xrlz0w506j2ffw5xmr97zqnhhq47"; - name = "libksieve-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/libksieve-16.12.0.tar.xz"; + sha256 = "1fcxs8bwb32pbprb8x4ld3s1m2mv44awlb9014nqb9gw8xikrci1"; + name = "libksieve-16.12.0.tar.xz"; }; }; lokalize = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/lokalize-16.08.3.tar.xz"; - sha256 = "0vk3rpzm0bjfh6sr1dgqpsf81rg8vvynwqm68646pfj38k54yf8m"; - name = "lokalize-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/lokalize-16.12.0.tar.xz"; + sha256 = "06k5wkx8wmhrl0ff0rix9fr2hhbxh0cm0mskajwavg9hcd3aga36"; + name = "lokalize-16.12.0.tar.xz"; }; }; lskat = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/lskat-16.08.3.tar.xz"; - sha256 = "19g2c0by67wnh8k8wg2wq45bablhzqaml04pvmy5zbf4vnvmcbyy"; - name = "lskat-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/lskat-16.12.0.tar.xz"; + sha256 = "1mlvg3iwz0klsnd258dgqs1zz7sz25l3bbwyvfz5r8j3k1gllw5q"; + name = "lskat-16.12.0.tar.xz"; }; }; mailcommon = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/mailcommon-16.08.3.tar.xz"; - sha256 = "080wf6ly7wrrj8ic9nz2cs7qcj6qvmfm8nfvlwymkzn4yyshf9rv"; - name = "mailcommon-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/mailcommon-16.12.0.tar.xz"; + sha256 = "1a25b8akcf1k957jbbcr21ksw3kl0vbs2xn28hzqzlbg5hsnw9yy"; + name = "mailcommon-16.12.0.tar.xz"; }; }; mailimporter = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/mailimporter-16.08.3.tar.xz"; - sha256 = "13cpfvbyr2i3ny3k0dd02353r693cn948cjakzw9jrfb7ha0rab8"; - name = "mailimporter-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/mailimporter-16.12.0.tar.xz"; + sha256 = "1z1lml4hlzzk7kj6ln3p0gz5pganwrjl57zvn0mpbwxsbpdkf8gk"; + name = "mailimporter-16.12.0.tar.xz"; }; }; marble = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/marble-16.08.3.tar.xz"; - sha256 = "0lxax24p3l04qcy2hmyb6c69s7cayjcq6m03nw8nbpjwlmik4b8w"; - name = "marble-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/marble-16.12.0.tar.xz"; + sha256 = "06hpwwqa62z63fsiw5qa50pbkjkyy93h14l9xphnwmcr8cjnfh8x"; + name = "marble-16.12.0.tar.xz"; + }; + }; + mbox-importer = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/mbox-importer-16.12.0.tar.xz"; + sha256 = "0pk751sjniz8kalydg2gl48w2v9jqcsp6qclgccxrm7rj7nsmyr2"; + name = "mbox-importer-16.12.0.tar.xz"; }; }; messagelib = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/messagelib-16.08.3.tar.xz"; - sha256 = "11qk72h45adgf4vmqb6vy8far8j9yr3s3ndj415iw3s07wkinhqa"; - name = "messagelib-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/messagelib-16.12.0.tar.xz"; + sha256 = "0n65xk2prhwjn172b47qjvml20hmff9qspk6dczx3b8knamzsyj4"; + name = "messagelib-16.12.0.tar.xz"; }; }; minuet = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/minuet-16.08.3.tar.xz"; - sha256 = "0p3x1f4nsamhrdnmvpmnv9swi96823sb2sh6r0lfgyzamkkj5mhm"; - name = "minuet-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/minuet-16.12.0.tar.xz"; + sha256 = "17yjs7hwr71f78zx89g83md5mad5g3rgxfxhnmc1hvwclcri12nv"; + name = "minuet-16.12.0.tar.xz"; }; }; okteta = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/okteta-16.08.3.tar.xz"; - sha256 = "01pl32wzv46xxq3mgb0vpw35vwmmdrkc4qfsm750ay58x99wm5hq"; - name = "okteta-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/okteta-16.12.0.tar.xz"; + sha256 = "0n334ksh2c7s5bavhgks1a11mr1w6pf6lvfb51735r379xxh6yqh"; + name = "okteta-16.12.0.tar.xz"; }; }; okular = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/okular-16.08.3.tar.xz"; - sha256 = "1wz4pmzi4wv5zc92lr8qrqfqmg2lymzfqhh6b33iqr39jkv504xx"; - name = "okular-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/okular-16.12.0.tar.xz"; + sha256 = "0a8g2845c0f6z2k6d4f8fccfa9zhqls2yaj1pkasrg8xmanmpmbd"; + name = "okular-16.12.0.tar.xz"; }; }; palapeli = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/palapeli-16.08.3.tar.xz"; - sha256 = "13pcwpks5bg9bw43lb4k2is22a7mzhkwl0sclp7lb9wn8qc831ns"; - name = "palapeli-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/palapeli-16.12.0.tar.xz"; + sha256 = "1ix8xhsif0pa1zsgwn33sqf1kclkpz8mhbviqjzh5ds80dyychdn"; + name = "palapeli-16.12.0.tar.xz"; }; }; parley = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/parley-16.08.3.tar.xz"; - sha256 = "1s3h4ywc84bnhm217jcffiwb3654j8nikl0zzzi1sigr9vhc9xmz"; - name = "parley-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/parley-16.12.0.tar.xz"; + sha256 = "1lvimp0fjy12973rjqa9y0680x19hqln2dmywqmg7fxyhk3ilwv3"; + name = "parley-16.12.0.tar.xz"; }; }; picmi = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/picmi-16.08.3.tar.xz"; - sha256 = "0qywy9n1ifyc5srqx3b0xzhmsv7h54llsxv0m9yxngrbnc7jc3bw"; - name = "picmi-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/picmi-16.12.0.tar.xz"; + sha256 = "03i8g7c84cyg1bn1d70cf34pw2bgfsnhvvjfavzzmmb0kmkj5nhw"; + name = "picmi-16.12.0.tar.xz"; }; }; pimcommon = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/pimcommon-16.08.3.tar.xz"; - sha256 = "06v8ak03rc7zmxmasqq12xi4misg73jag0vjy67a5izbqn613pry"; - name = "pimcommon-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/pimcommon-16.12.0.tar.xz"; + sha256 = "1crz2g2wcgq22vxxywvislw0n7rc21z08rsgcyq6m0dqcv96063l"; + name = "pimcommon-16.12.0.tar.xz"; + }; + }; + pim-data-exporter = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/pim-data-exporter-16.12.0.tar.xz"; + sha256 = "0x2nrspv4bc91ir361y6sp80a9c4nm8fwjzy76q3j23kvyk838m9"; + name = "pim-data-exporter-16.12.0.tar.xz"; + }; + }; + pim-sieve-editor = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/pim-sieve-editor-16.12.0.tar.xz"; + sha256 = "0da0fav852yazrlpinnsr97jm1vc5335wc3wb1rbcamcrvkkpz5r"; + name = "pim-sieve-editor-16.12.0.tar.xz"; + }; + }; + pim-storage-service-manager = { + version = "16.12.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.12.0/src/pim-storage-service-manager-16.12.0.tar.xz"; + sha256 = "1b3z8z921nfmqs2gn653jdsqma4xn3lf1imz942xbgc1w3000p64"; + name = "pim-storage-service-manager-16.12.0.tar.xz"; }; }; poxml = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/poxml-16.08.3.tar.xz"; - sha256 = "0zp0lrlha5npagb4d04c2ga4kpxgi96si29xncff59nvw8l5p1cf"; - name = "poxml-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/poxml-16.12.0.tar.xz"; + sha256 = "18q5lmwx5vdmj2kdi45rhi6cqnk9wrd1v7xc0xn842gjd7y42zh0"; + name = "poxml-16.12.0.tar.xz"; }; }; print-manager = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/print-manager-16.08.3.tar.xz"; - sha256 = "07bd7jyz2iwfw7vf63jkvhjk6la1gkjwz8nva3ms78b48byd96bx"; - name = "print-manager-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/print-manager-16.12.0.tar.xz"; + sha256 = "1na2kw6cdq2qkbjyaxi21cy4lkyalfyw50d6cvgpl4jgrmvdqc8h"; + name = "print-manager-16.12.0.tar.xz"; }; }; rocs = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/rocs-16.08.3.tar.xz"; - sha256 = "1z4l75gr5ixfzyk2198asbm8i6nv03wg0srxgf62pxx5ycvmkygw"; - name = "rocs-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/rocs-16.12.0.tar.xz"; + sha256 = "0lw5mrxjhxwwh7ms5jn576y303jzk54h79vf2qmf6hkmhmwwggam"; + name = "rocs-16.12.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/signon-kwallet-extension-16.08.3.tar.xz"; - sha256 = "11n1ychcl3piar7mk3lqxi70vjw6558nwzlqkjprlj8kqbcwphg0"; - name = "signon-kwallet-extension-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/signon-kwallet-extension-16.12.0.tar.xz"; + sha256 = "0shgg850cgnr3iihdhf4v04fmp1lc3hblgfwsrcyys23zh2xfqr5"; + name = "signon-kwallet-extension-16.12.0.tar.xz"; }; }; spectacle = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/spectacle-16.08.3.tar.xz"; - sha256 = "1ma5q9c66mbnbdv2izgfx7jpzlph3mvi9dkq89vkyr2hi3nznp4b"; - name = "spectacle-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/spectacle-16.12.0.tar.xz"; + sha256 = "1cri1yklzkdfhynfvlqrz21bmr58rcrlcg4g5n5wd71wl46v1m1i"; + name = "spectacle-16.12.0.tar.xz"; }; }; step = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/step-16.08.3.tar.xz"; - sha256 = "0lii1jydca6ksvk0qqy08acq354xwwvh5rjkj58x836fxrb39y9d"; - name = "step-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/step-16.12.0.tar.xz"; + sha256 = "0ilnbk8ax18vk0sbziydm2mzlhp3kl3jymg7cllpb8kknsmjiky4"; + name = "step-16.12.0.tar.xz"; }; }; svgpart = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/svgpart-16.08.3.tar.xz"; - sha256 = "0xriqcqffqdamxavby7gwjl4pxchslamci6xg0xwx7n0w9qa6vgv"; - name = "svgpart-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/svgpart-16.12.0.tar.xz"; + sha256 = "0cqlzxcnqsxyq60dlglpzz3081slr0fwf9bq1pv4d80fs84yj1nw"; + name = "svgpart-16.12.0.tar.xz"; }; }; sweeper = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/sweeper-16.08.3.tar.xz"; - sha256 = "01c89p54h497fk9pwj0hz86vyfqnx83iajmr3pskfsbh601xmipd"; - name = "sweeper-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/sweeper-16.12.0.tar.xz"; + sha256 = "0lha6m8aa8jwlkcyzwc11l48197m90apwv5fbbiy67h2gj105izr"; + name = "sweeper-16.12.0.tar.xz"; }; }; syndication = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/syndication-16.08.3.tar.xz"; - sha256 = "0dqhrzw8xbh1zpxkj40sw72g6sfzhm0slsnvmx3p3ivas0slmqbf"; - name = "syndication-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/syndication-16.12.0.tar.xz"; + sha256 = "1z0mfklr3f7081smxihvcck5arzvzqy3bnyf2wdj92wlj4k974km"; + name = "syndication-16.12.0.tar.xz"; }; }; umbrello = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/umbrello-16.08.3.tar.xz"; - sha256 = "0r1cw17pyyiq4052bdms4vn1vwzwlcyymili0d9m1n0ib8q9dpsd"; - name = "umbrello-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/umbrello-16.12.0.tar.xz"; + sha256 = "01zkrlg1iz0qampzxp77kralz4s9kw02lz5x2114mfjh8l3h65f6"; + name = "umbrello-16.12.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "16.08.3"; + version = "16.12.0"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.3/src/zeroconf-ioslave-16.08.3.tar.xz"; - sha256 = "16hani3ajdysyrw5gy86360zki54kgmlzn65ishl6lzp8c8bp7q9"; - name = "zeroconf-ioslave-16.08.3.tar.xz"; + url = "${mirror}/stable/applications/16.12.0/src/zeroconf-ioslave-16.12.0.tar.xz"; + sha256 = "0alfyp22w72yf7gaxgiqini6nv0qkjjnkgicph9z2yiysywq57a2"; + name = "zeroconf-ioslave-16.12.0.tar.xz"; }; }; } From 3f206e34f252c702c8aa29f8baf51852d845c46d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Dec 2016 08:26:15 -0600 Subject: [PATCH 1670/1749] kde5.kpackage: 5.29.0 -> 5.29.1 --- .../kde-frameworks/kpackage/default.nix | 26 ++++--------------- .../libraries/kde-frameworks/srcs.nix | 8 +++--- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index c3b89a05d198..86ca5935a75d 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,10 +1,7 @@ -{ kdeFramework, fetchurl, lib, copyPathsToStore -, ecm -, karchive -, kconfig -, kcoreaddons -, kdoctools -, ki18n +{ + kdeFramework, fetchurl, lib, copyPathsToStore, + ecm, kdoctools, + karchive, kconfig, kcoreaddons, ki18n }: kdeFramework { @@ -12,18 +9,5 @@ kdeFramework { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ]; - patches = - copyPathsToStore (lib.readPathsFromFile ./. ./series) - ++ [ - (fetchurl { - url = "https://cgit.kde.org/kpackage.git/patch/?id=26e59d58438cc777873a6afc7817418ec735aaa3"; - sha256 = "05ad3awdq8cz1bmnhnf1lapvm70z5qc8sbdzrcgxlka7wzdbm5lw"; - name = "fix-cmake-failure-package-id-collision.patch"; - }) - (fetchurl { - url = "https://cgit.kde.org/kpackage.git/patch/?id=17915200921836d61266ad93dd6c3b87db1dc9e4"; - sha256 = "07irfx297lf39cyrv10i3q4z04fr8msm6pcp8mcwvss4gih05b74"; - name = "fix-cmake-failure-package-id-collision.patch"; - }) - ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index e8ecb3d058fc..7bc0f55dc8b5 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -387,11 +387,11 @@ }; }; kpackage = { - version = "5.29.0"; + version = "5.29.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.29/kpackage-5.29.0.tar.xz"; - sha256 = "1hgzwfb0yxd6n8dc8hrkdsrf21s2xzrka69mhzq0giskpbd2m8fs"; - name = "kpackage-5.29.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.29/kpackage-5.29.1.tar.xz"; + sha256 = "1vbwq5s1psii3qa6g260lpar37y19k8b2g5hn3pyx4llz5wnrali"; + name = "kpackage-5.29.1.tar.xz"; }; }; kparts = { From b7cfbf96d612d4e2efb2aef431c143ee30b40b67 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 10 Dec 2016 04:37:37 +0100 Subject: [PATCH 1671/1749] tp_smapi: updateScript added --- .../browsers/firefox-bin/beta_sources.nix | 1111 ++++++++++++++--- pkgs/os-specific/linux/tp_smapi/default.nix | 19 +- pkgs/os-specific/linux/tp_smapi/update.json | 5 + pkgs/os-specific/linux/tp_smapi/update.nix | 23 + update.nix | 9 +- 5 files changed, 966 insertions(+), 201 deletions(-) create mode 100644 pkgs/os-specific/linux/tp_smapi/update.json create mode 100644 pkgs/os-specific/linux/tp_smapi/update.nix diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index bf45e30eb455..ef5c6b847e29 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,194 +1,925 @@ -# This file is generated from generate_sources.rb. DO NOT EDIT. -# Execute the following command to update the file. -# -# ruby generate_sources.rb 46.0.1 > sources.nix - { version = "51.0b6"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ach/firefox-51.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "9922d61aca30e0b95209010be736dd144c3c65986c08852798997cf3cf8e4969f815565bcdf1f0d82a81bbaecf3f4cf478cda66a2cd757f36043717ddce3385d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ach/firefox-51.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "de99e6e07ea084406927551ccbb549bfe583e21e16873707124d897c38dc04b183476eb620f5d457e19375df51a19d3b57bc3afe344efa07d7832ac973ea30eb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/af/firefox-51.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "cbd0e1e659c0568ee66004664cb5277b1df291747fa22d5dd2b0c68edc59ee9efd3bdb14c6ad60509dc613e80e955314c50b589a5aa9ab52dcfb7efeb8a0772b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/af/firefox-51.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "e4a653eec075b975f3a3d6f73874909f61a82bfded01935ea152d56b7249e726099ae873a347adff4d6fa82f73a267415711483a56845980d199fbebe57a9c23"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/an/firefox-51.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "c6705fbd66a251d3427da98d1efa67d7a3f8683f166b7daab8902480c009b4ab183ff1d4f2242628ce3c11a828b74c605d5c17322234cb7972930174a070bd41"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/an/firefox-51.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "cf5df1e60d2ee8387c173e5ea73699b29ba80251d2497b4e3cb25cfb37fe2bf8967f8d39be091ae5adea2d30cb8c911124bd4272c92e9d0ee811f36d13c62efe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ar/firefox-51.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "d6c91653320898857096b209f2572454351edd4aa4778e8bc91a6628870ca476f80ed48bd17b651e4dcbdd75013dac2b325cfe4e9aab6e62fbeec16f7013e8c8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ar/firefox-51.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "0e128e4c2edde6b9090e1278b5da9bfcf6fc6cd57c739fdad86084bc0e64637b6d9ce1fd31b1da53b85f460f26d9a02b7c95bd427de08dc46415e35dfa381b1c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/as/firefox-51.0b6.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "1fcd00eaf90603969e1e57ab486c088d7ca769c67382398caf1d0217134d6a814200f4c64a6ef8a5a58647e3cb0d45cacb6cf2cf64d7139443077905e4ceca72"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/as/firefox-51.0b6.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "fa223a00223abe964d6515e195dc4bef25a420ffbdc3131d13210ff70c584707757dfd44e53d2a3ca062cbe860ff3df590cf423fad5dff5dfdb1721f321a5b98"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ast/firefox-51.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "0314d493a15bd8069a6fcd4c86036e300ca7391f9b881d355065ebc248f9a4242787cfed6f5d13c7de828340c9013a325f011995b9544610aa93ade607334e99"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ast/firefox-51.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "835c02a80228fc317d8bc81429fa6331a5381e5ce26b7cf315c30d05e7bf8a29197d4105335bf8b32b0a9e2b65acd8c9c617afee5af3339777a0e23558dd92c9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/az/firefox-51.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "a63c05959fc74bca79f6760a31ce0be0ab19ebf372a83fcfb5b2e1807e025462f4fd6236f8848bc2f6066048862cdf6b68fa66de0aa3a0b0d7c65ccca097d9d6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/az/firefox-51.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "dbf48a762de944e8ffd39d65d4b94f67e4b2d3bf91ed0763e44f32343af0dc1183087421d0c6f737c6826e94fb205772cd6d484bfb45b19755948d602d02ae91"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/bg/firefox-51.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "a514ee7d9acdb0dcb95a5c02c8d786481b1d66b8d7de2c8c05793a330d711dc5b0136a822dacc6cf81e338a9e3eca93ff9a25fef457739c5767bd01ec10458f2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/bg/firefox-51.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "6bac773ce99d25062f188a01c3006689ff7441af29a80da323e7ebe09c678a426cc3938f0a1a83051bb0efe791e4779a92b6cd09a23c676ee3629ca2d8a43da7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/bn-BD/firefox-51.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "2738e2e97d52003b4f9b55e8912bceecc86a23c4e1db432db9e9d552e91c33bf0e523a924fc1011e45887b9432af801fab93574d808cfa1dbe77a0ae6056a2cc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/bn-BD/firefox-51.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "2648c10bddde134ee699c0b26be5520a8a47d2cd0ebe99fa114b2ed7f19ba7fddd0696585732d154db67099795e6aec922d49f9871a24eda571bd6e0c24dea35"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/bn-IN/firefox-51.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "c88648df222958a1c3c9ac71e54f2b248625a6637e46c2f39419ca3c57215f5af8ce16f4662326d24712f4cdf0b5f533e48a4bfd903e5cba66b579384d3bc7c0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/bn-IN/firefox-51.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "b97ba8c5bf7f282a323ad3a4e423e85cb9122b470a94eeca91df3c00c6ab3331e02bf36ad7e87684ae3f73770c213ba19ae7179117228ac7808ad2fbe5d99145"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/br/firefox-51.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "a5b160f8776b396dd837cc574cb4ae625e58afa0443ae12ccf857d52b5d5e16d21bea6dcfe7a77e52db6c038541f01efc78d4da0de74625992e3d833f84f0b94"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/br/firefox-51.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "a03eb659b54067721861a89d578b3fca086b02c8013e7e05b724caaa020f301a4015d81e4d9f2dcd69223930c94b4e0e7f12d4e0de4b2fe271bf903b75ba9ca2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/bs/firefox-51.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "18cb9436347d690aa1c7900f8eeaaccfcdc585c3ffe921cd77860596cb8cde01174d709d03489483b5867fb9d647baa9885673b983037656f020d245f4159da2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/bs/firefox-51.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "c64e5146ea1bdcd65b46dca33c8ac772d4c82ad49dc01fb4f1e51a56595e68167f7e4c8ecbe0fa3df258eb6f1ad6c2d9d0eb281e5c7b92831a03f7fbf8e2ddd0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ca/firefox-51.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "db8c8aaebf6679bd28d615e1e2304285ed0848906f93425a255171f48d6c75aa40fb2d88f71cf85eff3410d199032ff152585e277efe78c69440778705ef3b26"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ca/firefox-51.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "8c27b06059b07d2c915fa11ec7d57c7519093a9480dac97cd6c4a024777a79d64687cd3d0c48d0c723aa10ee533164c4f67be9ad6d1379bffac98755a4a3a980"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/cak/firefox-51.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "47cbf1f054fa5820ce1f8f769ce90ac26758f99ad300069e3a6c029e01115c3b12b08c812ebe1309667c17c1640d6cb2e7174fc6e050db8f013003436b7845aa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/cak/firefox-51.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "94ffb85f667d4a39c0de3d4b0853e72e9ad2d60822e7224110aefb187aea5ece6c0be0e82ec4d4f686c6ad710b73c54c70cae10282ec0b48ca6623d3d7558444"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/cs/firefox-51.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "8c5f82a831e31c42629f5e6c6406d5a1ecee37506b89cad845abb110b0f2b5a809ce3e81e8a70915f993fa96891fca4a5e36ff778bd45d23d2671ab55da9f874"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/cs/firefox-51.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "2523492cbcd990a0204dca79f393b7e034d1337e9ff81398de78575d2a98c806680cc363f7339514d9f57308bfe4cd863c8710f6bb6373487b584aa1e8de4077"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/cy/firefox-51.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "77080af629015197663e1e3de1feb76da0ccba3ce1341cf7592ef8d6d0b477f1349d944762d1e810d1cc3c8a0eb23bf44f73e7c00d07d1e9c2a0bc2e2c1692eb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/cy/firefox-51.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "3c4f972e53540ba28be94bdc1e0b67b6c744a20f0ce2c6bfa7a1a92ab20ba806a73f39c5c0afb0e83ed5c822dfb42ea7c0c2806b91cd889070e148de8e5d47a0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/da/firefox-51.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "d082549257e17392f75485548b1ed8062e155687c3d2f0a3287ec5139e6ad1db9cb4a8a449ed2ce18650e07719b03a3dbe1ac25589102c322727767a6d663dd9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/da/firefox-51.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "8b268c1d9e35a91e2a71623404fead75966d39d893944c311ceb572e02673a06c61ef0e08b9c0ba246e6fcd23772e94e7531be535b69c27840478ee1ce3cbe6f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/de/firefox-51.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "0b58e025fc3490c6b94df2f60c722edf909bccec3264bb9f618e54391cfbee8800a6ae1a2c625f68b975daae73596464bb53ffebbedd545bd4a79e77c1d9ca33"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/de/firefox-51.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "c2fb608c2c71412f192b1b910ffc7b270fb8d02b52c76af26fafe362c0cdb282086e902fe1e9eb3bc9d2d022e474816c45092480d199fe3b039083f0de94a3e0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/dsb/firefox-51.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "4f0633677c15ce3b9a4d3bade50c5d4e18c76b898cf82a6169213674220d4b82132912947aefdc2ff90e6e639224d76f3508242d664d051475366efeb4adf84d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/dsb/firefox-51.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "d7d7ec0004bf4712082c57f30e069cbcde9c70cd10d412979228f18fe2056cbab9c741cfda76c8cf5ffaa3086320dd4fede0e140fcc88fe200944e2f407f7606"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/el/firefox-51.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "089054405ee749b30895a8c6cd83a630399ef9cc493dd4f50d0654241ab35ee63c989ce03996f0921820ae701e90bd7af7b6a0058ecba25aa5272ba151da9f02"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/el/firefox-51.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "2fc754b1d951b4d008d9d7a0cfd2555e394e09f8a28adf00334fa780532d8694a78c19831500fda3aa1e85bbc649b7156400d659de45ac4d4ecc3dac3c642124"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/en-GB/firefox-51.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "4c4ec11a0642efe15b82991e8e3d614a239dab86866773b2ad966c45d928a0b6cba73c65bddbd0233cce0bcec7489ee2899115a8e38f02db1490a5a9814a5c30"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/en-GB/firefox-51.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "6dcc54ba099ea5c6845b109eb98cee58dff6bf2dbf442723a3369bd673d43ffa01c7656011d6280f5588e4ee49e8214de327ac3d7fd92ea0cf10fc9a00a3ccd6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/en-US/firefox-51.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "7c53368377d6b4258ba5a64fe16af394b514abcf516d04551c7fb22ff09ccd4fa37b0e16a21af179329f78c8970179b4d66b2882ede54960e9a7524403f7e7ab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/en-US/firefox-51.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "d3c8f949401e6b9ade7e620e0c0f9324d1440a313521d385d7ed038d16628c70762a90a46c45eb74c6880ff35c3ac856e3a083317c016ece2d4bc8e740fd6aec"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/en-ZA/firefox-51.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "f774c2c8803789dfd335dd6bdcab442eaffb2b7bdc1a3a59509060af8e1baf57e56bbca17224038fbadef1168ae20063cae8e6f98912ee35f031870ab65155b8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/en-ZA/firefox-51.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "802e89998c068af3712daebe727d7e865446189b436823175dceb325ea4c3aad8a0b4786961cd28013fa892d9b94d3bafd967bc8d3ebb40bd7d97a76a7c5bcef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/eo/firefox-51.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "103dc2a263d1eeb0bea61e3ddff6d16e399501c59a61045b5821654af7804bac571ce6fceb1e6616da44384d910005cacf44e515028e5da8ad58f1804298c0be"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/eo/firefox-51.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "0204acc897416b13938127b4fcf57eae2abd50f4cead0124f3422efd4e9122c8d3861be6fc5da0d996260205b938e36cbd064d4f2fde48b1e6afcb2dc3f92f1e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/es-AR/firefox-51.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "dc3f7f830ede78340d323f5062edc564fec3bca2eee32bd88d729227e8b7cda4739e56dca54fd7d8a7856778843012b3c52acf4d773ab53249ea8c186896b7ab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/es-AR/firefox-51.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "1a35ab3546f2358d8c3dcfe85528bb42142fa44a565b0d6dedbbff95d230e25ee5627753de50d7868617de5086e8ff0d668626b17cf8f47c320865e1c5a4a3f2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/es-CL/firefox-51.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "ae16ef4d94c2b75bf57f425aa670ab71525655a1a092d7151a513c783c7b4967f5b7e0726e4aad676615165d84551f8ec59b7cc8ad18570834e9abb1089fca6a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/es-CL/firefox-51.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "9f389f9e5bbc30be888942f62dc35360d01d195cba416066321c5f2153f9aa8c7d02f52452ecf1f5d0d290c246066b9fb19f93141ffa0dbced4624495ac3c515"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/es-ES/firefox-51.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "cebede3a4d5750f5b7160dfb8609faf7c73892689da08c7b93b87b6cf159184e04016b3ae92a49bfb8d40c50ac45a8806ac45c30b436a466875cedf4a0270994"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/es-ES/firefox-51.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "b58dc439dc2186bb23e5e401db162717fa0adb90517660516cda553f00100120da2db07e5de8aefea2159537408217825efe1e8d843b75175848f1cfc88f6151"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/es-MX/firefox-51.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "3a263de75799e50ec08961b0f25c3e5366129aff7e466f9dcd8820f1f455cf1ec959ac9a4388ae8edd92f3f5a1647068cd699b809f1e4de9ea9f3dd25b4a4e4c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/es-MX/firefox-51.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "1d466f5c2c2f557fee8b9997fb9f17bedcdc3287a3cf972cb963e47cbf6cd3a440296ffe60d93a45394f83603445a31338f055835f965a09fe4f32839b628ada"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/et/firefox-51.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "70f2d3009b715e27b350bcedd6503a311db8a2c6c75fa29eacdf13a8ea7fcc674680f59dfd18bc2b0440dd528d8e63bd885ee5ff3dfc88361efd3fb137ff3903"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/et/firefox-51.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "c9c51ca82cfc0062576a230a0f78900a62a188724f7eecd3786e78e37c4ba410dcef2953cbb5ffb4eb4c9f750bfc70ea0aeafdd75378b51bdaa825521db0f862"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/eu/firefox-51.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "8cfcd9b768bb83978697db322ead6afe39b6dfee7c05b1b4291f2acc9f84e450c79f419b3a158e3e9757c36d739ecb4325ac51d129015309999b5b0cf8f53df0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/eu/firefox-51.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "cda51c8a34b72ee822542da864f9de3d43a7448d5db77ca775eb7cdbbbc99c432918bd397f53a284cc30257793f1cf50d80de4621e53af99f61b2e6542a27751"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/fa/firefox-51.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "470b4d9545479ed1f97059d4af318c7f38aca6bd80754c0e56c78912164244b4ebcb9aa697a653d608bd26919f76fe0a12dcd02423315570d91aa4b822ef2e76"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/fa/firefox-51.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "dbe302146776542e63f0b98149ad72f514195f7c3f7589a14d9bd96b36d60710bfb2df8a8a931122e58ff75909832a6d26366b171bcb2c78c08c17073726d8fe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ff/firefox-51.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "725c8f4e6ee92877635993bdc83b5d6098531274239e74399cf94c156dd0193b900564a6a1c99b2b57c896f43b9769ccac1d6f280f5338e407a07a740ee4ed2e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ff/firefox-51.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "7e5c390195258b50f5e9a43def66550b11c1f410b21e69e141bc5903ff0cd6b9329a5927249078d64de31edfc8f711f6616f8d9e2432e5e1a03d4472ead43bc6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/fi/firefox-51.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "8ce26856aafb9b496b703c5446a9aced0edafd21c321496021da83efb57514c38ec4065e0f3bbc79342eaab524a4592fe7d5757867bc7af778717857d1701b45"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/fi/firefox-51.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "152c5c7721c373a1d618adb8b89e47365a5e45d621c1dde7070c57ba34091a31c712920d465dbfe3b4fa4c92547249ea4cd296b1524e774d151d512b8931ccbb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/fr/firefox-51.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "3b5a92eb7c1871551b16a4374713df0db4d9af2d288e4a1b4851ad805076c7f4359d164ea1079ea6a48dd42f6496bab748037c7fa2f3be338823279552726f87"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/fr/firefox-51.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "cad55002d699a0791496f4b839899d1c3ed312765e62f4c02fd9886b349f7b2bc9a531003c97be3ff75838d011cef2b82b7ff3a2d41f84a2189d098a8557577e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/fy-NL/firefox-51.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "807180c0e71c13ed5e9081c135b9de19b0f9ce60998b43d6c22364a6f07d9b8e835993e5a12d8c81f3090d48e53bdf84d43f0a1c5829e0e88b273e4e1eb92f1c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/fy-NL/firefox-51.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "6e6e2efa9b4a5b9ddb745a2a037ac83838a6038f4f97a4784cdc9421cf8b673b51d1c814ab0b5e6114b27bb19ac3b32a42f15e9b0db052025246de53268b40b1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ga-IE/firefox-51.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "a7e2fa69e0a9eddb019874c450a9874c9b302084872c536f04012990898e7a9fabe0eeaa1052a1888dc21bff54bb0872c3bce9c4df6c0026caaf93e1ee8fa533"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ga-IE/firefox-51.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "da861b0bbfabc6dfaf46f9b45038794da940023d0428b97957f220f8287d081972e2e97383c7e3d31e4af53ad769ef23490f451929c9ab2bb58f3eddd1f02c5f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/gd/firefox-51.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "9d61356a39ca08c751668969268fd219ee35428d9353f2cb8862d9552403dbe8c05ef961e0694eadaa82de9207e90fe5b349dc27a4d50981c6eb83f59617af85"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/gd/firefox-51.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "54c1e3c396859376c7d95808f39b564380a875abda74ca7eed9ee96947f4afff3088b30d6b7c70de830bca81a8abca9c0379733130be4617e6e44218a96ea3e7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/gl/firefox-51.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "d72a791e014c7c5a6f6304f35c74f572de4ab68f514598fe076d6218b152bd12f2a764262888faeac397f802849920adfe5e97a3b7d4331e43e4ce2de75aa31f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/gl/firefox-51.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "38981f59e6499e1f0d7cfb88a0a62ea0b3874a5b956442da0c9a2852a8c35e6885ba467084c74b482b1bec80513c37835a9dbc5372898ec4500f4de9afb5a71b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/gn/firefox-51.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "c44d87a70e45d31412f38d0ba0a25a1b58d661d91c7a9b6deae19ec40c88da4a480933ba257cb83fea4120d31c3f959ce9c5ad0da4c10247b5fa2c68fdee6aca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/gn/firefox-51.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "fcc6c0432e61b90c7cf8983846d89fcd89c7b9a87eae2c6421194a8c26a4210e2dd7ec87be25e3ee291163fc70ea7703f26adc73137d4adc7ec09b09c152b071"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/gu-IN/firefox-51.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "a782a9bc8a2008a37feb74b4acbbb679eb406fa04745d38196f16304275727cf2215e301f3f25df443430684dffe800534e6f7bd7d35effb2f051895b8426825"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/gu-IN/firefox-51.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "eb59334967705f215d5ab445e829ed1d1c53859589b08610d349cf2bdf28a36bc1ebb1bb18afcb8279790ebcbc6dab032bbc0389020959709d46e3e23eae08c2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/he/firefox-51.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "e0cbf0607d45cf2f079ca2d138d26866bc2d0a65be9e64514417f77ecb89a0228ae228b876af56fce712d9e47aaa41f93c3c908ded27e2a8a1224b2100919f92"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/he/firefox-51.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "1202568d873164c3bd104ccccdde7e201a7e15b88aed1ea6f1fc76099df98fb074a99f3f3fddcbd46992c603a7009ce6dc769641737cac82755c0d2e5c410a38"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hi-IN/firefox-51.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "9d05eff13dfecee6f488d7748c3d109ae6d441760a5fe385011fe1a9d7cea2e4c1a8e3fad8fa8216a45af2d8f99ec8467d588f8fae410eb52f71d408dbbd03b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hi-IN/firefox-51.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "a35c3679d390ee6bc1ace19a07dd3e96b4bac7147d698ebec42f1fb800c9f9f259c194140ff821a8fd84c0ba8171c5aea01257987b051a07a705c82b60ac1f34"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hr/firefox-51.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "fe1a5472ce390b5f6825a40176e3e3e13d79931cf44447da06bf08fa8c483368f95877b848302e7e9cb0c4a8b7e13db03fb7bf895c78b8b5ac6e707dc2ac5979"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hr/firefox-51.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "f3ee08747a0b209681d53fcb82b139bc75797f0c7b60bf35e55c2b702213fc99e99133d9be0df74a4b925d706583f545bd33d99b96ad5eba2e7d7308c4bec318"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hsb/firefox-51.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "a2d170a74de204d24a883cb0be93f9c55eaec4d8872a85e59be3005df7b6f78f02d95bcc0cf24e9b9ee6f6b9e301acec7e692d259b98718b4088b84c56ae0347"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hsb/firefox-51.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "22ae95d23ac80add17200e042e03830cd1e9e709d34e5906217abacdd626533e1e1c359e1312b2dcf44d0dc184e0d9c523dc870c04a759c7c8d7f42abc05391b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hu/firefox-51.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "dede1498aae89a5cf2e78ce927efd801d058fa0a7cfcda6d2aca816b913206e39b78581f48100b2ecde4d9408be30f221e66cdb7d1d1b4e9a86d5a8beed372b5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hu/firefox-51.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "552c6398313ac5e8d49373ac8959b3e39281a067ecceceef8d3d26c53ec276a8fcde181dc96072cd82aac8e952f81a821f87349a58a9f43c4ee41410bfc955c8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/hy-AM/firefox-51.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "2d3b69d793ae4483dd73bd205f6692f86254735a885609033994e697b6df0b843612a10df0c227af280b94d1435555b3caebaa7ce0d229e3960f1d219d1ba180"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/hy-AM/firefox-51.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "760b31298a9f7ee58035089581742e3a855aeffa4ba7a2b34d927e52834a684329f8849201f348395f3224e60aed6540cdb76ca3c5a8fcb0d34c343317423917"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/id/firefox-51.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "be01e48d71ffcfd99973e1d34d3c8779cd79c13a16f325f9e760ca282d7ccf1582e3ee33eecec2f4146ad4001ecf9d8c91a6dd433918c4993e5920fd743ad50f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/id/firefox-51.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "98bda73d7c1cbcccd64b186747e5cbd9a798704c731bf76f05710be945be08a0f6538d1cbf9a839d939371e57428a3be66feabf06cc6166aba27541599748dcc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/is/firefox-51.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "45c337a8c734778f20ed5199911c24b92dcd24d27d4213b9932be675b215fcca39953e914c0ad4ffd35b4401f8debc89cd0d28e5c3b980c94e9f6d1d59f8b105"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/is/firefox-51.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "f28cc5822333bd4497a7d5f5e494e551baba9b7c73f7eb303bc7fc3b907333ebf759ad7e05c0e1b85eec178795ecad4803d0dd872470ac6a55ec4f3856e6596e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/it/firefox-51.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "62e5bc1312904866c09a82ac1a237e0c6b58ddb43f5ba154162ba5d4f51b0df5c54b92f4d6cb0be76f6d5aa5308ad2cca079bdfdcf1893d03f470898d4524015"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/it/firefox-51.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "fa7c0cee7be57b9dbc48785a9320597d03a68508578be7dc0e0d465d30c0d6fc54f330b2f65bf21be0c99c9355daf93f53a7a3b0dc25eda2dd109ef7fd04368e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ja/firefox-51.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "14d190cd8b483af4d9d7c97441e9fb198c1f675e4cc8878e692d940366ad83a48a279957270a4022ca056e0bc28b0c8de625bc81025bef4db1d5e39942376747"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ja/firefox-51.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "d62906737f20a0e886800f883fb671ac798b3cfa04303d364ce513040be3decac3da828578c8fb971908e14cfe07b82021d33f9c24216dc2869524fa2923955b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ka/firefox-51.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; sha512 = "417ae8fca27325c1a1f20b3ee88845db8f03350287869986c6665bd64970bb3f828ebbb516d36c5b9048d848c65f767c539198ee5aa29047cf145851b3a1148c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ka/firefox-51.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; sha512 = "c4d445c52a0579bb6e38e1919a47e7cb26667a1e9b7c54a3d581d56cb55e810fc44cfaba17a89e65aff214d1ad22bb43141a2a776f86a9e068ccc0743c9dc202"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/kab/firefox-51.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; sha512 = "64b677faaf6550dedc968116a86342facc92d7b2aaff8e2f47256a9151bb834e79fc08597808f37541b303eda283d9b8138972547db614a07ab87ea339f44df7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/kab/firefox-51.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; sha512 = "51971dab1d818c0360e351738f96083ebfc493397eb48e39ea2ff129c155bbabe50b591180f32ff6464c66fecaa8fd8b872e206846450ae8e6c76da21c538f8e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/kk/firefox-51.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "3674f209fd4b80daf47319a5ae6014490a9cfc3a64c548d84439dfdb14a3f2053c94cc5e47285924e21409fbaae03cd1f2fbcec02bf5fadf1567379d172cae2c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/kk/firefox-51.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "a7621c7f77f3315bbfac9c3587f05f726a65ba8711071f4f48bdb0e7cfa866f08f7c8bdc71b02a35ef47ed6572d899ad8c5a81977361c9e3845c4ccb84fe4f89"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/km/firefox-51.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "e9358288bd40d66ed2f27676cf92974e1c54f098f8a7978bc8d914a5e045bf94c68efa25674e42f4d976dfbdc1ad23b44d1174f0310e798f1cb1c7c8c1b93349"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/km/firefox-51.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "f5748497701c5c66fcf9fd508664c6846eda0c353782a259c58ddb0852f49dee6bf1b067ea87be53047d31debcc3cd242692bfc831a8b30b6aa01303d9b0a243"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/kn/firefox-51.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "e8f8331ff3d638955d087d2b75ffe7fa04426b6f72a35e1b0e194c92948793fc25e25ae927f03f119dac01a6cbd30f944f5022c32ff933b15a8dbe67245f310c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/kn/firefox-51.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "bc82153cc0a490be1c0e8197c3bb5d69bfb3799cabf4ef55650ea9164ce68c94e846b129fe8988c5cfc9699141b6313add4caff4bba2dff48dc17af2e173cedc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ko/firefox-51.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "58437f794e59333093bbd5a4d673d1a3149ca3468ef9a31bb0fdb4c40773faa6ed688b7636191223021e9bc7bfc09726dc45ad627e4f731f19ee78cd782ecc08"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ko/firefox-51.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "e3528d611eaab0313edd3def0753ddad32a624136c32ea181807b0efd63f5205002a689d5b9ebadc4dfca8059dc4ecb236709b9c64d4743989c9a590a326698b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/lij/firefox-51.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "80c30dc8064a0a075613c6720b976379b3a9fc4ca05db2c727a4bf1e4abbd4f6f44b45eba42bc3633c164cc3c15ef756b85d638d3ab857bd0e6d21d9e6f640fd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/lij/firefox-51.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "22daba4493e91d7ee15e7f9a0849f73dcde985ad909d3a8502b30a6e350cf04dc98fe2728068d2f3d8b7b5106d57caaaadb2fae70d49d50d893854b99a926485"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/lt/firefox-51.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "fd4ce4207ea3eebda966881ab9f113688122322d16a2c9a205b17d7c73ae0de4fd5a48789e01c96392ac5c84a59a790269329ddd9686b9cfa64c787a817101bd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/lt/firefox-51.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "8dc6e28946a238db81695080f73b3502e0f88bdb2d835c88574f79ab25896162c84b9184a37142c8ca1fe3b28f42d87be9e88b59233dde36287d5b05371824eb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/lv/firefox-51.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "57877344c135ad47073e992a06e5568a4564209f2a79c2b1851d69b2fff6c9c32d96cf3278e1bba4d91fc001765f4d65d6d4b730603ac0a5cc28d2520fac2d60"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/lv/firefox-51.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "f289cda83f46ae3d2343f66bcd007d99862768ee48220a92e79f2b7941a2b2a56ea000cfa1986283e2fc9ceac749f264f122503f1bf71676888473bac9841d47"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/mai/firefox-51.0b6.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "07a87e16e68b9089c7aa58048ae4b41e15bc267d9810a218c9473f0d1082ac935fa5adb759a9ac43c0bf2a6e79e830c6344943cb7b61b73746911dbd66a7fdaf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/mai/firefox-51.0b6.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "34aec0414161df6ab435b7518f1d522c4bce6eff415f3ff103d31e9ae6099ff6b3be03099a0f5a21754daebdfff852193e2bb93ee52d622d26644aea94d72aee"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/mk/firefox-51.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "8e4a61d4f20c17f1dc2748568d731f8e9f9050741896f98ec761d551a0c9bf0836731ba9049684819d71f6eabae7f2d1e93e0add593661d882d619783fb996ce"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/mk/firefox-51.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "10696ef0643af2ed0a7681f6679c6eaef375ef1e193b0b0e315d0ff4aeedb373235ec4e8d26fc562887361ce659a85163c276ed1fd4d4563dc945c7281786298"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ml/firefox-51.0b6.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "f2300cfbce84cf49b434f56b262c34e734eb2ed47abd5b318b9ac9197252869c80b77a7e0617a61f8a1d06a7e6c083479833865b5f1a0e3172102c07d8b9d878"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ml/firefox-51.0b6.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "ac0a334c3beb163351b4fc7eb42ea8363ba9667a52cb14c59f32c404bc362da957f22a44d49f09299c73971a737685d8a93c1fe4eb456489fcab2eab1be1b6b8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/mr/firefox-51.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "e8536f0786bf5a49536f7703ac50fbaf31db932c1c855988c192d495365e677f674f1d84bdd5b5d07ae0b04c6498262a29d11949f4ee172d1ed97c3708e2e0e9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/mr/firefox-51.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "b7d89ca6b79661098ee64cbf945a7080b76a8557f9a2b33fb18b8166bd9cab9cf4c775e3460bb4637121c6ae2159786e185c33cd8eb819410edf71d8d962ae6b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ms/firefox-51.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "c3d6c1772f2d53e6e3928d9c680e737a03cba9fb22fcfe051c49afe147502c6b458832c735ecefd29a06a22fd91ec13f98f0590f386c5331d6faefb83afc64a7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ms/firefox-51.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "8f44e7510675d691a4735d13169c529414942b8a18c8106dc220b53f4d85f9c1284314279ef5cd1d59543baa60803f117796f2fd2d55ecc01a6b67314b1e23a9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/nb-NO/firefox-51.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "2d42ede2a1232c48068bbde4c9401e495b82ebc356cee2490e8282e7a50e7ebdaf235e5d109a6ad1e30bb4773b81a75dd8d8f338738db499a8bc910a435fcde9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/nb-NO/firefox-51.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "05ff88244ec7c715e642c62a2f71980e94346624db05b35fe35a605f8c9bf0fb661cd0aad8ffc7a290a3507711053f7d31573d4e7e82482de63db3492197a7b1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/nl/firefox-51.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "3f7d57fd1a64f4c99a573c6c2272999bb9bed78648a1476ae3d1d843ae7407612a750b07b6730c0c326b57e16c87df374049c49f8e9e2fe9ca7d14860af983a3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/nl/firefox-51.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "26ba18dee36247d64447b7aaed71795e582e86e333e0feb95f1085b26508299044a970fd535bf57f38e0caedd116e10a3eceba05c5f1cf92649553d6ad95d1d5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/nn-NO/firefox-51.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "649a79569ca51e418101d013061bb7ae977d80e0ca4854c03e256e214e4a0c2373caf994fb1d41db6beb4816524e4ba76d434b7a2942b20cd628b42f409792b2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/nn-NO/firefox-51.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "61a99b54b807e518e62813e76606111737904c20afb73c12e5ae866476f829a177365a4c8c9d36bd5fa2a355f512f556fbc9bbc7d1fdb962535dbd6340907b04"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/or/firefox-51.0b6.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "68a761c18b24f5ab5ee511f635653d1c3e798239f82a120c2bce73d5f0e706b5b8dad2540ece11361c0652f34b00f767c6be2c700c69a0d0eb08c35bfec29fcc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/or/firefox-51.0b6.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "4640280e8645f2ac9ec96a5b02a2705bcc96f2bd3d25c6456a5d4b0a45100f264afbf618dcd8e5b211b2c8186a2ed8bd0e306d95b118e52bd6548caf5f32d58d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/pa-IN/firefox-51.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "2d57687e8fbf53cf2bd8b0bc6780dffdfe1284b47fbef20ab9fa591e2eefec00e097bdd24159a28700d47f02273395f32fcabb401d0f5f3e13cce75481b9cd7c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/pa-IN/firefox-51.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "0898c9577c92d92e51026948fdd1b201e989ca1b0ef0515f3a22a9ab2fc0932b99d859c90ca0137a8bbd913c2d5f873a77b75fdbf01c330064ed2f854fc58dcb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/pl/firefox-51.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "afaef3a9d125774454adf37f83447600536db9abd7bf388a2a9e9024ee46f67269f122c39041b5537be23b19af39e8efc27cf142064fdfcb5cd3f404792b1383"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/pl/firefox-51.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "350c67a48d318bb19cf4885718d336f3242a648b40e0f79096214f4fd6254882ff1af2a50111424a00d2396fd1c481a9ba1125f098794296899cf306269993cd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/pt-BR/firefox-51.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "c3a34e85cde018ef1323786e373e8842cb6c590cc8db64441e99d5a092d87ca7cd935dd238b30a2752393515fd5455100e97a98e08b395b4082d09e800e25846"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/pt-BR/firefox-51.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "3d986e9e932156db8db994484f19519dd5dad00e4edd04d5d2510e1aa1c9360e0cb01f9369705861e806796cbe246c1c79882320caf91a59fd400b439bb4db8a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/pt-PT/firefox-51.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "2aa6b07f64b83287aeee048edf436632737da32188ce650ea2e323fa5587457cbceb05356b3917b75bcd1927bb9cf1da89e23fdebc3db2096bd4598ce8cc714d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/pt-PT/firefox-51.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "87614bfa16f6bc89180775331a52054a597ab54232a92af0062ea47b8a1c348d9f20b5802e2cb74f1619120eed56ed02bdc705e81f5944798ea2261384764d1c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/rm/firefox-51.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "1e774ec46f28bc561bc5dbc9af3c0c5a198485f5da7a7fc7d5d1ef920b54227ddc9b0168b7cce30cc30cd606513aaec317369335deb945bcf94fb49bf29367dd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/rm/firefox-51.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "24239e55efc9ec3979a0ae64cc977ebf853817b358c39266099bf892fc6cff7bc4e3adbc927684a95b4abb9ffd08877c5f25b2e579884ca93e0dad8a717a79d8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ro/firefox-51.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "3d449880c97442f60aee98be29abd097330b95acd9f121a57744d5694f5471afffc337239b2d3e527b2dc709daf0607b73ba664ddd466eab6236f3d842ee93f2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ro/firefox-51.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "90c0cdc6d9fae3620770455b80db01920685abe7514b2b112af32ee7554d0896e4877f2f9ad38f827ad8cea9fc8f9f0c6b97c049d7e98cdf20612a50018bbcc8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ru/firefox-51.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "42d9d4e4f2fe48e1c7db8395eb22737bd42b7a771bf8bb0f69b210fc4a2fafed421e22f498d68d1ab3e1661a3e828c1e21e096d655f47d6c6216c6c8bf4a38e8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ru/firefox-51.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "8456ce7fe9ec9ae2c8e4ee74ceaa75417d33559e84277350ae058a109f3b8cb7bcc52e35684bb343f8cd3f020df31c26ff15d4e6bfbe4d89733bbd4cefb307ab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/si/firefox-51.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "4d0132f95f13076df9cc4fc6e6fe6912d16aa3c71fd18a6dc81f4ba9dc53842b7cb4a3fb4da62436fe6d9e4061e90b8c02ec686644020437b7da78ea5ab09479"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/si/firefox-51.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "5947c45892fcb7f1d0beb429ef12448242631c14e568495d6c3a1e21d01cc44e316ada5c9d9099e8835e2abfd286589622b25eb8730ef2fce9ac18c6b854dd01"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sk/firefox-51.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "93eabc3dfdff6089ba9ca7ec7210ebf174fd548d4c5e3076551470a27b0b7f19ab8d4b6813aeaf7206ea8bde863cccc2e34f447e4f09a3b0b0f632dfe5c1bf05"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sk/firefox-51.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "8b4a24c9eecfc02ef1dd297e98590471ec3a9ee37abc248f06ee69e0b822537765fa1d6dc255c9424e996af27f1cf6f45f50728d2c2be52b8e58ed3e8c1cef7d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sl/firefox-51.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "ee064cabe643fce46242fed3292e3067159ce0dc57f08d8af67658f37b7cefe80082609be57e024b939054cda80f7573ca6715bdd4f084bb847e32776267394f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sl/firefox-51.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "a8207ba7d7606e93f6f39ca9e05320181353d8bd05f519196a20cbe335aba825edaa1403488c539ae9c622949d6b9c81bf5a711cc1118963e8a66a12e2bc5133"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/son/firefox-51.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "3a5c3ac7b1482fac457a5e537d743f14eb99b6d139ed840cc5c1fa4020e7c4950957b9cafc19dda8ec21741b48698a91dbe3dd455c9b002af407eb68a29cc8e6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/son/firefox-51.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "c3b34c6e958344acb66101712d4ddddf4041e060e45037aed5e35b8006d37bc92d88c9478538a2e3ba0dd14f78ef0027a3a4f569038ba3fd06ce3c2438c48a34"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sq/firefox-51.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "00782a5b28cc04a1fe58309503bb984b29c6842e4ebd9c8e43d8965d9041b3a676208134307d3b8f04637458e052dce8c3d5fcb593d48ef93a71fe3bccffb684"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sq/firefox-51.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "27ea36701359e9baf447434d34cd4e4615f4e4d1d1a82cf93e79390320b0f76ced36784d66fda6354fe5bd5eed8bb6c74306c922880b8d42097abbb34bb0b6f2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sr/firefox-51.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "b32b88641024c0f263bf8e190ab0bd8e3d2d6091aa38733971cb8f00ad1c776859d5b037ef6f2b6d220f93629b39c8730f99bba654bc3791e767b3f7182ca758"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sr/firefox-51.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "06b188b1dd9113a51d2cd369721919ff6132cceb108304b485c9d42898cc7b20d821ac201102af4652f157ea56cd7e17b5bd09ec645243df7ef8e2030b003d2a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/sv-SE/firefox-51.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "08a713dda121e0df1131dfb50c5196c2b2e4ca58823a56453c23955d94f53b877f737c5f5d805f1203a4c9361f25d0f8e8327cfbefe9fdc32d2ddd5dda359e14"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/sv-SE/firefox-51.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "b1d35953186b4fe3a1a823cec5a399f81ffcbbb2379e488805de10751614300994e4ae6f5e68396d2d45b72ba2cde0874690a8c7d47ab224d1e653a3ff380294"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/ta/firefox-51.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "b8986fe3919db0386ed411c1269aba0f38fa6c01a36b24544e91e382e3f22a72b5cccebcbd59e21a1573910b9f4b838cd482e588a92153b3932835bbb87b8061"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/ta/firefox-51.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "a98aa3c2ef28ece7ef2866af5f0044f195ddf56152131d608320dc211f5eb4d5f5be0a95e138598e32d4160baf29281219e6bbc38349ca374289144dbfbf94a5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/te/firefox-51.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "4f040903bf00eb129adb0aa431921bd39754815b8a789b9e8118ecd87bd6923ae02faff7791f17e326dfb844745b1b12ecdf8978c814be0964825dbdacad146f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/te/firefox-51.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "b2e54cb4ff6421923e20be26db7ef302715a29f49c4c0723191096aad9a910e3f68291d932bee6f5a26fb3f85252a2cb89434dbf8acc2ff19860123bb00ee18b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/th/firefox-51.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "b2868ea454d231e87e1389005d5ed7863865e708ac2b99075f08644875323427e4dc92a245be4de90f4d5e3791b352a27e26e3ab2c08e6f3dd8377225af70a00"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/th/firefox-51.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "e3682094081d4131e68a9fb4bab81a5430fe4bd8cc1903f24c48e110313d3489e338d58dcd6719a28d5363bb35c734144a695c3e81d1a805a0f20679a52ff645"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/tr/firefox-51.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "dfa63ee5ba94400175f1252c06bbc1070579a3fc9395f55528cfe6a0a99bc6a654708ffb930efa4153322c76532d201863206b14f07973bf6713c90b297898b8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/tr/firefox-51.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "29c9efc3253770b953634e6f2d09cf82245c9b580a43103a28a14adc795ae307644edf3dee65ad4d7248efde6562485750f1d976eebd413f339044774b9660fc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/uk/firefox-51.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "43157bfb4bca885e830035e525ef2642795e9f22e582c486f28a99acf462dcb09142b9e1fc35f014f800e5f30365d6bc76b0c4b7caeebbd9e2e3fb4bfeb780c7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/uk/firefox-51.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "33790606f02644a0b99b43a3e7d9df77dfbea8404d8ea2ad34ab81090fba6fe4553fdce83425e27a5816f8af0725f598efa0cefba755af537f1d0a953eafe8af"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/uz/firefox-51.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "0ce3bcd1bd6c7aa9d363ca869d9f1638f930b5df7a7e22b88b12300dba8cc0ebb9e7e1b61318b49e9452f21f1855dd3e0b38448f4067d2a0683b6aaae39e90ae"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/uz/firefox-51.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "24ad9eb31144e51e69653c50501ad2c8e8a5c40d13464da3ab8af464cbeda9fc37a47401987f48157603f679ff281728ebb10e686659f1cce8db764a4c0b3216"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/vi/firefox-51.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "c68aae839b6438ef934953c419d99921378bd81aa08da9653299a3410d2e102ad9890870e99ff9541477a0dcf779d8e80905b6741b8f40faf4fa9b7fa8fcf86c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/vi/firefox-51.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "1b5263078040636fa3dda434ab9433c96e7ba4d10460174de5d5abc1f05de8faa930ee1fe24dd9f8dc05bc20d6087d7657bef390725d446a4ad292e2cd06ab7a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/xh/firefox-51.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "c4422a3f38d47cf9caea2ea93f5eb4c402461a76fbd8285f8894bbf3d4ae0bb484be20f0761425ac9139facb1fca12ca4122efef47391b988d4dc4118482d660"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/xh/firefox-51.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "97ecde3e48e7f3cabe8b80db7c74b34946407831aebecc87fe5913a8622b866914d2a6bcba8166c4d8e85b35eec43eec337a2389a9856d9ca48f4694d61838e3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/zh-CN/firefox-51.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "5cefa5a67a1d468c017294884b04d3ae412f1f3bce56fb96e72919266ba697b46430460334d3593608d08238921517b9972435bd76fdf012ff3fec51bc64de82"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/zh-CN/firefox-51.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "e37d07897665c195648c7b96ad47487bbe1671f9aedb06e9e5ca415dfc0484b7a13171b217866af1ab29b2e3376c45bf382e9d9bd804d57030ab401eb083560d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-i686/zh-TW/firefox-51.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "485a9f5184722c59a4a60a8f02c0c10d4f8fed359083a70701462a311caf652170625f06eabd5baa9f8b5312ca978c48c4da01a4de49c35f52a8c8c6a2d738bd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/51.0b6/linux-x86_64/zh-TW/firefox-51.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "5c1a87b1a96149f67c3213315c13524cda3d29b47ae078e22c04685de4f961c3a9bfd77a79c48e3ae619cf2bee7f035c725e480337d7e3491d48abab1bff1aaf"; } - ]; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ach/firefox-51.0b6.tar.bz2"; + locale = "ach"; + arch = "linux-x86_64"; + sha512 = "de99e6e07ea084406927551ccbb549bfe583e21e16873707124d897c38dc04b183476eb620f5d457e19375df51a19d3b57bc3afe344efa07d7832ac973ea30eb"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/af/firefox-51.0b6.tar.bz2"; + locale = "af"; + arch = "linux-x86_64"; + sha512 = "e4a653eec075b975f3a3d6f73874909f61a82bfded01935ea152d56b7249e726099ae873a347adff4d6fa82f73a267415711483a56845980d199fbebe57a9c23"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/an/firefox-51.0b6.tar.bz2"; + locale = "an"; + arch = "linux-x86_64"; + sha512 = "cf5df1e60d2ee8387c173e5ea73699b29ba80251d2497b4e3cb25cfb37fe2bf8967f8d39be091ae5adea2d30cb8c911124bd4272c92e9d0ee811f36d13c62efe"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ar/firefox-51.0b6.tar.bz2"; + locale = "ar"; + arch = "linux-x86_64"; + sha512 = "0e128e4c2edde6b9090e1278b5da9bfcf6fc6cd57c739fdad86084bc0e64637b6d9ce1fd31b1da53b85f460f26d9a02b7c95bd427de08dc46415e35dfa381b1c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/as/firefox-51.0b6.tar.bz2"; + locale = "as"; + arch = "linux-x86_64"; + sha512 = "fa223a00223abe964d6515e195dc4bef25a420ffbdc3131d13210ff70c584707757dfd44e53d2a3ca062cbe860ff3df590cf423fad5dff5dfdb1721f321a5b98"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ast/firefox-51.0b6.tar.bz2"; + locale = "ast"; + arch = "linux-x86_64"; + sha512 = "835c02a80228fc317d8bc81429fa6331a5381e5ce26b7cf315c30d05e7bf8a29197d4105335bf8b32b0a9e2b65acd8c9c617afee5af3339777a0e23558dd92c9"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/az/firefox-51.0b6.tar.bz2"; + locale = "az"; + arch = "linux-x86_64"; + sha512 = "dbf48a762de944e8ffd39d65d4b94f67e4b2d3bf91ed0763e44f32343af0dc1183087421d0c6f737c6826e94fb205772cd6d484bfb45b19755948d602d02ae91"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/bg/firefox-51.0b6.tar.bz2"; + locale = "bg"; + arch = "linux-x86_64"; + sha512 = "6bac773ce99d25062f188a01c3006689ff7441af29a80da323e7ebe09c678a426cc3938f0a1a83051bb0efe791e4779a92b6cd09a23c676ee3629ca2d8a43da7"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/bn-BD/firefox-51.0b6.tar.bz2"; + locale = "bn-BD"; + arch = "linux-x86_64"; + sha512 = "2648c10bddde134ee699c0b26be5520a8a47d2cd0ebe99fa114b2ed7f19ba7fddd0696585732d154db67099795e6aec922d49f9871a24eda571bd6e0c24dea35"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/bn-IN/firefox-51.0b6.tar.bz2"; + locale = "bn-IN"; + arch = "linux-x86_64"; + sha512 = "b97ba8c5bf7f282a323ad3a4e423e85cb9122b470a94eeca91df3c00c6ab3331e02bf36ad7e87684ae3f73770c213ba19ae7179117228ac7808ad2fbe5d99145"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/br/firefox-51.0b6.tar.bz2"; + locale = "br"; + arch = "linux-x86_64"; + sha512 = "a03eb659b54067721861a89d578b3fca086b02c8013e7e05b724caaa020f301a4015d81e4d9f2dcd69223930c94b4e0e7f12d4e0de4b2fe271bf903b75ba9ca2"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/bs/firefox-51.0b6.tar.bz2"; + locale = "bs"; + arch = "linux-x86_64"; + sha512 = "c64e5146ea1bdcd65b46dca33c8ac772d4c82ad49dc01fb4f1e51a56595e68167f7e4c8ecbe0fa3df258eb6f1ad6c2d9d0eb281e5c7b92831a03f7fbf8e2ddd0"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ca/firefox-51.0b6.tar.bz2"; + locale = "ca"; + arch = "linux-x86_64"; + sha512 = "8c27b06059b07d2c915fa11ec7d57c7519093a9480dac97cd6c4a024777a79d64687cd3d0c48d0c723aa10ee533164c4f67be9ad6d1379bffac98755a4a3a980"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/cak/firefox-51.0b6.tar.bz2"; + locale = "cak"; + arch = "linux-x86_64"; + sha512 = "94ffb85f667d4a39c0de3d4b0853e72e9ad2d60822e7224110aefb187aea5ece6c0be0e82ec4d4f686c6ad710b73c54c70cae10282ec0b48ca6623d3d7558444"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/cs/firefox-51.0b6.tar.bz2"; + locale = "cs"; + arch = "linux-x86_64"; + sha512 = "2523492cbcd990a0204dca79f393b7e034d1337e9ff81398de78575d2a98c806680cc363f7339514d9f57308bfe4cd863c8710f6bb6373487b584aa1e8de4077"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/cy/firefox-51.0b6.tar.bz2"; + locale = "cy"; + arch = "linux-x86_64"; + sha512 = "3c4f972e53540ba28be94bdc1e0b67b6c744a20f0ce2c6bfa7a1a92ab20ba806a73f39c5c0afb0e83ed5c822dfb42ea7c0c2806b91cd889070e148de8e5d47a0"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/da/firefox-51.0b6.tar.bz2"; + locale = "da"; + arch = "linux-x86_64"; + sha512 = "8b268c1d9e35a91e2a71623404fead75966d39d893944c311ceb572e02673a06c61ef0e08b9c0ba246e6fcd23772e94e7531be535b69c27840478ee1ce3cbe6f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/de/firefox-51.0b6.tar.bz2"; + locale = "de"; + arch = "linux-x86_64"; + sha512 = "c2fb608c2c71412f192b1b910ffc7b270fb8d02b52c76af26fafe362c0cdb282086e902fe1e9eb3bc9d2d022e474816c45092480d199fe3b039083f0de94a3e0"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/dsb/firefox-51.0b6.tar.bz2"; + locale = "dsb"; + arch = "linux-x86_64"; + sha512 = "d7d7ec0004bf4712082c57f30e069cbcde9c70cd10d412979228f18fe2056cbab9c741cfda76c8cf5ffaa3086320dd4fede0e140fcc88fe200944e2f407f7606"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/el/firefox-51.0b6.tar.bz2"; + locale = "el"; + arch = "linux-x86_64"; + sha512 = "2fc754b1d951b4d008d9d7a0cfd2555e394e09f8a28adf00334fa780532d8694a78c19831500fda3aa1e85bbc649b7156400d659de45ac4d4ecc3dac3c642124"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/en-GB/firefox-51.0b6.tar.bz2"; + locale = "en-GB"; + arch = "linux-x86_64"; + sha512 = "6dcc54ba099ea5c6845b109eb98cee58dff6bf2dbf442723a3369bd673d43ffa01c7656011d6280f5588e4ee49e8214de327ac3d7fd92ea0cf10fc9a00a3ccd6"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/en-US/firefox-51.0b6.tar.bz2"; + locale = "en-US"; + arch = "linux-x86_64"; + sha512 = "d3c8f949401e6b9ade7e620e0c0f9324d1440a313521d385d7ed038d16628c70762a90a46c45eb74c6880ff35c3ac856e3a083317c016ece2d4bc8e740fd6aec"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/en-ZA/firefox-51.0b6.tar.bz2"; + locale = "en-ZA"; + arch = "linux-x86_64"; + sha512 = "802e89998c068af3712daebe727d7e865446189b436823175dceb325ea4c3aad8a0b4786961cd28013fa892d9b94d3bafd967bc8d3ebb40bd7d97a76a7c5bcef"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/eo/firefox-51.0b6.tar.bz2"; + locale = "eo"; + arch = "linux-x86_64"; + sha512 = "0204acc897416b13938127b4fcf57eae2abd50f4cead0124f3422efd4e9122c8d3861be6fc5da0d996260205b938e36cbd064d4f2fde48b1e6afcb2dc3f92f1e"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/es-AR/firefox-51.0b6.tar.bz2"; + locale = "es-AR"; + arch = "linux-x86_64"; + sha512 = "1a35ab3546f2358d8c3dcfe85528bb42142fa44a565b0d6dedbbff95d230e25ee5627753de50d7868617de5086e8ff0d668626b17cf8f47c320865e1c5a4a3f2"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/es-CL/firefox-51.0b6.tar.bz2"; + locale = "es-CL"; + arch = "linux-x86_64"; + sha512 = "9f389f9e5bbc30be888942f62dc35360d01d195cba416066321c5f2153f9aa8c7d02f52452ecf1f5d0d290c246066b9fb19f93141ffa0dbced4624495ac3c515"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/es-ES/firefox-51.0b6.tar.bz2"; + locale = "es-ES"; + arch = "linux-x86_64"; + sha512 = "b58dc439dc2186bb23e5e401db162717fa0adb90517660516cda553f00100120da2db07e5de8aefea2159537408217825efe1e8d843b75175848f1cfc88f6151"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/es-MX/firefox-51.0b6.tar.bz2"; + locale = "es-MX"; + arch = "linux-x86_64"; + sha512 = "1d466f5c2c2f557fee8b9997fb9f17bedcdc3287a3cf972cb963e47cbf6cd3a440296ffe60d93a45394f83603445a31338f055835f965a09fe4f32839b628ada"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/et/firefox-51.0b6.tar.bz2"; + locale = "et"; + arch = "linux-x86_64"; + sha512 = "c9c51ca82cfc0062576a230a0f78900a62a188724f7eecd3786e78e37c4ba410dcef2953cbb5ffb4eb4c9f750bfc70ea0aeafdd75378b51bdaa825521db0f862"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/eu/firefox-51.0b6.tar.bz2"; + locale = "eu"; + arch = "linux-x86_64"; + sha512 = "cda51c8a34b72ee822542da864f9de3d43a7448d5db77ca775eb7cdbbbc99c432918bd397f53a284cc30257793f1cf50d80de4621e53af99f61b2e6542a27751"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/fa/firefox-51.0b6.tar.bz2"; + locale = "fa"; + arch = "linux-x86_64"; + sha512 = "dbe302146776542e63f0b98149ad72f514195f7c3f7589a14d9bd96b36d60710bfb2df8a8a931122e58ff75909832a6d26366b171bcb2c78c08c17073726d8fe"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ff/firefox-51.0b6.tar.bz2"; + locale = "ff"; + arch = "linux-x86_64"; + sha512 = "7e5c390195258b50f5e9a43def66550b11c1f410b21e69e141bc5903ff0cd6b9329a5927249078d64de31edfc8f711f6616f8d9e2432e5e1a03d4472ead43bc6"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/fi/firefox-51.0b6.tar.bz2"; + locale = "fi"; + arch = "linux-x86_64"; + sha512 = "152c5c7721c373a1d618adb8b89e47365a5e45d621c1dde7070c57ba34091a31c712920d465dbfe3b4fa4c92547249ea4cd296b1524e774d151d512b8931ccbb"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/fr/firefox-51.0b6.tar.bz2"; + locale = "fr"; + arch = "linux-x86_64"; + sha512 = "cad55002d699a0791496f4b839899d1c3ed312765e62f4c02fd9886b349f7b2bc9a531003c97be3ff75838d011cef2b82b7ff3a2d41f84a2189d098a8557577e"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/fy-NL/firefox-51.0b6.tar.bz2"; + locale = "fy-NL"; + arch = "linux-x86_64"; + sha512 = "6e6e2efa9b4a5b9ddb745a2a037ac83838a6038f4f97a4784cdc9421cf8b673b51d1c814ab0b5e6114b27bb19ac3b32a42f15e9b0db052025246de53268b40b1"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ga-IE/firefox-51.0b6.tar.bz2"; + locale = "ga-IE"; + arch = "linux-x86_64"; + sha512 = "da861b0bbfabc6dfaf46f9b45038794da940023d0428b97957f220f8287d081972e2e97383c7e3d31e4af53ad769ef23490f451929c9ab2bb58f3eddd1f02c5f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/gd/firefox-51.0b6.tar.bz2"; + locale = "gd"; + arch = "linux-x86_64"; + sha512 = "54c1e3c396859376c7d95808f39b564380a875abda74ca7eed9ee96947f4afff3088b30d6b7c70de830bca81a8abca9c0379733130be4617e6e44218a96ea3e7"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/gl/firefox-51.0b6.tar.bz2"; + locale = "gl"; + arch = "linux-x86_64"; + sha512 = "38981f59e6499e1f0d7cfb88a0a62ea0b3874a5b956442da0c9a2852a8c35e6885ba467084c74b482b1bec80513c37835a9dbc5372898ec4500f4de9afb5a71b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/gn/firefox-51.0b6.tar.bz2"; + locale = "gn"; + arch = "linux-x86_64"; + sha512 = "fcc6c0432e61b90c7cf8983846d89fcd89c7b9a87eae2c6421194a8c26a4210e2dd7ec87be25e3ee291163fc70ea7703f26adc73137d4adc7ec09b09c152b071"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/gu-IN/firefox-51.0b6.tar.bz2"; + locale = "gu-IN"; + arch = "linux-x86_64"; + sha512 = "eb59334967705f215d5ab445e829ed1d1c53859589b08610d349cf2bdf28a36bc1ebb1bb18afcb8279790ebcbc6dab032bbc0389020959709d46e3e23eae08c2"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/he/firefox-51.0b6.tar.bz2"; + locale = "he"; + arch = "linux-x86_64"; + sha512 = "1202568d873164c3bd104ccccdde7e201a7e15b88aed1ea6f1fc76099df98fb074a99f3f3fddcbd46992c603a7009ce6dc769641737cac82755c0d2e5c410a38"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/hi-IN/firefox-51.0b6.tar.bz2"; + locale = "hi-IN"; + arch = "linux-x86_64"; + sha512 = "a35c3679d390ee6bc1ace19a07dd3e96b4bac7147d698ebec42f1fb800c9f9f259c194140ff821a8fd84c0ba8171c5aea01257987b051a07a705c82b60ac1f34"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/hr/firefox-51.0b6.tar.bz2"; + locale = "hr"; + arch = "linux-x86_64"; + sha512 = "f3ee08747a0b209681d53fcb82b139bc75797f0c7b60bf35e55c2b702213fc99e99133d9be0df74a4b925d706583f545bd33d99b96ad5eba2e7d7308c4bec318"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/hsb/firefox-51.0b6.tar.bz2"; + locale = "hsb"; + arch = "linux-x86_64"; + sha512 = "22ae95d23ac80add17200e042e03830cd1e9e709d34e5906217abacdd626533e1e1c359e1312b2dcf44d0dc184e0d9c523dc870c04a759c7c8d7f42abc05391b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/hu/firefox-51.0b6.tar.bz2"; + locale = "hu"; + arch = "linux-x86_64"; + sha512 = "552c6398313ac5e8d49373ac8959b3e39281a067ecceceef8d3d26c53ec276a8fcde181dc96072cd82aac8e952f81a821f87349a58a9f43c4ee41410bfc955c8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/hy-AM/firefox-51.0b6.tar.bz2"; + locale = "hy-AM"; + arch = "linux-x86_64"; + sha512 = "760b31298a9f7ee58035089581742e3a855aeffa4ba7a2b34d927e52834a684329f8849201f348395f3224e60aed6540cdb76ca3c5a8fcb0d34c343317423917"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/id/firefox-51.0b6.tar.bz2"; + locale = "id"; + arch = "linux-x86_64"; + sha512 = "98bda73d7c1cbcccd64b186747e5cbd9a798704c731bf76f05710be945be08a0f6538d1cbf9a839d939371e57428a3be66feabf06cc6166aba27541599748dcc"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/is/firefox-51.0b6.tar.bz2"; + locale = "is"; + arch = "linux-x86_64"; + sha512 = "f28cc5822333bd4497a7d5f5e494e551baba9b7c73f7eb303bc7fc3b907333ebf759ad7e05c0e1b85eec178795ecad4803d0dd872470ac6a55ec4f3856e6596e"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/it/firefox-51.0b6.tar.bz2"; + locale = "it"; + arch = "linux-x86_64"; + sha512 = "fa7c0cee7be57b9dbc48785a9320597d03a68508578be7dc0e0d465d30c0d6fc54f330b2f65bf21be0c99c9355daf93f53a7a3b0dc25eda2dd109ef7fd04368e"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ja/firefox-51.0b6.tar.bz2"; + locale = "ja"; + arch = "linux-x86_64"; + sha512 = "d62906737f20a0e886800f883fb671ac798b3cfa04303d364ce513040be3decac3da828578c8fb971908e14cfe07b82021d33f9c24216dc2869524fa2923955b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ka/firefox-51.0b6.tar.bz2"; + locale = "ka"; + arch = "linux-x86_64"; + sha512 = "c4d445c52a0579bb6e38e1919a47e7cb26667a1e9b7c54a3d581d56cb55e810fc44cfaba17a89e65aff214d1ad22bb43141a2a776f86a9e068ccc0743c9dc202"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/kab/firefox-51.0b6.tar.bz2"; + locale = "kab"; + arch = "linux-x86_64"; + sha512 = "51971dab1d818c0360e351738f96083ebfc493397eb48e39ea2ff129c155bbabe50b591180f32ff6464c66fecaa8fd8b872e206846450ae8e6c76da21c538f8e"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/kk/firefox-51.0b6.tar.bz2"; + locale = "kk"; + arch = "linux-x86_64"; + sha512 = "a7621c7f77f3315bbfac9c3587f05f726a65ba8711071f4f48bdb0e7cfa866f08f7c8bdc71b02a35ef47ed6572d899ad8c5a81977361c9e3845c4ccb84fe4f89"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/km/firefox-51.0b6.tar.bz2"; + locale = "km"; + arch = "linux-x86_64"; + sha512 = "f5748497701c5c66fcf9fd508664c6846eda0c353782a259c58ddb0852f49dee6bf1b067ea87be53047d31debcc3cd242692bfc831a8b30b6aa01303d9b0a243"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/kn/firefox-51.0b6.tar.bz2"; + locale = "kn"; + arch = "linux-x86_64"; + sha512 = "bc82153cc0a490be1c0e8197c3bb5d69bfb3799cabf4ef55650ea9164ce68c94e846b129fe8988c5cfc9699141b6313add4caff4bba2dff48dc17af2e173cedc"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ko/firefox-51.0b6.tar.bz2"; + locale = "ko"; + arch = "linux-x86_64"; + sha512 = "e3528d611eaab0313edd3def0753ddad32a624136c32ea181807b0efd63f5205002a689d5b9ebadc4dfca8059dc4ecb236709b9c64d4743989c9a590a326698b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/lij/firefox-51.0b6.tar.bz2"; + locale = "lij"; + arch = "linux-x86_64"; + sha512 = "22daba4493e91d7ee15e7f9a0849f73dcde985ad909d3a8502b30a6e350cf04dc98fe2728068d2f3d8b7b5106d57caaaadb2fae70d49d50d893854b99a926485"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/lt/firefox-51.0b6.tar.bz2"; + locale = "lt"; + arch = "linux-x86_64"; + sha512 = "8dc6e28946a238db81695080f73b3502e0f88bdb2d835c88574f79ab25896162c84b9184a37142c8ca1fe3b28f42d87be9e88b59233dde36287d5b05371824eb"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/lv/firefox-51.0b6.tar.bz2"; + locale = "lv"; + arch = "linux-x86_64"; + sha512 = "f289cda83f46ae3d2343f66bcd007d99862768ee48220a92e79f2b7941a2b2a56ea000cfa1986283e2fc9ceac749f264f122503f1bf71676888473bac9841d47"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/mai/firefox-51.0b6.tar.bz2"; + locale = "mai"; + arch = "linux-x86_64"; + sha512 = "34aec0414161df6ab435b7518f1d522c4bce6eff415f3ff103d31e9ae6099ff6b3be03099a0f5a21754daebdfff852193e2bb93ee52d622d26644aea94d72aee"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/mk/firefox-51.0b6.tar.bz2"; + locale = "mk"; + arch = "linux-x86_64"; + sha512 = "10696ef0643af2ed0a7681f6679c6eaef375ef1e193b0b0e315d0ff4aeedb373235ec4e8d26fc562887361ce659a85163c276ed1fd4d4563dc945c7281786298"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ml/firefox-51.0b6.tar.bz2"; + locale = "ml"; + arch = "linux-x86_64"; + sha512 = "ac0a334c3beb163351b4fc7eb42ea8363ba9667a52cb14c59f32c404bc362da957f22a44d49f09299c73971a737685d8a93c1fe4eb456489fcab2eab1be1b6b8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/mr/firefox-51.0b6.tar.bz2"; + locale = "mr"; + arch = "linux-x86_64"; + sha512 = "b7d89ca6b79661098ee64cbf945a7080b76a8557f9a2b33fb18b8166bd9cab9cf4c775e3460bb4637121c6ae2159786e185c33cd8eb819410edf71d8d962ae6b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ms/firefox-51.0b6.tar.bz2"; + locale = "ms"; + arch = "linux-x86_64"; + sha512 = "8f44e7510675d691a4735d13169c529414942b8a18c8106dc220b53f4d85f9c1284314279ef5cd1d59543baa60803f117796f2fd2d55ecc01a6b67314b1e23a9"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/nb-NO/firefox-51.0b6.tar.bz2"; + locale = "nb-NO"; + arch = "linux-x86_64"; + sha512 = "05ff88244ec7c715e642c62a2f71980e94346624db05b35fe35a605f8c9bf0fb661cd0aad8ffc7a290a3507711053f7d31573d4e7e82482de63db3492197a7b1"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/nl/firefox-51.0b6.tar.bz2"; + locale = "nl"; + arch = "linux-x86_64"; + sha512 = "26ba18dee36247d64447b7aaed71795e582e86e333e0feb95f1085b26508299044a970fd535bf57f38e0caedd116e10a3eceba05c5f1cf92649553d6ad95d1d5"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/nn-NO/firefox-51.0b6.tar.bz2"; + locale = "nn-NO"; + arch = "linux-x86_64"; + sha512 = "61a99b54b807e518e62813e76606111737904c20afb73c12e5ae866476f829a177365a4c8c9d36bd5fa2a355f512f556fbc9bbc7d1fdb962535dbd6340907b04"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/or/firefox-51.0b6.tar.bz2"; + locale = "or"; + arch = "linux-x86_64"; + sha512 = "4640280e8645f2ac9ec96a5b02a2705bcc96f2bd3d25c6456a5d4b0a45100f264afbf618dcd8e5b211b2c8186a2ed8bd0e306d95b118e52bd6548caf5f32d58d"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/pa-IN/firefox-51.0b6.tar.bz2"; + locale = "pa-IN"; + arch = "linux-x86_64"; + sha512 = "0898c9577c92d92e51026948fdd1b201e989ca1b0ef0515f3a22a9ab2fc0932b99d859c90ca0137a8bbd913c2d5f873a77b75fdbf01c330064ed2f854fc58dcb"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/pl/firefox-51.0b6.tar.bz2"; + locale = "pl"; + arch = "linux-x86_64"; + sha512 = "350c67a48d318bb19cf4885718d336f3242a648b40e0f79096214f4fd6254882ff1af2a50111424a00d2396fd1c481a9ba1125f098794296899cf306269993cd"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/pt-BR/firefox-51.0b6.tar.bz2"; + locale = "pt-BR"; + arch = "linux-x86_64"; + sha512 = "3d986e9e932156db8db994484f19519dd5dad00e4edd04d5d2510e1aa1c9360e0cb01f9369705861e806796cbe246c1c79882320caf91a59fd400b439bb4db8a"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/pt-PT/firefox-51.0b6.tar.bz2"; + locale = "pt-PT"; + arch = "linux-x86_64"; + sha512 = "87614bfa16f6bc89180775331a52054a597ab54232a92af0062ea47b8a1c348d9f20b5802e2cb74f1619120eed56ed02bdc705e81f5944798ea2261384764d1c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/rm/firefox-51.0b6.tar.bz2"; + locale = "rm"; + arch = "linux-x86_64"; + sha512 = "24239e55efc9ec3979a0ae64cc977ebf853817b358c39266099bf892fc6cff7bc4e3adbc927684a95b4abb9ffd08877c5f25b2e579884ca93e0dad8a717a79d8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ro/firefox-51.0b6.tar.bz2"; + locale = "ro"; + arch = "linux-x86_64"; + sha512 = "90c0cdc6d9fae3620770455b80db01920685abe7514b2b112af32ee7554d0896e4877f2f9ad38f827ad8cea9fc8f9f0c6b97c049d7e98cdf20612a50018bbcc8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ru/firefox-51.0b6.tar.bz2"; + locale = "ru"; + arch = "linux-x86_64"; + sha512 = "8456ce7fe9ec9ae2c8e4ee74ceaa75417d33559e84277350ae058a109f3b8cb7bcc52e35684bb343f8cd3f020df31c26ff15d4e6bfbe4d89733bbd4cefb307ab"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/si/firefox-51.0b6.tar.bz2"; + locale = "si"; + arch = "linux-x86_64"; + sha512 = "5947c45892fcb7f1d0beb429ef12448242631c14e568495d6c3a1e21d01cc44e316ada5c9d9099e8835e2abfd286589622b25eb8730ef2fce9ac18c6b854dd01"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/sk/firefox-51.0b6.tar.bz2"; + locale = "sk"; + arch = "linux-x86_64"; + sha512 = "8b4a24c9eecfc02ef1dd297e98590471ec3a9ee37abc248f06ee69e0b822537765fa1d6dc255c9424e996af27f1cf6f45f50728d2c2be52b8e58ed3e8c1cef7d"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/sl/firefox-51.0b6.tar.bz2"; + locale = "sl"; + arch = "linux-x86_64"; + sha512 = "a8207ba7d7606e93f6f39ca9e05320181353d8bd05f519196a20cbe335aba825edaa1403488c539ae9c622949d6b9c81bf5a711cc1118963e8a66a12e2bc5133"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/son/firefox-51.0b6.tar.bz2"; + locale = "son"; + arch = "linux-x86_64"; + sha512 = "c3b34c6e958344acb66101712d4ddddf4041e060e45037aed5e35b8006d37bc92d88c9478538a2e3ba0dd14f78ef0027a3a4f569038ba3fd06ce3c2438c48a34"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/sq/firefox-51.0b6.tar.bz2"; + locale = "sq"; + arch = "linux-x86_64"; + sha512 = "27ea36701359e9baf447434d34cd4e4615f4e4d1d1a82cf93e79390320b0f76ced36784d66fda6354fe5bd5eed8bb6c74306c922880b8d42097abbb34bb0b6f2"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/sr/firefox-51.0b6.tar.bz2"; + locale = "sr"; + arch = "linux-x86_64"; + sha512 = "06b188b1dd9113a51d2cd369721919ff6132cceb108304b485c9d42898cc7b20d821ac201102af4652f157ea56cd7e17b5bd09ec645243df7ef8e2030b003d2a"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/sv-SE/firefox-51.0b6.tar.bz2"; + locale = "sv-SE"; + arch = "linux-x86_64"; + sha512 = "b1d35953186b4fe3a1a823cec5a399f81ffcbbb2379e488805de10751614300994e4ae6f5e68396d2d45b72ba2cde0874690a8c7d47ab224d1e653a3ff380294"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ta/firefox-51.0b6.tar.bz2"; + locale = "ta"; + arch = "linux-x86_64"; + sha512 = "a98aa3c2ef28ece7ef2866af5f0044f195ddf56152131d608320dc211f5eb4d5f5be0a95e138598e32d4160baf29281219e6bbc38349ca374289144dbfbf94a5"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/te/firefox-51.0b6.tar.bz2"; + locale = "te"; + arch = "linux-x86_64"; + sha512 = "b2e54cb4ff6421923e20be26db7ef302715a29f49c4c0723191096aad9a910e3f68291d932bee6f5a26fb3f85252a2cb89434dbf8acc2ff19860123bb00ee18b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/th/firefox-51.0b6.tar.bz2"; + locale = "th"; + arch = "linux-x86_64"; + sha512 = "e3682094081d4131e68a9fb4bab81a5430fe4bd8cc1903f24c48e110313d3489e338d58dcd6719a28d5363bb35c734144a695c3e81d1a805a0f20679a52ff645"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/tr/firefox-51.0b6.tar.bz2"; + locale = "tr"; + arch = "linux-x86_64"; + sha512 = "29c9efc3253770b953634e6f2d09cf82245c9b580a43103a28a14adc795ae307644edf3dee65ad4d7248efde6562485750f1d976eebd413f339044774b9660fc"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/uk/firefox-51.0b6.tar.bz2"; + locale = "uk"; + arch = "linux-x86_64"; + sha512 = "33790606f02644a0b99b43a3e7d9df77dfbea8404d8ea2ad34ab81090fba6fe4553fdce83425e27a5816f8af0725f598efa0cefba755af537f1d0a953eafe8af"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/uz/firefox-51.0b6.tar.bz2"; + locale = "uz"; + arch = "linux-x86_64"; + sha512 = "24ad9eb31144e51e69653c50501ad2c8e8a5c40d13464da3ab8af464cbeda9fc37a47401987f48157603f679ff281728ebb10e686659f1cce8db764a4c0b3216"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/vi/firefox-51.0b6.tar.bz2"; + locale = "vi"; + arch = "linux-x86_64"; + sha512 = "1b5263078040636fa3dda434ab9433c96e7ba4d10460174de5d5abc1f05de8faa930ee1fe24dd9f8dc05bc20d6087d7657bef390725d446a4ad292e2cd06ab7a"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/xh/firefox-51.0b6.tar.bz2"; + locale = "xh"; + arch = "linux-x86_64"; + sha512 = "97ecde3e48e7f3cabe8b80db7c74b34946407831aebecc87fe5913a8622b866914d2a6bcba8166c4d8e85b35eec43eec337a2389a9856d9ca48f4694d61838e3"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/zh-CN/firefox-51.0b6.tar.bz2"; + locale = "zh-CN"; + arch = "linux-x86_64"; + sha512 = "e37d07897665c195648c7b96ad47487bbe1671f9aedb06e9e5ca415dfc0484b7a13171b217866af1ab29b2e3376c45bf382e9d9bd804d57030ab401eb083560d"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/zh-TW/firefox-51.0b6.tar.bz2"; + locale = "zh-TW"; + arch = "linux-x86_64"; + sha512 = "5c1a87b1a96149f67c3213315c13524cda3d29b47ae078e22c04685de4f961c3a9bfd77a79c48e3ae619cf2bee7f035c725e480337d7e3491d48abab1bff1aaf"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ach/firefox-51.0b6.tar.bz2"; + locale = "ach"; + arch = "linux-i686"; + sha512 = "9922d61aca30e0b95209010be736dd144c3c65986c08852798997cf3cf8e4969f815565bcdf1f0d82a81bbaecf3f4cf478cda66a2cd757f36043717ddce3385d"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/af/firefox-51.0b6.tar.bz2"; + locale = "af"; + arch = "linux-i686"; + sha512 = "cbd0e1e659c0568ee66004664cb5277b1df291747fa22d5dd2b0c68edc59ee9efd3bdb14c6ad60509dc613e80e955314c50b589a5aa9ab52dcfb7efeb8a0772b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/an/firefox-51.0b6.tar.bz2"; + locale = "an"; + arch = "linux-i686"; + sha512 = "c6705fbd66a251d3427da98d1efa67d7a3f8683f166b7daab8902480c009b4ab183ff1d4f2242628ce3c11a828b74c605d5c17322234cb7972930174a070bd41"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ar/firefox-51.0b6.tar.bz2"; + locale = "ar"; + arch = "linux-i686"; + sha512 = "d6c91653320898857096b209f2572454351edd4aa4778e8bc91a6628870ca476f80ed48bd17b651e4dcbdd75013dac2b325cfe4e9aab6e62fbeec16f7013e8c8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/as/firefox-51.0b6.tar.bz2"; + locale = "as"; + arch = "linux-i686"; + sha512 = "1fcd00eaf90603969e1e57ab486c088d7ca769c67382398caf1d0217134d6a814200f4c64a6ef8a5a58647e3cb0d45cacb6cf2cf64d7139443077905e4ceca72"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ast/firefox-51.0b6.tar.bz2"; + locale = "ast"; + arch = "linux-i686"; + sha512 = "0314d493a15bd8069a6fcd4c86036e300ca7391f9b881d355065ebc248f9a4242787cfed6f5d13c7de828340c9013a325f011995b9544610aa93ade607334e99"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/az/firefox-51.0b6.tar.bz2"; + locale = "az"; + arch = "linux-i686"; + sha512 = "a63c05959fc74bca79f6760a31ce0be0ab19ebf372a83fcfb5b2e1807e025462f4fd6236f8848bc2f6066048862cdf6b68fa66de0aa3a0b0d7c65ccca097d9d6"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/bg/firefox-51.0b6.tar.bz2"; + locale = "bg"; + arch = "linux-i686"; + sha512 = "a514ee7d9acdb0dcb95a5c02c8d786481b1d66b8d7de2c8c05793a330d711dc5b0136a822dacc6cf81e338a9e3eca93ff9a25fef457739c5767bd01ec10458f2"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/bn-BD/firefox-51.0b6.tar.bz2"; + locale = "bn-BD"; + arch = "linux-i686"; + sha512 = "2738e2e97d52003b4f9b55e8912bceecc86a23c4e1db432db9e9d552e91c33bf0e523a924fc1011e45887b9432af801fab93574d808cfa1dbe77a0ae6056a2cc"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/bn-IN/firefox-51.0b6.tar.bz2"; + locale = "bn-IN"; + arch = "linux-i686"; + sha512 = "c88648df222958a1c3c9ac71e54f2b248625a6637e46c2f39419ca3c57215f5af8ce16f4662326d24712f4cdf0b5f533e48a4bfd903e5cba66b579384d3bc7c0"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/br/firefox-51.0b6.tar.bz2"; + locale = "br"; + arch = "linux-i686"; + sha512 = "a5b160f8776b396dd837cc574cb4ae625e58afa0443ae12ccf857d52b5d5e16d21bea6dcfe7a77e52db6c038541f01efc78d4da0de74625992e3d833f84f0b94"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/bs/firefox-51.0b6.tar.bz2"; + locale = "bs"; + arch = "linux-i686"; + sha512 = "18cb9436347d690aa1c7900f8eeaaccfcdc585c3ffe921cd77860596cb8cde01174d709d03489483b5867fb9d647baa9885673b983037656f020d245f4159da2"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ca/firefox-51.0b6.tar.bz2"; + locale = "ca"; + arch = "linux-i686"; + sha512 = "db8c8aaebf6679bd28d615e1e2304285ed0848906f93425a255171f48d6c75aa40fb2d88f71cf85eff3410d199032ff152585e277efe78c69440778705ef3b26"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/cak/firefox-51.0b6.tar.bz2"; + locale = "cak"; + arch = "linux-i686"; + sha512 = "47cbf1f054fa5820ce1f8f769ce90ac26758f99ad300069e3a6c029e01115c3b12b08c812ebe1309667c17c1640d6cb2e7174fc6e050db8f013003436b7845aa"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/cs/firefox-51.0b6.tar.bz2"; + locale = "cs"; + arch = "linux-i686"; + sha512 = "8c5f82a831e31c42629f5e6c6406d5a1ecee37506b89cad845abb110b0f2b5a809ce3e81e8a70915f993fa96891fca4a5e36ff778bd45d23d2671ab55da9f874"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/cy/firefox-51.0b6.tar.bz2"; + locale = "cy"; + arch = "linux-i686"; + sha512 = "77080af629015197663e1e3de1feb76da0ccba3ce1341cf7592ef8d6d0b477f1349d944762d1e810d1cc3c8a0eb23bf44f73e7c00d07d1e9c2a0bc2e2c1692eb"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/da/firefox-51.0b6.tar.bz2"; + locale = "da"; + arch = "linux-i686"; + sha512 = "d082549257e17392f75485548b1ed8062e155687c3d2f0a3287ec5139e6ad1db9cb4a8a449ed2ce18650e07719b03a3dbe1ac25589102c322727767a6d663dd9"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/de/firefox-51.0b6.tar.bz2"; + locale = "de"; + arch = "linux-i686"; + sha512 = "0b58e025fc3490c6b94df2f60c722edf909bccec3264bb9f618e54391cfbee8800a6ae1a2c625f68b975daae73596464bb53ffebbedd545bd4a79e77c1d9ca33"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/dsb/firefox-51.0b6.tar.bz2"; + locale = "dsb"; + arch = "linux-i686"; + sha512 = "4f0633677c15ce3b9a4d3bade50c5d4e18c76b898cf82a6169213674220d4b82132912947aefdc2ff90e6e639224d76f3508242d664d051475366efeb4adf84d"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/el/firefox-51.0b6.tar.bz2"; + locale = "el"; + arch = "linux-i686"; + sha512 = "089054405ee749b30895a8c6cd83a630399ef9cc493dd4f50d0654241ab35ee63c989ce03996f0921820ae701e90bd7af7b6a0058ecba25aa5272ba151da9f02"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/en-GB/firefox-51.0b6.tar.bz2"; + locale = "en-GB"; + arch = "linux-i686"; + sha512 = "4c4ec11a0642efe15b82991e8e3d614a239dab86866773b2ad966c45d928a0b6cba73c65bddbd0233cce0bcec7489ee2899115a8e38f02db1490a5a9814a5c30"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/en-US/firefox-51.0b6.tar.bz2"; + locale = "en-US"; + arch = "linux-i686"; + sha512 = "7c53368377d6b4258ba5a64fe16af394b514abcf516d04551c7fb22ff09ccd4fa37b0e16a21af179329f78c8970179b4d66b2882ede54960e9a7524403f7e7ab"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/en-ZA/firefox-51.0b6.tar.bz2"; + locale = "en-ZA"; + arch = "linux-i686"; + sha512 = "f774c2c8803789dfd335dd6bdcab442eaffb2b7bdc1a3a59509060af8e1baf57e56bbca17224038fbadef1168ae20063cae8e6f98912ee35f031870ab65155b8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/eo/firefox-51.0b6.tar.bz2"; + locale = "eo"; + arch = "linux-i686"; + sha512 = "103dc2a263d1eeb0bea61e3ddff6d16e399501c59a61045b5821654af7804bac571ce6fceb1e6616da44384d910005cacf44e515028e5da8ad58f1804298c0be"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/es-AR/firefox-51.0b6.tar.bz2"; + locale = "es-AR"; + arch = "linux-i686"; + sha512 = "dc3f7f830ede78340d323f5062edc564fec3bca2eee32bd88d729227e8b7cda4739e56dca54fd7d8a7856778843012b3c52acf4d773ab53249ea8c186896b7ab"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/es-CL/firefox-51.0b6.tar.bz2"; + locale = "es-CL"; + arch = "linux-i686"; + sha512 = "ae16ef4d94c2b75bf57f425aa670ab71525655a1a092d7151a513c783c7b4967f5b7e0726e4aad676615165d84551f8ec59b7cc8ad18570834e9abb1089fca6a"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/es-ES/firefox-51.0b6.tar.bz2"; + locale = "es-ES"; + arch = "linux-i686"; + sha512 = "cebede3a4d5750f5b7160dfb8609faf7c73892689da08c7b93b87b6cf159184e04016b3ae92a49bfb8d40c50ac45a8806ac45c30b436a466875cedf4a0270994"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/es-MX/firefox-51.0b6.tar.bz2"; + locale = "es-MX"; + arch = "linux-i686"; + sha512 = "3a263de75799e50ec08961b0f25c3e5366129aff7e466f9dcd8820f1f455cf1ec959ac9a4388ae8edd92f3f5a1647068cd699b809f1e4de9ea9f3dd25b4a4e4c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/et/firefox-51.0b6.tar.bz2"; + locale = "et"; + arch = "linux-i686"; + sha512 = "70f2d3009b715e27b350bcedd6503a311db8a2c6c75fa29eacdf13a8ea7fcc674680f59dfd18bc2b0440dd528d8e63bd885ee5ff3dfc88361efd3fb137ff3903"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/eu/firefox-51.0b6.tar.bz2"; + locale = "eu"; + arch = "linux-i686"; + sha512 = "8cfcd9b768bb83978697db322ead6afe39b6dfee7c05b1b4291f2acc9f84e450c79f419b3a158e3e9757c36d739ecb4325ac51d129015309999b5b0cf8f53df0"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/fa/firefox-51.0b6.tar.bz2"; + locale = "fa"; + arch = "linux-i686"; + sha512 = "470b4d9545479ed1f97059d4af318c7f38aca6bd80754c0e56c78912164244b4ebcb9aa697a653d608bd26919f76fe0a12dcd02423315570d91aa4b822ef2e76"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ff/firefox-51.0b6.tar.bz2"; + locale = "ff"; + arch = "linux-i686"; + sha512 = "725c8f4e6ee92877635993bdc83b5d6098531274239e74399cf94c156dd0193b900564a6a1c99b2b57c896f43b9769ccac1d6f280f5338e407a07a740ee4ed2e"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/fi/firefox-51.0b6.tar.bz2"; + locale = "fi"; + arch = "linux-i686"; + sha512 = "8ce26856aafb9b496b703c5446a9aced0edafd21c321496021da83efb57514c38ec4065e0f3bbc79342eaab524a4592fe7d5757867bc7af778717857d1701b45"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/fr/firefox-51.0b6.tar.bz2"; + locale = "fr"; + arch = "linux-i686"; + sha512 = "3b5a92eb7c1871551b16a4374713df0db4d9af2d288e4a1b4851ad805076c7f4359d164ea1079ea6a48dd42f6496bab748037c7fa2f3be338823279552726f87"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/fy-NL/firefox-51.0b6.tar.bz2"; + locale = "fy-NL"; + arch = "linux-i686"; + sha512 = "807180c0e71c13ed5e9081c135b9de19b0f9ce60998b43d6c22364a6f07d9b8e835993e5a12d8c81f3090d48e53bdf84d43f0a1c5829e0e88b273e4e1eb92f1c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ga-IE/firefox-51.0b6.tar.bz2"; + locale = "ga-IE"; + arch = "linux-i686"; + sha512 = "a7e2fa69e0a9eddb019874c450a9874c9b302084872c536f04012990898e7a9fabe0eeaa1052a1888dc21bff54bb0872c3bce9c4df6c0026caaf93e1ee8fa533"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/gd/firefox-51.0b6.tar.bz2"; + locale = "gd"; + arch = "linux-i686"; + sha512 = "9d61356a39ca08c751668969268fd219ee35428d9353f2cb8862d9552403dbe8c05ef961e0694eadaa82de9207e90fe5b349dc27a4d50981c6eb83f59617af85"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/gl/firefox-51.0b6.tar.bz2"; + locale = "gl"; + arch = "linux-i686"; + sha512 = "d72a791e014c7c5a6f6304f35c74f572de4ab68f514598fe076d6218b152bd12f2a764262888faeac397f802849920adfe5e97a3b7d4331e43e4ce2de75aa31f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/gn/firefox-51.0b6.tar.bz2"; + locale = "gn"; + arch = "linux-i686"; + sha512 = "c44d87a70e45d31412f38d0ba0a25a1b58d661d91c7a9b6deae19ec40c88da4a480933ba257cb83fea4120d31c3f959ce9c5ad0da4c10247b5fa2c68fdee6aca"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/gu-IN/firefox-51.0b6.tar.bz2"; + locale = "gu-IN"; + arch = "linux-i686"; + sha512 = "a782a9bc8a2008a37feb74b4acbbb679eb406fa04745d38196f16304275727cf2215e301f3f25df443430684dffe800534e6f7bd7d35effb2f051895b8426825"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/he/firefox-51.0b6.tar.bz2"; + locale = "he"; + arch = "linux-i686"; + sha512 = "e0cbf0607d45cf2f079ca2d138d26866bc2d0a65be9e64514417f77ecb89a0228ae228b876af56fce712d9e47aaa41f93c3c908ded27e2a8a1224b2100919f92"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/hi-IN/firefox-51.0b6.tar.bz2"; + locale = "hi-IN"; + arch = "linux-i686"; + sha512 = "9d05eff13dfecee6f488d7748c3d109ae6d441760a5fe385011fe1a9d7cea2e4c1a8e3fad8fa8216a45af2d8f99ec8467d588f8fae410eb52f71d408dbbd03b6"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/hr/firefox-51.0b6.tar.bz2"; + locale = "hr"; + arch = "linux-i686"; + sha512 = "fe1a5472ce390b5f6825a40176e3e3e13d79931cf44447da06bf08fa8c483368f95877b848302e7e9cb0c4a8b7e13db03fb7bf895c78b8b5ac6e707dc2ac5979"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/hsb/firefox-51.0b6.tar.bz2"; + locale = "hsb"; + arch = "linux-i686"; + sha512 = "a2d170a74de204d24a883cb0be93f9c55eaec4d8872a85e59be3005df7b6f78f02d95bcc0cf24e9b9ee6f6b9e301acec7e692d259b98718b4088b84c56ae0347"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/hu/firefox-51.0b6.tar.bz2"; + locale = "hu"; + arch = "linux-i686"; + sha512 = "dede1498aae89a5cf2e78ce927efd801d058fa0a7cfcda6d2aca816b913206e39b78581f48100b2ecde4d9408be30f221e66cdb7d1d1b4e9a86d5a8beed372b5"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/hy-AM/firefox-51.0b6.tar.bz2"; + locale = "hy-AM"; + arch = "linux-i686"; + sha512 = "2d3b69d793ae4483dd73bd205f6692f86254735a885609033994e697b6df0b843612a10df0c227af280b94d1435555b3caebaa7ce0d229e3960f1d219d1ba180"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/id/firefox-51.0b6.tar.bz2"; + locale = "id"; + arch = "linux-i686"; + sha512 = "be01e48d71ffcfd99973e1d34d3c8779cd79c13a16f325f9e760ca282d7ccf1582e3ee33eecec2f4146ad4001ecf9d8c91a6dd433918c4993e5920fd743ad50f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/is/firefox-51.0b6.tar.bz2"; + locale = "is"; + arch = "linux-i686"; + sha512 = "45c337a8c734778f20ed5199911c24b92dcd24d27d4213b9932be675b215fcca39953e914c0ad4ffd35b4401f8debc89cd0d28e5c3b980c94e9f6d1d59f8b105"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/it/firefox-51.0b6.tar.bz2"; + locale = "it"; + arch = "linux-i686"; + sha512 = "62e5bc1312904866c09a82ac1a237e0c6b58ddb43f5ba154162ba5d4f51b0df5c54b92f4d6cb0be76f6d5aa5308ad2cca079bdfdcf1893d03f470898d4524015"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ja/firefox-51.0b6.tar.bz2"; + locale = "ja"; + arch = "linux-i686"; + sha512 = "14d190cd8b483af4d9d7c97441e9fb198c1f675e4cc8878e692d940366ad83a48a279957270a4022ca056e0bc28b0c8de625bc81025bef4db1d5e39942376747"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ka/firefox-51.0b6.tar.bz2"; + locale = "ka"; + arch = "linux-i686"; + sha512 = "417ae8fca27325c1a1f20b3ee88845db8f03350287869986c6665bd64970bb3f828ebbb516d36c5b9048d848c65f767c539198ee5aa29047cf145851b3a1148c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/kab/firefox-51.0b6.tar.bz2"; + locale = "kab"; + arch = "linux-i686"; + sha512 = "64b677faaf6550dedc968116a86342facc92d7b2aaff8e2f47256a9151bb834e79fc08597808f37541b303eda283d9b8138972547db614a07ab87ea339f44df7"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/kk/firefox-51.0b6.tar.bz2"; + locale = "kk"; + arch = "linux-i686"; + sha512 = "3674f209fd4b80daf47319a5ae6014490a9cfc3a64c548d84439dfdb14a3f2053c94cc5e47285924e21409fbaae03cd1f2fbcec02bf5fadf1567379d172cae2c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/km/firefox-51.0b6.tar.bz2"; + locale = "km"; + arch = "linux-i686"; + sha512 = "e9358288bd40d66ed2f27676cf92974e1c54f098f8a7978bc8d914a5e045bf94c68efa25674e42f4d976dfbdc1ad23b44d1174f0310e798f1cb1c7c8c1b93349"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/kn/firefox-51.0b6.tar.bz2"; + locale = "kn"; + arch = "linux-i686"; + sha512 = "e8f8331ff3d638955d087d2b75ffe7fa04426b6f72a35e1b0e194c92948793fc25e25ae927f03f119dac01a6cbd30f944f5022c32ff933b15a8dbe67245f310c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ko/firefox-51.0b6.tar.bz2"; + locale = "ko"; + arch = "linux-i686"; + sha512 = "58437f794e59333093bbd5a4d673d1a3149ca3468ef9a31bb0fdb4c40773faa6ed688b7636191223021e9bc7bfc09726dc45ad627e4f731f19ee78cd782ecc08"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/lij/firefox-51.0b6.tar.bz2"; + locale = "lij"; + arch = "linux-i686"; + sha512 = "80c30dc8064a0a075613c6720b976379b3a9fc4ca05db2c727a4bf1e4abbd4f6f44b45eba42bc3633c164cc3c15ef756b85d638d3ab857bd0e6d21d9e6f640fd"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/lt/firefox-51.0b6.tar.bz2"; + locale = "lt"; + arch = "linux-i686"; + sha512 = "fd4ce4207ea3eebda966881ab9f113688122322d16a2c9a205b17d7c73ae0de4fd5a48789e01c96392ac5c84a59a790269329ddd9686b9cfa64c787a817101bd"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/lv/firefox-51.0b6.tar.bz2"; + locale = "lv"; + arch = "linux-i686"; + sha512 = "57877344c135ad47073e992a06e5568a4564209f2a79c2b1851d69b2fff6c9c32d96cf3278e1bba4d91fc001765f4d65d6d4b730603ac0a5cc28d2520fac2d60"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/mai/firefox-51.0b6.tar.bz2"; + locale = "mai"; + arch = "linux-i686"; + sha512 = "07a87e16e68b9089c7aa58048ae4b41e15bc267d9810a218c9473f0d1082ac935fa5adb759a9ac43c0bf2a6e79e830c6344943cb7b61b73746911dbd66a7fdaf"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/mk/firefox-51.0b6.tar.bz2"; + locale = "mk"; + arch = "linux-i686"; + sha512 = "8e4a61d4f20c17f1dc2748568d731f8e9f9050741896f98ec761d551a0c9bf0836731ba9049684819d71f6eabae7f2d1e93e0add593661d882d619783fb996ce"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ml/firefox-51.0b6.tar.bz2"; + locale = "ml"; + arch = "linux-i686"; + sha512 = "f2300cfbce84cf49b434f56b262c34e734eb2ed47abd5b318b9ac9197252869c80b77a7e0617a61f8a1d06a7e6c083479833865b5f1a0e3172102c07d8b9d878"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/mr/firefox-51.0b6.tar.bz2"; + locale = "mr"; + arch = "linux-i686"; + sha512 = "e8536f0786bf5a49536f7703ac50fbaf31db932c1c855988c192d495365e677f674f1d84bdd5b5d07ae0b04c6498262a29d11949f4ee172d1ed97c3708e2e0e9"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ms/firefox-51.0b6.tar.bz2"; + locale = "ms"; + arch = "linux-i686"; + sha512 = "c3d6c1772f2d53e6e3928d9c680e737a03cba9fb22fcfe051c49afe147502c6b458832c735ecefd29a06a22fd91ec13f98f0590f386c5331d6faefb83afc64a7"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/nb-NO/firefox-51.0b6.tar.bz2"; + locale = "nb-NO"; + arch = "linux-i686"; + sha512 = "2d42ede2a1232c48068bbde4c9401e495b82ebc356cee2490e8282e7a50e7ebdaf235e5d109a6ad1e30bb4773b81a75dd8d8f338738db499a8bc910a435fcde9"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/nl/firefox-51.0b6.tar.bz2"; + locale = "nl"; + arch = "linux-i686"; + sha512 = "3f7d57fd1a64f4c99a573c6c2272999bb9bed78648a1476ae3d1d843ae7407612a750b07b6730c0c326b57e16c87df374049c49f8e9e2fe9ca7d14860af983a3"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/nn-NO/firefox-51.0b6.tar.bz2"; + locale = "nn-NO"; + arch = "linux-i686"; + sha512 = "649a79569ca51e418101d013061bb7ae977d80e0ca4854c03e256e214e4a0c2373caf994fb1d41db6beb4816524e4ba76d434b7a2942b20cd628b42f409792b2"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/or/firefox-51.0b6.tar.bz2"; + locale = "or"; + arch = "linux-i686"; + sha512 = "68a761c18b24f5ab5ee511f635653d1c3e798239f82a120c2bce73d5f0e706b5b8dad2540ece11361c0652f34b00f767c6be2c700c69a0d0eb08c35bfec29fcc"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/pa-IN/firefox-51.0b6.tar.bz2"; + locale = "pa-IN"; + arch = "linux-i686"; + sha512 = "2d57687e8fbf53cf2bd8b0bc6780dffdfe1284b47fbef20ab9fa591e2eefec00e097bdd24159a28700d47f02273395f32fcabb401d0f5f3e13cce75481b9cd7c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/pl/firefox-51.0b6.tar.bz2"; + locale = "pl"; + arch = "linux-i686"; + sha512 = "afaef3a9d125774454adf37f83447600536db9abd7bf388a2a9e9024ee46f67269f122c39041b5537be23b19af39e8efc27cf142064fdfcb5cd3f404792b1383"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/pt-BR/firefox-51.0b6.tar.bz2"; + locale = "pt-BR"; + arch = "linux-i686"; + sha512 = "c3a34e85cde018ef1323786e373e8842cb6c590cc8db64441e99d5a092d87ca7cd935dd238b30a2752393515fd5455100e97a98e08b395b4082d09e800e25846"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/pt-PT/firefox-51.0b6.tar.bz2"; + locale = "pt-PT"; + arch = "linux-i686"; + sha512 = "2aa6b07f64b83287aeee048edf436632737da32188ce650ea2e323fa5587457cbceb05356b3917b75bcd1927bb9cf1da89e23fdebc3db2096bd4598ce8cc714d"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/rm/firefox-51.0b6.tar.bz2"; + locale = "rm"; + arch = "linux-i686"; + sha512 = "1e774ec46f28bc561bc5dbc9af3c0c5a198485f5da7a7fc7d5d1ef920b54227ddc9b0168b7cce30cc30cd606513aaec317369335deb945bcf94fb49bf29367dd"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ro/firefox-51.0b6.tar.bz2"; + locale = "ro"; + arch = "linux-i686"; + sha512 = "3d449880c97442f60aee98be29abd097330b95acd9f121a57744d5694f5471afffc337239b2d3e527b2dc709daf0607b73ba664ddd466eab6236f3d842ee93f2"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ru/firefox-51.0b6.tar.bz2"; + locale = "ru"; + arch = "linux-i686"; + sha512 = "42d9d4e4f2fe48e1c7db8395eb22737bd42b7a771bf8bb0f69b210fc4a2fafed421e22f498d68d1ab3e1661a3e828c1e21e096d655f47d6c6216c6c8bf4a38e8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/si/firefox-51.0b6.tar.bz2"; + locale = "si"; + arch = "linux-i686"; + sha512 = "4d0132f95f13076df9cc4fc6e6fe6912d16aa3c71fd18a6dc81f4ba9dc53842b7cb4a3fb4da62436fe6d9e4061e90b8c02ec686644020437b7da78ea5ab09479"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/sk/firefox-51.0b6.tar.bz2"; + locale = "sk"; + arch = "linux-i686"; + sha512 = "93eabc3dfdff6089ba9ca7ec7210ebf174fd548d4c5e3076551470a27b0b7f19ab8d4b6813aeaf7206ea8bde863cccc2e34f447e4f09a3b0b0f632dfe5c1bf05"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/sl/firefox-51.0b6.tar.bz2"; + locale = "sl"; + arch = "linux-i686"; + sha512 = "ee064cabe643fce46242fed3292e3067159ce0dc57f08d8af67658f37b7cefe80082609be57e024b939054cda80f7573ca6715bdd4f084bb847e32776267394f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/son/firefox-51.0b6.tar.bz2"; + locale = "son"; + arch = "linux-i686"; + sha512 = "3a5c3ac7b1482fac457a5e537d743f14eb99b6d139ed840cc5c1fa4020e7c4950957b9cafc19dda8ec21741b48698a91dbe3dd455c9b002af407eb68a29cc8e6"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/sq/firefox-51.0b6.tar.bz2"; + locale = "sq"; + arch = "linux-i686"; + sha512 = "00782a5b28cc04a1fe58309503bb984b29c6842e4ebd9c8e43d8965d9041b3a676208134307d3b8f04637458e052dce8c3d5fcb593d48ef93a71fe3bccffb684"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/sr/firefox-51.0b6.tar.bz2"; + locale = "sr"; + arch = "linux-i686"; + sha512 = "b32b88641024c0f263bf8e190ab0bd8e3d2d6091aa38733971cb8f00ad1c776859d5b037ef6f2b6d220f93629b39c8730f99bba654bc3791e767b3f7182ca758"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/sv-SE/firefox-51.0b6.tar.bz2"; + locale = "sv-SE"; + arch = "linux-i686"; + sha512 = "08a713dda121e0df1131dfb50c5196c2b2e4ca58823a56453c23955d94f53b877f737c5f5d805f1203a4c9361f25d0f8e8327cfbefe9fdc32d2ddd5dda359e14"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ta/firefox-51.0b6.tar.bz2"; + locale = "ta"; + arch = "linux-i686"; + sha512 = "b8986fe3919db0386ed411c1269aba0f38fa6c01a36b24544e91e382e3f22a72b5cccebcbd59e21a1573910b9f4b838cd482e588a92153b3932835bbb87b8061"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/te/firefox-51.0b6.tar.bz2"; + locale = "te"; + arch = "linux-i686"; + sha512 = "4f040903bf00eb129adb0aa431921bd39754815b8a789b9e8118ecd87bd6923ae02faff7791f17e326dfb844745b1b12ecdf8978c814be0964825dbdacad146f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/th/firefox-51.0b6.tar.bz2"; + locale = "th"; + arch = "linux-i686"; + sha512 = "b2868ea454d231e87e1389005d5ed7863865e708ac2b99075f08644875323427e4dc92a245be4de90f4d5e3791b352a27e26e3ab2c08e6f3dd8377225af70a00"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/tr/firefox-51.0b6.tar.bz2"; + locale = "tr"; + arch = "linux-i686"; + sha512 = "dfa63ee5ba94400175f1252c06bbc1070579a3fc9395f55528cfe6a0a99bc6a654708ffb930efa4153322c76532d201863206b14f07973bf6713c90b297898b8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/uk/firefox-51.0b6.tar.bz2"; + locale = "uk"; + arch = "linux-i686"; + sha512 = "43157bfb4bca885e830035e525ef2642795e9f22e582c486f28a99acf462dcb09142b9e1fc35f014f800e5f30365d6bc76b0c4b7caeebbd9e2e3fb4bfeb780c7"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/uz/firefox-51.0b6.tar.bz2"; + locale = "uz"; + arch = "linux-i686"; + sha512 = "0ce3bcd1bd6c7aa9d363ca869d9f1638f930b5df7a7e22b88b12300dba8cc0ebb9e7e1b61318b49e9452f21f1855dd3e0b38448f4067d2a0683b6aaae39e90ae"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/vi/firefox-51.0b6.tar.bz2"; + locale = "vi"; + arch = "linux-i686"; + sha512 = "c68aae839b6438ef934953c419d99921378bd81aa08da9653299a3410d2e102ad9890870e99ff9541477a0dcf779d8e80905b6741b8f40faf4fa9b7fa8fcf86c"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/xh/firefox-51.0b6.tar.bz2"; + locale = "xh"; + arch = "linux-i686"; + sha512 = "c4422a3f38d47cf9caea2ea93f5eb4c402461a76fbd8285f8894bbf3d4ae0bb484be20f0761425ac9139facb1fca12ca4122efef47391b988d4dc4118482d660"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/zh-CN/firefox-51.0b6.tar.bz2"; + locale = "zh-CN"; + arch = "linux-i686"; + sha512 = "5cefa5a67a1d468c017294884b04d3ae412f1f3bce56fb96e72919266ba697b46430460334d3593608d08238921517b9972435bd76fdf012ff3fec51bc64de82"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/zh-TW/firefox-51.0b6.tar.bz2"; + locale = "zh-TW"; + arch = "linux-i686"; + sha512 = "485a9f5184722c59a4a60a8f02c0c10d4f8fed359083a70701462a311caf652170625f06eabd5baa9f8b5312ca978c48c4da01a4de49c35f52a8c8c6a2d738bd"; + } + ]; } diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index f0f25f14e496..272b1368dec4 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -1,13 +1,12 @@ -{stdenv, fetchurl, kernel}: +{ stdenv, fetchurl, kernel, writeScript, coreutils, gnugrep, jq, curl +}: -stdenv.mkDerivation rec { - version = "0.42"; - name = "tp_smapi-${version}-${kernel.version}"; +let + data = stdenv.lib.importJSON ./update.json; +in stdenv.mkDerivation rec { + name = "tp_smapi-${data.version}-${kernel.version}"; - src = fetchurl { - url = "https://github.com/evgeni/tp_smapi/releases/download/tp-smapi%2F0.42/tp_smapi-${version}.tgz"; - sha256 = "09rdg7fm423x6sbbw3lvnvmk4nyc33az8ar93xgq0n9qii49z3bv"; - }; + src = fetchurl { inherit (data) url sha256; }; hardeningDisable = [ "pic" ]; @@ -25,6 +24,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = import ./update.nix { + inherit writeScript coreutils gnugrep jq curl; + }; + meta = { description = "IBM ThinkPad hardware functions driver"; homepage = "https://github.com/evgeni/tp_smapi/tree/tp-smapi/0.41"; diff --git a/pkgs/os-specific/linux/tp_smapi/update.json b/pkgs/os-specific/linux/tp_smapi/update.json new file mode 100644 index 000000000000..15e9801e7f25 --- /dev/null +++ b/pkgs/os-specific/linux/tp_smapi/update.json @@ -0,0 +1,5 @@ +{ + "version": "0.42", + "url": "https://github.com/evgeni/tp_smapi/archive/tp-smapi/0.42.tar.gz", + "sha256": "cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381" +} diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix new file mode 100644 index 000000000000..0c97d18472cd --- /dev/null +++ b/pkgs/os-specific/linux/tp_smapi/update.nix @@ -0,0 +1,23 @@ +{ writeScript, coreutils, gnugrep, jq, curl +}: + +writeScript "update-tp_smapi" '' +PATH=${coreutils}/bin:${gnugrep}/bin:${jq}/bin:${curl}/bin + +pushd pkgs/os-specific/linux/tp_smapi + +tmpfile=`mktemp` +tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags` +latest_tag=`echo $tags | jq -r '.[] | .name' | grep -oP "^tp-smapi/\K.*" | sort --version-sort | tail -1` +sha256=`curl -sL "https://github.com/evgeni/tp_smapi/archive/tp-smapi/$latest_tag.tar.gz" | sha256sum | cut -d" " -f1` + +cat > update.json < Date: Fri, 16 Dec 2016 16:11:15 +0100 Subject: [PATCH 1672/1749] typo in update.nix --- update.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.nix b/update.nix index a914a4028c54..e8028abae065 100755 --- a/update.nix +++ b/update.nix @@ -16,7 +16,7 @@ let result = builtins.tryEval ( if pkgs.lib.isDerivation pkg && cond name pkg then [(return name pkg)] - else if pkg.recurseForFerivations or false || pkg.recureseForRelease or false + else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false then packagesWith cond return pkg else [] ); From 56cb5b7609f97e07bf4633ba5d59d230193a0248 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 16 Dec 2016 16:14:05 +0100 Subject: [PATCH 1673/1749] update.nix moved to maintainers/scripts/update.nix --- update.nix => maintainers/scripts/update.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename update.nix => maintainers/scripts/update.nix (95%) diff --git a/update.nix b/maintainers/scripts/update.nix similarity index 95% rename from update.nix rename to maintainers/scripts/update.nix index e8028abae065..2035950da3e3 100755 --- a/update.nix +++ b/maintainers/scripts/update.nix @@ -6,7 +6,7 @@ let - pkgs = import ./default.nix { }; + pkgs = import ./../../default.nix { }; packagesWith = cond: return: set: pkgs.lib.flatten @@ -69,12 +69,12 @@ let helpText = '' Please run: - % nix-shell update.nix --argstr maintainer garbas + % nix-shell maintainers/scripts/update.nix --argstr maintainer garbas to run all update scripts for all packages that lists \`garbas\` as a maintainer and have \`updateScript\` defined, or: - % nix-shell update.nix --argstr package garbas + % nix-shell maintainers/scripts/update.nix --argstr package garbas to run update script for specific package. ''; From a66b703f94e80215a46b10bbd613ae9c8d9d74ec Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 16 Dec 2016 16:34:25 +0100 Subject: [PATCH 1674/1749] firefox-bin/thunderbird-bin: reuse the same updateScript for both --- .../browsers/firefox-bin/beta_sources.nix | 738 +++++++++--------- .../browsers/firefox-bin/default.nix | 72 +- .../browsers/firefox-bin/sources.nix | 182 ++--- .../browsers/firefox-bin/update.nix | 78 ++ .../mailreaders/thunderbird-bin/default.nix | 14 +- .../mailreaders/thunderbird-bin/sources.nix | 703 ++++++++++++++--- 6 files changed, 1135 insertions(+), 652 deletions(-) create mode 100644 pkgs/applications/networking/browsers/firefox-bin/update.nix diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index ef5c6b847e29..fec1665f8b7c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,925 +1,925 @@ { - version = "51.0b6"; + version = "51.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ach/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ach/firefox-51.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "de99e6e07ea084406927551ccbb549bfe583e21e16873707124d897c38dc04b183476eb620f5d457e19375df51a19d3b57bc3afe344efa07d7832ac973ea30eb"; + sha512 = "c251fe3e50d7bb85a46e86afb9d041b161061e6718cbfe6114172a098f35eedaa2f221a3f7bcdb2ebe210a5ebb5cc33fb50b1dd04da5256cb32646678d722b28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/af/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/af/firefox-51.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "e4a653eec075b975f3a3d6f73874909f61a82bfded01935ea152d56b7249e726099ae873a347adff4d6fa82f73a267415711483a56845980d199fbebe57a9c23"; + sha512 = "ff8af74fdf27e72169193a81e62b99ce831bc466e50ef2d843dda03894fe3cc764ba69021c839ee09ab48b7b3a6140f1ed01c045efb01f75342bcbc333158a49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/an/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/an/firefox-51.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "cf5df1e60d2ee8387c173e5ea73699b29ba80251d2497b4e3cb25cfb37fe2bf8967f8d39be091ae5adea2d30cb8c911124bd4272c92e9d0ee811f36d13c62efe"; + sha512 = "20b5965b70cc773eb2226608fef18efdc24fe22f2feea43f39fe9d09afcb89db15caa8149a908bbca3f26e8d6b4f3651d164fb97f2dd2ee67e33b8e43635871e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ar/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ar/firefox-51.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "0e128e4c2edde6b9090e1278b5da9bfcf6fc6cd57c739fdad86084bc0e64637b6d9ce1fd31b1da53b85f460f26d9a02b7c95bd427de08dc46415e35dfa381b1c"; + sha512 = "b1816f401757634f618e1d9929c2a341adfdfad42bcefa8673c7d8c511c46267054352558f3a83d399c68e7f80faa1c2cea519ac24618479828c37b4067f8e78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/as/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/as/firefox-51.0b8.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "fa223a00223abe964d6515e195dc4bef25a420ffbdc3131d13210ff70c584707757dfd44e53d2a3ca062cbe860ff3df590cf423fad5dff5dfdb1721f321a5b98"; + sha512 = "049a8f3782a34d8432204ef6119a2909ca4e6eba83f760c8f35f1be86595483e47823088e508a1389d68ee366e14431686db7edc44d1fd5934f887aaed85bc4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ast/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ast/firefox-51.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "835c02a80228fc317d8bc81429fa6331a5381e5ce26b7cf315c30d05e7bf8a29197d4105335bf8b32b0a9e2b65acd8c9c617afee5af3339777a0e23558dd92c9"; + sha512 = "b2c48f6009e01924e75d7671a819b4af51b87a3a08576812bc7f89b2273d047a3ca914147b519dcc50f1deb21acebeeebb05fc306fbbe016f12e3fbaa885bf16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/az/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/az/firefox-51.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "dbf48a762de944e8ffd39d65d4b94f67e4b2d3bf91ed0763e44f32343af0dc1183087421d0c6f737c6826e94fb205772cd6d484bfb45b19755948d602d02ae91"; + sha512 = "315e47d4e4d6d985f4390d8a40cb736ec871ecb30ab76db9235bb040eac9b73c3a1e709d783db2363c97f6ca91e3281c4c88e10c4d9fc62131fd8c105d7269ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/bg/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bg/firefox-51.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "6bac773ce99d25062f188a01c3006689ff7441af29a80da323e7ebe09c678a426cc3938f0a1a83051bb0efe791e4779a92b6cd09a23c676ee3629ca2d8a43da7"; + sha512 = "b31bf59b6546741ab005c5ca11115f1557923f467e801f16049e83881deb8a8f6b775b425a8fc2a608b51170fa00a4b464c9e60e306267fb50b2144b23948613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/bn-BD/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bn-BD/firefox-51.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "2648c10bddde134ee699c0b26be5520a8a47d2cd0ebe99fa114b2ed7f19ba7fddd0696585732d154db67099795e6aec922d49f9871a24eda571bd6e0c24dea35"; + sha512 = "5683955a4d1e678d9893554d9cc534a61f2cb0242e2ac068424eba238f1ce89e58692cdb35e43d58cdd71c0c0683a5d61920089ffd100416e6a2448ce43f2004"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/bn-IN/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bn-IN/firefox-51.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "b97ba8c5bf7f282a323ad3a4e423e85cb9122b470a94eeca91df3c00c6ab3331e02bf36ad7e87684ae3f73770c213ba19ae7179117228ac7808ad2fbe5d99145"; + sha512 = "0220a226f53b7a99d123a1e72a6db88e726748c9d3e0ed46a51ab36b2ba5213dbf2cdef55b8a8892c97ee656905f01920563e344a412142993c719f15cb0bc43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/br/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/br/firefox-51.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "a03eb659b54067721861a89d578b3fca086b02c8013e7e05b724caaa020f301a4015d81e4d9f2dcd69223930c94b4e0e7f12d4e0de4b2fe271bf903b75ba9ca2"; + sha512 = "046d7c42a294fe636cbdbd13da8fccb879595ebda6353ed91981ecae39f670f1650f33b1ce0d3705158a437a22a718d5d381bbc37583702253941abe25ebc477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/bs/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bs/firefox-51.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "c64e5146ea1bdcd65b46dca33c8ac772d4c82ad49dc01fb4f1e51a56595e68167f7e4c8ecbe0fa3df258eb6f1ad6c2d9d0eb281e5c7b92831a03f7fbf8e2ddd0"; + sha512 = "a2e0df77bdb46f501e2760df79589ebec8e1bfb85e07ddee1d89c797a34781efd57e1790127d6cb38199bbe01680e5b04208f2c06b22a9bc684c87042f825267"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ca/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ca/firefox-51.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "8c27b06059b07d2c915fa11ec7d57c7519093a9480dac97cd6c4a024777a79d64687cd3d0c48d0c723aa10ee533164c4f67be9ad6d1379bffac98755a4a3a980"; + sha512 = "e8a4a37a55a882ce638e51ad5d4a08ac815fb5cd556d0e8db3982501ee2f9c0ec141132ffb0eebbdae47be78f74dec7fba730638c8ebe38ce82ecdcfb570adb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/cak/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/cak/firefox-51.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "94ffb85f667d4a39c0de3d4b0853e72e9ad2d60822e7224110aefb187aea5ece6c0be0e82ec4d4f686c6ad710b73c54c70cae10282ec0b48ca6623d3d7558444"; + sha512 = "aefda93ce59fdf238c2b957e45463c6f75e511a4331596bafaa4e8a99139f17ad2facc22befcf2fbe105651e9b003447bb62c3c2c6ffe4681816baa400f68a6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/cs/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/cs/firefox-51.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "2523492cbcd990a0204dca79f393b7e034d1337e9ff81398de78575d2a98c806680cc363f7339514d9f57308bfe4cd863c8710f6bb6373487b584aa1e8de4077"; + sha512 = "9eeeab75b2963959db947165f46443f686760f655dedae4de3d174a340c88830fbfcc0fd1df23740e6abe6d7f4552f06630c93f28246ff907fe6eebc1437d943"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/cy/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/cy/firefox-51.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "3c4f972e53540ba28be94bdc1e0b67b6c744a20f0ce2c6bfa7a1a92ab20ba806a73f39c5c0afb0e83ed5c822dfb42ea7c0c2806b91cd889070e148de8e5d47a0"; + sha512 = "659ea6606bb307893448b0352c175761e6bae90246ce157eb2cb9373b923ffede18eb8526330391396f9998fdade7db135a54f8aa14c4f52daeb9cddc44f344e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/da/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/da/firefox-51.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "8b268c1d9e35a91e2a71623404fead75966d39d893944c311ceb572e02673a06c61ef0e08b9c0ba246e6fcd23772e94e7531be535b69c27840478ee1ce3cbe6f"; + sha512 = "22647561d07e92d82be5bcd2c5f2e7a08d6491ea582464f64a8ba686496b0267eab6c07db49ae189f996b8cac9d0c4c7789c3230003d05dbc5fa8319acabc4fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/de/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/de/firefox-51.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "c2fb608c2c71412f192b1b910ffc7b270fb8d02b52c76af26fafe362c0cdb282086e902fe1e9eb3bc9d2d022e474816c45092480d199fe3b039083f0de94a3e0"; + sha512 = "313446d8dd7764b98eba2284d71d8abb47568577f312718f02a73bdbee4938477ed407d3d638fee4dfacbb43d4125806c882e0c96cda43c9fc5b09e7fc6656d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/dsb/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/dsb/firefox-51.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "d7d7ec0004bf4712082c57f30e069cbcde9c70cd10d412979228f18fe2056cbab9c741cfda76c8cf5ffaa3086320dd4fede0e140fcc88fe200944e2f407f7606"; + sha512 = "4e0bec424f15dec37ed21a46c79f9672d380f9d59e3109afd4debbda2cfe58bf8b17f75d905babcbf7bce5cb8f7f3312bd938ad945e163d3e11be42b9dee2fca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/el/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/el/firefox-51.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "2fc754b1d951b4d008d9d7a0cfd2555e394e09f8a28adf00334fa780532d8694a78c19831500fda3aa1e85bbc649b7156400d659de45ac4d4ecc3dac3c642124"; + sha512 = "c10b58b13a85bc1cee23ed23ab8f62dc79247d025ead6efbc4165895568c6d369574fed7cd2d294bbbdec56e7673928ffa4db77720d871011b7757aa90789e18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/en-GB/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/en-GB/firefox-51.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "6dcc54ba099ea5c6845b109eb98cee58dff6bf2dbf442723a3369bd673d43ffa01c7656011d6280f5588e4ee49e8214de327ac3d7fd92ea0cf10fc9a00a3ccd6"; + sha512 = "1cfe32620ca3a3fc5cce03ba13c6acb174567f99879fac86705e10d0036eea35c912064827676fe5dd0ba3da5bbc624795c3f7bde7546f15246b1acc1cbfbcda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/en-US/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/en-US/firefox-51.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d3c8f949401e6b9ade7e620e0c0f9324d1440a313521d385d7ed038d16628c70762a90a46c45eb74c6880ff35c3ac856e3a083317c016ece2d4bc8e740fd6aec"; + sha512 = "c8504535fc15bad6fdcf5aeb11a54ef26ef56d14076ac6fe06cfb530c1952118b957fc3cc6ea2c046af3a5ca90dc87655ae67d7baf66e46064382ba529045362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/en-ZA/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/en-ZA/firefox-51.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "802e89998c068af3712daebe727d7e865446189b436823175dceb325ea4c3aad8a0b4786961cd28013fa892d9b94d3bafd967bc8d3ebb40bd7d97a76a7c5bcef"; + sha512 = "80b40ea103d5691cff9df8373231acb151e6bda0526d27d59bf226f24e8287eae335b1224429b61676c8c9f3021ba77a31cfd3bfc68948d6553978fc570ac6f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/eo/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/eo/firefox-51.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "0204acc897416b13938127b4fcf57eae2abd50f4cead0124f3422efd4e9122c8d3861be6fc5da0d996260205b938e36cbd064d4f2fde48b1e6afcb2dc3f92f1e"; + sha512 = "a9809ec0e031e7e127441c11003bc81d8dc701e3acc45f137e7e68bbf1ebdcb5cf40267e9f8e7431e62506678cac04f732e73978ad566cd51597a1cb45eb0ac7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/es-AR/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-AR/firefox-51.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "1a35ab3546f2358d8c3dcfe85528bb42142fa44a565b0d6dedbbff95d230e25ee5627753de50d7868617de5086e8ff0d668626b17cf8f47c320865e1c5a4a3f2"; + sha512 = "18851295d00c2204b75c8e3d2d07a12ecdb9456d8ce41606178054b64ea5b7e9ebd3832db76412d2d5a26941494936c811084216525c56e4f017063734d7ca44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/es-CL/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-CL/firefox-51.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "9f389f9e5bbc30be888942f62dc35360d01d195cba416066321c5f2153f9aa8c7d02f52452ecf1f5d0d290c246066b9fb19f93141ffa0dbced4624495ac3c515"; + sha512 = "9a7dabef38bb5f0909f033950f4e0424fc2c0119f4bbc0de85bf76f29413b2984e0d56522f900055cd9e79916397791f0597229a19d2d6fe0f8850c09f9bf3f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/es-ES/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-ES/firefox-51.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b58dc439dc2186bb23e5e401db162717fa0adb90517660516cda553f00100120da2db07e5de8aefea2159537408217825efe1e8d843b75175848f1cfc88f6151"; + sha512 = "52b87c75267dc27aa9acb9a49ce9e59bf989f76827c078acb8d9166f60f0d86f6a0e937aba324e8e9e9ab5e0c721f75f0330199e16540809d0e8e9c068826406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/es-MX/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-MX/firefox-51.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "1d466f5c2c2f557fee8b9997fb9f17bedcdc3287a3cf972cb963e47cbf6cd3a440296ffe60d93a45394f83603445a31338f055835f965a09fe4f32839b628ada"; + sha512 = "e57f22ee791acab3792cce3f52823d5fdcced5befb2808cc717d0da4a876a517d52b2e22f4558c33ecbbff01a799d70e2e67ead9140630a0111d73ffa5e54de9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/et/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/et/firefox-51.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "c9c51ca82cfc0062576a230a0f78900a62a188724f7eecd3786e78e37c4ba410dcef2953cbb5ffb4eb4c9f750bfc70ea0aeafdd75378b51bdaa825521db0f862"; + sha512 = "572a6f67b10f1a4981d7f0f131bfb9900a20a094f34cb3eee717d7694e3c1b2a949dbe262a10b6ed22cdc97c3a99ef885a4f34d15268c6aacdc7cd28ceb16f8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/eu/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/eu/firefox-51.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "cda51c8a34b72ee822542da864f9de3d43a7448d5db77ca775eb7cdbbbc99c432918bd397f53a284cc30257793f1cf50d80de4621e53af99f61b2e6542a27751"; + sha512 = "8ce7450a27a26954701585a2d55616d98658295c122071641209274a2555e0bd45e57e17be715cd69e00187169501f7c8fdf419a3e1626c4a1e5636f36be26b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/fa/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fa/firefox-51.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "dbe302146776542e63f0b98149ad72f514195f7c3f7589a14d9bd96b36d60710bfb2df8a8a931122e58ff75909832a6d26366b171bcb2c78c08c17073726d8fe"; + sha512 = "f42a0effb6ff4210707371f6693e2bb25119f7535581c488760c237a3019e58fa270543f6981348f609c776bee54e76a220c449b7169d7032b2817ea1255eacf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ff/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ff/firefox-51.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "7e5c390195258b50f5e9a43def66550b11c1f410b21e69e141bc5903ff0cd6b9329a5927249078d64de31edfc8f711f6616f8d9e2432e5e1a03d4472ead43bc6"; + sha512 = "7718bb71ff031975bae785130c86c1fe007698177b04d55008a5175074f9ba33841e3939f80dd76034680d7409ba281162540757b4365c03e10fdc21317b3df4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/fi/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fi/firefox-51.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "152c5c7721c373a1d618adb8b89e47365a5e45d621c1dde7070c57ba34091a31c712920d465dbfe3b4fa4c92547249ea4cd296b1524e774d151d512b8931ccbb"; + sha512 = "9f5cb2d9ad20d788d715eae64406abc5fdf9229125f8a88f44de574c836af2943a7844ddbd96eb6770a5e011c5e239009aaf022ae6c0a14fc1c01dd2a9283b1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/fr/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fr/firefox-51.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "cad55002d699a0791496f4b839899d1c3ed312765e62f4c02fd9886b349f7b2bc9a531003c97be3ff75838d011cef2b82b7ff3a2d41f84a2189d098a8557577e"; + sha512 = "d9098b1b61bdfa82db7acc0f24fdd8e248f9fc0ae1c044829a27c45ed99c933fe7e8eded84cce9d454dd544b0645b2e871a00f3677868aa4efc00bd82dbeaf5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/fy-NL/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fy-NL/firefox-51.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "6e6e2efa9b4a5b9ddb745a2a037ac83838a6038f4f97a4784cdc9421cf8b673b51d1c814ab0b5e6114b27bb19ac3b32a42f15e9b0db052025246de53268b40b1"; + sha512 = "146b24d3670822394130e270b851beb3a4017818004ad5d6699b8424ca5d4dda16788668addb7f42b21980a6dd39a2c3546bc36d5bf2298b831fa83e957beefb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ga-IE/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ga-IE/firefox-51.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "da861b0bbfabc6dfaf46f9b45038794da940023d0428b97957f220f8287d081972e2e97383c7e3d31e4af53ad769ef23490f451929c9ab2bb58f3eddd1f02c5f"; + sha512 = "b1b38c876e9226abe24cc4379ae8a0d489db7f91f332560f922b3998d0c564f42730ab568277f4159bce95c1024634f20c918b97e84fa7915e4b841f9d0b760d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/gd/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gd/firefox-51.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "54c1e3c396859376c7d95808f39b564380a875abda74ca7eed9ee96947f4afff3088b30d6b7c70de830bca81a8abca9c0379733130be4617e6e44218a96ea3e7"; + sha512 = "e3b3191298f2a08ff52314aaf9ff9689e8ea83128f43010fa90ad8a24caf340e24223c8f5109fec2286a68c699bcfa98fbdca0c10f62956dfd768a473e0a77a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/gl/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gl/firefox-51.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "38981f59e6499e1f0d7cfb88a0a62ea0b3874a5b956442da0c9a2852a8c35e6885ba467084c74b482b1bec80513c37835a9dbc5372898ec4500f4de9afb5a71b"; + sha512 = "024747e36d569e323964b9e0c3a3922563c94c5679774a9cfade272d8378dfed987c291bc55554b0e0273938a3cf65f48b5924549f6962dfffb51caeb053b64c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/gn/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gn/firefox-51.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "fcc6c0432e61b90c7cf8983846d89fcd89c7b9a87eae2c6421194a8c26a4210e2dd7ec87be25e3ee291163fc70ea7703f26adc73137d4adc7ec09b09c152b071"; + sha512 = "e0487d5ac3730b09315f1b5b486fdd8359c78ed7a741ead18ab7d4951f9e079b80c1066a54f2b86988bcc8edab62971f0cc99e7d7cbaa97122d90e4fdc08298f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/gu-IN/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gu-IN/firefox-51.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "eb59334967705f215d5ab445e829ed1d1c53859589b08610d349cf2bdf28a36bc1ebb1bb18afcb8279790ebcbc6dab032bbc0389020959709d46e3e23eae08c2"; + sha512 = "e9ceb5eea20eb9881c87e47700dddca0060628c28f7a8bee4df1be45d7b0f9f7ced122e7bd1b16468853512f759691072a455c13ab98e642c94f2f8794ca6b3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/he/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/he/firefox-51.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "1202568d873164c3bd104ccccdde7e201a7e15b88aed1ea6f1fc76099df98fb074a99f3f3fddcbd46992c603a7009ce6dc769641737cac82755c0d2e5c410a38"; + sha512 = "68ef5903758f59df5e3bad14903734d470ee19cf7e3f34f112ff5be5d11b28e19cbb55331552a7437ba3bfea1d03d527690d0efecf0ca9e824c12fd2c5992269"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/hi-IN/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hi-IN/firefox-51.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a35c3679d390ee6bc1ace19a07dd3e96b4bac7147d698ebec42f1fb800c9f9f259c194140ff821a8fd84c0ba8171c5aea01257987b051a07a705c82b60ac1f34"; + sha512 = "c0bb9bab0b5ff7571af336febf1ecb07427400ef72d6a49fed3958a48fdb63a5cc8174b4365fbbecc11d4f7b646ef32d2204241d2c17290dda4b99bb971a1dc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/hr/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hr/firefox-51.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f3ee08747a0b209681d53fcb82b139bc75797f0c7b60bf35e55c2b702213fc99e99133d9be0df74a4b925d706583f545bd33d99b96ad5eba2e7d7308c4bec318"; + sha512 = "16e07aaaf4bcbe83dbe40ab688e4f40d02792e3793afa1fdbc90be6d7cce87ca3c8ebce27585eb24e899348f6bfcf3b471c73a0f09d0007c62e224710bbdf538"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/hsb/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hsb/firefox-51.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "22ae95d23ac80add17200e042e03830cd1e9e709d34e5906217abacdd626533e1e1c359e1312b2dcf44d0dc184e0d9c523dc870c04a759c7c8d7f42abc05391b"; + sha512 = "6968bcc314f05af065a7a8dff0723579c760d979db7186e0c6dd7a1ddd5c5135673ff940ec471b57f2eee550e5c357342115a2799f1dd48c2120d3404c5e0510"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/hu/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hu/firefox-51.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "552c6398313ac5e8d49373ac8959b3e39281a067ecceceef8d3d26c53ec276a8fcde181dc96072cd82aac8e952f81a821f87349a58a9f43c4ee41410bfc955c8"; + sha512 = "498823b2075e70459b71b60560ce7e458a8619e249fce237d91cdfa2a3992e279223586d82af35c2804eddb05544602f06925c8d24c76f9dc8aa37f8c5fa40b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/hy-AM/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hy-AM/firefox-51.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "760b31298a9f7ee58035089581742e3a855aeffa4ba7a2b34d927e52834a684329f8849201f348395f3224e60aed6540cdb76ca3c5a8fcb0d34c343317423917"; + sha512 = "3b86b1efc5b958b999303de303df07967d4a51f5b8853663bf3e07c19762cc273cb26c073d8bfafb873f09399e6299472a210148d6dca2494580f727fcb7ce35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/id/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/id/firefox-51.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "98bda73d7c1cbcccd64b186747e5cbd9a798704c731bf76f05710be945be08a0f6538d1cbf9a839d939371e57428a3be66feabf06cc6166aba27541599748dcc"; + sha512 = "27a7574ff31cb8bafec7d2882b19d944829ff1508810118dc4053c602313c7f5ead2dc6328c14313c8b687fb5bc369be0aa5bef78193251ade7461f178ed466b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/is/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/is/firefox-51.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f28cc5822333bd4497a7d5f5e494e551baba9b7c73f7eb303bc7fc3b907333ebf759ad7e05c0e1b85eec178795ecad4803d0dd872470ac6a55ec4f3856e6596e"; + sha512 = "d990e47ddbfda4c4a22a1c9f60b0aee13cad35de496c50c13d6f33fb6624e948a0c94a1f883a8f6ab94f0310fd3d3db1554b502c4faed8e05844c06f84d7bc23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/it/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/it/firefox-51.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "fa7c0cee7be57b9dbc48785a9320597d03a68508578be7dc0e0d465d30c0d6fc54f330b2f65bf21be0c99c9355daf93f53a7a3b0dc25eda2dd109ef7fd04368e"; + sha512 = "faedb800d78be5cda15858df073099767d521bbd71915733cb8558deb2fe3a6e90a203ae946795ce6f55ad7a6d35fa0acd016c3466286548e3d198a499d24bd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ja/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ja/firefox-51.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d62906737f20a0e886800f883fb671ac798b3cfa04303d364ce513040be3decac3da828578c8fb971908e14cfe07b82021d33f9c24216dc2869524fa2923955b"; + sha512 = "3063eb49a6076153cabf57d7006c6e41306c652573a4d037ccba721fc4069b9fe7a3ec1f65ac8b8f596a4b7493209b8b46f9338f4eb3141793caaa47dbf7e821"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ka/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ka/firefox-51.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "c4d445c52a0579bb6e38e1919a47e7cb26667a1e9b7c54a3d581d56cb55e810fc44cfaba17a89e65aff214d1ad22bb43141a2a776f86a9e068ccc0743c9dc202"; + sha512 = "24defb6af2daaeb42c850d876feff49504e3e93ef2e1a4c3d1b85a8a86c4e8cedbfdb86693bf7bf7e4bd2e096f6ad53ea877b6c1505842b731ff2cfe7a75c134"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/kab/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/kab/firefox-51.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "51971dab1d818c0360e351738f96083ebfc493397eb48e39ea2ff129c155bbabe50b591180f32ff6464c66fecaa8fd8b872e206846450ae8e6c76da21c538f8e"; + sha512 = "0c41c51f725e02e1fae284723547911cac5958352bf36f2382a8f293001d086e2667722e06fe7aa3ddfcdb24f60e6307b9f050eb15d4d58b7a9e0ef9e7a89b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/kk/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/kk/firefox-51.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "a7621c7f77f3315bbfac9c3587f05f726a65ba8711071f4f48bdb0e7cfa866f08f7c8bdc71b02a35ef47ed6572d899ad8c5a81977361c9e3845c4ccb84fe4f89"; + sha512 = "82cc8c6063359fa1a28d84a56500a0aea2fe7735dc695e0bb5c57445284e0d4a4b0cb76cd78e399023af83fbc00bfd20f0b17098a264aa6a230d925b5453112a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/km/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/km/firefox-51.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "f5748497701c5c66fcf9fd508664c6846eda0c353782a259c58ddb0852f49dee6bf1b067ea87be53047d31debcc3cd242692bfc831a8b30b6aa01303d9b0a243"; + sha512 = "a2a4d80aa6e9096cc8d11c101128e712079f3b6d3da9da3a9268e6e433274ebac4b0adb07da1fc63f57673dacf16ba91efce38bdfa3db9c4b4d1454fa4ecfb63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/kn/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/kn/firefox-51.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "bc82153cc0a490be1c0e8197c3bb5d69bfb3799cabf4ef55650ea9164ce68c94e846b129fe8988c5cfc9699141b6313add4caff4bba2dff48dc17af2e173cedc"; + sha512 = "5c202454bc5e221f14aa1ddcb04df9d489e1c036538a747315848b238ab8a8e569fa35b27e906bbbfa00b4502bb0f6a64d317744d5d3e82b430f2c0f28ee3d60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ko/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ko/firefox-51.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "e3528d611eaab0313edd3def0753ddad32a624136c32ea181807b0efd63f5205002a689d5b9ebadc4dfca8059dc4ecb236709b9c64d4743989c9a590a326698b"; + sha512 = "88f96e25f721e005acd51512e5f5323eadaaeb0fed0bc5c0e919661109e8800c3b940ba131fc788a82a8e6a35be37f9c7111c189b2e9d1ed4ba1a5a3503748ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/lij/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/lij/firefox-51.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "22daba4493e91d7ee15e7f9a0849f73dcde985ad909d3a8502b30a6e350cf04dc98fe2728068d2f3d8b7b5106d57caaaadb2fae70d49d50d893854b99a926485"; + sha512 = "9b5bd55794df871bb7a622ded9bfe3b85d2edcff1a1a4bf5237f17dba98e3af53f70de48636c0bbcba68c5c19fac08873607094492d03bcfbd7550cbae9e4178"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/lt/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/lt/firefox-51.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "8dc6e28946a238db81695080f73b3502e0f88bdb2d835c88574f79ab25896162c84b9184a37142c8ca1fe3b28f42d87be9e88b59233dde36287d5b05371824eb"; + sha512 = "be075ac4bda511c2bd81e726003f4ee680f35022e84365fccae090305c45dcc586162428dad944bd59b7e3c1f836e8b07a2a78e5a28d0eabb6aa44877398650c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/lv/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/lv/firefox-51.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "f289cda83f46ae3d2343f66bcd007d99862768ee48220a92e79f2b7941a2b2a56ea000cfa1986283e2fc9ceac749f264f122503f1bf71676888473bac9841d47"; + sha512 = "0bd623b3203c1403ca187a3b25abe0e438ddda0c6f5d4f947c0643ae3f492c649cf830002f7211853050b15e179a482677898ef0d93d32c5afe34ad6e7040cff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/mai/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/mai/firefox-51.0b8.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "34aec0414161df6ab435b7518f1d522c4bce6eff415f3ff103d31e9ae6099ff6b3be03099a0f5a21754daebdfff852193e2bb93ee52d622d26644aea94d72aee"; + sha512 = "b406ea5ddf4169961cb11104186a809ca7c8a69b124e85e796703326a37ee18473e4f0b430d5da2dfbbc38f7ec370951a5dd0c73be4f9bf48da771bb603bf38d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/mk/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/mk/firefox-51.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "10696ef0643af2ed0a7681f6679c6eaef375ef1e193b0b0e315d0ff4aeedb373235ec4e8d26fc562887361ce659a85163c276ed1fd4d4563dc945c7281786298"; + sha512 = "ae182c6ffd7fcb3acd396e8d9f4b2baa65942d78498acf7a0f3efff69cce62812c2e60c937611c29116a45c5799625891f39e25ff499b7d3e4f453f790d8e8ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ml/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ml/firefox-51.0b8.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "ac0a334c3beb163351b4fc7eb42ea8363ba9667a52cb14c59f32c404bc362da957f22a44d49f09299c73971a737685d8a93c1fe4eb456489fcab2eab1be1b6b8"; + sha512 = "9dfe1593bdbedb6262e7cf50857036a624a3ae13bfcc853dd91fd800d74f831665d8c89832b5727a9bd2bae3b4123104dbaaae1bdd39918f2c06be2fdf0a5c0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/mr/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/mr/firefox-51.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "b7d89ca6b79661098ee64cbf945a7080b76a8557f9a2b33fb18b8166bd9cab9cf4c775e3460bb4637121c6ae2159786e185c33cd8eb819410edf71d8d962ae6b"; + sha512 = "2744d4fb88f2713b956efdb6d56fa1ef7e003013cb9a526ab2f9e8cfeb915fa3651978a3d863cc3c4dd62a447bb8cdde402483701b38cb206b99eff5fe5272c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ms/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ms/firefox-51.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8f44e7510675d691a4735d13169c529414942b8a18c8106dc220b53f4d85f9c1284314279ef5cd1d59543baa60803f117796f2fd2d55ecc01a6b67314b1e23a9"; + sha512 = "4a313418db320dff4f91f817cba054fb65b5e97a434a6150d4f3373bb788b18bc02b194fc8349e5f41e1b8ebee94f0874431759fe79ed32fe7f5645f25c4e297"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/nb-NO/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/nb-NO/firefox-51.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "05ff88244ec7c715e642c62a2f71980e94346624db05b35fe35a605f8c9bf0fb661cd0aad8ffc7a290a3507711053f7d31573d4e7e82482de63db3492197a7b1"; + sha512 = "41085294ea372990b058e61942de5f2c972511bb22a1719e92275e4258d6c0c0a71ada6ab21475c1b32021fddf5b149f1dccb469a948050d901b2ddfb91886f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/nl/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/nl/firefox-51.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "26ba18dee36247d64447b7aaed71795e582e86e333e0feb95f1085b26508299044a970fd535bf57f38e0caedd116e10a3eceba05c5f1cf92649553d6ad95d1d5"; + sha512 = "45ed2265c4d6a66142bfe117794bd950e56821d377a5437c9d0cb8405e7605de617cad3e92ec6aa71129117690591fc95ba5c4d9e662fafa408c3e018845e40e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/nn-NO/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/nn-NO/firefox-51.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "61a99b54b807e518e62813e76606111737904c20afb73c12e5ae866476f829a177365a4c8c9d36bd5fa2a355f512f556fbc9bbc7d1fdb962535dbd6340907b04"; + sha512 = "1c981c33bea1ecea733db9c278d92ef42809a4dcc0ce8f9064e08b303a56970099b4f3591103fe262a777c4ded9948d9cedcca6d2046512851544c8da774a250"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/or/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/or/firefox-51.0b8.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "4640280e8645f2ac9ec96a5b02a2705bcc96f2bd3d25c6456a5d4b0a45100f264afbf618dcd8e5b211b2c8186a2ed8bd0e306d95b118e52bd6548caf5f32d58d"; + sha512 = "3c67ad9f3ae800cd2e0665f35cbe92f17337c5f2568b057b9c9baa7aa8c91ba4f5b1e7718f288a2cc982ecfa43241e992e35c798e833fa56c636f8c7296d5a55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/pa-IN/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pa-IN/firefox-51.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "0898c9577c92d92e51026948fdd1b201e989ca1b0ef0515f3a22a9ab2fc0932b99d859c90ca0137a8bbd913c2d5f873a77b75fdbf01c330064ed2f854fc58dcb"; + sha512 = "9778843430f504faae4f8e138490a92c14f5f0f1c47c642f7f1f81c90a37c4cdf0660ad5b134429d6a86f61bbbed0f285a41ba315b9c318799a90f3208cc4a3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/pl/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pl/firefox-51.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "350c67a48d318bb19cf4885718d336f3242a648b40e0f79096214f4fd6254882ff1af2a50111424a00d2396fd1c481a9ba1125f098794296899cf306269993cd"; + sha512 = "336a3afddebd687f62753f0bfd6b7e57884cbcb4c536de2d2a85e9ab22a696bda55795d5511ce299d34eac20abe91032450ddac97fd2be9c4b8db6b4b0fe6c6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/pt-BR/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pt-BR/firefox-51.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "3d986e9e932156db8db994484f19519dd5dad00e4edd04d5d2510e1aa1c9360e0cb01f9369705861e806796cbe246c1c79882320caf91a59fd400b439bb4db8a"; + sha512 = "1908080393d171ea86a05277a4a0d67c0c054fdbc60c5a9ba76fdc92071e45ffa57750bca8b1f56c65a4a45d296399c1cf3e9c0db8593ae57e7b8b53a6969171"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/pt-PT/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pt-PT/firefox-51.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "87614bfa16f6bc89180775331a52054a597ab54232a92af0062ea47b8a1c348d9f20b5802e2cb74f1619120eed56ed02bdc705e81f5944798ea2261384764d1c"; + sha512 = "eaec79b2cf363f613cefb2cbbeb3a5b607ab608d7e82ac21aaf4b591475a85374f49f34c912b569ae3fb8224f19b93d753298ef8f6db820fdb84a70b306b16d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/rm/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/rm/firefox-51.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "24239e55efc9ec3979a0ae64cc977ebf853817b358c39266099bf892fc6cff7bc4e3adbc927684a95b4abb9ffd08877c5f25b2e579884ca93e0dad8a717a79d8"; + sha512 = "f6fa58d42c155552546b7500d6a0081b3c02c3cd300c0744e4a964b97970f1a87e9754e126de346880447b6af9853a91f157ef5285a2db1a8fd677c46cd0f347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ro/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ro/firefox-51.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "90c0cdc6d9fae3620770455b80db01920685abe7514b2b112af32ee7554d0896e4877f2f9ad38f827ad8cea9fc8f9f0c6b97c049d7e98cdf20612a50018bbcc8"; + sha512 = "876be7fb744a6887890671e00d84387c71e5c77ece611646e721eda3659654760094e39544a2bd3b6e80b075e7d24acfe1d7e86dcb4003efd867b2e7b81e3366"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ru/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ru/firefox-51.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "8456ce7fe9ec9ae2c8e4ee74ceaa75417d33559e84277350ae058a109f3b8cb7bcc52e35684bb343f8cd3f020df31c26ff15d4e6bfbe4d89733bbd4cefb307ab"; + sha512 = "52f58ee2af336e18640b1edeb54f2c632104a1cd40952509b512af5dc838deda531e850e0b56d605bfad046af34db1158dbd69bb25380b80a178f32083d148dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/si/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/si/firefox-51.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "5947c45892fcb7f1d0beb429ef12448242631c14e568495d6c3a1e21d01cc44e316ada5c9d9099e8835e2abfd286589622b25eb8730ef2fce9ac18c6b854dd01"; + sha512 = "0b36230b9d214793cbd75f282f537e73e28ed37efc9f17e4aa0f5dbb3bdaee5b5569708d99f4cff772767e074a2b85a7079e48acf7aa31e955e6ae6658a779d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/sk/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sk/firefox-51.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "8b4a24c9eecfc02ef1dd297e98590471ec3a9ee37abc248f06ee69e0b822537765fa1d6dc255c9424e996af27f1cf6f45f50728d2c2be52b8e58ed3e8c1cef7d"; + sha512 = "6595aa0a2601005b0488e8ad02f0f5a8b96c4419beaf9a88660e111bb6e932cc98dfa16e511e0af2622360635e2139a8007bea5fd61708f4558576ad54da17dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/sl/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sl/firefox-51.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "a8207ba7d7606e93f6f39ca9e05320181353d8bd05f519196a20cbe335aba825edaa1403488c539ae9c622949d6b9c81bf5a711cc1118963e8a66a12e2bc5133"; + sha512 = "56fd9bb355c5dfc680a7a91a1686285a32e147b1b0a72787106fca5244277238948ce9635f97b7c3ccd59d7999c794d4224bf4172384bcf2a02e0aa9d4716633"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/son/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/son/firefox-51.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "c3b34c6e958344acb66101712d4ddddf4041e060e45037aed5e35b8006d37bc92d88c9478538a2e3ba0dd14f78ef0027a3a4f569038ba3fd06ce3c2438c48a34"; + sha512 = "6475248c31a1d5199d6a4dcba9c98eb3a0c4bdd57ef37c5fb611ec68807658ff9de9056c0a5ad9e016e55d8ccc3ba7987948b2b2f47d6c3061e3f4d13051cf27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/sq/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sq/firefox-51.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "27ea36701359e9baf447434d34cd4e4615f4e4d1d1a82cf93e79390320b0f76ced36784d66fda6354fe5bd5eed8bb6c74306c922880b8d42097abbb34bb0b6f2"; + sha512 = "41b602396bf33e36974c97ec25f120ee7452df5d26caed74a10835f0fa7a9302aa87d0fe09fafc2e6670d8ce859a8757a7e7c70657b29a7154b1501e478510a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/sr/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sr/firefox-51.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "06b188b1dd9113a51d2cd369721919ff6132cceb108304b485c9d42898cc7b20d821ac201102af4652f157ea56cd7e17b5bd09ec645243df7ef8e2030b003d2a"; + sha512 = "dbc7df70483246003f27acd833c881b3ae6ddaa9e93c7e612334923e63a1a4bcf35c082d355d67425fcb72123039ee4b33a5ce5f75909ea6cc3990d76dc21c41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/sv-SE/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sv-SE/firefox-51.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "b1d35953186b4fe3a1a823cec5a399f81ffcbbb2379e488805de10751614300994e4ae6f5e68396d2d45b72ba2cde0874690a8c7d47ab224d1e653a3ff380294"; + sha512 = "082f21155e8c68f8e1f786a3bfc3f832637813bda06881f1b6ebe8a1be85bfeff03100d4a9f311ea8bd6ec802e55bbb674eddcd9551db6a26ae32a6a97535bd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/ta/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ta/firefox-51.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a98aa3c2ef28ece7ef2866af5f0044f195ddf56152131d608320dc211f5eb4d5f5be0a95e138598e32d4160baf29281219e6bbc38349ca374289144dbfbf94a5"; + sha512 = "51bf00c2014222e0d1b30d83a483882930d87d5f281d6b33712616769060dd4b1c5ffa92d30e0e61effe2392490dee43e1d49cd6e28c28bd3b94ef005b87846d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/te/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/te/firefox-51.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "b2e54cb4ff6421923e20be26db7ef302715a29f49c4c0723191096aad9a910e3f68291d932bee6f5a26fb3f85252a2cb89434dbf8acc2ff19860123bb00ee18b"; + sha512 = "83a879a6d9b96963e3370068961559cd530695cfd7db200fb8bff7d79ed01de0357e211454f9735b667a1c65ad7338da913646709d9c212704f2dad0486b3d24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/th/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/th/firefox-51.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "e3682094081d4131e68a9fb4bab81a5430fe4bd8cc1903f24c48e110313d3489e338d58dcd6719a28d5363bb35c734144a695c3e81d1a805a0f20679a52ff645"; + sha512 = "d49d76980c091d354638a2c887cef68e762ddcf9d2a7c1ef74d1d735791949928a6fafa270711a0f776e51410b35c9b396015288ceb5992969af88dd3dea990b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/tr/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/tr/firefox-51.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "29c9efc3253770b953634e6f2d09cf82245c9b580a43103a28a14adc795ae307644edf3dee65ad4d7248efde6562485750f1d976eebd413f339044774b9660fc"; + sha512 = "642a6be0577f16c0c4ede21a82cf6c3866011c3b663f7ce7c15961eec7f01133fca8bebd46dc2cb9b91116ab7cb1060f04e9b4e208eaf6a1ddb3e64219a2d5c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/uk/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/uk/firefox-51.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "33790606f02644a0b99b43a3e7d9df77dfbea8404d8ea2ad34ab81090fba6fe4553fdce83425e27a5816f8af0725f598efa0cefba755af537f1d0a953eafe8af"; + sha512 = "bd72d88ff7f82b195f6ce44ab8d9b7541e0564ae7b6cc6bb9676a38a9bb2a2e23561f07006749de5598da1c6aadc1e90d0ad2a5eb1be0f998b4d36534a075afb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/uz/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/uz/firefox-51.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "24ad9eb31144e51e69653c50501ad2c8e8a5c40d13464da3ab8af464cbeda9fc37a47401987f48157603f679ff281728ebb10e686659f1cce8db764a4c0b3216"; + sha512 = "242b5367c7e78f0c753ebf4f8a4b1d1fd42e236f7417a3dc441a9e72c071fbb9488b226214cc14991f5d12c514e53b35de3c903ddbe5fd4aad31e53f1a6516cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/vi/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/vi/firefox-51.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "1b5263078040636fa3dda434ab9433c96e7ba4d10460174de5d5abc1f05de8faa930ee1fe24dd9f8dc05bc20d6087d7657bef390725d446a4ad292e2cd06ab7a"; + sha512 = "d2cf85b0592b3116de4848665c5726f40d3ee2e7b92c808a7a41f0760041fb5aee1d61b626d9fc427a8b0bbf697828ed86741a1d319e27694b51dde630afff8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/xh/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/xh/firefox-51.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "97ecde3e48e7f3cabe8b80db7c74b34946407831aebecc87fe5913a8622b866914d2a6bcba8166c4d8e85b35eec43eec337a2389a9856d9ca48f4694d61838e3"; + sha512 = "c865f0b18d427aa364f512b0e5cf02c126f156bffc4db2ab50f32fe9d28a949644fc672fae9a651a28ce6119191b6b0cbf7dfef3e102266b790fd0290d3ecdcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/zh-CN/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/zh-CN/firefox-51.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e37d07897665c195648c7b96ad47487bbe1671f9aedb06e9e5ca415dfc0484b7a13171b217866af1ab29b2e3376c45bf382e9d9bd804d57030ab401eb083560d"; + sha512 = "20fb7a5ed74e3badb56038ef16064b1fb92c6bf274341db0aed52427e313558846f34372cd019730ba0593439e6fb127241ec02906a76b5a7139c7ac45960783"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-x86_64/linux-x86_64/zh-TW/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/zh-TW/firefox-51.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "5c1a87b1a96149f67c3213315c13524cda3d29b47ae078e22c04685de4f961c3a9bfd77a79c48e3ae619cf2bee7f035c725e480337d7e3491d48abab1bff1aaf"; + sha512 = "955bc613dfe9a968bd298b6cf038bf7db615ce456de31da656fb54c7f3e8126391154b49b1948a95871ddec04d03a51b543b9248498b661a998d40249f6e8bd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ach/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ach/firefox-51.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "9922d61aca30e0b95209010be736dd144c3c65986c08852798997cf3cf8e4969f815565bcdf1f0d82a81bbaecf3f4cf478cda66a2cd757f36043717ddce3385d"; + sha512 = "cbceeff2ef8fa20f18ae5106a6cec638bb064c7b32fdd9bca83776bd58f3a579babd2a6e933e0cee9d0ff2e553358e136ea478b629317a1892f62c4c52f47e22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/af/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/af/firefox-51.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "cbd0e1e659c0568ee66004664cb5277b1df291747fa22d5dd2b0c68edc59ee9efd3bdb14c6ad60509dc613e80e955314c50b589a5aa9ab52dcfb7efeb8a0772b"; + sha512 = "76c6eff9a98743a64d387f3a58830b7583510444fff7bcec5daac6fbe56f068925491fb2c8114302f862ddee3d4bce7df4a1dfd1057a918f584de4774da7ebc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/an/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/an/firefox-51.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "c6705fbd66a251d3427da98d1efa67d7a3f8683f166b7daab8902480c009b4ab183ff1d4f2242628ce3c11a828b74c605d5c17322234cb7972930174a070bd41"; + sha512 = "6152904cf2cb33e6fe63b3c573bfabed1915b538d028be9fcf7ad3c169c98899becee772bb803a2b6830457a0d93bbacd49e8c0b962fd1898e8225463387e092"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ar/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ar/firefox-51.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "d6c91653320898857096b209f2572454351edd4aa4778e8bc91a6628870ca476f80ed48bd17b651e4dcbdd75013dac2b325cfe4e9aab6e62fbeec16f7013e8c8"; + sha512 = "a83ab8633fa7658669daf271db339ed5812d0a85a9eaf313165671f11ae6d50ac92cdd8414945dc6b374a8a46b68df241812e8c8396e9256521ab81949969b6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/as/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/as/firefox-51.0b8.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "1fcd00eaf90603969e1e57ab486c088d7ca769c67382398caf1d0217134d6a814200f4c64a6ef8a5a58647e3cb0d45cacb6cf2cf64d7139443077905e4ceca72"; + sha512 = "2a76a7eb0b3015eced2a4a83965d314753e44232bc333cccdacc8a0c207b5113aeb7b97fa972dfdaf6e79eda03d8e18f4d8daa6ae3f8059d75e1245ff5618173"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ast/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ast/firefox-51.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "0314d493a15bd8069a6fcd4c86036e300ca7391f9b881d355065ebc248f9a4242787cfed6f5d13c7de828340c9013a325f011995b9544610aa93ade607334e99"; + sha512 = "91d8801a2fffaadee3635643a813d588650b318d9e074ce3284f97795408a9d513ccdc573fb083e523959470095ffabb8023f250e7b3abf7f94853f126ff42d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/az/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/az/firefox-51.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a63c05959fc74bca79f6760a31ce0be0ab19ebf372a83fcfb5b2e1807e025462f4fd6236f8848bc2f6066048862cdf6b68fa66de0aa3a0b0d7c65ccca097d9d6"; + sha512 = "abdaf4dcaf3ed2813b389fb91adee89f796d30152374110bab10b6aa1b328a406cf9e572b2d41b5ad9827928f8d5249c9d6abaea5b0698ff2840f66ffb71b656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/bg/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bg/firefox-51.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a514ee7d9acdb0dcb95a5c02c8d786481b1d66b8d7de2c8c05793a330d711dc5b0136a822dacc6cf81e338a9e3eca93ff9a25fef457739c5767bd01ec10458f2"; + sha512 = "65a76933c06f7d8bb71ab24e28f6e755090f8eef8cb7ac741d37c8532d20aa35eb119dcc0f7e28a97dec34a3720b79f869f8adda079b49dd270227bdc081d1ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/bn-BD/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bn-BD/firefox-51.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "2738e2e97d52003b4f9b55e8912bceecc86a23c4e1db432db9e9d552e91c33bf0e523a924fc1011e45887b9432af801fab93574d808cfa1dbe77a0ae6056a2cc"; + sha512 = "e6cb0cf7469a125da031b2e9bb4d2dfa90df169e6a61f03d482e44e9beb19744a038eb1922ac31812732d0e72419211894bd5029e16091741aaf45c00e72c14b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/bn-IN/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bn-IN/firefox-51.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "c88648df222958a1c3c9ac71e54f2b248625a6637e46c2f39419ca3c57215f5af8ce16f4662326d24712f4cdf0b5f533e48a4bfd903e5cba66b579384d3bc7c0"; + sha512 = "4018dd322a92660780cd4e9ef9c8631593c34717d2d1ccee1a340e34c8465ea7a5fb196f39292c3f502f7458bd4790971a443cd9c16f28e1112417c8eed35bed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/br/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/br/firefox-51.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "a5b160f8776b396dd837cc574cb4ae625e58afa0443ae12ccf857d52b5d5e16d21bea6dcfe7a77e52db6c038541f01efc78d4da0de74625992e3d833f84f0b94"; + sha512 = "31f75272fa7a747031697505505f8362589f46986f840fc8325fb95c0009356d4fbeccd33e20e923c49df91d7af40c948ebdbf35e6d2d48b734055e33b1a19de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/bs/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bs/firefox-51.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "18cb9436347d690aa1c7900f8eeaaccfcdc585c3ffe921cd77860596cb8cde01174d709d03489483b5867fb9d647baa9885673b983037656f020d245f4159da2"; + sha512 = "888c6b2e2d79071710d580da39e33dbfa4392b9995bdfbe16a7c4377f54e7b9c81cdd4864fdd05d2f376e1d6650dcfb5dc94fe67e3bbbca55471ce2f62cc4589"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ca/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ca/firefox-51.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "db8c8aaebf6679bd28d615e1e2304285ed0848906f93425a255171f48d6c75aa40fb2d88f71cf85eff3410d199032ff152585e277efe78c69440778705ef3b26"; + sha512 = "87971a8c4bcf96a67fc370778274e2c35356b6239db4104740c16b281a45d45b03e4c8627c14f1c6f3ac5702784134c743f07998f3db2b2a8d4a2e6cf9c0b97b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/cak/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/cak/firefox-51.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "47cbf1f054fa5820ce1f8f769ce90ac26758f99ad300069e3a6c029e01115c3b12b08c812ebe1309667c17c1640d6cb2e7174fc6e050db8f013003436b7845aa"; + sha512 = "047e10a19ac8fae5474820ae26429711efff76e84d9f58b0f4b8a36d7f5c45fad6c46402448c454c32b3466de3618e2b2a392bd186361466f7e87717fcda4108"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/cs/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/cs/firefox-51.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "8c5f82a831e31c42629f5e6c6406d5a1ecee37506b89cad845abb110b0f2b5a809ce3e81e8a70915f993fa96891fca4a5e36ff778bd45d23d2671ab55da9f874"; + sha512 = "7d7b4583e3c6c4e906cde2cea8cb7bda2ce4cd007640b3e681608651e6f414675b7039c1ff13678947d617607cef407382feefd44ec1fe1534b9abb0b1dd0d7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/cy/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/cy/firefox-51.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "77080af629015197663e1e3de1feb76da0ccba3ce1341cf7592ef8d6d0b477f1349d944762d1e810d1cc3c8a0eb23bf44f73e7c00d07d1e9c2a0bc2e2c1692eb"; + sha512 = "768429d9772d8e39d4230fac01c4bc6fbe20c7c2efd326e78cdcdf74382e3a38bee9bda90a1d97b61035cb35b5be8f337fd80d15d4f185a6a668f68afd3b67af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/da/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/da/firefox-51.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "d082549257e17392f75485548b1ed8062e155687c3d2f0a3287ec5139e6ad1db9cb4a8a449ed2ce18650e07719b03a3dbe1ac25589102c322727767a6d663dd9"; + sha512 = "a6e435be5ac73d683ade3dc29bd6d5e0c4ebea30f8521036650981b510d4df014891f8eb65a5a6a39855fcf5e45d1b393617d7c16071812952c635725bf206ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/de/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/de/firefox-51.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "0b58e025fc3490c6b94df2f60c722edf909bccec3264bb9f618e54391cfbee8800a6ae1a2c625f68b975daae73596464bb53ffebbedd545bd4a79e77c1d9ca33"; + sha512 = "7ea17df3c926546f1eb7ec0880f7b0b63cc8201044b444280b31d2646999ad36ac10ce74e19794ba7c1a026f860c79e83ce6ead339865fe31a021bccd85f04b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/dsb/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/dsb/firefox-51.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "4f0633677c15ce3b9a4d3bade50c5d4e18c76b898cf82a6169213674220d4b82132912947aefdc2ff90e6e639224d76f3508242d664d051475366efeb4adf84d"; + sha512 = "0e75929ba5879fbbc269d1fe8e18627ba54c5f74edd3179360998c9aefbf21d1f3c3cb0860990e7b1b0a5f5037ce9a4779c3edb64912f4f13c80501e579cfa3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/el/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/el/firefox-51.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "089054405ee749b30895a8c6cd83a630399ef9cc493dd4f50d0654241ab35ee63c989ce03996f0921820ae701e90bd7af7b6a0058ecba25aa5272ba151da9f02"; + sha512 = "b682e47f225a270ab421b3642f7c28085d9f2f1de1e68867ba09e69fed3d9b5908909be46bfaac6e9d0d1243eaad3cfe2bbeeeae6a5b9696b0ffb901a98db50b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/en-GB/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/en-GB/firefox-51.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4c4ec11a0642efe15b82991e8e3d614a239dab86866773b2ad966c45d928a0b6cba73c65bddbd0233cce0bcec7489ee2899115a8e38f02db1490a5a9814a5c30"; + sha512 = "aeac6a542c1a4f91ee6bf01d4c916f8da4628b36550d80a166dc46c5c9b1a010b5201c87613e4d59640bdf9d2f9d029d0112bf8b62c7707e99b928c4ec18babe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/en-US/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/en-US/firefox-51.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "7c53368377d6b4258ba5a64fe16af394b514abcf516d04551c7fb22ff09ccd4fa37b0e16a21af179329f78c8970179b4d66b2882ede54960e9a7524403f7e7ab"; + sha512 = "1315208cd55f48ee05fcfc98c92891307442dc0bb34bb636e14a88701a1fef2229a62a0e8eb00e8028f460518c95c1369a198666cf67c4b09a0e69c2b76c75b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/en-ZA/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/en-ZA/firefox-51.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "f774c2c8803789dfd335dd6bdcab442eaffb2b7bdc1a3a59509060af8e1baf57e56bbca17224038fbadef1168ae20063cae8e6f98912ee35f031870ab65155b8"; + sha512 = "891b4a076239132976a4cc51a3a374fe244b6a9119f76303253d6ec9d62b8230ac9c04b657bc741b13ca291a9b75a7b38a4aa25471e4faa6f34f06000a7f2fb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/eo/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/eo/firefox-51.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "103dc2a263d1eeb0bea61e3ddff6d16e399501c59a61045b5821654af7804bac571ce6fceb1e6616da44384d910005cacf44e515028e5da8ad58f1804298c0be"; + sha512 = "f805e9bb3d2241a366026354433670c2792c16c74ab2f5d3691081f682639b23c4e6d1e91e5e81719601c571e74270d8b5bc4f24e7babfc77ee435c6a2125ba2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/es-AR/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-AR/firefox-51.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "dc3f7f830ede78340d323f5062edc564fec3bca2eee32bd88d729227e8b7cda4739e56dca54fd7d8a7856778843012b3c52acf4d773ab53249ea8c186896b7ab"; + sha512 = "df78b4626f41afaba10331cc8921dc8f196aa2c8669366ae286a75e8850a647e7288964a8a323c742926d7661aa122072dcad592654dead9f57b8c008b61f7e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/es-CL/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-CL/firefox-51.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "ae16ef4d94c2b75bf57f425aa670ab71525655a1a092d7151a513c783c7b4967f5b7e0726e4aad676615165d84551f8ec59b7cc8ad18570834e9abb1089fca6a"; + sha512 = "71a340f8b004f3907eb763bcd817338be19955ef447241a6a680381823591324df9b9771425255693b49513a8f4475fa1ed8558e5a510bcd370bd225469a5f69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/es-ES/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-ES/firefox-51.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "cebede3a4d5750f5b7160dfb8609faf7c73892689da08c7b93b87b6cf159184e04016b3ae92a49bfb8d40c50ac45a8806ac45c30b436a466875cedf4a0270994"; + sha512 = "a34dc5ceef8875bd5d15c61ed9ada2f62b52cbe42636675cfb6a3df694a0fcbbb3b0dd61c3a0ed5b18e7ec427dfbf58887b91a0ada596dca04b3d2cd066123a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/es-MX/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-MX/firefox-51.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "3a263de75799e50ec08961b0f25c3e5366129aff7e466f9dcd8820f1f455cf1ec959ac9a4388ae8edd92f3f5a1647068cd699b809f1e4de9ea9f3dd25b4a4e4c"; + sha512 = "a178599eb6454eb9a463fea5704b49c720cd2f9df033bd6f271322c75a5f2f52e82661c82f9ff9097af28ba617e2393979b28209758df3710ecdf72d0304c5f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/et/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/et/firefox-51.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "70f2d3009b715e27b350bcedd6503a311db8a2c6c75fa29eacdf13a8ea7fcc674680f59dfd18bc2b0440dd528d8e63bd885ee5ff3dfc88361efd3fb137ff3903"; + sha512 = "20e3af6d1f7fb7f154e366ee5e031889f3f24e04691a3d2915f4405f33e7220dae91e6e635ae98451048c254b7a08900851f013e7979c013f84b643635ecfebd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/eu/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/eu/firefox-51.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "8cfcd9b768bb83978697db322ead6afe39b6dfee7c05b1b4291f2acc9f84e450c79f419b3a158e3e9757c36d739ecb4325ac51d129015309999b5b0cf8f53df0"; + sha512 = "d13833a0eeb5b4c37baf6d1f85adcb3502b67219aef6ac5b5d25914fae90cf78284830acba0e8d6c76d8ceef7fbe3332d673be125325b9bf53f24d4b070e6998"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/fa/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fa/firefox-51.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "470b4d9545479ed1f97059d4af318c7f38aca6bd80754c0e56c78912164244b4ebcb9aa697a653d608bd26919f76fe0a12dcd02423315570d91aa4b822ef2e76"; + sha512 = "fc4a1d2c1e635de2094a8fdf3b082c0407bb937f089ae33c0f429e0c0bb41a7c0cc3158fdd1d01e81cbd01213b452301e2ba83a9dce1810c8d7c8adb035ba903"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ff/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ff/firefox-51.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "725c8f4e6ee92877635993bdc83b5d6098531274239e74399cf94c156dd0193b900564a6a1c99b2b57c896f43b9769ccac1d6f280f5338e407a07a740ee4ed2e"; + sha512 = "1e4626d053e7abf236fc795f59e7dfd8053048fa1d0d8f4585efe7ea872a99511f9053e9bd6a1ae1af22cb3ff399d16d33c1b45a7b3c6557bda49062d1c672cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/fi/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fi/firefox-51.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "8ce26856aafb9b496b703c5446a9aced0edafd21c321496021da83efb57514c38ec4065e0f3bbc79342eaab524a4592fe7d5757867bc7af778717857d1701b45"; + sha512 = "dd8ea8dea6f76f3c5dee63abdc187f69e949e0b6b11126d4219b38d1314ba6ac77cc789e0923fe9efb26167200187cb236a783f7aadde64f20798d44839236ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/fr/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fr/firefox-51.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "3b5a92eb7c1871551b16a4374713df0db4d9af2d288e4a1b4851ad805076c7f4359d164ea1079ea6a48dd42f6496bab748037c7fa2f3be338823279552726f87"; + sha512 = "9124a3c541879fa6f886555c93b1e07f431eef0d0b864cf414d2bf5d3cd749e30c65db4fb85a16072260f656598066cb8957d667aebf07f9067646e11fa09ad1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/fy-NL/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fy-NL/firefox-51.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "807180c0e71c13ed5e9081c135b9de19b0f9ce60998b43d6c22364a6f07d9b8e835993e5a12d8c81f3090d48e53bdf84d43f0a1c5829e0e88b273e4e1eb92f1c"; + sha512 = "2ff6aed7c4b172b5dd801d180a7b7e945a4f39b8b8001e673bfb16b868a2079a2c741ea1a0b44c6588468546e883c6057fc4787eac64ca9b10860b7d538fd72f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ga-IE/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ga-IE/firefox-51.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "a7e2fa69e0a9eddb019874c450a9874c9b302084872c536f04012990898e7a9fabe0eeaa1052a1888dc21bff54bb0872c3bce9c4df6c0026caaf93e1ee8fa533"; + sha512 = "163994a889e92bc84999e0c827f7ed0d162b43b1046a0391a851bd826730ce1199fa54a0e5dd549b3f30e197a8535ac5b4e1cb99f7f7a8706f7ecdd5bc125cff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/gd/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gd/firefox-51.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "9d61356a39ca08c751668969268fd219ee35428d9353f2cb8862d9552403dbe8c05ef961e0694eadaa82de9207e90fe5b349dc27a4d50981c6eb83f59617af85"; + sha512 = "324c856b4f0505bf5481ee57a2549594739dcec8b2a57ff32156c724adc001dfaaa2202b0b66a30565061f4ad8719bebb382ac5961c960f4991e9ab6488f2195"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/gl/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gl/firefox-51.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "d72a791e014c7c5a6f6304f35c74f572de4ab68f514598fe076d6218b152bd12f2a764262888faeac397f802849920adfe5e97a3b7d4331e43e4ce2de75aa31f"; + sha512 = "1b055c927c318d09ade13b64e50cb6ed03e10676535c9171ff3867200e8c79bd175b08b89377a4ef86f92f91977cd8a6cbeb48ac8beaf6576707d14743299227"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/gn/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gn/firefox-51.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "c44d87a70e45d31412f38d0ba0a25a1b58d661d91c7a9b6deae19ec40c88da4a480933ba257cb83fea4120d31c3f959ce9c5ad0da4c10247b5fa2c68fdee6aca"; + sha512 = "7ef12effe16f92e87d98c71cde4f3f7303674b124a41d174e57a9a4bbca0c6cd33cf8f39bbf72fc693355b5a054fc8c6ef15228751eef52a1599b280c9a17801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/gu-IN/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gu-IN/firefox-51.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "a782a9bc8a2008a37feb74b4acbbb679eb406fa04745d38196f16304275727cf2215e301f3f25df443430684dffe800534e6f7bd7d35effb2f051895b8426825"; + sha512 = "6437e9fc0e171f48c335fc7c6b7ba327dd9419dcd293449ecabef1a6a6546dc70c38099abdd42e5f087290a256362170fec02ca53ee33e8883f4c654c9382e29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/he/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/he/firefox-51.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "e0cbf0607d45cf2f079ca2d138d26866bc2d0a65be9e64514417f77ecb89a0228ae228b876af56fce712d9e47aaa41f93c3c908ded27e2a8a1224b2100919f92"; + sha512 = "ed8e6b961458652c273e443a29f4640b230044ca03d6da22a374704c800bbf8df4f7e984e9d3ec936153263cf29ee066c4fb6578ffdecf9955b7f65f10c26828"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/hi-IN/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hi-IN/firefox-51.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "9d05eff13dfecee6f488d7748c3d109ae6d441760a5fe385011fe1a9d7cea2e4c1a8e3fad8fa8216a45af2d8f99ec8467d588f8fae410eb52f71d408dbbd03b6"; + sha512 = "091595a3b68c6951357f1a8e417a8ebed56c41fc1548c8aabe846980c4e3a769795fc0fc7e4cb1af47be2f4bf77b691269018d8ac2052f5acc5111b752fbafb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/hr/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hr/firefox-51.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "fe1a5472ce390b5f6825a40176e3e3e13d79931cf44447da06bf08fa8c483368f95877b848302e7e9cb0c4a8b7e13db03fb7bf895c78b8b5ac6e707dc2ac5979"; + sha512 = "4dd4646bedeffd0219e1577e61f4e17f5c2b67b78cd8f8001d033dd7d4f906d0ac8d3e6d5500fa8a4aa049be0f7aeed967909d6cfa13b97fd1b9f93ac7d7b687"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/hsb/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hsb/firefox-51.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "a2d170a74de204d24a883cb0be93f9c55eaec4d8872a85e59be3005df7b6f78f02d95bcc0cf24e9b9ee6f6b9e301acec7e692d259b98718b4088b84c56ae0347"; + sha512 = "8cc10487146e89e1728529271b6a9e3e6ce6260d495ad0a013c5489da06425ff9adb88bb521ce8bb90c0ac5e21ba126147d23cefe716b2708bf084d39d70c800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/hu/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hu/firefox-51.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "dede1498aae89a5cf2e78ce927efd801d058fa0a7cfcda6d2aca816b913206e39b78581f48100b2ecde4d9408be30f221e66cdb7d1d1b4e9a86d5a8beed372b5"; + sha512 = "5c15c474ce885c88d863f1f22e73d300e0defeaf61009b939ea6c2e62f16a6fb3693a3dafdf264e83c618263153d3dd81bfcacbe5c9f701a28530d17b38d8189"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/hy-AM/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hy-AM/firefox-51.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "2d3b69d793ae4483dd73bd205f6692f86254735a885609033994e697b6df0b843612a10df0c227af280b94d1435555b3caebaa7ce0d229e3960f1d219d1ba180"; + sha512 = "fdd30dbeeb08a07822de29eb0e6ccb9df895675546054c75b4bfb0cf1f427488cfad9e2a1f541894cf366ddd1bb03e8eb4a75c318a1f80b2cc967a5b4ded8b39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/id/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/id/firefox-51.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "be01e48d71ffcfd99973e1d34d3c8779cd79c13a16f325f9e760ca282d7ccf1582e3ee33eecec2f4146ad4001ecf9d8c91a6dd433918c4993e5920fd743ad50f"; + sha512 = "54734428db8860a7ae9c1543c341a5dd53f6e966f290a176e69f4fa66c2a4bcdd25075c5ec5f311adc033abb85e525b2b7426e113743632ebed07abaf31dba4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/is/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/is/firefox-51.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "45c337a8c734778f20ed5199911c24b92dcd24d27d4213b9932be675b215fcca39953e914c0ad4ffd35b4401f8debc89cd0d28e5c3b980c94e9f6d1d59f8b105"; + sha512 = "6ee38f9506403f3cb57c6b7f971c599ea1a2e77cbd5424bae209390a20b322f0b527ea4a0be93bac8976cadb5080d22e262d6797b4e9257aec232e768909c235"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/it/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/it/firefox-51.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "62e5bc1312904866c09a82ac1a237e0c6b58ddb43f5ba154162ba5d4f51b0df5c54b92f4d6cb0be76f6d5aa5308ad2cca079bdfdcf1893d03f470898d4524015"; + sha512 = "71a1d593554466db36e09aed429d07ac9ed563af33959c899319e96e7d757e8dfe912a8d18b52cc198a0c4a1c45226406bb56996bc199b67f79c6a3aaea7f6b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ja/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ja/firefox-51.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "14d190cd8b483af4d9d7c97441e9fb198c1f675e4cc8878e692d940366ad83a48a279957270a4022ca056e0bc28b0c8de625bc81025bef4db1d5e39942376747"; + sha512 = "7d38e749f69ee99bcb546291b09a0a2b51b969bd4fcea50dc4f386cb951ab8a025c2ae8746c9e1d6398024d7904b63497421fc16f4f061babd0efafd17ea52af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ka/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ka/firefox-51.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "417ae8fca27325c1a1f20b3ee88845db8f03350287869986c6665bd64970bb3f828ebbb516d36c5b9048d848c65f767c539198ee5aa29047cf145851b3a1148c"; + sha512 = "813069de2be9e1b299bbead6e2078d86d3a382bf6d502c5f96a9c10c9571f4dc79127b450760d994e8fe41b3afd966fc70cea60e798432c7b8aa900d3d715bb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/kab/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/kab/firefox-51.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "64b677faaf6550dedc968116a86342facc92d7b2aaff8e2f47256a9151bb834e79fc08597808f37541b303eda283d9b8138972547db614a07ab87ea339f44df7"; + sha512 = "e1c562cf189a60b15c94fdd681007b4a64fe3e275900c3c78d492854fa28eb61ff30ab65ce7d3537170f28d51ad543e1b306b94d1ef6280b0b03b466fae9edf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/kk/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/kk/firefox-51.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "3674f209fd4b80daf47319a5ae6014490a9cfc3a64c548d84439dfdb14a3f2053c94cc5e47285924e21409fbaae03cd1f2fbcec02bf5fadf1567379d172cae2c"; + sha512 = "be54a4085ecccf9d2dbb8894872d73d3d261a8a75c755fbb91ac4c1d8bd3ab696b95a25c87f0d509ab250b53470b20aad3255d128296928c591d45b2786c1cf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/km/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/km/firefox-51.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "e9358288bd40d66ed2f27676cf92974e1c54f098f8a7978bc8d914a5e045bf94c68efa25674e42f4d976dfbdc1ad23b44d1174f0310e798f1cb1c7c8c1b93349"; + sha512 = "6369eb361d1ee31d33b9780072c1c49926fc4314168e5883ca71cf864765d7758d51db55f5ccda231e24ed4b65d2665b5fde7a3fcb1524a04e7057490e8b2308"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/kn/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/kn/firefox-51.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "e8f8331ff3d638955d087d2b75ffe7fa04426b6f72a35e1b0e194c92948793fc25e25ae927f03f119dac01a6cbd30f944f5022c32ff933b15a8dbe67245f310c"; + sha512 = "671165858cedd7f4ba9173cabe9532f08de780c967f6af085e73e3ac97f156b39000b3b672bb690cc40691d3b9b6b9d20c08883a1f2a1da689a71093096642a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ko/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ko/firefox-51.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "58437f794e59333093bbd5a4d673d1a3149ca3468ef9a31bb0fdb4c40773faa6ed688b7636191223021e9bc7bfc09726dc45ad627e4f731f19ee78cd782ecc08"; + sha512 = "04cd3b277dc483cddcf6fbb79687b3ec170d33b0eee46717d645358df0f224c86f36723442e4d28e4460e663b3357f3d3c7a7aa1ec594013a8d91d030e08313a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/lij/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/lij/firefox-51.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "80c30dc8064a0a075613c6720b976379b3a9fc4ca05db2c727a4bf1e4abbd4f6f44b45eba42bc3633c164cc3c15ef756b85d638d3ab857bd0e6d21d9e6f640fd"; + sha512 = "e62b1481001d5d63b65e07b527dbfc29b435f659db7237b411105711a601d9117d62f71dd93849b5ebb8dd0dd4e5981ffe9f318aff2e74485580471f672d5b6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/lt/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/lt/firefox-51.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "fd4ce4207ea3eebda966881ab9f113688122322d16a2c9a205b17d7c73ae0de4fd5a48789e01c96392ac5c84a59a790269329ddd9686b9cfa64c787a817101bd"; + sha512 = "f7cb9819f955f7b32439a7ffaf0cb57351bc25be579646d00f945f04152f64c9174bb49c99ec49b2d5c053634c73872a5b4a9615fd66744d0b5c650c9bbc67d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/lv/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/lv/firefox-51.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "57877344c135ad47073e992a06e5568a4564209f2a79c2b1851d69b2fff6c9c32d96cf3278e1bba4d91fc001765f4d65d6d4b730603ac0a5cc28d2520fac2d60"; + sha512 = "e7cfab908f9ea12c77ff0a76d2283e205c9b3751eb16a5dc06171e2cc3315193c6010faca943341e1a6496b48b3d90520308c53d85677cc18014fb8560f7714a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/mai/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/mai/firefox-51.0b8.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "07a87e16e68b9089c7aa58048ae4b41e15bc267d9810a218c9473f0d1082ac935fa5adb759a9ac43c0bf2a6e79e830c6344943cb7b61b73746911dbd66a7fdaf"; + sha512 = "6088910c06e1310097d09c6bd582e20928de56fddec03d7338faa9b9651900919315c15cffc601a0e4878ef7c8821d40d5e4d7e6998786b1cd50f21ca0e2dfc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/mk/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/mk/firefox-51.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "8e4a61d4f20c17f1dc2748568d731f8e9f9050741896f98ec761d551a0c9bf0836731ba9049684819d71f6eabae7f2d1e93e0add593661d882d619783fb996ce"; + sha512 = "d4ab8618c7945843cd0c9234ffa68dc61adfc3759a99bd174f66456038614497e3b389b0af452b3958c12e9b2755ddbed33e098c9e4c07110daf0bc5c4b874cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ml/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ml/firefox-51.0b8.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "f2300cfbce84cf49b434f56b262c34e734eb2ed47abd5b318b9ac9197252869c80b77a7e0617a61f8a1d06a7e6c083479833865b5f1a0e3172102c07d8b9d878"; + sha512 = "05d3de5e0565316ccad5ad407299f6c31071d48edf1ec44492e61b8764040f22a6b23230b74f256554f313575084c9d79504d3ef85451c9f73c12edd663c57a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/mr/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/mr/firefox-51.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e8536f0786bf5a49536f7703ac50fbaf31db932c1c855988c192d495365e677f674f1d84bdd5b5d07ae0b04c6498262a29d11949f4ee172d1ed97c3708e2e0e9"; + sha512 = "1ba2e3529f379c8e77941ce42a0100cef1f2daab31d8b1a0b23bed898ce0bdc4cb3a873aae71c1c3f5789f35edf7ffd88e11902154a3aa4f3117ba1ba782b0c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ms/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ms/firefox-51.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "c3d6c1772f2d53e6e3928d9c680e737a03cba9fb22fcfe051c49afe147502c6b458832c735ecefd29a06a22fd91ec13f98f0590f386c5331d6faefb83afc64a7"; + sha512 = "7fe116ab0d79e7de3faeeebcdaedebbfba94ce6320b563ad79de7f3d5459cc113a1f10b6b2fb3c3b074d4a027f0cff9106e078c2945a62e5f3b828459c1e8d83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/nb-NO/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/nb-NO/firefox-51.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "2d42ede2a1232c48068bbde4c9401e495b82ebc356cee2490e8282e7a50e7ebdaf235e5d109a6ad1e30bb4773b81a75dd8d8f338738db499a8bc910a435fcde9"; + sha512 = "9625821a4ce710ba5f1b5f7416086d4e33c67037e40dc0ad9a5d57049b4fd5bef9fd1b1c4c02cf6910465c641242a5ab9e596c962f5f4ace66b07cf4f0f85405"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/nl/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/nl/firefox-51.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "3f7d57fd1a64f4c99a573c6c2272999bb9bed78648a1476ae3d1d843ae7407612a750b07b6730c0c326b57e16c87df374049c49f8e9e2fe9ca7d14860af983a3"; + sha512 = "5ff420c38ec644f622aed733c599a505498bde48f2a573492d647745d7f7c5cee44b009eaccb8de458af813260bd19f9baa7f9f1e2dd946cde48f09510a885cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/nn-NO/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/nn-NO/firefox-51.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "649a79569ca51e418101d013061bb7ae977d80e0ca4854c03e256e214e4a0c2373caf994fb1d41db6beb4816524e4ba76d434b7a2942b20cd628b42f409792b2"; + sha512 = "12ccce434da504753b38449959c97952767fa5af7aa2b0f58777f8775e4dac94d55d67e8d575f68e55e084bc65cdae101ad92b4654bcf345782bbe914d01f655"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/or/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/or/firefox-51.0b8.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "68a761c18b24f5ab5ee511f635653d1c3e798239f82a120c2bce73d5f0e706b5b8dad2540ece11361c0652f34b00f767c6be2c700c69a0d0eb08c35bfec29fcc"; + sha512 = "3b456b222d39b5a69761da7cd33504fc64ee76d5d8e6e4ca26be158f562bad27a3322604a6542195aed1181f578a650b05200b1ba75d5d8a05e400014bf25660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/pa-IN/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pa-IN/firefox-51.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "2d57687e8fbf53cf2bd8b0bc6780dffdfe1284b47fbef20ab9fa591e2eefec00e097bdd24159a28700d47f02273395f32fcabb401d0f5f3e13cce75481b9cd7c"; + sha512 = "3472c5eb75dd40b68995bfed8542546a9f35e04ca8a7fe17465a99a94846ea696d1cfedcca2d59a47082de6d2261f1701950be3295f063e69846cc90d531f5e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/pl/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pl/firefox-51.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "afaef3a9d125774454adf37f83447600536db9abd7bf388a2a9e9024ee46f67269f122c39041b5537be23b19af39e8efc27cf142064fdfcb5cd3f404792b1383"; + sha512 = "0a883e16dc997c748a6d76e32455473ffea6612dcb88446f331e43f9d247f01ae93e49827b1e222a2990e54e201c58aed2150e800080fa47b222daaa69154bd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/pt-BR/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pt-BR/firefox-51.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "c3a34e85cde018ef1323786e373e8842cb6c590cc8db64441e99d5a092d87ca7cd935dd238b30a2752393515fd5455100e97a98e08b395b4082d09e800e25846"; + sha512 = "34e6870557e30a75838bcac1e268796f670b8f5dc4e49cdbcc6e34cab5f8c3e4996cc73149d13a5178ebadd1f052ac5c2eaecbaaf0d3f4245080e71f8b86c856"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/pt-PT/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pt-PT/firefox-51.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "2aa6b07f64b83287aeee048edf436632737da32188ce650ea2e323fa5587457cbceb05356b3917b75bcd1927bb9cf1da89e23fdebc3db2096bd4598ce8cc714d"; + sha512 = "932291baa2091d12d9832483d14a6e05568fa8d1d1c41f42d066c5efc13d7e511afcb953945334b9e7a573776bd2263c9e38a64f73cb44f4f8a32509e5fe5119"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/rm/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/rm/firefox-51.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "1e774ec46f28bc561bc5dbc9af3c0c5a198485f5da7a7fc7d5d1ef920b54227ddc9b0168b7cce30cc30cd606513aaec317369335deb945bcf94fb49bf29367dd"; + sha512 = "7258b1c4a865d593e820220f5b48bfd1a8b9c4a7bdeac9b15208f5060ca501e03b72914b2b53b65164d2db606b092252f0abd6fd83f781ef0f330d4bb487dbb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ro/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ro/firefox-51.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "3d449880c97442f60aee98be29abd097330b95acd9f121a57744d5694f5471afffc337239b2d3e527b2dc709daf0607b73ba664ddd466eab6236f3d842ee93f2"; + sha512 = "5fedc4a3dee59bcd804eee04ba07ee4b862e6ea8198d1a5c3383cf36667e2f15ef728f21138868b84c15f59c7b11760fb5fe293e8545840d1e5c98945f404eb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ru/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ru/firefox-51.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "42d9d4e4f2fe48e1c7db8395eb22737bd42b7a771bf8bb0f69b210fc4a2fafed421e22f498d68d1ab3e1661a3e828c1e21e096d655f47d6c6216c6c8bf4a38e8"; + sha512 = "8e6a4f786d5db808ac5c63d4abbe4a53b941845a48fe2fb8dfbefb46e01e1053d591aa8bda63ee83785ef3cdc481593c86c804e4683455a2e27fe594b96a650b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/si/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/si/firefox-51.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "4d0132f95f13076df9cc4fc6e6fe6912d16aa3c71fd18a6dc81f4ba9dc53842b7cb4a3fb4da62436fe6d9e4061e90b8c02ec686644020437b7da78ea5ab09479"; + sha512 = "39c0c3487242a54287af42c9457ebe8882112954dec168630b8914896e3900e9799691bb88147927328c4c5f4b2078bf68e623e09ca2f62a4b7efb4e625bb283"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/sk/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sk/firefox-51.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "93eabc3dfdff6089ba9ca7ec7210ebf174fd548d4c5e3076551470a27b0b7f19ab8d4b6813aeaf7206ea8bde863cccc2e34f447e4f09a3b0b0f632dfe5c1bf05"; + sha512 = "e87215632b5f0264a04fefd631def717c3f6bdfe31817dbe855d7c6195b4f340af043bf613fa9f89ca4af4893cc6effb876eb51555a089880970315f7ad15e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/sl/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sl/firefox-51.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "ee064cabe643fce46242fed3292e3067159ce0dc57f08d8af67658f37b7cefe80082609be57e024b939054cda80f7573ca6715bdd4f084bb847e32776267394f"; + sha512 = "7cb036e5926b2ce9a03b27f37359b640f824f32a918ad8e9959683114755949ad7d2069f02e0206c2d67633ec9763ea612ec3e3e44dc5e881d4e275d1767cf30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/son/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/son/firefox-51.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "3a5c3ac7b1482fac457a5e537d743f14eb99b6d139ed840cc5c1fa4020e7c4950957b9cafc19dda8ec21741b48698a91dbe3dd455c9b002af407eb68a29cc8e6"; + sha512 = "e74ea45d6b5dab67229472ab524abc805c5e1c91b7ba627d95f0fb5eb1310aacfcd73a4a5fbfe8d7d5546aba9d254297494b34efe81aecc7e261cce23b9e0de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/sq/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sq/firefox-51.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "00782a5b28cc04a1fe58309503bb984b29c6842e4ebd9c8e43d8965d9041b3a676208134307d3b8f04637458e052dce8c3d5fcb593d48ef93a71fe3bccffb684"; + sha512 = "8321933b4eec21e9297e446d62f63b4a7c69eef3952d99aa32828b76776c34efc9cc174ded4637c586a383558eebd2ce43a63dcb7608ea0a2568c03fa363e0aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/sr/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sr/firefox-51.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b32b88641024c0f263bf8e190ab0bd8e3d2d6091aa38733971cb8f00ad1c776859d5b037ef6f2b6d220f93629b39c8730f99bba654bc3791e767b3f7182ca758"; + sha512 = "a81dcf72785936754c04fe2e549795f612af671e360a653860dec811a65ad8e19cb6cba5fb205ee5925f364e49a358d459c354e26b23746a2e5deba41374115a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/sv-SE/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sv-SE/firefox-51.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "08a713dda121e0df1131dfb50c5196c2b2e4ca58823a56453c23955d94f53b877f737c5f5d805f1203a4c9361f25d0f8e8327cfbefe9fdc32d2ddd5dda359e14"; + sha512 = "1835da3f930b9daa37dc14785feb0d145aa9640278a4119b2a8f6168bb5bb385187914a625fcf3d88c3822ea62f338c2376c08831a2c4d8203a4b6c0bacb2d7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/ta/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ta/firefox-51.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "b8986fe3919db0386ed411c1269aba0f38fa6c01a36b24544e91e382e3f22a72b5cccebcbd59e21a1573910b9f4b838cd482e588a92153b3932835bbb87b8061"; + sha512 = "0a7f219eece161bb3ae9ef280457e94470d1929770123a9197c08eb320ca2119aac66cd7fc5181e4c0c1359514d0338d306db1322435abea70538f9c55d5d7a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/te/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/te/firefox-51.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "4f040903bf00eb129adb0aa431921bd39754815b8a789b9e8118ecd87bd6923ae02faff7791f17e326dfb844745b1b12ecdf8978c814be0964825dbdacad146f"; + sha512 = "10a412a83c75b8a7d4adc800c858d9f0adbbf7b2c08cf8a3d5dc494ecf38cf8a83cd3a462eda7eabdec73e194264b698f40a705458fb0916829b783c511fd3aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/th/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/th/firefox-51.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "b2868ea454d231e87e1389005d5ed7863865e708ac2b99075f08644875323427e4dc92a245be4de90f4d5e3791b352a27e26e3ab2c08e6f3dd8377225af70a00"; + sha512 = "d5bd9c86174be82336f711d50dc75e6f252a468083354c0a1dff99f4c72469a1a789144ffab2beba65d3e43a2e8812955176f426b560bb000607bb683eed81ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/tr/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/tr/firefox-51.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "dfa63ee5ba94400175f1252c06bbc1070579a3fc9395f55528cfe6a0a99bc6a654708ffb930efa4153322c76532d201863206b14f07973bf6713c90b297898b8"; + sha512 = "7ec4d2419a1afd9b23351ed896c92ba7812f4aac083e72242d21e0608c32dd5ac157c8d08a89991fd051f6fa0cc56507739b49cc94731a4aa83219d9c76cfc85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/uk/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/uk/firefox-51.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "43157bfb4bca885e830035e525ef2642795e9f22e582c486f28a99acf462dcb09142b9e1fc35f014f800e5f30365d6bc76b0c4b7caeebbd9e2e3fb4bfeb780c7"; + sha512 = "eaebff23162685126416f9974ca6d4d20a8dfa320818c76716e695c6d9984e4591620185fc5bb4ea97c2ab0d042864525f9704d7c3e0fd222db3eb60fbbc63cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/uz/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/uz/firefox-51.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "0ce3bcd1bd6c7aa9d363ca869d9f1638f930b5df7a7e22b88b12300dba8cc0ebb9e7e1b61318b49e9452f21f1855dd3e0b38448f4067d2a0683b6aaae39e90ae"; + sha512 = "5cc21748974536c0f2e73dbd486e2bba1e5d44b4c198d94a6a4d8c3c0be925e89264a7201031903e1c4a41e4bd2c9fb558117ace9acb8f52051224c35b3558ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/vi/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/vi/firefox-51.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "c68aae839b6438ef934953c419d99921378bd81aa08da9653299a3410d2e102ad9890870e99ff9541477a0dcf779d8e80905b6741b8f40faf4fa9b7fa8fcf86c"; + sha512 = "42ad1640ffd4c1f35addf69156992f87e1cf5925c8e5d5a1ee49a34835d28117918d3c7cc7087e258726f83e16e3e8fae14f6b8530d308b29606105c8a2f337d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/xh/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/xh/firefox-51.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "c4422a3f38d47cf9caea2ea93f5eb4c402461a76fbd8285f8894bbf3d4ae0bb484be20f0761425ac9139facb1fca12ca4122efef47391b988d4dc4118482d660"; + sha512 = "14f18ee698bf639d4e51c13f58257af6a4a87e912e14dce51b2052351005f66df501e5b28408079d6d6221e2419da55675d298859c65b6c40b94108a7406f5c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/zh-CN/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/zh-CN/firefox-51.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "5cefa5a67a1d468c017294884b04d3ae412f1f3bce56fb96e72919266ba697b46430460334d3593608d08238921517b9972435bd76fdf012ff3fec51bc64de82"; + sha512 = "66ee019ea1694d8e16e16a39799fa0bf1b6fca66a39ed5435865c7d3fd9ebd93496d20c37d750a1e70006e11672ae1a603ea81781146a10086604dbe39c3f2d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b6/linux-i686/linux-i686/zh-TW/firefox-51.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/zh-TW/firefox-51.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "485a9f5184722c59a4a60a8f02c0c10d4f8fed359083a70701462a311caf652170625f06eabd5baa9f8b5312ca978c48c4da01a4de49c35f52a8c8c6a2d738bd"; + sha512 = "2575b4111e6061f941237392f23254eabbe7bf7c29a5113fcd61780238fb22f5b9d8ca9df0243f29d40b69f65ab5fa59d8ed83fdaff96ebab0b0e648f9adc0ad"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index c640266539a1..0b9ff9db219c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -172,75 +172,9 @@ stdenv.mkDerivation { ''; passthru.ffmpegSupport = true; - passthru.updateScript = - let - version = (builtins.parseDrvName name).version; - isBeta = builtins.stringLength version + 1 == builtins.stringLength (builtins.replaceStrings ["b"] ["bb"] version); - in - writeScript "update-firefox-bin" '' - PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin - - pushd pkgs/applications/networking/browsers/firefox-bin - - tmpfile=`mktemp` - url=http://archive.mozilla.org/pub/firefox/releases/ - - # retriving latest released version - # - extracts all links from the $url - # - removes . and .. - # - this line remove everything not starting with a number - # - this line sorts everything with semver in mind - # - we remove lines that are mentioning funnelcake - # - this line removes beta version if we are looking for final release - # versions or removes release versions if we are looking for beta - # versions - # - this line pick up latest release - version=`xidel -q $url --extract "//a" | \ - sed s"/.$//" | \ - grep "^[0-9]" | \ - sort --version-sort | \ - grep -v "funnelcake" | \ - grep -e "${if isBeta then "b" else ""}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${if isBeta then "" else "grep -v \"b\" |"} \ - tail -1` - - # this is a list of sha512 and tarballs for both arches - shasums=`curl --silent $url$version/SHA512SUMS` - - cat > $tmpfile <> $tmpfile <> $tmpfile < $tmpfile <> $tmpfile <> $tmpfile < sources.nix - { version = "45.5.1"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha512 = "a2495d8d9a56104b5c5d87e795689d0334563fdb98fa751a2d7bedc9993ba66d3b1cfdc9d0d3711b8c8a2f91d8267c97035d1120051baa4aefcba1b968b9edc8"; } - { locale = "ar"; arch = "linux-x86_64"; sha512 = "b5760210c14df4648d6bbd48136dbb3221c682ecebb649be848f8fbecf89d2251630c8d8208438f0ab66b73964bbdf8e05035bb88f0c773ea253cab163b569b1"; } - { locale = "ast"; arch = "linux-i686"; sha512 = "b1ccb4d51d9f5aec0cef3ccb0d5fcd14ca69a446cb18fc8b9f22d98325c0be45ea608f9c9ac15fb33e2b426b84c53e908a05331e360af728e088ad9c3cc77107"; } - { locale = "ast"; arch = "linux-x86_64"; sha512 = "64028617fe76832663fd69e2305ca84dfd576507348dcffc680d94d6d1de640fdd13874a73638767d3aedd2c84d38fd370e57ba3f95281a0fc0ad9d21b4d727d"; } - { locale = "be"; arch = "linux-i686"; sha512 = "32d89785e95667d17b7b4d19d37557c7d592370e42613c8c171e1b816d38a16197fdf8397211f61a9261457ea426f6de84af721462e4296c825f931655e64e66"; } - { locale = "be"; arch = "linux-x86_64"; sha512 = "932f0dbe85e6cf43c70ea6f9537785322bc5280106c97b4e21ea828ebc5d997d027c260f4e1b4441909c3a3b7e61f51b95167cf6a632bce98fd2b6aa33eb413d"; } - { locale = "bg"; arch = "linux-i686"; sha512 = "b5d2ed68959cc6a473e83db35634c6322f4638edae1a19f81d5ae1ab0080aed0940b751e96d3d3a562aa1811ca3c5435f2f3b0a205948f06c2d479cd98109e88"; } - { locale = "bg"; arch = "linux-x86_64"; sha512 = "359973dc382c7565623f63ede93e37b1d1a2bbcf9690710e05fc066a8c7f67b059b9d14c978c93741d65544029e5970f520d7a64dd07902d89f0331b9a3330f3"; } - { locale = "bn-BD"; arch = "linux-i686"; sha512 = "a76fb786e1cb0485b4e212097685fa259ff76386bce3cbbec1d47e061c7116df76adb8bf419e51ade098fdb9b55a7aad5348e13917104d22a0aa39518205ca47"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "f2d5b0c3fadb19d89733feecb50a7507b1c29dd93b5064a0db95292be1635c29bb3d98b84fb29ac38224c97dc7af29ff6024652562273eeca2a6ee38a0d19de3"; } - { locale = "br"; arch = "linux-i686"; sha512 = "51c1402350cec63a60f4ea96cdaedb1aa74250583a3cfed575060fb5990294446a8254108fcbd99607a286b8bde43357ccc8e0195330352d1497b8c173a7b283"; } - { locale = "br"; arch = "linux-x86_64"; sha512 = "3d1aba23ef4d969548b2fa729ad1795496f7123b4437f7692bfcbda4c87b0bd7edd1caf00cdb207eb4aaaf6c8ec8d0554d553a7db5a85e1e24d07c401d507794"; } - { locale = "ca"; arch = "linux-i686"; sha512 = "1df09781962fdfc7abc425f9f96d2efcc7471bb9bb8cf2c0152846673c7fbfc86b6b4c05d73d3c949607d056478661be0e0d24b769f816820d1e4670fdf240f7"; } - { locale = "ca"; arch = "linux-x86_64"; sha512 = "a1c04f9846edba32587b1f62379e703a62af0b9886f1e56e86854629a034657d86a4f06ace3bca9f75a21c734b559f17522692e4c90607ab353669bfe02a3dc4"; } - { locale = "cs"; arch = "linux-i686"; sha512 = "463f336f49ababdb13397a10db3b189e3d364b07f9f42a4d31e770edd846c56fdb81f79228ffa51ab7f6555818bc3a0a3e5f1e546727bb3cd81f95f2264c392d"; } - { locale = "cs"; arch = "linux-x86_64"; sha512 = "f93ab27ec7e126aa309ba4d6d5900be7c427a29ccbbe141cd4e7f211daaeca6459163711204f02fafda285020173417d89a9c46f593114c81b73ce430a2c7743"; } - { locale = "cy"; arch = "linux-i686"; sha512 = "8a4802763162dd32577e02f878482094b3bae4c51b9ac7c109d188c8b5ab9fd0053c34eb2fabaed873e0ba9e7f5fac2ebe6604a0da00b806594e28fd0f823721"; } - { locale = "cy"; arch = "linux-x86_64"; sha512 = "9166a6c737dde179411e1a0d509141f29c7df7e3fe7e4f6def229be08bba4ccf5963804a86490d08e5ae3dd602f246c2fdce717562616445257b81b8c17ee795"; } - { locale = "da"; arch = "linux-i686"; sha512 = "bc430839b463ee22e4d1736be48f8f9e958307c3069b337b0ad816e3f88274b22b98ce66fec267f4ed134750fed656b1ebad0bce29637594d053bd82d1be3d34"; } - { locale = "da"; arch = "linux-x86_64"; sha512 = "6965968613889d69182ddf3dadf7e109e958d7561cb2b1a3936d9302b725d9c59c8cb8730ecf62e422a38c108da2ffa6ae5b012df348dd9250047a15b046e760"; } - { locale = "de"; arch = "linux-i686"; sha512 = "0a9ac8af9a823d69c8b2671f24bb203239a888d1423656241926dc5fa978e989ca5df303211e4a5208624d01ba34dd93915463eb88b0ee8ed027dad592a057c0"; } - { locale = "de"; arch = "linux-x86_64"; sha512 = "2a33d8104e1149181e91e9588a4236b481a8837835af2a1b08f3cc2dd55eecb3059aafbabccae8b0dbb8cfc632bdc8fc6198bb600b60a9dbff5a96a8609699d1"; } - { locale = "dsb"; arch = "linux-i686"; sha512 = "9f089cc93ed4660250ebb0d4c677d36515d9dbf29f78947c88558c69362663fffff293fbb3acaf4fca2e40a88d093d7637e385db757812cad29c31b6b746e87c"; } - { locale = "dsb"; arch = "linux-x86_64"; sha512 = "91314f8c8c7a9e1d13f618a1b71df8141933e6fe5f3317da06ac84ce1ea269bfe0740d94b2d8e240005a315a469cab39e79f70c06169712fdf318c9b3b5ac9c8"; } - { locale = "el"; arch = "linux-i686"; sha512 = "1099c8443c089ac7f430023960802ab2ce914f103983d68dd283f0f1bb7d36ff8b35e44b7e766237cf19e9c6f02e5dbbab5f62e4cfdd8b80816d0892779732bd"; } - { locale = "el"; arch = "linux-x86_64"; sha512 = "601ed7cd8f6f1e867647036ab3f8fadca0507f4441998ac29dfd15a6c8cf0c65b94cd647b0b4602d7624f041a8fd14a8210fde26a7c09763746d31008699e0d3"; } - { locale = "en-GB"; arch = "linux-i686"; sha512 = "1efadd60994808919b24214c1610dccda0a76bf0de6cf3518b6eb665d035272f1a2e5e4e9e09fc2d4eb5a7021bdfaf3c3391e166737824355bb859b1d3fa54b8"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "07222127e045d41f912baa160b08e22a373ba605f857d001c92792ebbcf789e1094c68e0f16bf9c609fda0321ee0a0f702c7d47481f4da6a9cb80071b7e21095"; } - { locale = "en-US"; arch = "linux-i686"; sha512 = "663ff453dfc556bd85633030e271174d96f039d8ea77bb1a338df02298feaea297ca7b4010d9c2973d19ba988b6e2b807486ca40f69bbfce84d0b7f8b21f7c32"; } - { locale = "en-US"; arch = "linux-x86_64"; sha512 = "3dfeaa5e64b4063e0b5ae552bc47db1ab06e4381c55ccd35b05766aeac5add880804f07a40d39db08395a467ffa96d67261971359c46bce8d9ec6adde5948f2a"; } - { locale = "es-AR"; arch = "linux-i686"; sha512 = "34fbd5a614ef5a0b9c46b63c80292dfe7caf2f65758a52d130ad4567311cde3e84ca1ab41d5fa87509b5ad9c6ce4ab136a4c08f1977b3695e5471265a758bd7d"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "087caecb722222c3950c8a644cf7af37cd356b62b4802fcac1a4b93620fa086e2b3e97a6c5f6b22aa61d3478dad41bc7b8ab39d31bf76b710f2e53b36cea2049"; } - { locale = "es-ES"; arch = "linux-i686"; sha512 = "e429e936f7d022b421c995ea8df18d72a3abf8a9dd2a0a6ae87435333c94a8abdcfa3c2416e36f883b1d2b5f573a17d8a38161fed5ff323767fc25756dc72d69"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "f335002365f68e28cf0e28c407843f8de3184b33a7e57638104d1ac3515cfcbd14842ecc6d61a7de012e2cb1d7c5ff170598b5f81dbcbb71b81549f6a8bb5531"; } - { locale = "et"; arch = "linux-i686"; sha512 = "3ec9056dc49cbc6b7734498ab5522fef93eeb6f08668cd04bb610bf0d2519759c614de07562706a3efc2b5e64325a70c04b18fb3138c2ce3cabe6ba1a51bdde5"; } - { locale = "et"; arch = "linux-x86_64"; sha512 = "555874dfde25076892647a451bd9e02879eb5c8584dd22d5bb73f9c5deab5f64103d80c57292ed6a04b73fe27aa28d78210a1a5da7147fdae0980faaa8d19641"; } - { locale = "eu"; arch = "linux-i686"; sha512 = "951a9fcb82f77cb45a5ccaf300d0516da7d1be069931fde87e729b9c9d99a0a07ee810a4bf4791698741ff52128f66d6ecc3d8c7887cf22462006929c582cacf"; } - { locale = "eu"; arch = "linux-x86_64"; sha512 = "5f4361f43bca179613f24045835fe31e17fe949da0e2f9e470635d714f521abac45d0104e663ab44806a7e45f4d44d515b002508e8388c2c72e0b91c793ec8bf"; } - { locale = "fi"; arch = "linux-i686"; sha512 = "e28371194085e689d6445ce3a0de77c7b8127aeb740769ff2aaa8f0345cfbc7b3e8ad5f2d891c8ca34c2fa004cfcaace649b900248493e5c6ac4404b6f581e19"; } - { locale = "fi"; arch = "linux-x86_64"; sha512 = "5ee311ba705cdfd7a6687a1a17e7c5b40fda22fa7acb3a9a0c236e2aa3d8037bbf568d9be29853abf3d52d6840ea96b7ee59cf9264709973aee3bc43e8c07979"; } - { locale = "fr"; arch = "linux-i686"; sha512 = "f135ff1b365df65cc9fab35941628be6f6264d2c91d8394d22fc35e945207640c8238cf2e0046598348d7521c1684eccdae0d7f0dc2bb22f415a862cad72d67a"; } - { locale = "fr"; arch = "linux-x86_64"; sha512 = "ffa44a92d3ab3ac8bcdd945b910e6da6a4c0b05f4c95572fd2a56fe73f935f7a387fb98100c7a84e4adc22c9b1cf8a0aa84ac04eb14c4b60b7989053c2021a0a"; } - { locale = "fy-NL"; arch = "linux-i686"; sha512 = "c90579ec9607992f4e551d327a3122d6bfd87ef3f1fb4708579c1a07deb2270a252c7443f3a3551bb725ef46a8cd9fa61cf59910260f9775eb8805e5e8acd61e"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "3cf5e391adca05195ea24be90a2414640f0fd72ffc858e971fc82675f49def7238c30f3ac48c08312414f436f9bde0ac2b05e11db94b40079c9d37f3d1a8ac5c"; } - { locale = "ga-IE"; arch = "linux-i686"; sha512 = "a6a9f52acd576b615075f8829cff2ed085e7254e8a4a2380c0eb088cba1986ac81f9d0badecbf0ece1f7ba7b7b169c8cda23fb32a9e79fa78d29fe8c0cb4c8de"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "4260f3a7245d8c7f0b6f3a0a47793c84eb83be44e19105a3efbc35ef1a1455f872a987c714eb95a1cfd4157816cd9eb09c5a6098460e90584e9d630812d66716"; } - { locale = "gd"; arch = "linux-i686"; sha512 = "12edcfd67dbc5d093d1c22eb707668e4f534a6baf96986e436684c9271d165fb2f422a2e84ef35b72063f1a91100230c92df2b08aee428ea0b384d6658f6bcb3"; } - { locale = "gd"; arch = "linux-x86_64"; sha512 = "b9ce9839cd3a4e8fbbba4f107a934ab4733b1feb65dd1e40a1c064f39026d03d1208b67b413ed4c643c7039f91e1ceb8747f3a46cc44d1bedb22275512f867b8"; } - { locale = "gl"; arch = "linux-i686"; sha512 = "d357cc4f8a9ba8ff47458b03d17e4d10dc7be8bb16493ac3e896f63a3229962034012c7ecda4a70d4dd1d9c4aa76c349bf21725c6164fc96e6fc36f9b0fea9ea"; } - { locale = "gl"; arch = "linux-x86_64"; sha512 = "fbd8a4eae6a94d966f8e1e9e2bcc7a6aed8b5a9991fc8367de28c11fc7b341fcf745c983f8259b89767a762604e55ade6212f5c1496dbf843c8eb49f89e8810c"; } - { locale = "he"; arch = "linux-i686"; sha512 = "440a86fb6a94657f05eda2bde2a2e74d17398468a0b603866a03a7f37458e69a921e81d2ac1af2718f1168a56ee03ad596c39e8d88c933576efecb99a724957e"; } - { locale = "he"; arch = "linux-x86_64"; sha512 = "51f3acbaf8971bd0bc93502605526f6d0be5093810f8a91f43c2597541dc23eb590a10b4f2839cd9ce1e13685fc7e38668184b12a23ae99356ffacf3f6481d83"; } - { locale = "hr"; arch = "linux-i686"; sha512 = "1b5960e4df8a6247c63fb3f5e80b1795b4e098f446debd96b6344dbf97694337d6437dad53635fac57036ed6551b8a780ca4880dc35626aee83860a5934f3f9f"; } - { locale = "hr"; arch = "linux-x86_64"; sha512 = "65110b98cea4a6174dd31de4aea53d2efb1fee822025f9a7ccd6ef3ac80c0baa605fefd7078c3528451ffad7d9e86400c5b7b527b026aaca022a0099673442af"; } - { locale = "hsb"; arch = "linux-i686"; sha512 = "bba6aa43cfee2422414c526f0c40fdc70984acb54e25e5eb75ef684e674b17a8dbf606e31d5d609bd572647ab3a9bbd78c76669156a1d2d4d45d8402650148b5"; } - { locale = "hsb"; arch = "linux-x86_64"; sha512 = "d50057bc3cdff3820f0bc09679f672d14a35240fc3e997836f9c04bd8aa922e41b627e0f632c2e76982439d4510262618d7d59adaa530708cadaf1fb111159e3"; } - { locale = "hu"; arch = "linux-i686"; sha512 = "026a686dbe81a4c52bd3997de66e0919ea870954a3d14c4483f5f76f618424013b82a2478ec9eb3f506a1f666ef3333832a3e4533adcce41901db79120d2a454"; } - { locale = "hu"; arch = "linux-x86_64"; sha512 = "bbff40d50155756c0d06fc4c9f7bf31f770901139b0a8d475ee0d8bd7ff1b2d4e8f5f3343fffd7af83f5f53f0567845f6c7ddde8abbd3f9f004c31a1479ec4ed"; } - { locale = "hy-AM"; arch = "linux-i686"; sha512 = "a798c9581cdb2debbe773ed952bbc56f7d7444eac5a448fce0f17ba2b260405526cdcec306c39c39b2e80ce7addba810bc659312505af8c0a928c8a2f8107245"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "570815807b0ea61bcf506effb2acc52ee6e8089b1328a046a8c55de0e3e72227a2d097ffe61f383733ca6f11405e5689595bc31f931f41e854f71770e18230de"; } - { locale = "id"; arch = "linux-i686"; sha512 = "ce54045626941976435a94bc5cf7513b79bc4e3e6a3b03bf1036ce9433cc6042689735b95d60afc4bf1de2ea31fe0ebc55b856bb51f0ba468744931a8c0727fa"; } - { locale = "id"; arch = "linux-x86_64"; sha512 = "ac9a78df1a8c6228560247e07cd7695eedf9ef0afd2c25a770aaffc8d96555f229e9332204e73ba803df2b8a7f590b970020b277123668ff20375608b093dc8c"; } - { locale = "is"; arch = "linux-i686"; sha512 = "7e0a2c31968102010d1fba379a25c4bcbbf447f2a0005e01271faf1e19dc7e71a5f8cfcfbf36ed510743d53886864aa4164284e99f7ab86ac27629ffaca6000a"; } - { locale = "is"; arch = "linux-x86_64"; sha512 = "cb78e3c2e1824d1da479e8ca5cdbdf420f7e046895a60b8912d44cbecf6966a32acbe2811545961a6da72f22052d8d2bed8d8ee1208b9c4e16250e6900265335"; } - { locale = "it"; arch = "linux-i686"; sha512 = "4852e13d1be422f107e18537bb364b04fb06fbb4854bb30f97753b0e0138ca2d9073e29c4b5905154fcd215701b300c0680025310479c6dca4294e3a591ff841"; } - { locale = "it"; arch = "linux-x86_64"; sha512 = "84c053e27ecd67a15d84bb2c222ed97061c130fde590db558c7f5919dd8acc8bcc5f032f84c53fe364f95607aa04bcf43375d2cc9fac2d4990535aa38d939793"; } - { locale = "ja"; arch = "linux-i686"; sha512 = "c539473ab434e20528f252f76f542f1938accde06b7d460b8e4a767a2721cded73710cca2264d2b18cd533a6118dfa9ae1c2701a6e1b18afe398f42a109439e9"; } - { locale = "ja"; arch = "linux-x86_64"; sha512 = "dada1c9e859b27a1bad7ba277749e77d68a20ad4c033861ee5ec54f78627efcaf336d082b1a8f9e4dfc91f6b16adde3eda873ae261351c3292c73c7f7ff05526"; } - { locale = "ko"; arch = "linux-i686"; sha512 = "59421684c74f6c9fce41c4769ef725445bc84224357db21f1f4c9f5154c695a337445bfa05fca1f045d0e05ce64faf2d2e5a9be8cac0d62dfa17bf1571f9db57"; } - { locale = "ko"; arch = "linux-x86_64"; sha512 = "3eead074a7c82570db1923b8a64afdd8d8d802d33c4087c8b647f905f580d27ede2913e1323b98c46fdeb83a91db1a43dd155d013d3f42b54a7daac1d541b449"; } - { locale = "lt"; arch = "linux-i686"; sha512 = "317315c0c436ddf882ac2d5a5c76a942f0fe04f80c1d7634ff7223b363b5fedd0778b127e1cbe21e737acdb869e770b9c828a9df075eb19f4d4870767297b912"; } - { locale = "lt"; arch = "linux-x86_64"; sha512 = "2926b5ec95101dc682723a3157de86fcfd9974a7a74486c1d80481145feeb49264bc661621fed4739238e852ca2759dda155a2c22094da90c6d5dcf43107b3d4"; } - { locale = "nb-NO"; arch = "linux-i686"; sha512 = "36638e01b76b608c2af0dd6f6336877fab6e0c8b8d16c5f90095c0bb24d475bf5486782fc26061dea134e7817288d84b8b805351411b7e70f39f3a76c9354b92"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "cde8fcd4b1cd8202085aa7a04b5781cd561a2d2ad3e1551af420397816addee8d57f4c49036ba79e49bd6f4452107cf8f3acc7c238beca5814ac5522aff2195d"; } - { locale = "nl"; arch = "linux-i686"; sha512 = "03aa22ab612c39e9a7df2a346a338b70c6ee13802860ab9359322e6fae425c1f8416cab762b9e061e3d8b34417043c3979e49a5c7079bc8327c0a317e5b98abf"; } - { locale = "nl"; arch = "linux-x86_64"; sha512 = "a78658fcd3cd6c9cf5c775d37e5ebb38f72e0317e30abf7dcbd57c0f400355bbe242ae4ae9862eeeccdfe0fe2cdfe6c6b1c06b8bda3010e941041bdeb6a51fab"; } - { locale = "nn-NO"; arch = "linux-i686"; sha512 = "4594fdc88d66a61567652f4ef7fbf43b55853933f098526671801e0fcd6256367e71c5a179419b1015d410b49a26505879ba0397013c8b510a2462798e5b3821"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "e76bbf55d900e8c7c92e3ad130e58c061685f2abeb2f3ced71e52c36bd0d979eca58cc3a74daa394469281011e7339c15b423847bc43631bd6b3da7f1d4aecd5"; } - { locale = "pa-IN"; arch = "linux-i686"; sha512 = "590b974b9785db9843b35dfdd9aa9d8422379570b6511a02564d5a0edbaeafad38f99aba403cb996ed47416a9944ca7fcc74d8aacda74c8113de7f112b10f397"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "0de6495b746c39e5117f5662b4896b206cb7a4f22a8a8c4f6c080f434b856fdf1f4029c7b8aa9a3372b6bd66d883c26ec82dc2aa17ce89005f462d58b6e3ecea"; } - { locale = "pl"; arch = "linux-i686"; sha512 = "f03e723aebf1c7709a0f08b9416acef98b5e4082b981fae3276d26e3c11650153cc56fd8f96653eb9d2b5213f5ccc42e062b42cf6182dc910c56a24f07440102"; } - { locale = "pl"; arch = "linux-x86_64"; sha512 = "4179561c6fdb2b48a0ab87ac6d823b702181b18c3ca7f28f28a546cd7bbd7453a525e80600a5cebd89912fd69b78d768e136bf12398e5b0471a6fac310fafbe9"; } - { locale = "pt-BR"; arch = "linux-i686"; sha512 = "906510719e6d7149fe2c8cee9d5a88ae0a86cbd4bb6e2c4ec0bc4d77b252f71b98939f4002dab69a24db75d022e485d1711350ca1f26b3b55b05701dfff6f9da"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "ed1c438050b3e0a22d61f39b9771f22e2425a9b7cca1fc9ae41606f708b32354f5cfe7321f87f3a77dd50270a7e38554215c6f8fbaa0ffbbc1a1c7f01c8c4c6c"; } - { locale = "pt-PT"; arch = "linux-i686"; sha512 = "1ed53b8ac706dc2750276928b507c072e3b2e49f7df2ab6d382b31b0618da6e41ce3fcf50f7815b4736859fe899017ea4a646f4594f4ac7ef5c272ccdd6d69a7"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "07b00355b73786d61dfa2cf1752fe42f8c464291f77f8192117414b66ef5f3c627064a608abb18c6938c8a2b1e4dfe223ebeb4f1c4590bb8c80dadb0b77841d7"; } - { locale = "rm"; arch = "linux-i686"; sha512 = "6fa680229b2dadfe6984af37d1ec93ef9d5f2d9014bc62618690c2e71a6bf8bd7d945fb0312553f0f2858fee89b454b84375a65fbb90f8479d1812d838ef1109"; } - { locale = "rm"; arch = "linux-x86_64"; sha512 = "b95336e5ae9bf794e35dcf58fb8b4c17c4b4e58b4fd8552d708f15e6d9518640f42599350fcb6f140bac57e7d54d49946ab5c910ed67ac453b0c1c3150a195ed"; } - { locale = "ro"; arch = "linux-i686"; sha512 = "102b3a1c23742bf9fad04c1d87a43cf4b6f805b93528ec7139d5b3eecf141990594f32c2c89a7a950aa4257801ec2e5aa91ca6fcf2e1a067978f47cec500f6b3"; } - { locale = "ro"; arch = "linux-x86_64"; sha512 = "8a613cf9fbf8a96ee2b3a6610ad2638f388530601cb7af4bf9c44f73e92f21e97ea3a147887ebcb5080570bf6f7d9c0965e834eec011c646fc57100d8fcb7df1"; } - { locale = "ru"; arch = "linux-i686"; sha512 = "6d2a1bb3db76516f1011b701827b43e66099a50d575facd3b5be9718be21d4b7ef80feba091e4273960af8f56f416514c2d308877b039be06898bb50365e9e27"; } - { locale = "ru"; arch = "linux-x86_64"; sha512 = "e74578096eca86f68e993f620eaf66f220cc577522e73592092b6c63657640cea95d0b41ea035d505580aee258629e2f36e2abca9952372d102bcb0136e995d8"; } - { locale = "si"; arch = "linux-i686"; sha512 = "9900c9462c97d7e783dc9893a4a6f87a0e000866ddb3dffefd67548b30ffa4e9db8a2e93247027a45aae03c9d0bac305991a1684de17e8bd28f3c2d3e5a38309"; } - { locale = "si"; arch = "linux-x86_64"; sha512 = "00666797cc9b4ba2b3ec7c9914639ef5fda3df3c124aaa3255b37f721289f1b2e33a99e6e68d40a66daf96860b21c6af10a68a216b6e3a35d8261ba704be7081"; } - { locale = "sk"; arch = "linux-i686"; sha512 = "ca001243f8359c38b781fea53c3ede7baabea25af516d852e75b6beaca9ea1b9ce4964c345ff5754657a1a953a18bef2c631e962d92f699e2dc5a31a9d594d39"; } - { locale = "sk"; arch = "linux-x86_64"; sha512 = "5ce7dbdf5f9ac2b46c1a27aace9607011dd064de64a778ae39009d9ae6d729da903f5a3c09def1ad7d571a8b717a3f66889053abb38eddfe4146b04597fc2a0c"; } - { locale = "sl"; arch = "linux-i686"; sha512 = "ff9784d31a9233c925d1745752497cbe055df378b702169ed4cf1df144b00936566d9dbef4ae5ed9821933e70bec3ef71de4086b0a89f639df2bd57e1796ef3c"; } - { locale = "sl"; arch = "linux-x86_64"; sha512 = "673413e23de2de7daa9c4230105c6e58f21d4ebfc55b1df58c0351448d2f252e128c03ee59ba43525d6c92e2578af4c073e08f6250b4c94bb42beba81ae20f7a"; } - { locale = "sq"; arch = "linux-i686"; sha512 = "f2e3bccba1c8ad67d696e54e2001726cabe6f61e41daaa9dab2eee00cac7877a8af15c4876993ebed6042fe540c68b25fcee52888a6bd5ad6726875bb4489e05"; } - { locale = "sq"; arch = "linux-x86_64"; sha512 = "aa560ee3859d3bed0c5d5c4203b05ff47f7357b674c9d4ddad403a5f0c403994ecb982ca15b542ec9a32d0f27a5e04f41c574a1cbdc5f056c8a57e62de778f7b"; } - { locale = "sr"; arch = "linux-i686"; sha512 = "9739c33d30b7e6d6c28fc29f8f1badb06d32ae686fc684ec6743a5ffc4ba42d6060ba95c2bd1e3c2486c4d36ee0f14a1201f74768197073136991e49acec79ff"; } - { locale = "sr"; arch = "linux-x86_64"; sha512 = "5a86b2a9c67d489b21077eda647585291ddea2ea98d678b60fda134e11ee074ee39b06f84d3263d04b43358a10c04d4b238a65e9e3015801847e319850643bd3"; } - { locale = "sv-SE"; arch = "linux-i686"; sha512 = "e394654340d4f2da306149ed7cf0413ac0d40fb1488402e12e15c09c831585ecfcf6c355b420a902d76ec0aea7a5c9e234004f1ee19ed295d7b52343ab67c9a6"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "5d044f32243d99ffa8ab0b7345b0ea1a78d83cf6a921af0e89154c4f9f7caa21260f1e3c2c8287050dc44381f2979af51ab028efca7d197310d175dc86aecfcc"; } - { locale = "ta-LK"; arch = "linux-i686"; sha512 = "08154b5030c58cb52ef6b6584fc3d20d62e02cc0ee919f37c3a2e97f5afdac777f9dc6dd5881e3a87e5c20dfefdf816c068da014e42e111a3a8c7043b6e9002a"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "e8f88dbf82414cf680d9748c606ef73fef11a37bafd82a3cd79b5c5abebedf629993e7ecb3e3d6dcd3524fbda10b8b0af743e2948ac49141c76d008432706c4f"; } - { locale = "tr"; arch = "linux-i686"; sha512 = "63bcbce3c8f6e635cbfc73f83b33c6c6e9fd5f45f8878aa500772f807f1acdf611dcf4002084902937f95cd1abab1a76e00822327235e7b61ffb369b327974de"; } - { locale = "tr"; arch = "linux-x86_64"; sha512 = "cc5c84cd0854c0626e6c880e1abf4090f5488c84f39f52d466f2deb871ed55ad9890bf9f4a104c182ec292979eda56e4de114d328deddac5746ec9e969b6ecc6"; } - { locale = "uk"; arch = "linux-i686"; sha512 = "c55ae7ae3e388ec11d8c9bbeb3f18fa5883a5ea5b90d924e5f9a7d61876142a7b336eb50d35e54a405cee803ab7ad4d754a7ceb02cb9a2b9adeb415c44bd0c88"; } - { locale = "uk"; arch = "linux-x86_64"; sha512 = "42e535767e82c01868d2cd574805c814e7d67caaab9e531d0b82d36df92a2e42e19d8d6593b28c237b645e60035100d85a54b8acaba8c7a48ef83e865553cfc8"; } - { locale = "vi"; arch = "linux-i686"; sha512 = "52e05acb6c681ba62b608cb60d24816aaa35f296b6552b7006fe56b2f2d908a71736490c85e8bfb350d468510a031deedad65f691e4b77fc1dfee26bd30bdb41"; } - { locale = "vi"; arch = "linux-x86_64"; sha512 = "9a5b7cae14bcb8e390f7c8b7924a107058dc382e2627984f8c9eb5f380eb1d38b1152c928a5852d387d5d2b7ef7aa0d7393176a03dec0d3f1c1fade399149b7d"; } - { locale = "zh-CN"; arch = "linux-i686"; sha512 = "caa4533f57b85ed57ef66fe4807f8079d8bef73ad9a454e23a90154253c205a110e13fe1376c0a7d644b326f7dde888d8ed97ffedb8282d8887bb7131749f510"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "d025a3d878c6bf3ae9c1d07c023d89fc83b1c1314179f986fdac46066d334e209689d662bc7fef0fb7bfd7943cc741db5f397188b258ab42247a85c559ac27d7"; } - { locale = "zh-TW"; arch = "linux-i686"; sha512 = "d3e44f2f92ec4bf6b4a5dfebbcd2f05b323050ff88a1eb3b19301224a6815051e0e884e663dde834cef0a6889217ae94e446669aa0c97201c2d1f1bc2729c1b3"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "6c750b1f7f1253f1702178cdc80a1f8962961e16fd1f2e3f2f9d91062785349183e52799a399e60dcf7a3b7208a0755c3d7c137c28ee0b6ac99ccfa75e63b60f"; } - ]; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ar/thunderbird-45.5.1.tar.bz2"; + locale = "ar"; + arch = "linux-x86_64"; + sha512 = "b5760210c14df4648d6bbd48136dbb3221c682ecebb649be848f8fbecf89d2251630c8d8208438f0ab66b73964bbdf8e05035bb88f0c773ea253cab163b569b1"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ast/thunderbird-45.5.1.tar.bz2"; + locale = "ast"; + arch = "linux-x86_64"; + sha512 = "64028617fe76832663fd69e2305ca84dfd576507348dcffc680d94d6d1de640fdd13874a73638767d3aedd2c84d38fd370e57ba3f95281a0fc0ad9d21b4d727d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/be/thunderbird-45.5.1.tar.bz2"; + locale = "be"; + arch = "linux-x86_64"; + sha512 = "932f0dbe85e6cf43c70ea6f9537785322bc5280106c97b4e21ea828ebc5d997d027c260f4e1b4441909c3a3b7e61f51b95167cf6a632bce98fd2b6aa33eb413d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/bg/thunderbird-45.5.1.tar.bz2"; + locale = "bg"; + arch = "linux-x86_64"; + sha512 = "359973dc382c7565623f63ede93e37b1d1a2bbcf9690710e05fc066a8c7f67b059b9d14c978c93741d65544029e5970f520d7a64dd07902d89f0331b9a3330f3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/bn-BD/thunderbird-45.5.1.tar.bz2"; + locale = "bn-BD"; + arch = "linux-x86_64"; + sha512 = "f2d5b0c3fadb19d89733feecb50a7507b1c29dd93b5064a0db95292be1635c29bb3d98b84fb29ac38224c97dc7af29ff6024652562273eeca2a6ee38a0d19de3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/br/thunderbird-45.5.1.tar.bz2"; + locale = "br"; + arch = "linux-x86_64"; + sha512 = "3d1aba23ef4d969548b2fa729ad1795496f7123b4437f7692bfcbda4c87b0bd7edd1caf00cdb207eb4aaaf6c8ec8d0554d553a7db5a85e1e24d07c401d507794"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ca/thunderbird-45.5.1.tar.bz2"; + locale = "ca"; + arch = "linux-x86_64"; + sha512 = "a1c04f9846edba32587b1f62379e703a62af0b9886f1e56e86854629a034657d86a4f06ace3bca9f75a21c734b559f17522692e4c90607ab353669bfe02a3dc4"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/cs/thunderbird-45.5.1.tar.bz2"; + locale = "cs"; + arch = "linux-x86_64"; + sha512 = "f93ab27ec7e126aa309ba4d6d5900be7c427a29ccbbe141cd4e7f211daaeca6459163711204f02fafda285020173417d89a9c46f593114c81b73ce430a2c7743"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/cy/thunderbird-45.5.1.tar.bz2"; + locale = "cy"; + arch = "linux-x86_64"; + sha512 = "9166a6c737dde179411e1a0d509141f29c7df7e3fe7e4f6def229be08bba4ccf5963804a86490d08e5ae3dd602f246c2fdce717562616445257b81b8c17ee795"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/da/thunderbird-45.5.1.tar.bz2"; + locale = "da"; + arch = "linux-x86_64"; + sha512 = "6965968613889d69182ddf3dadf7e109e958d7561cb2b1a3936d9302b725d9c59c8cb8730ecf62e422a38c108da2ffa6ae5b012df348dd9250047a15b046e760"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/de/thunderbird-45.5.1.tar.bz2"; + locale = "de"; + arch = "linux-x86_64"; + sha512 = "2a33d8104e1149181e91e9588a4236b481a8837835af2a1b08f3cc2dd55eecb3059aafbabccae8b0dbb8cfc632bdc8fc6198bb600b60a9dbff5a96a8609699d1"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/dsb/thunderbird-45.5.1.tar.bz2"; + locale = "dsb"; + arch = "linux-x86_64"; + sha512 = "91314f8c8c7a9e1d13f618a1b71df8141933e6fe5f3317da06ac84ce1ea269bfe0740d94b2d8e240005a315a469cab39e79f70c06169712fdf318c9b3b5ac9c8"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/el/thunderbird-45.5.1.tar.bz2"; + locale = "el"; + arch = "linux-x86_64"; + sha512 = "601ed7cd8f6f1e867647036ab3f8fadca0507f4441998ac29dfd15a6c8cf0c65b94cd647b0b4602d7624f041a8fd14a8210fde26a7c09763746d31008699e0d3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/en-GB/thunderbird-45.5.1.tar.bz2"; + locale = "en-GB"; + arch = "linux-x86_64"; + sha512 = "07222127e045d41f912baa160b08e22a373ba605f857d001c92792ebbcf789e1094c68e0f16bf9c609fda0321ee0a0f702c7d47481f4da6a9cb80071b7e21095"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/en-US/thunderbird-45.5.1.tar.bz2"; + locale = "en-US"; + arch = "linux-x86_64"; + sha512 = "3dfeaa5e64b4063e0b5ae552bc47db1ab06e4381c55ccd35b05766aeac5add880804f07a40d39db08395a467ffa96d67261971359c46bce8d9ec6adde5948f2a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/es-AR/thunderbird-45.5.1.tar.bz2"; + locale = "es-AR"; + arch = "linux-x86_64"; + sha512 = "087caecb722222c3950c8a644cf7af37cd356b62b4802fcac1a4b93620fa086e2b3e97a6c5f6b22aa61d3478dad41bc7b8ab39d31bf76b710f2e53b36cea2049"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/es-ES/thunderbird-45.5.1.tar.bz2"; + locale = "es-ES"; + arch = "linux-x86_64"; + sha512 = "f335002365f68e28cf0e28c407843f8de3184b33a7e57638104d1ac3515cfcbd14842ecc6d61a7de012e2cb1d7c5ff170598b5f81dbcbb71b81549f6a8bb5531"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/et/thunderbird-45.5.1.tar.bz2"; + locale = "et"; + arch = "linux-x86_64"; + sha512 = "555874dfde25076892647a451bd9e02879eb5c8584dd22d5bb73f9c5deab5f64103d80c57292ed6a04b73fe27aa28d78210a1a5da7147fdae0980faaa8d19641"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/eu/thunderbird-45.5.1.tar.bz2"; + locale = "eu"; + arch = "linux-x86_64"; + sha512 = "5f4361f43bca179613f24045835fe31e17fe949da0e2f9e470635d714f521abac45d0104e663ab44806a7e45f4d44d515b002508e8388c2c72e0b91c793ec8bf"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fi/thunderbird-45.5.1.tar.bz2"; + locale = "fi"; + arch = "linux-x86_64"; + sha512 = "5ee311ba705cdfd7a6687a1a17e7c5b40fda22fa7acb3a9a0c236e2aa3d8037bbf568d9be29853abf3d52d6840ea96b7ee59cf9264709973aee3bc43e8c07979"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fr/thunderbird-45.5.1.tar.bz2"; + locale = "fr"; + arch = "linux-x86_64"; + sha512 = "ffa44a92d3ab3ac8bcdd945b910e6da6a4c0b05f4c95572fd2a56fe73f935f7a387fb98100c7a84e4adc22c9b1cf8a0aa84ac04eb14c4b60b7989053c2021a0a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fy-NL/thunderbird-45.5.1.tar.bz2"; + locale = "fy-NL"; + arch = "linux-x86_64"; + sha512 = "3cf5e391adca05195ea24be90a2414640f0fd72ffc858e971fc82675f49def7238c30f3ac48c08312414f436f9bde0ac2b05e11db94b40079c9d37f3d1a8ac5c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ga-IE/thunderbird-45.5.1.tar.bz2"; + locale = "ga-IE"; + arch = "linux-x86_64"; + sha512 = "4260f3a7245d8c7f0b6f3a0a47793c84eb83be44e19105a3efbc35ef1a1455f872a987c714eb95a1cfd4157816cd9eb09c5a6098460e90584e9d630812d66716"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/gd/thunderbird-45.5.1.tar.bz2"; + locale = "gd"; + arch = "linux-x86_64"; + sha512 = "b9ce9839cd3a4e8fbbba4f107a934ab4733b1feb65dd1e40a1c064f39026d03d1208b67b413ed4c643c7039f91e1ceb8747f3a46cc44d1bedb22275512f867b8"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/gl/thunderbird-45.5.1.tar.bz2"; + locale = "gl"; + arch = "linux-x86_64"; + sha512 = "fbd8a4eae6a94d966f8e1e9e2bcc7a6aed8b5a9991fc8367de28c11fc7b341fcf745c983f8259b89767a762604e55ade6212f5c1496dbf843c8eb49f89e8810c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/he/thunderbird-45.5.1.tar.bz2"; + locale = "he"; + arch = "linux-x86_64"; + sha512 = "51f3acbaf8971bd0bc93502605526f6d0be5093810f8a91f43c2597541dc23eb590a10b4f2839cd9ce1e13685fc7e38668184b12a23ae99356ffacf3f6481d83"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hr/thunderbird-45.5.1.tar.bz2"; + locale = "hr"; + arch = "linux-x86_64"; + sha512 = "65110b98cea4a6174dd31de4aea53d2efb1fee822025f9a7ccd6ef3ac80c0baa605fefd7078c3528451ffad7d9e86400c5b7b527b026aaca022a0099673442af"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hsb/thunderbird-45.5.1.tar.bz2"; + locale = "hsb"; + arch = "linux-x86_64"; + sha512 = "d50057bc3cdff3820f0bc09679f672d14a35240fc3e997836f9c04bd8aa922e41b627e0f632c2e76982439d4510262618d7d59adaa530708cadaf1fb111159e3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hu/thunderbird-45.5.1.tar.bz2"; + locale = "hu"; + arch = "linux-x86_64"; + sha512 = "bbff40d50155756c0d06fc4c9f7bf31f770901139b0a8d475ee0d8bd7ff1b2d4e8f5f3343fffd7af83f5f53f0567845f6c7ddde8abbd3f9f004c31a1479ec4ed"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hy-AM/thunderbird-45.5.1.tar.bz2"; + locale = "hy-AM"; + arch = "linux-x86_64"; + sha512 = "570815807b0ea61bcf506effb2acc52ee6e8089b1328a046a8c55de0e3e72227a2d097ffe61f383733ca6f11405e5689595bc31f931f41e854f71770e18230de"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/id/thunderbird-45.5.1.tar.bz2"; + locale = "id"; + arch = "linux-x86_64"; + sha512 = "ac9a78df1a8c6228560247e07cd7695eedf9ef0afd2c25a770aaffc8d96555f229e9332204e73ba803df2b8a7f590b970020b277123668ff20375608b093dc8c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/is/thunderbird-45.5.1.tar.bz2"; + locale = "is"; + arch = "linux-x86_64"; + sha512 = "cb78e3c2e1824d1da479e8ca5cdbdf420f7e046895a60b8912d44cbecf6966a32acbe2811545961a6da72f22052d8d2bed8d8ee1208b9c4e16250e6900265335"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/it/thunderbird-45.5.1.tar.bz2"; + locale = "it"; + arch = "linux-x86_64"; + sha512 = "84c053e27ecd67a15d84bb2c222ed97061c130fde590db558c7f5919dd8acc8bcc5f032f84c53fe364f95607aa04bcf43375d2cc9fac2d4990535aa38d939793"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ja/thunderbird-45.5.1.tar.bz2"; + locale = "ja"; + arch = "linux-x86_64"; + sha512 = "dada1c9e859b27a1bad7ba277749e77d68a20ad4c033861ee5ec54f78627efcaf336d082b1a8f9e4dfc91f6b16adde3eda873ae261351c3292c73c7f7ff05526"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ko/thunderbird-45.5.1.tar.bz2"; + locale = "ko"; + arch = "linux-x86_64"; + sha512 = "3eead074a7c82570db1923b8a64afdd8d8d802d33c4087c8b647f905f580d27ede2913e1323b98c46fdeb83a91db1a43dd155d013d3f42b54a7daac1d541b449"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/lt/thunderbird-45.5.1.tar.bz2"; + locale = "lt"; + arch = "linux-x86_64"; + sha512 = "2926b5ec95101dc682723a3157de86fcfd9974a7a74486c1d80481145feeb49264bc661621fed4739238e852ca2759dda155a2c22094da90c6d5dcf43107b3d4"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nb-NO/thunderbird-45.5.1.tar.bz2"; + locale = "nb-NO"; + arch = "linux-x86_64"; + sha512 = "cde8fcd4b1cd8202085aa7a04b5781cd561a2d2ad3e1551af420397816addee8d57f4c49036ba79e49bd6f4452107cf8f3acc7c238beca5814ac5522aff2195d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nl/thunderbird-45.5.1.tar.bz2"; + locale = "nl"; + arch = "linux-x86_64"; + sha512 = "a78658fcd3cd6c9cf5c775d37e5ebb38f72e0317e30abf7dcbd57c0f400355bbe242ae4ae9862eeeccdfe0fe2cdfe6c6b1c06b8bda3010e941041bdeb6a51fab"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nn-NO/thunderbird-45.5.1.tar.bz2"; + locale = "nn-NO"; + arch = "linux-x86_64"; + sha512 = "e76bbf55d900e8c7c92e3ad130e58c061685f2abeb2f3ced71e52c36bd0d979eca58cc3a74daa394469281011e7339c15b423847bc43631bd6b3da7f1d4aecd5"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pa-IN/thunderbird-45.5.1.tar.bz2"; + locale = "pa-IN"; + arch = "linux-x86_64"; + sha512 = "0de6495b746c39e5117f5662b4896b206cb7a4f22a8a8c4f6c080f434b856fdf1f4029c7b8aa9a3372b6bd66d883c26ec82dc2aa17ce89005f462d58b6e3ecea"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pl/thunderbird-45.5.1.tar.bz2"; + locale = "pl"; + arch = "linux-x86_64"; + sha512 = "4179561c6fdb2b48a0ab87ac6d823b702181b18c3ca7f28f28a546cd7bbd7453a525e80600a5cebd89912fd69b78d768e136bf12398e5b0471a6fac310fafbe9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pt-BR/thunderbird-45.5.1.tar.bz2"; + locale = "pt-BR"; + arch = "linux-x86_64"; + sha512 = "ed1c438050b3e0a22d61f39b9771f22e2425a9b7cca1fc9ae41606f708b32354f5cfe7321f87f3a77dd50270a7e38554215c6f8fbaa0ffbbc1a1c7f01c8c4c6c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pt-PT/thunderbird-45.5.1.tar.bz2"; + locale = "pt-PT"; + arch = "linux-x86_64"; + sha512 = "07b00355b73786d61dfa2cf1752fe42f8c464291f77f8192117414b66ef5f3c627064a608abb18c6938c8a2b1e4dfe223ebeb4f1c4590bb8c80dadb0b77841d7"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/rm/thunderbird-45.5.1.tar.bz2"; + locale = "rm"; + arch = "linux-x86_64"; + sha512 = "b95336e5ae9bf794e35dcf58fb8b4c17c4b4e58b4fd8552d708f15e6d9518640f42599350fcb6f140bac57e7d54d49946ab5c910ed67ac453b0c1c3150a195ed"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ro/thunderbird-45.5.1.tar.bz2"; + locale = "ro"; + arch = "linux-x86_64"; + sha512 = "8a613cf9fbf8a96ee2b3a6610ad2638f388530601cb7af4bf9c44f73e92f21e97ea3a147887ebcb5080570bf6f7d9c0965e834eec011c646fc57100d8fcb7df1"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ru/thunderbird-45.5.1.tar.bz2"; + locale = "ru"; + arch = "linux-x86_64"; + sha512 = "e74578096eca86f68e993f620eaf66f220cc577522e73592092b6c63657640cea95d0b41ea035d505580aee258629e2f36e2abca9952372d102bcb0136e995d8"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/si/thunderbird-45.5.1.tar.bz2"; + locale = "si"; + arch = "linux-x86_64"; + sha512 = "00666797cc9b4ba2b3ec7c9914639ef5fda3df3c124aaa3255b37f721289f1b2e33a99e6e68d40a66daf96860b21c6af10a68a216b6e3a35d8261ba704be7081"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sk/thunderbird-45.5.1.tar.bz2"; + locale = "sk"; + arch = "linux-x86_64"; + sha512 = "5ce7dbdf5f9ac2b46c1a27aace9607011dd064de64a778ae39009d9ae6d729da903f5a3c09def1ad7d571a8b717a3f66889053abb38eddfe4146b04597fc2a0c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sl/thunderbird-45.5.1.tar.bz2"; + locale = "sl"; + arch = "linux-x86_64"; + sha512 = "673413e23de2de7daa9c4230105c6e58f21d4ebfc55b1df58c0351448d2f252e128c03ee59ba43525d6c92e2578af4c073e08f6250b4c94bb42beba81ae20f7a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sq/thunderbird-45.5.1.tar.bz2"; + locale = "sq"; + arch = "linux-x86_64"; + sha512 = "aa560ee3859d3bed0c5d5c4203b05ff47f7357b674c9d4ddad403a5f0c403994ecb982ca15b542ec9a32d0f27a5e04f41c574a1cbdc5f056c8a57e62de778f7b"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sr/thunderbird-45.5.1.tar.bz2"; + locale = "sr"; + arch = "linux-x86_64"; + sha512 = "5a86b2a9c67d489b21077eda647585291ddea2ea98d678b60fda134e11ee074ee39b06f84d3263d04b43358a10c04d4b238a65e9e3015801847e319850643bd3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sv-SE/thunderbird-45.5.1.tar.bz2"; + locale = "sv-SE"; + arch = "linux-x86_64"; + sha512 = "5d044f32243d99ffa8ab0b7345b0ea1a78d83cf6a921af0e89154c4f9f7caa21260f1e3c2c8287050dc44381f2979af51ab028efca7d197310d175dc86aecfcc"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ta-LK/thunderbird-45.5.1.tar.bz2"; + locale = "ta-LK"; + arch = "linux-x86_64"; + sha512 = "e8f88dbf82414cf680d9748c606ef73fef11a37bafd82a3cd79b5c5abebedf629993e7ecb3e3d6dcd3524fbda10b8b0af743e2948ac49141c76d008432706c4f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/tr/thunderbird-45.5.1.tar.bz2"; + locale = "tr"; + arch = "linux-x86_64"; + sha512 = "cc5c84cd0854c0626e6c880e1abf4090f5488c84f39f52d466f2deb871ed55ad9890bf9f4a104c182ec292979eda56e4de114d328deddac5746ec9e969b6ecc6"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/uk/thunderbird-45.5.1.tar.bz2"; + locale = "uk"; + arch = "linux-x86_64"; + sha512 = "42e535767e82c01868d2cd574805c814e7d67caaab9e531d0b82d36df92a2e42e19d8d6593b28c237b645e60035100d85a54b8acaba8c7a48ef83e865553cfc8"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/vi/thunderbird-45.5.1.tar.bz2"; + locale = "vi"; + arch = "linux-x86_64"; + sha512 = "9a5b7cae14bcb8e390f7c8b7924a107058dc382e2627984f8c9eb5f380eb1d38b1152c928a5852d387d5d2b7ef7aa0d7393176a03dec0d3f1c1fade399149b7d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/zh-CN/thunderbird-45.5.1.tar.bz2"; + locale = "zh-CN"; + arch = "linux-x86_64"; + sha512 = "d025a3d878c6bf3ae9c1d07c023d89fc83b1c1314179f986fdac46066d334e209689d662bc7fef0fb7bfd7943cc741db5f397188b258ab42247a85c559ac27d7"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/zh-TW/thunderbird-45.5.1.tar.bz2"; + locale = "zh-TW"; + arch = "linux-x86_64"; + sha512 = "6c750b1f7f1253f1702178cdc80a1f8962961e16fd1f2e3f2f9d91062785349183e52799a399e60dcf7a3b7208a0755c3d7c137c28ee0b6ac99ccfa75e63b60f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ar/thunderbird-45.5.1.tar.bz2"; + locale = "ar"; + arch = "linux-i686"; + sha512 = "a2495d8d9a56104b5c5d87e795689d0334563fdb98fa751a2d7bedc9993ba66d3b1cfdc9d0d3711b8c8a2f91d8267c97035d1120051baa4aefcba1b968b9edc8"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ast/thunderbird-45.5.1.tar.bz2"; + locale = "ast"; + arch = "linux-i686"; + sha512 = "b1ccb4d51d9f5aec0cef3ccb0d5fcd14ca69a446cb18fc8b9f22d98325c0be45ea608f9c9ac15fb33e2b426b84c53e908a05331e360af728e088ad9c3cc77107"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/be/thunderbird-45.5.1.tar.bz2"; + locale = "be"; + arch = "linux-i686"; + sha512 = "32d89785e95667d17b7b4d19d37557c7d592370e42613c8c171e1b816d38a16197fdf8397211f61a9261457ea426f6de84af721462e4296c825f931655e64e66"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/bg/thunderbird-45.5.1.tar.bz2"; + locale = "bg"; + arch = "linux-i686"; + sha512 = "b5d2ed68959cc6a473e83db35634c6322f4638edae1a19f81d5ae1ab0080aed0940b751e96d3d3a562aa1811ca3c5435f2f3b0a205948f06c2d479cd98109e88"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/bn-BD/thunderbird-45.5.1.tar.bz2"; + locale = "bn-BD"; + arch = "linux-i686"; + sha512 = "a76fb786e1cb0485b4e212097685fa259ff76386bce3cbbec1d47e061c7116df76adb8bf419e51ade098fdb9b55a7aad5348e13917104d22a0aa39518205ca47"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/br/thunderbird-45.5.1.tar.bz2"; + locale = "br"; + arch = "linux-i686"; + sha512 = "51c1402350cec63a60f4ea96cdaedb1aa74250583a3cfed575060fb5990294446a8254108fcbd99607a286b8bde43357ccc8e0195330352d1497b8c173a7b283"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ca/thunderbird-45.5.1.tar.bz2"; + locale = "ca"; + arch = "linux-i686"; + sha512 = "1df09781962fdfc7abc425f9f96d2efcc7471bb9bb8cf2c0152846673c7fbfc86b6b4c05d73d3c949607d056478661be0e0d24b769f816820d1e4670fdf240f7"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/cs/thunderbird-45.5.1.tar.bz2"; + locale = "cs"; + arch = "linux-i686"; + sha512 = "463f336f49ababdb13397a10db3b189e3d364b07f9f42a4d31e770edd846c56fdb81f79228ffa51ab7f6555818bc3a0a3e5f1e546727bb3cd81f95f2264c392d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/cy/thunderbird-45.5.1.tar.bz2"; + locale = "cy"; + arch = "linux-i686"; + sha512 = "8a4802763162dd32577e02f878482094b3bae4c51b9ac7c109d188c8b5ab9fd0053c34eb2fabaed873e0ba9e7f5fac2ebe6604a0da00b806594e28fd0f823721"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/da/thunderbird-45.5.1.tar.bz2"; + locale = "da"; + arch = "linux-i686"; + sha512 = "bc430839b463ee22e4d1736be48f8f9e958307c3069b337b0ad816e3f88274b22b98ce66fec267f4ed134750fed656b1ebad0bce29637594d053bd82d1be3d34"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/de/thunderbird-45.5.1.tar.bz2"; + locale = "de"; + arch = "linux-i686"; + sha512 = "0a9ac8af9a823d69c8b2671f24bb203239a888d1423656241926dc5fa978e989ca5df303211e4a5208624d01ba34dd93915463eb88b0ee8ed027dad592a057c0"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/dsb/thunderbird-45.5.1.tar.bz2"; + locale = "dsb"; + arch = "linux-i686"; + sha512 = "9f089cc93ed4660250ebb0d4c677d36515d9dbf29f78947c88558c69362663fffff293fbb3acaf4fca2e40a88d093d7637e385db757812cad29c31b6b746e87c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/el/thunderbird-45.5.1.tar.bz2"; + locale = "el"; + arch = "linux-i686"; + sha512 = "1099c8443c089ac7f430023960802ab2ce914f103983d68dd283f0f1bb7d36ff8b35e44b7e766237cf19e9c6f02e5dbbab5f62e4cfdd8b80816d0892779732bd"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/en-GB/thunderbird-45.5.1.tar.bz2"; + locale = "en-GB"; + arch = "linux-i686"; + sha512 = "1efadd60994808919b24214c1610dccda0a76bf0de6cf3518b6eb665d035272f1a2e5e4e9e09fc2d4eb5a7021bdfaf3c3391e166737824355bb859b1d3fa54b8"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/en-US/thunderbird-45.5.1.tar.bz2"; + locale = "en-US"; + arch = "linux-i686"; + sha512 = "663ff453dfc556bd85633030e271174d96f039d8ea77bb1a338df02298feaea297ca7b4010d9c2973d19ba988b6e2b807486ca40f69bbfce84d0b7f8b21f7c32"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/es-AR/thunderbird-45.5.1.tar.bz2"; + locale = "es-AR"; + arch = "linux-i686"; + sha512 = "34fbd5a614ef5a0b9c46b63c80292dfe7caf2f65758a52d130ad4567311cde3e84ca1ab41d5fa87509b5ad9c6ce4ab136a4c08f1977b3695e5471265a758bd7d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/es-ES/thunderbird-45.5.1.tar.bz2"; + locale = "es-ES"; + arch = "linux-i686"; + sha512 = "e429e936f7d022b421c995ea8df18d72a3abf8a9dd2a0a6ae87435333c94a8abdcfa3c2416e36f883b1d2b5f573a17d8a38161fed5ff323767fc25756dc72d69"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/et/thunderbird-45.5.1.tar.bz2"; + locale = "et"; + arch = "linux-i686"; + sha512 = "3ec9056dc49cbc6b7734498ab5522fef93eeb6f08668cd04bb610bf0d2519759c614de07562706a3efc2b5e64325a70c04b18fb3138c2ce3cabe6ba1a51bdde5"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/eu/thunderbird-45.5.1.tar.bz2"; + locale = "eu"; + arch = "linux-i686"; + sha512 = "951a9fcb82f77cb45a5ccaf300d0516da7d1be069931fde87e729b9c9d99a0a07ee810a4bf4791698741ff52128f66d6ecc3d8c7887cf22462006929c582cacf"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fi/thunderbird-45.5.1.tar.bz2"; + locale = "fi"; + arch = "linux-i686"; + sha512 = "e28371194085e689d6445ce3a0de77c7b8127aeb740769ff2aaa8f0345cfbc7b3e8ad5f2d891c8ca34c2fa004cfcaace649b900248493e5c6ac4404b6f581e19"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fr/thunderbird-45.5.1.tar.bz2"; + locale = "fr"; + arch = "linux-i686"; + sha512 = "f135ff1b365df65cc9fab35941628be6f6264d2c91d8394d22fc35e945207640c8238cf2e0046598348d7521c1684eccdae0d7f0dc2bb22f415a862cad72d67a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fy-NL/thunderbird-45.5.1.tar.bz2"; + locale = "fy-NL"; + arch = "linux-i686"; + sha512 = "c90579ec9607992f4e551d327a3122d6bfd87ef3f1fb4708579c1a07deb2270a252c7443f3a3551bb725ef46a8cd9fa61cf59910260f9775eb8805e5e8acd61e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ga-IE/thunderbird-45.5.1.tar.bz2"; + locale = "ga-IE"; + arch = "linux-i686"; + sha512 = "a6a9f52acd576b615075f8829cff2ed085e7254e8a4a2380c0eb088cba1986ac81f9d0badecbf0ece1f7ba7b7b169c8cda23fb32a9e79fa78d29fe8c0cb4c8de"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/gd/thunderbird-45.5.1.tar.bz2"; + locale = "gd"; + arch = "linux-i686"; + sha512 = "12edcfd67dbc5d093d1c22eb707668e4f534a6baf96986e436684c9271d165fb2f422a2e84ef35b72063f1a91100230c92df2b08aee428ea0b384d6658f6bcb3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/gl/thunderbird-45.5.1.tar.bz2"; + locale = "gl"; + arch = "linux-i686"; + sha512 = "d357cc4f8a9ba8ff47458b03d17e4d10dc7be8bb16493ac3e896f63a3229962034012c7ecda4a70d4dd1d9c4aa76c349bf21725c6164fc96e6fc36f9b0fea9ea"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/he/thunderbird-45.5.1.tar.bz2"; + locale = "he"; + arch = "linux-i686"; + sha512 = "440a86fb6a94657f05eda2bde2a2e74d17398468a0b603866a03a7f37458e69a921e81d2ac1af2718f1168a56ee03ad596c39e8d88c933576efecb99a724957e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hr/thunderbird-45.5.1.tar.bz2"; + locale = "hr"; + arch = "linux-i686"; + sha512 = "1b5960e4df8a6247c63fb3f5e80b1795b4e098f446debd96b6344dbf97694337d6437dad53635fac57036ed6551b8a780ca4880dc35626aee83860a5934f3f9f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hsb/thunderbird-45.5.1.tar.bz2"; + locale = "hsb"; + arch = "linux-i686"; + sha512 = "bba6aa43cfee2422414c526f0c40fdc70984acb54e25e5eb75ef684e674b17a8dbf606e31d5d609bd572647ab3a9bbd78c76669156a1d2d4d45d8402650148b5"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hu/thunderbird-45.5.1.tar.bz2"; + locale = "hu"; + arch = "linux-i686"; + sha512 = "026a686dbe81a4c52bd3997de66e0919ea870954a3d14c4483f5f76f618424013b82a2478ec9eb3f506a1f666ef3333832a3e4533adcce41901db79120d2a454"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hy-AM/thunderbird-45.5.1.tar.bz2"; + locale = "hy-AM"; + arch = "linux-i686"; + sha512 = "a798c9581cdb2debbe773ed952bbc56f7d7444eac5a448fce0f17ba2b260405526cdcec306c39c39b2e80ce7addba810bc659312505af8c0a928c8a2f8107245"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/id/thunderbird-45.5.1.tar.bz2"; + locale = "id"; + arch = "linux-i686"; + sha512 = "ce54045626941976435a94bc5cf7513b79bc4e3e6a3b03bf1036ce9433cc6042689735b95d60afc4bf1de2ea31fe0ebc55b856bb51f0ba468744931a8c0727fa"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/is/thunderbird-45.5.1.tar.bz2"; + locale = "is"; + arch = "linux-i686"; + sha512 = "7e0a2c31968102010d1fba379a25c4bcbbf447f2a0005e01271faf1e19dc7e71a5f8cfcfbf36ed510743d53886864aa4164284e99f7ab86ac27629ffaca6000a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/it/thunderbird-45.5.1.tar.bz2"; + locale = "it"; + arch = "linux-i686"; + sha512 = "4852e13d1be422f107e18537bb364b04fb06fbb4854bb30f97753b0e0138ca2d9073e29c4b5905154fcd215701b300c0680025310479c6dca4294e3a591ff841"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ja/thunderbird-45.5.1.tar.bz2"; + locale = "ja"; + arch = "linux-i686"; + sha512 = "c539473ab434e20528f252f76f542f1938accde06b7d460b8e4a767a2721cded73710cca2264d2b18cd533a6118dfa9ae1c2701a6e1b18afe398f42a109439e9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ko/thunderbird-45.5.1.tar.bz2"; + locale = "ko"; + arch = "linux-i686"; + sha512 = "59421684c74f6c9fce41c4769ef725445bc84224357db21f1f4c9f5154c695a337445bfa05fca1f045d0e05ce64faf2d2e5a9be8cac0d62dfa17bf1571f9db57"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/lt/thunderbird-45.5.1.tar.bz2"; + locale = "lt"; + arch = "linux-i686"; + sha512 = "317315c0c436ddf882ac2d5a5c76a942f0fe04f80c1d7634ff7223b363b5fedd0778b127e1cbe21e737acdb869e770b9c828a9df075eb19f4d4870767297b912"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nb-NO/thunderbird-45.5.1.tar.bz2"; + locale = "nb-NO"; + arch = "linux-i686"; + sha512 = "36638e01b76b608c2af0dd6f6336877fab6e0c8b8d16c5f90095c0bb24d475bf5486782fc26061dea134e7817288d84b8b805351411b7e70f39f3a76c9354b92"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nl/thunderbird-45.5.1.tar.bz2"; + locale = "nl"; + arch = "linux-i686"; + sha512 = "03aa22ab612c39e9a7df2a346a338b70c6ee13802860ab9359322e6fae425c1f8416cab762b9e061e3d8b34417043c3979e49a5c7079bc8327c0a317e5b98abf"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nn-NO/thunderbird-45.5.1.tar.bz2"; + locale = "nn-NO"; + arch = "linux-i686"; + sha512 = "4594fdc88d66a61567652f4ef7fbf43b55853933f098526671801e0fcd6256367e71c5a179419b1015d410b49a26505879ba0397013c8b510a2462798e5b3821"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pa-IN/thunderbird-45.5.1.tar.bz2"; + locale = "pa-IN"; + arch = "linux-i686"; + sha512 = "590b974b9785db9843b35dfdd9aa9d8422379570b6511a02564d5a0edbaeafad38f99aba403cb996ed47416a9944ca7fcc74d8aacda74c8113de7f112b10f397"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pl/thunderbird-45.5.1.tar.bz2"; + locale = "pl"; + arch = "linux-i686"; + sha512 = "f03e723aebf1c7709a0f08b9416acef98b5e4082b981fae3276d26e3c11650153cc56fd8f96653eb9d2b5213f5ccc42e062b42cf6182dc910c56a24f07440102"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pt-BR/thunderbird-45.5.1.tar.bz2"; + locale = "pt-BR"; + arch = "linux-i686"; + sha512 = "906510719e6d7149fe2c8cee9d5a88ae0a86cbd4bb6e2c4ec0bc4d77b252f71b98939f4002dab69a24db75d022e485d1711350ca1f26b3b55b05701dfff6f9da"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pt-PT/thunderbird-45.5.1.tar.bz2"; + locale = "pt-PT"; + arch = "linux-i686"; + sha512 = "1ed53b8ac706dc2750276928b507c072e3b2e49f7df2ab6d382b31b0618da6e41ce3fcf50f7815b4736859fe899017ea4a646f4594f4ac7ef5c272ccdd6d69a7"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/rm/thunderbird-45.5.1.tar.bz2"; + locale = "rm"; + arch = "linux-i686"; + sha512 = "6fa680229b2dadfe6984af37d1ec93ef9d5f2d9014bc62618690c2e71a6bf8bd7d945fb0312553f0f2858fee89b454b84375a65fbb90f8479d1812d838ef1109"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ro/thunderbird-45.5.1.tar.bz2"; + locale = "ro"; + arch = "linux-i686"; + sha512 = "102b3a1c23742bf9fad04c1d87a43cf4b6f805b93528ec7139d5b3eecf141990594f32c2c89a7a950aa4257801ec2e5aa91ca6fcf2e1a067978f47cec500f6b3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ru/thunderbird-45.5.1.tar.bz2"; + locale = "ru"; + arch = "linux-i686"; + sha512 = "6d2a1bb3db76516f1011b701827b43e66099a50d575facd3b5be9718be21d4b7ef80feba091e4273960af8f56f416514c2d308877b039be06898bb50365e9e27"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/si/thunderbird-45.5.1.tar.bz2"; + locale = "si"; + arch = "linux-i686"; + sha512 = "9900c9462c97d7e783dc9893a4a6f87a0e000866ddb3dffefd67548b30ffa4e9db8a2e93247027a45aae03c9d0bac305991a1684de17e8bd28f3c2d3e5a38309"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sk/thunderbird-45.5.1.tar.bz2"; + locale = "sk"; + arch = "linux-i686"; + sha512 = "ca001243f8359c38b781fea53c3ede7baabea25af516d852e75b6beaca9ea1b9ce4964c345ff5754657a1a953a18bef2c631e962d92f699e2dc5a31a9d594d39"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sl/thunderbird-45.5.1.tar.bz2"; + locale = "sl"; + arch = "linux-i686"; + sha512 = "ff9784d31a9233c925d1745752497cbe055df378b702169ed4cf1df144b00936566d9dbef4ae5ed9821933e70bec3ef71de4086b0a89f639df2bd57e1796ef3c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sq/thunderbird-45.5.1.tar.bz2"; + locale = "sq"; + arch = "linux-i686"; + sha512 = "f2e3bccba1c8ad67d696e54e2001726cabe6f61e41daaa9dab2eee00cac7877a8af15c4876993ebed6042fe540c68b25fcee52888a6bd5ad6726875bb4489e05"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sr/thunderbird-45.5.1.tar.bz2"; + locale = "sr"; + arch = "linux-i686"; + sha512 = "9739c33d30b7e6d6c28fc29f8f1badb06d32ae686fc684ec6743a5ffc4ba42d6060ba95c2bd1e3c2486c4d36ee0f14a1201f74768197073136991e49acec79ff"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sv-SE/thunderbird-45.5.1.tar.bz2"; + locale = "sv-SE"; + arch = "linux-i686"; + sha512 = "e394654340d4f2da306149ed7cf0413ac0d40fb1488402e12e15c09c831585ecfcf6c355b420a902d76ec0aea7a5c9e234004f1ee19ed295d7b52343ab67c9a6"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ta-LK/thunderbird-45.5.1.tar.bz2"; + locale = "ta-LK"; + arch = "linux-i686"; + sha512 = "08154b5030c58cb52ef6b6584fc3d20d62e02cc0ee919f37c3a2e97f5afdac777f9dc6dd5881e3a87e5c20dfefdf816c068da014e42e111a3a8c7043b6e9002a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/tr/thunderbird-45.5.1.tar.bz2"; + locale = "tr"; + arch = "linux-i686"; + sha512 = "63bcbce3c8f6e635cbfc73f83b33c6c6e9fd5f45f8878aa500772f807f1acdf611dcf4002084902937f95cd1abab1a76e00822327235e7b61ffb369b327974de"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/uk/thunderbird-45.5.1.tar.bz2"; + locale = "uk"; + arch = "linux-i686"; + sha512 = "c55ae7ae3e388ec11d8c9bbeb3f18fa5883a5ea5b90d924e5f9a7d61876142a7b336eb50d35e54a405cee803ab7ad4d754a7ceb02cb9a2b9adeb415c44bd0c88"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/vi/thunderbird-45.5.1.tar.bz2"; + locale = "vi"; + arch = "linux-i686"; + sha512 = "52e05acb6c681ba62b608cb60d24816aaa35f296b6552b7006fe56b2f2d908a71736490c85e8bfb350d468510a031deedad65f691e4b77fc1dfee26bd30bdb41"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/zh-CN/thunderbird-45.5.1.tar.bz2"; + locale = "zh-CN"; + arch = "linux-i686"; + sha512 = "caa4533f57b85ed57ef66fe4807f8079d8bef73ad9a454e23a90154253c205a110e13fe1376c0a7d644b326f7dde888d8ed97ffedb8282d8887bb7131749f510"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/zh-TW/thunderbird-45.5.1.tar.bz2"; + locale = "zh-TW"; + arch = "linux-i686"; + sha512 = "d3e44f2f92ec4bf6b4a5dfebbcd2f05b323050ff88a1eb3b19301224a6815051e0e884e663dde834cef0a6889217ae94e446669aa0c97201c2d1f1bc2729c1b3"; + } + ]; } From bb63d4af9c6082c261c20e0d4c0c2510d1082a6a Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sun, 18 Dec 2016 20:49:29 +0300 Subject: [PATCH 1675/1749] kdecoration-viewer: init at 2015-08-20 --- .../tools/misc/kdecoration-viewer/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/misc/kdecoration-viewer/default.nix diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix new file mode 100644 index 000000000000..c32a814f2328 --- /dev/null +++ b/pkgs/tools/misc/kdecoration-viewer/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub +, cmake, ecm, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }: + +stdenv.mkDerivation rec { + name = "kdecoration-viewer-2015-08-20"; + + src = fetchFromGitHub { + owner = "KDE"; + repo = "kdecoration-viewer"; + rev = "d7174acee01475fbdb71cfd48ca49d487a141701"; + sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6"; + }; + + buildInputs = [ cmake ecm qtquickcontrols kconfigwidgets kdeclarative kdecoration ]; + + meta = with stdenv.lib; { + description = "Allows to preview a KDecoration plugin"; + longDescription = '' + kdecoration-viewer allows to preview a KDecoration plugin. Put your plugins under + $QT_PLUGIN_PATH/org.kde.kdecoration2 to preview. + ''; + homepage = https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/; + license = licenses.gpl2; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a505e4eef2cb..44e375547df7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13552,6 +13552,8 @@ in kdeconnect = qt5.callPackage ../applications/misc/kdeconnect { }; + kdecoration-viewer = kde5.callPackage ../tools/misc/kdecoration-viewer {}; + kdevelop-pg-qt = kde5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {}; kdevelop = kde5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { From bc6e9af7fa02e30d2ea0a4f353b1f9763034375c Mon Sep 17 00:00:00 2001 From: Marcin Janczyk Date: Sun, 18 Dec 2016 18:56:34 +0100 Subject: [PATCH 1676/1749] keepass-keefox: add myself as a maintainer --- lib/maintainers.nix | 1 + pkgs/applications/misc/keepass-plugins/keefox/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a1a61f97e299..4144d5f019f7 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -293,6 +293,7 @@ mingchuan = "Ming Chuan "; mirdhyn = "Merlin Gaillard "; mirrexagon = "Andrew Abbott "; + mjanczyk = "Marcin Janczyk "; mlieberman85 = "Michael Lieberman "; modulistic = "Pablo Costa "; mog = "Matthew O'Gorman "; diff --git a/pkgs/applications/misc/keepass-plugins/keefox/default.nix b/pkgs/applications/misc/keepass-plugins/keefox/default.nix index 72836c17c86a..0215c5a71c2f 100644 --- a/pkgs/applications/misc/keepass-plugins/keefox/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keefox/default.nix @@ -14,6 +14,7 @@ let homepage = http://keefox.org; platforms = with stdenv.lib.platforms; linux; license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.mjanczyk ]; }; buildInputs = [ unzip ]; From 786b5dd07b12afdd967cb6df1ec6c592817cdd89 Mon Sep 17 00:00:00 2001 From: Balletie Date: Sun, 18 Dec 2016 18:20:29 +0100 Subject: [PATCH 1677/1749] light-locker: use systemd/logind instead of UPower Since systemd has been adopted for a while now, we should switch to using it for light-locker as well. So I disabled ConsoleKit/UPower support in favor of using systemd with logind. This fixed many issues for me, and made light-locker working again. I followed the PKGBUILD of Arch's package in determining the right configure flags. See: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/light-locker --- .../screensavers/light-locker/default.nix | 22 ++++++++++++++++--- .../screensavers/light-locker/systemd.patch | 13 +++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 pkgs/misc/screensavers/light-locker/systemd.patch diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 80e405d4442f..17b0ef5e7d52 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -5,6 +5,8 @@ , glib , pkgconfig , libX11 +, libXScrnSaver +, libXxf86misc , gtk3 , dbus_glib , systemd @@ -23,18 +25,32 @@ stdenv.mkDerivation rec { sha256 = "0ygkp5vgkx2nfhfql6j2jsfay394gda23ir3sx4f72j4agsirjvj"; }; - buildInputs = [ which xfce.xfce4_dev_tools glib pkgconfig libX11 gtk3 dbus_glib systemd wrapGAppsHook ]; + # Patch so that systemd is "found" when configuring. + patches = [ ./systemd.patch ]; + + buildInputs = [ which xfce.xfce4_dev_tools glib systemd pkgconfig + libX11 libXScrnSaver libXxf86misc gtk3 dbus_glib wrapGAppsHook ]; preConfigure = '' ./autogen.sh ''; + configureFlags = [ "--with-xf86gamma-ext" "--with-mit-ext" + "--with-dpms-ext" "--with-systemd" + # ConsoleKit and UPower were dropped in favor + # of systemd replacements + "--without-console-kit" "--without-upower" ]; + meta = with stdenv.lib; { homepage = https://github.com/the-cavalry/light-locker; description = "Light-locker is a simple locker"; longDescription = '' - light-locker is a simple locker (forked from gnome-screensaver) that aims to have simple, sane, secure defaults and be well integrated with the desktop while not carrying any desktop-specific dependencies. - It relies on lightdm for locking and unlocking your session via ConsoleKit/UPower or logind/systemd. + light-locker is a simple locker (forked from gnome-screensaver) + that aims to have simple, sane, secure defaults and be well + integrated with the desktop while not carrying any + desktop-specific dependencies. It relies on lightdm for locking + and unlocking your session via ConsoleKit/UPower or + logind/systemd. ''; license = licenses.gpl2; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/misc/screensavers/light-locker/systemd.patch b/pkgs/misc/screensavers/light-locker/systemd.patch new file mode 100644 index 000000000000..9cba8b9c0d2f --- /dev/null +++ b/pkgs/misc/screensavers/light-locker/systemd.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac.in b/configure.ac.in +index f7d5f5d..341bc83 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -424,7 +424,7 @@ AC_ARG_WITH(systemd, + [with_systemd=$withval], [with_systemd=auto]) + + PKG_CHECK_MODULES(SYSTEMD, +- [libsystemd-login], ++ [libsystemd], + [have_systemd=yes], [have_systemd=no]) + + if test "x$with_systemd" = "xauto" ; then From bf82db37d25101956ee52fd078f8e582ca2fbae7 Mon Sep 17 00:00:00 2001 From: Balletie Date: Sun, 18 Dec 2016 19:33:13 +0100 Subject: [PATCH 1678/1749] light-locker: Conform meta.description to CONTRIBUTING --- pkgs/misc/screensavers/light-locker/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 17b0ef5e7d52..b13e9c7866c9 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -43,14 +43,15 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/the-cavalry/light-locker; - description = "Light-locker is a simple locker"; + description = "A simple session-locker for LightDM"; longDescription = '' - light-locker is a simple locker (forked from gnome-screensaver) - that aims to have simple, sane, secure defaults and be well - integrated with the desktop while not carrying any - desktop-specific dependencies. It relies on lightdm for locking - and unlocking your session via ConsoleKit/UPower or - logind/systemd. + A simple locker (forked from gnome-screensaver) that aims to + have simple, sane, secure defaults and be well integrated with + the desktop while not carrying any desktop-specific + dependencies. + + It relies on LightDM for locking and unlocking your session via + ConsoleKit/UPower or logind/systemd. ''; license = licenses.gpl2; maintainers = with maintainers; [ obadz ]; From 4f57a25e62696d5beae7fd65e600c280cf0fee23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Sun, 18 Dec 2016 19:27:48 +0100 Subject: [PATCH 1679/1749] gem-config: add lxc as a dependency for ruby-lxc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- pkgs/development/ruby-modules/gem-config/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index b889ae60d639..20dc23979f5a 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,7 +21,7 @@ , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl -, libmsgpack, qt48, libsodium, snappy, libossp_uuid +, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc }@args: let @@ -145,6 +145,10 @@ in buildInputs = [ imagemagick pkgconfig which ]; }; + ruby-lxc = attrs: { + buildInputs = [ lxc ]; + }; + ruby-terminfo = attrs: { buildInputs = [ ncurses ]; buildFlags = [ From 8ca29a796068d65594d7c05aef01b45e07992011 Mon Sep 17 00:00:00 2001 From: Stefan Goetz Date: Sun, 18 Dec 2016 20:47:15 +0100 Subject: [PATCH 1680/1749] youtube-dl: 2016.12.12 -> 2016.12.15 (#21258) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index db11875afa08..808ba21ab660 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.12.12"; + version = "2016.12.15"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "643efa7755ac4aa03a241f106d8923dfd5dbaf8d3c14e56b696048c4f2fab430"; + sha256 = "85d937a6edb8c14f8eac1b17d2e5d45574c7ec3f2cb792781ac1d8fb6a6ca39e"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From 5e5df0fea29323a1a75b8a16911e22955525ed82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 18 Dec 2016 22:16:48 +0100 Subject: [PATCH 1681/1749] rocksdb-haskell: just compile rocksdb statically to fix #21215 --- pkgs/development/haskell-modules/hackage-packages.nix | 2 +- pkgs/development/libraries/rocksdb/default.nix | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 840c45d3d019..6a3492ef97ec 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -148676,7 +148676,7 @@ self: { homepage = "http://github.com/agrafix/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) rocksdb;}; "roguestar" = callPackage diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index a8f8ab31d1c2..9a481c0b20f1 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -36,13 +36,10 @@ stdenv.mkDerivation rec { JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc"; buildFlags = [ - "shared_lib" "static_lib" ]; installFlags = [ - "install-shared" - "install-static" "INSTALL_PATH=\${out}" ]; From c04c9f7435a5eba30e5d2831da10f27d74e5adc3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 18 Dec 2016 21:51:36 +0100 Subject: [PATCH 1682/1749] electrum: improve build determinism The icon resource file captures the build timestamp, introducing an element of indeterminism. Fix by patching out the timestamp. This allows ```sh nix-build --check -A electrum ``` to succeed. --- pkgs/applications/misc/electrum/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 2ec212d493b8..53c1766d01bf 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -36,6 +36,8 @@ python2Packages.buildPythonApplication rec { preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py pyrcc4 icons.qrc -o gui/qt/icons_rc.py + # Recording the creation timestamps introduces indeterminism to the build + sed -i '/Created: .*/d' gui/qt/icons_rc.py ''; doInstallCheck = true; From 1ee50bc78a973554f6393266c759b5219aadb48f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 18 Dec 2016 21:56:43 +0100 Subject: [PATCH 1683/1749] electrum: manually fixup installation of share --- pkgs/applications/misc/electrum/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 53c1766d01bf..e0d426e99b62 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -40,6 +40,13 @@ python2Packages.buildPythonApplication rec { sed -i '/Created: .*/d' gui/qt/icons_rc.py ''; + postInstall = '' + # Despite setting usr_share above, these files are installed under + # $out/nix ... + mv $out/lib/python2.7/site-packages/nix/store/*/share $out + rm -rf $out/lib/python2.7/site-packages/nix + ''; + doInstallCheck = true; installCheckPhase = '' $out/bin/electrum help >/dev/null From 0cf907ae126bdf7e4cd8d399c161c0bd8ff3c303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Sun, 18 Dec 2016 22:39:27 +0100 Subject: [PATCH 1684/1749] nixos-rebuild: Fix SSHOPTS typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- nixos/modules/installer/tools/nixos-rebuild.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 36700d2bf566..8e55a4f525f9 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -126,9 +126,9 @@ targetHostCmd() { copyToTarget() { if ! [ "$targetHost" = "$buildHost" ]; then if [ -z "$targetHost" ]; then - NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --from "$buildHost" "$1" + NIX_SSHOPTS=$SSHOPTS nix-copy-closure --from "$buildHost" "$1" elif [ -z "$buildHost" ]; then - NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$targetHost" "$1" + NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$targetHost" "$1" else buildHostCmd nix-copy-closure --to "$targetHost" "$1" fi @@ -169,7 +169,7 @@ nixBuild() { local drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")" if [ -a "$drv" ]; then - NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$buildHost" "$drv" + NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$buildHost" "$drv" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" else echo "nix-instantiate failed" From d6aa35d5898bbedc2577ce498012db611a3020ce Mon Sep 17 00:00:00 2001 From: Marcin Janczyk Date: Sun, 18 Dec 2016 13:15:32 +0100 Subject: [PATCH 1685/1749] spotify: 1.0.43.125 -> 1.0.45.182 --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 0ff4e2c1cbc3..a1a4d26e2a03 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux"; let # Please update the stable branch! - version = "1.0.43.125.g376063c5-91"; + version = "1.0.45.182.gbbd5909f-72"; deps = [ alsaLib @@ -51,7 +51,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "1qkyfqi6dy8sggq8kakl6y03l6w2fcxb22ya3kxb4d468bifss3v"; + sha256 = "0vpwwla5vrx5ryx434a486l8vcgr1vxh28ri6ab4f28xrz16ipys"; }; buildInputs = [ dpkg makeWrapper ]; From c2e2a8120ff98c98c6e9f38b6fae380e69f5a27f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Dec 2016 15:55:57 -0600 Subject: [PATCH 1686/1749] audaciousQt5: init at 3.8.1 --- pkgs/applications/audio/audacious/qt-5.nix | 89 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 90 insertions(+) create mode 100644 pkgs/applications/audio/audacious/qt-5.nix diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix new file mode 100644 index 000000000000..b86efe7eb97e --- /dev/null +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -0,0 +1,89 @@ +{ + stdenv, lib, fetchurl, + gettext, makeQtWrapper, pkgconfig, + qtbase, + alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b, + libcddb, libcdio082, libcue, libjack2, libmad, libmcs, libmms, libmodplug, + libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, + libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, + wavpack +}: + +let + version = "3.8.1"; + sources = { + "audacious-${version}" = fetchurl { + url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; + sha256 = "1k9blmgqia0df18l39bd2bbcwmjfxak6bd286vcd9zzmjhqs4qdc"; + }; + + "audacious-plugins-${version}" = fetchurl { + url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; + sha256 = "0f16ivcp8nd83r781hnw1qgbs9hi2b2v22zwv7c3sw3jq1chb70h"; + }; + }; +in + +stdenv.mkDerivation { + inherit version; + name = "audacious-${version}"; + + sourceFiles = lib.attrValues sources; + sourceRoots = lib.attrNames sources; + + nativeBuildInputs = [ + gettext makeQtWrapper pkgconfig + ]; + + buildInputs = [ + # Core dependencies + qtbase + + # Plugin dependencies + alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb + libcdio082 libcue libjack2 libmad libmcs libmms libmodplug libmowgli + libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile + libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack + ]; + + configureFlags = [ "--enable-qt" "--disable-gtk" ]; + + # Here we build both audacious and audacious-plugins in one + # derivations, since they really expect to be in the same prefix. + # This is slighly tricky. + builder = builtins.toFile "builder.sh" '' + sourceFiles=( $sourceFiles ) + sourceRoots=( $sourceRoots ) + for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do + + ( + src=''${sourceFiles[$i]} + sourceRoot=''${sourceRoots[$i]} + source $stdenv/setup + genericBuild + ) + + if [ $i == 0 ]; then + nativeBuildInputs="$out $nativeBuildInputs" + fi + + done + + source $stdenv/setup + wrapQtProgram $out/bin/audacious + wrapQtProgram $out/bin/audtool + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Audio player"; + homepage = http://audacious-media-player.org/; + maintainers = with maintainers; [ ttuegel ]; + platforms = with platforms; linux; + license = with licenses; [ + bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING + gpl2 gpl3 lgpl2Plus #http://redmine.audacious-media-player.org/issues/46 + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 210fdcde7f6e..77aafb98822a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12259,6 +12259,7 @@ in }; audacious = callPackage ../applications/audio/audacious { }; + audaciousQt5 = qt5.callPackage ../applications/audio/audacious/qt-5.nix { }; audacity = callPackage ../applications/audio/audacity { }; From 327a650f09583b6f7d5bb2812bdd8d5b5a8fdab6 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 19 Dec 2016 09:05:45 +0100 Subject: [PATCH 1687/1749] google-cloud-sdk: 134.0.0 -> 138.0.0 --- pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 90bfd97ab593..dd8aada62fe8 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -7,18 +7,18 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "134.0.0"; + version = "138.0.0"; src = if stdenv.system == "i686-linux" then fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; - sha256 = "0pv2whqqcjvz3x02rn08vyssvbqxsncqvx9916v2ycdpiymffdz0"; + sha256 = "1z2v4bg743qkdlmyyy0z2j5s0g10vbc1643gxrhyz491sk6sp616"; } else fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; - sha256 = "1kji861ii4ig73scg64lijcqdg2p0d2i2af1fdbkils0imwa3m5l"; + sha256 = "1y64bx9vj6rrapffr7zwxbxxbqlddx91n82kr99mwv19n11hydyw"; }; buildInputs = [python27 makeWrapper]; From 56c0f5de89e047f8a38792cea4109079ef94a5c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Dec 2016 15:34:44 +0100 Subject: [PATCH 1688/1749] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.4 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/efd8c635e06a0a670699702b4ca97544ea44f8de. --- .../haskell-modules/hackage-packages.nix | 1282 +++++++++++++---- 1 file changed, 1011 insertions(+), 271 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6a3492ef97ec..65a6a47d9bf7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2754,6 +2754,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Clipboard_2_3_0_2" = callPackage + ({ mkDerivation, base, directory, unix, utf8-string, X11 }: + mkDerivation { + pname = "Clipboard"; + version = "2.3.0.2"; + sha256 = "c746972095b1c4473208992bb6f267a9b3ba2620b722922f0f4c35d71c71e939"; + libraryHaskellDepends = [ base directory unix utf8-string X11 ]; + homepage = "http://haskell.org/haskellwiki/Clipboard"; + description = "System clipboard interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ClustalParser" = callPackage ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec , vector @@ -5449,6 +5462,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Frames_0_1_9" = callPackage + ({ mkDerivation, base, directory, ghc-prim, hspec, htoml, pipes + , pretty, primitive, readable, regex-applicative, template-haskell + , temporary, text, transformers, unordered-containers, vector + , vinyl + }: + mkDerivation { + pname = "Frames"; + version = "0.1.9"; + sha256 = "18eaea64c8f3ff7156ca1dcc372bae3e8ff7538cffce4c415710eae770eb6b25"; + libraryHaskellDepends = [ + base ghc-prim pipes primitive readable template-haskell text + transformers vector vinyl + ]; + testHaskellDepends = [ + base directory hspec htoml pretty regex-applicative + template-haskell temporary text unordered-containers + ]; + description = "Data frames For working with tabular data files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Frank" = callPackage ({ mkDerivation, base, mtl, newtype, she, void }: mkDerivation { @@ -6585,6 +6621,7 @@ self: { homepage = "https://tweag.github.io/HaskellR"; description = "The Haskell/R mixed programming environment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HARM" = callPackage @@ -11031,8 +11068,8 @@ self: { ({ mkDerivation, base, bytestring, hidapi, mtl }: mkDerivation { pname = "MBot"; - version = "0.1.0.2"; - sha256 = "147655ce2a168c963fa04130b0f6196cb3679dbc8512d04dbff3c12406d16ec2"; + version = "0.1.1.0"; + sha256 = "6752fb112e01c02273ef55254b0f9cb16bbff4954592372ba9c152d9cb41dc12"; libraryHaskellDepends = [ base bytestring hidapi mtl ]; description = "Haskell interface for controlling the mBot educational robot"; license = stdenv.lib.licenses.gpl3; @@ -15826,6 +15863,7 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-api-server" = callPackage @@ -17903,6 +17941,26 @@ self: { inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11_1_7" = callPackage + ({ mkDerivation, base, data-default, libX11, libXext, libXinerama + , libXrandr, libXrender + }: + mkDerivation { + pname = "X11"; + version = "1.7"; + sha256 = "9e7a67b9521fc0140b4804928f3821b6c3d3950fdc1d9c55478844dc4f57f5f4"; + libraryHaskellDepends = [ base data-default ]; + librarySystemDepends = [ + libX11 libXext libXinerama libXrandr libXrender + ]; + homepage = "https://github.com/xmonad/X11"; + description = "A binding to the X11 graphics library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + inherit (pkgs.xorg) libXrender;}; + "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: mkDerivation { @@ -21880,6 +21938,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon AppStream SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-autoscaling" = callPackage @@ -21935,6 +21994,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Budgets SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-certificatemanager" = callPackage @@ -22323,6 +22383,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeBuild SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codecommit" = callPackage @@ -23422,6 +23483,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Health APIs and Notifications SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iam" = callPackage @@ -23792,6 +23854,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lightsail SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-marketplace-analytics" = callPackage @@ -23958,6 +24021,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks for Chef Automate SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-pinpoint" = callPackage @@ -23976,6 +24040,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Pinpoint SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-polly" = callPackage @@ -23994,6 +24059,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Polly SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-rds" = callPackage @@ -24087,6 +24153,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Rekognition SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53" = callPackage @@ -24309,6 +24376,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Shield SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sms" = callPackage @@ -24327,6 +24395,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Server Migration Service SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-snowball" = callPackage @@ -24476,6 +24545,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Step Functions SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-storagegateway" = callPackage @@ -24761,6 +24831,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon X-Ray SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amby" = callPackage @@ -24785,6 +24856,7 @@ self: { homepage = "https://github.com/jsermeno/amby#readme"; description = "Statistical data visualization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ampersand" = callPackage @@ -24875,8 +24947,8 @@ self: { }: mkDerivation { pname = "amqp-worker"; - version = "0.2.2"; - sha256 = "4d45b13eb6d58763f7da1d058ebca6163e37775c25898869811c684719d975e4"; + version = "0.2.3"; + sha256 = "41e7ed6f745cde27d451057958e5d017a6e6558ed5083f0cd0a10ee3bc757a09"; libraryHaskellDepends = [ aeson amqp base bytestring data-default exceptions monad-control mtl resource-pool split text transformers-base @@ -25212,10 +25284,8 @@ self: { }: mkDerivation { pname = "ansi-pretty"; - version = "0.1.2.0"; - sha256 = "11079e97b7faaf3825d0ab2bb3e111b5d1b9085343e6505fc2b58240c4eaa424"; - revision = "3"; - editedCabalFile = "f95f677bc3d419b5ad555799a7456684a11612e35ab08e2fe557323ed22d3127"; + version = "0.1.2.1"; + sha256 = "708819f93f1759919a19dcfccddf3ddc8d9fba930cb73fab3ec9f6f5691394c6"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -34218,16 +34288,17 @@ self: { "bolt" = callPackage ({ mkDerivation, base, bifunctors, bytestring, cereal, containers - , hashable, network, network-uri, text, unordered-containers - , vector + , hashable, network, network-uri, scientific, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "bolt"; - version = "0.1.0.3"; - sha256 = "7779436fc5da3ea036547273a82dd10909caebf76a294b3741aa5097b75aaa22"; + version = "0.2.0.0"; + sha256 = "2a066c5e24a707c7fb418b34c01b7dc0f47b084eb621baefa3a79afe03640e12"; libraryHaskellDepends = [ base bifunctors bytestring cereal containers hashable network - network-uri text unordered-containers vector + network-uri scientific text transformers unordered-containers + vector ]; homepage = "https://github.com/bflyblue/bolt#readme"; description = "Bolt driver for Neo4j"; @@ -36927,8 +36998,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.0.3"; - sha256 = "d3e2f376bf255daab8ea476831c8f4948e774e7307b19dbceb15a7f0df882654"; + version = "2.0.4"; + sha256 = "b20b597df92787ba878073cd7cc855b3c0186f1781ac65056f261c420a1c7fe3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40112,6 +40183,7 @@ self: { homepage = "https://github.com/beijaflor-io/haskell-cielo"; description = "Cielo API v3 Bindings for Haskell"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cil" = callPackage @@ -40880,6 +40952,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "classy-prelude-yesod_1_1_0" = 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.1.0"; + sha256 = "2b7672093e16850dba4c118c56d8626d8049e3c29b163c8389619bfc265f5b58"; + 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; + }) {}; + "classyplate" = callPackage ({ mkDerivation, base, template-haskell, type-list }: mkDerivation { @@ -40952,6 +41044,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; + "clckwrks_0_24_0" = callPackage + ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base + , blaze-html, bytestring, cereal, containers, directory, filepath + , happstack-authenticate, happstack-hsp, happstack-jmacro + , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs + , ixset, jmacro, lens, mtl, network, network-uri, old-locale + , openssl, process, random, reform, reform-happstack, reform-hsp + , safecopy, stm, text, time, time-locale-compat + , unordered-containers, userid, utf8-string, uuid-orphans + , uuid-types, vector, web-plugins, web-routes, web-routes-happstack + , web-routes-hsp, web-routes-th, xss-sanitize + }: + mkDerivation { + pname = "clckwrks"; + version = "0.24.0"; + sha256 = "aae3a0d63da228eb0876505ec574f90955d5f2c3512003b57371d988b94a2e5c"; + libraryHaskellDepends = [ + acid-state aeson aeson-qq attoparsec base blaze-html bytestring + cereal containers directory filepath happstack-authenticate + happstack-hsp happstack-jmacro happstack-server + happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl + network network-uri old-locale process random reform + reform-happstack reform-hsp safecopy stm text time + time-locale-compat unordered-containers userid utf8-string + uuid-orphans uuid-types vector web-plugins web-routes + web-routes-happstack web-routes-hsp web-routes-th xss-sanitize + ]; + librarySystemDepends = [ openssl ]; + homepage = "http://www.clckwrks.com/"; + description = "A secure, reliable content management system (CMS) and blogging platform"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "clckwrks-cli" = callPackage ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl , network, parsec @@ -41405,8 +41531,8 @@ self: { }: mkDerivation { pname = "clit"; - version = "0.1.0.0"; - sha256 = "7845c4a1d58becddb4683fa2972e3aa40eb62ca43d63e7c9b63905666af23c6b"; + version = "0.1.1.0"; + sha256 = "fc9feafd9f09fe9899af922c6a230d658b675621e5a5fe4da77af916a2ccca6f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41415,7 +41541,7 @@ self: { ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; - description = "Post tweets that you pipe to stdin"; + description = "Post tweets from stdin"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -43514,6 +43640,7 @@ self: { homepage = "https://github.com/hltcoe"; description = "Library for the Concrete data format"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concrete-relaxng-parser" = callPackage @@ -44219,24 +44346,24 @@ self: { }) {}; "config-ini" = callPackage - ({ mkDerivation, base, directory, ini, megaparsec, QuickCheck, text - , transformers, unordered-containers + ({ mkDerivation, base, directory, doctest, ini, megaparsec + , microlens, QuickCheck, text, transformers, unordered-containers }: mkDerivation { pname = "config-ini"; - version = "0.1.1.0"; - sha256 = "ef88423e53604474a4e1b2bfb0f0824efed740af25f2b1841577838bc96d10ac"; - revision = "1"; - editedCabalFile = "8665338f86052e9963fe0472b0c1e30c865e14f8450d16bc35519bf5e07f2032"; + version = "0.1.2.0"; + sha256 = "d3a2b77545fba315db644ce177248e59f918cf4b6e17123c04d66e8bb3c7ee15"; libraryHaskellDepends = [ base megaparsec text transformers unordered-containers ]; testHaskellDepends = [ - base directory ini QuickCheck text unordered-containers + base directory doctest ini microlens 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "config-manager" = callPackage @@ -47535,15 +47662,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cryptonite_0_20" = callPackage + "cryptonite_0_21" = callPackage ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim , integer-gmp, memory, tasty, tasty-hunit, tasty-kat , tasty-quickcheck }: mkDerivation { pname = "cryptonite"; - version = "0.20"; - sha256 = "261bfac4e032f24658a31d8c34abd0c0f64f9de07be69ad43a9139a7c0b5c354"; + version = "0.21"; + sha256 = "639a66aee1c3fa64161b1886d319612b8ce92f751adde476fdc35aea730262ee"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp memory ]; @@ -47781,6 +47908,7 @@ self: { libraryHaskellDepends = [ base containers pretty ]; description = "AST and pretty printer for CSPm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "css" = callPackage @@ -47846,8 +47974,8 @@ self: { }: mkDerivation { pname = "csv-conduit"; - version = "0.6.6"; - sha256 = "7329056af16c2f81382ad0cc3437232b80e9910288daf687519a2e2cd2ee5d8b"; + version = "0.6.7"; + sha256 = "501e6b0b7c6f0e80ba381b5f18af5ec343eb5e1afb4f5fc4e5e318ce51eeb33d"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring conduit conduit-extra containers data-default ghc-prim mmorph monad-control @@ -48121,6 +48249,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {cudd = null;}; + "cue-sheet" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck + , text + }: + mkDerivation { + pname = "cue-sheet"; + version = "0.1.0"; + sha256 = "cb4d369b3eb3859b9006dce4f9b45a3b9dafb75370d02bf5f178f06905dd05f1"; + libraryHaskellDepends = [ + base bytestring containers data-default-class exceptions megaparsec + mtl QuickCheck text + ]; + testHaskellDepends = [ + base bytestring exceptions hspec hspec-megaparsec QuickCheck text + ]; + homepage = "https://github.com/mrkkrp/cue-sheet"; + description = "Support for construction, rendering, and parsing of CUE sheets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cufft" = callPackage ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath , template-haskell @@ -54969,6 +55118,8 @@ self: { pname = "distributed-process-simplelocalnet"; version = "0.2.3.3"; sha256 = "7b98498f2d6ce185ae0a855ff35e97a9ad1bd1ec7872b2d75aa0bb1f1fb24316"; + revision = "1"; + editedCabalFile = "4ccf03a12611141e322511b6370e2f757e215f17e68fc3f68485ec5b48fa8f70"; libraryHaskellDepends = [ base binary bytestring containers data-accessor distributed-process network network-multicast network-transport network-transport-tcp @@ -57250,8 +57401,8 @@ self: { }: mkDerivation { pname = "dynamodb-simple"; - version = "0.2.0.0"; - sha256 = "d1fbc3a6f4df1b8a8a5125227e3492299cca6b88cec6b24d838ade5f081406b9"; + version = "0.3.0.0"; + sha256 = "5a1693cacc9d15727b4d0f71cf6015a71e2e5269b8872c9e50016ff6d0f7265b"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb base bytestring conduit containers double-conversion exceptions generics-sop @@ -57266,6 +57417,7 @@ self: { homepage = "https://github.com/ondrap/dynamodb-simple"; description = "Typesafe library for working with DynamoDB database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynobud" = callPackage @@ -58632,6 +58784,7 @@ self: { homepage = "https://github.com/jb55/elm-export-persistent"; description = "elm-export persistent entities"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-get" = callPackage @@ -59234,8 +59387,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.13"; - sha256 = "5fc53f8a4a0ba563b9592e7bf3d9475a4a7ce165c66cd63a303567f6a941cf45"; + version = "1.2.14"; + sha256 = "f321e826d56d7f14b4e027ddb57be59b2efa34a714e566e23a6bcee192ab6f33"; libraryHaskellDepends = [ aeson async attoparsec base base64-bytestring bytestring either free monad-loops mwc-random stm stm-delay text transformers @@ -63610,12 +63763,14 @@ self: { }) {}; "finite-typelits" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, deepseq }: mkDerivation { pname = "finite-typelits"; - version = "0.1.0.0"; - sha256 = "1729a66604cf852f1370f3575ac7cd74777df17106929c2afa57cf6c8fc78c58"; - libraryHaskellDepends = [ base ]; + version = "0.1.1.0"; + sha256 = "40cbe752fa659fdebd5afeb7a15177746b08227cf6add085481b94f53f8c858b"; + revision = "1"; + editedCabalFile = "4c5ae66b960dcede29688c32b9fb0d839a4bfb53bcde8e13f6a62b7f4fd55b4f"; + libraryHaskellDepends = [ base deepseq ]; homepage = "https://github.com/mniip/finite-typelits"; description = "A type inhabited by finitely many values, indexed by type-level naturals"; license = stdenv.lib.licenses.bsd3; @@ -63966,6 +64121,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Fixed width subsets of an Int64/Word64"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixedprec" = callPackage @@ -64610,8 +64766,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.0.0"; - sha256 = "95590b3e27edd3b79a33dd872a5c7a3d6f4a436db63eea7fe282066e1319f506"; + version = "0.5.0.1"; + sha256 = "440e605c927bbd10b5b6bb17d2b608797747f6780eb7014eb29998519fd3b495"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring text ]; @@ -65222,6 +65378,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "forest" = callPackage + ({ mkDerivation, aeson, base, bifunctors, deepseq, hashable + , profunctors, semigroupoids + }: + mkDerivation { + pname = "forest"; + version = "0.1"; + sha256 = "4de243b4eddddc534881617c6335e0658496ad67c2ebc65ba148b2965fe64460"; + libraryHaskellDepends = [ + aeson base bifunctors deepseq hashable profunctors semigroupoids + ]; + homepage = "https://github.com/duairc/forest"; + description = "Tree and Forest types"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "forger" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -65543,6 +65715,8 @@ self: { pname = "foundation"; version = "0.0.2"; sha256 = "d879240154104273197249b4fbd2bd6d6ad9739166a8a75e9484bf87b6d9388f"; + revision = "1"; + editedCabalFile = "171bd233fb790408501779243fdcbc2659911e55e39067efb80254bbcc3781e4"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -66251,16 +66425,19 @@ self: { }) {}; "friday" = callPackage - ({ mkDerivation, base, convertible, deepseq, primitive, QuickCheck - , ratio-int, test-framework, test-framework-quickcheck2 + ({ mkDerivation, base, containers, convertible, deepseq, primitive + , QuickCheck, ratio-int, test-framework, test-framework-quickcheck2 , transformers, vector }: mkDerivation { pname = "friday"; - version = "0.2.2.0"; - sha256 = "d9a59b716eec813d6108d535b2a180d51f152cb04103670535a7ade7e1ab8833"; + version = "0.2.3.1"; + sha256 = "0827492c1a6116baa5c4866539a4cfa0f6d81bf31f6573616bf5ac4484199613"; + revision = "1"; + editedCabalFile = "a8b4d38b593d866bebbdf141273ce70d2af8ca3351af86ea334dd5bce9252e58"; libraryHaskellDepends = [ - base convertible deepseq primitive ratio-int transformers vector + base containers convertible deepseq primitive ratio-int + transformers vector ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 vector @@ -67237,6 +67414,7 @@ self: { homepage = "https://github.com/ziocroc/FWGL"; description = "FWGL GHCJS backend"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "g-npm" = callPackage @@ -69639,6 +69817,7 @@ self: { homepage = "https://github.com/agocorona/ghcjs-hplay"; description = "Client-side web EDSL for transient nodes running in the web browser"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-perch" = callPackage @@ -69662,6 +69841,7 @@ self: { homepage = "https://github.com/vwwv/ghcjs-promise"; description = "Bidirectional bidings to javascript's promise"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-websockets" = callPackage @@ -69999,6 +70179,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GIRepository (gobject-introspection) bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gobjectIntrospection;}; "gi-glib" = callPackage @@ -70236,8 +70417,8 @@ self: { }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.2.0"; - sha256 = "1e028105e79012de9bc54d576bc888994f950512c4ef1b72ad0776bcdeb4a1e6"; + version = "0.3.4.0"; + sha256 = "2e7ce60dded6d70a4598001469894d1f415bc28d600e5a6ac9f4558c624200e4"; libraryHaskellDepends = [ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi-base mtl text transformers @@ -70657,8 +70838,10 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.3.7.2"; - sha256 = "53b18bf7146c4d46347eb74a64add43167220377d75fb572afe5bb1e0ac173dd"; + version = "0.3.8.0"; + sha256 = "938391f36b50a5fafe7f2668f25d08a4db77cdcc43cb6b15644dedfb81ed7625"; + revision = "1"; + editedCabalFile = "39afd3a71efabe33c2a2f5d3fd11906a0f8e1e8c4931acc230c8a9794ef6d676"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70772,7 +70955,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "giphy-api_0_5_1_0" = callPackage + "giphy-api_0_5_2_0" = callPackage ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers , directory, hspec, http-api-data, http-client, http-client-tls , lens, microlens, microlens-th, mtl, network-uri, servant @@ -70780,8 +70963,8 @@ self: { }: mkDerivation { pname = "giphy-api"; - version = "0.5.1.0"; - sha256 = "b4b33df49353f67621fba1655cf5938c5ca6f1e563e349a3f9a43edc6a98fa99"; + version = "0.5.2.0"; + sha256 = "447111d3fa32a76ffc50b26fbec59d9e9a097d7e2facb04a7a272cb9abd97ce9"; libraryHaskellDepends = [ aeson base containers http-api-data http-client http-client-tls microlens microlens-th mtl network-uri servant servant-client text @@ -71795,15 +71978,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "glabrous_0_2_0" = callPackage + "glabrous_0_2_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , cereal, cereal-text, directory, either, hspec, text , unordered-containers }: mkDerivation { pname = "glabrous"; - version = "0.2.0"; - sha256 = "2c4b636c0f53ddd51f6bc8f0e208cca8cf1326ce107b7164ca80ea629fed8dbb"; + version = "0.2.0.1"; + sha256 = "cb2f9a9f60395f0abc062311a7cbea8505ecd546f1cb71e51b01291aea323327"; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring cereal cereal-text either text unordered-containers @@ -77769,6 +77952,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "h-reversi" = callPackage + ({ mkDerivation, base, blank-canvas, containers, hspec, QuickCheck + , split, stm, text + }: + mkDerivation { + pname = "h-reversi"; + version = "0.1.0.3"; + sha256 = "919633a7c253004c166b06a1b390581519f3164a2e9ca83ac4cbffe178392ee2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blank-canvas containers split stm text + ]; + executableHaskellDepends = [ + base blank-canvas containers split stm text + ]; + testHaskellDepends = [ + base containers hspec QuickCheck split text + ]; + homepage = "https://github.com/apoorvingle/h-reversi"; + description = "Reversi game in haskell/blank-canvas"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "h2048" = callPackage ({ mkDerivation, base, HUnit, MonadRandom, mtl, text, transformers , vty, vty-ui @@ -79954,6 +80162,7 @@ self: { homepage = "https://github.com/oisdk/hakyll-series"; description = "Adds series functionality to hakyll"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-shakespeare" = callPackage @@ -80173,6 +80382,7 @@ self: { homepage = "https://github.com/mstksg/hamilton"; description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hamlet" = callPackage @@ -81533,6 +81743,7 @@ self: { homepage = "https://github.com/zmactep/hasbolt#readme"; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hascal" = callPackage @@ -81999,6 +82210,7 @@ self: { homepage = "http://github.com/cosbynator/haskakafka"; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) rdkafka;}; "haskanoid" = callPackage @@ -83231,8 +83443,8 @@ self: { }: mkDerivation { pname = "haskell-tools-ast"; - version = "0.3.0.1"; - sha256 = "5eab56307a8f415114da1c891e1753ccfe7febe8fe04c0280a8eb5b4e20c8728"; + version = "0.4.0.0"; + sha256 = "467845d216b9f4799c0ab681b2046df5cd410a170b9e6b78cf351b047f5bb70b"; libraryHaskellDepends = [ base ghc mtl references template-haskell uniplate ]; @@ -83303,8 +83515,8 @@ self: { }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "0.3.0.1"; - sha256 = "a63cd589f21a534bd0e68f27307a791f2257ab6e8eca7c76832a26e2b17868a3"; + version = "0.4.0.0"; + sha256 = "72755148f8866075be70a3b244d451b3f0755e53cc14b94401d7cd3c80dfd279"; libraryHaskellDepends = [ base bytestring containers ghc haskell-tools-ast mtl references safe split template-haskell transformers uniplate @@ -83316,48 +83528,85 @@ self: { }) {}; "haskell-tools-cli" = callPackage - ({ mkDerivation, base, containers, directory, filepath, ghc - , ghc-paths, haskell-tools-ast, haskell-tools-prettyprint - , haskell-tools-refactor, HUnit, mtl, references, split + ({ mkDerivation, base, bytestring, containers, directory, filepath + , ghc, ghc-paths, haskell-tools-ast, haskell-tools-prettyprint + , haskell-tools-refactor, knob, mtl, references, split, tasty + , tasty-hunit }: mkDerivation { pname = "haskell-tools-cli"; - version = "0.3.0.1"; - sha256 = "0e60a276383fff8b9cceda6fe82d45001156db5d3888b1914b16b04280f697b2"; + version = "0.4.0.0"; + sha256 = "0bc38f0d805b3d7bb0f643a83e217d7ff6139bc561c15ad4d8b45e208da9de37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory ghc ghc-paths haskell-tools-ast + base containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-prettyprint haskell-tools-refactor mtl references split ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base directory filepath HUnit ]; + testHaskellDepends = [ + base bytestring directory filepath knob tasty tasty-hunit + ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Command-line frontend for Haskell-tools Refact"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-daemon" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl + , network, references, split, tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-daemon"; + version = "0.4.0.0"; + sha256 = "a339059dcdcaf2af3d622d61c64c3467e849748d27525d6d66c8e135ed5b5aeb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-prettyprint haskell-tools-refactor + mtl network references split + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath HUnit network tasty + tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Background process for Haskell-tools refactor that editors can connect to"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint - , haskell-tools-refactor, http-types, mtl, references, transformers - , wai, wai-websockets, warp, websockets + , haskell-tools-refactor, http-types, HUnit, mtl, network + , references, tasty, tasty-hunit, transformers, wai, wai-websockets + , warp, websockets }: mkDerivation { pname = "haskell-tools-demo"; - version = "0.3.0.1"; - sha256 = "9c85cd53b3cb18a1f6355b1d7f9c9f702ad82cead9f6b2e2d20d4ff1de5ca744"; - isLibrary = false; + version = "0.4.0.0"; + sha256 = "1e52d8e1408323d75fd8f15344328c1f7ea194f7662d632cbb28e384fca05451"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ aeson base bytestring containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc haskell-tools-prettyprint haskell-tools-refactor http-types mtl references transformers wai wai-websockets warp websockets ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath HUnit network tasty + tasty-hunit websockets + ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "A web-based demo for Haskell-tools Refactor"; license = stdenv.lib.licenses.bsd3; @@ -83370,8 +83619,8 @@ self: { }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "0.3.0.1"; - sha256 = "13356a19d14a0d0c6a95b0ec56600fd4166dcee23ddef80fe0913b5d734ade5c"; + version = "0.4.0.0"; + sha256 = "408fca758679e050c8a984e635853d356b9f1c5141add998e3fbf67e24fafbaf"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split uniplate ]; @@ -83385,13 +83634,14 @@ self: { ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint - , haskell-tools-rewrite, HUnit, mtl, old-time, polyparse - , references, split, template-haskell, time, transformers, uniplate + , haskell-tools-rewrite, mtl, old-time, polyparse, references + , split, tasty, tasty-hunit, template-haskell, time, transformers + , uniplate }: mkDerivation { pname = "haskell-tools-refactor"; - version = "0.3.0.1"; - sha256 = "0fc7d41b05d130f57681f90a571ad9e112186a3fe5395c6ecc4575814aa8b2f5"; + version = "0.4.0.0"; + sha256 = "066cc62a3d553ff7510f64acd4627baa154e65e4d941ac74402aa7b978394c93"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -83401,9 +83651,9 @@ self: { testHaskellDepends = [ base Cabal containers directory either filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-rewrite HUnit mtl old-time - polyparse references split template-haskell time transformers - uniplate + haskell-tools-prettyprint haskell-tools-rewrite mtl old-time + polyparse references split tasty tasty-hunit template-haskell time + transformers uniplate ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; @@ -83412,17 +83662,22 @@ self: { }) {}; "haskell-tools-rewrite" = callPackage - ({ mkDerivation, base, containers, ghc, haskell-tools-ast - , haskell-tools-prettyprint, mtl, references + ({ mkDerivation, base, containers, directory, filepath, ghc + , haskell-tools-ast, haskell-tools-prettyprint, mtl, references + , tasty, tasty-hunit }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "0.3.0.1"; - sha256 = "190e3aaa5a2a77e4106dd7ae243605b5036b82848197d0ab747c91b89a6b3aa6"; + version = "0.4.0.0"; + sha256 = "a47604c77b77a5ca1ca5ce0c5c517a68d7cdc33d9b056f7fd5f98d3756af61a2"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references ]; + testHaskellDepends = [ + base directory filepath haskell-tools-ast haskell-tools-prettyprint + tasty tasty-hunit + ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Facilities for generating new parts of the Haskell-Tools AST"; license = stdenv.lib.licenses.bsd3; @@ -84759,6 +85014,28 @@ self: { homepage = "https://github.com/chris-kahn/hasql-generic#readme"; description = "Generic encoder and decoder deriving for Hasql"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hasql-migration" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, contravariant + , cryptohash, data-default-class, directory, hasql + , hasql-transaction, hspec, text, time, transformers + }: + mkDerivation { + pname = "hasql-migration"; + version = "0.1.1"; + sha256 = "0cb83fffe9ebda4632fd426a97506c9c5f803c42a01d0987e7752240aceff595"; + libraryHaskellDepends = [ + base base64-bytestring bytestring contravariant cryptohash + data-default-class directory hasql hasql-transaction text time + ]; + testHaskellDepends = [ + base bytestring hasql hasql-transaction hspec transformers + ]; + homepage = "https://github.com/tvh/hasql-migration"; + description = "PostgreSQL Schema Migrations"; + license = stdenv.lib.licenses.bsd3; }) {}; "hasql-optparse-applicative" = callPackage @@ -84938,8 +85215,8 @@ self: { }: mkDerivation { pname = "haste-compiler"; - version = "0.5.5.0"; - sha256 = "9e6d526193f73ae90e863b9fff0dcf8b3e028f430d3157ee3eb1a9a46fae250c"; + version = "0.5.5.1"; + sha256 = "c93d1dce0f0024ecae56019b1c7a5b68ca37cf32ba7a8ee7b2f248981af4865c"; configureFlags = [ "-fportable" ]; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 directory @@ -86312,19 +86589,19 @@ self: { }) {}; "heckle" = callPackage - ({ mkDerivation, base, blaze-html, dates, directory, filepath + ({ mkDerivation, base, blaze-html, directory, filepath , optparse-applicative, optparse-generic, pandoc, pandoc-types - , process, split, tagsoup + , process, split, tagsoup, time }: mkDerivation { pname = "heckle"; - version = "2.0.1.5"; - sha256 = "64655fc2c10b00e31cbd8ba6ca6a339fdb184f580f56e24258ecf85605e7d97b"; + version = "2.0.1.9"; + sha256 = "b8a14e8e80dfc0190088e8f05baf9b47c46ac72e6b8ec5f36be244087b0469ba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-html dates directory filepath pandoc pandoc-types - process split tagsoup + base blaze-html directory filepath pandoc pandoc-types process + split tagsoup time ]; executableHaskellDepends = [ base directory filepath optparse-applicative optparse-generic @@ -87371,10 +87648,8 @@ self: { ({ mkDerivation, base, bytestring, extra }: mkDerivation { pname = "hexml"; - version = "0.1"; - sha256 = "dab6b475d2c9e9e1b733c37d3a97ebd7f1ef1db606b17c97544ce53d9748226a"; - revision = "1"; - editedCabalFile = "a46997607148d6e6ddb555d128cf73c9dfe29b1aeccf383beb283e4d06ff79f6"; + version = "0.2"; + sha256 = "4c14883bc7fd5e059e05a24d5daabacec295ee71fcf91e3fdd066e7993085a2a"; libraryHaskellDepends = [ base bytestring extra ]; testHaskellDepends = [ base bytestring ]; homepage = "https://github.com/ndmitchell/hexml#readme"; @@ -90443,25 +90718,24 @@ self: { "hnetcdf" = callPackage ({ mkDerivation, base, c2hs, containers, directory, either, errors - , filepath, hmatrix, HUnit, netcdf, QuickCheck, repa - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , transformers, vector + , filepath, HUnit, netcdf, QuickCheck, repa, test-framework + , test-framework-hunit, test-framework-quickcheck2, transformers + , vector }: mkDerivation { pname = "hnetcdf"; - version = "0.3.0.0"; - sha256 = "3a8c5c30a9210e4a7af213a0d0967515f692876f23c78582f7896559d69f098c"; + version = "0.4.0.0"; + sha256 = "70ea9ddc84b29848fc000d9eaaea5d7d6273597662437591354a8b5c12b2d795"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers either errors filepath hmatrix repa transformers - vector + base containers either errors filepath repa transformers vector ]; librarySystemDepends = [ netcdf ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base containers hmatrix repa vector ]; + executableHaskellDepends = [ base containers repa vector ]; testHaskellDepends = [ - base containers directory errors hmatrix HUnit QuickCheck repa + base containers directory errors HUnit QuickCheck repa test-framework test-framework-hunit test-framework-quickcheck2 vector ]; @@ -90579,14 +90853,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoauth2_0_5_6_0" = callPackage + "hoauth2_0_5_7" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types , text, unordered-containers }: mkDerivation { pname = "hoauth2"; - version = "0.5.6.0"; - sha256 = "e678e9d0029b354f255b9796dddac5de0c9894261e54591b0435685a787e2dad"; + version = "0.5.7"; + sha256 = "7b196e4b70b8207c4beb3479f5ab4476c17d9c0ec7d8f1fcb658590641e9b9ec"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types text unordered-containers @@ -91575,8 +91849,8 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.2.1"; - sha256 = "213baa6a2a53f9b0efec11affcdf0ddb24e86a462a333f7a9d81df829f4d55a0"; + version = "0.3.0"; + sha256 = "e6663e8654fe93daa5a4628219eea03e2b6f31d7894a9f7c4180f43f92921d8f"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; @@ -91592,8 +91866,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.2.1"; - sha256 = "b03dacf5d0b85b859d01c8cb29045092ad64cb983ec162d37f87ecabc9d052ba"; + version = "0.3.0"; + sha256 = "48d8e8c41c1204ced517a337d454a1dc87bd6a5ef3697f09756fac22e4d374ef"; libraryHaskellDepends = [ base containers directory filepath haskell-src mtl ]; @@ -91604,12 +91878,12 @@ self: { }) {}; "hoppy-runtime" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers }: mkDerivation { pname = "hoppy-runtime"; - version = "0.2.1"; - sha256 = "f4969d7cd352399d2f76739cf4ab75e23b1ff491437400ca2e3bc4bbe4505392"; - libraryHaskellDepends = [ base ]; + version = "0.3.0"; + sha256 = "44463a38c42a61789f723a538a5c3df0eac312c08dbac81a10642a8bffaba9d9"; + libraryHaskellDepends = [ base containers ]; homepage = "http://khumba.net/projects/hoppy"; description = "C++ FFI generator - Runtime support"; license = stdenv.lib.licenses.asl20; @@ -91620,8 +91894,8 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.2.1"; - sha256 = "13eee9e5d2f993d8486f2c9125c109d89ba5d6ec13b3165e7f733b04e8c677cc"; + version = "0.3.0"; + sha256 = "4bf6cbf4456ac92517bb19a044863e509e20ca7965f1a8324bcd4848f5c4fb65"; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator ]; @@ -91680,13 +91954,19 @@ self: { }) {}; "hora" = callPackage - ({ mkDerivation, base, binary, hspec, QuickCheck, time }: + ({ mkDerivation, base, binary, hspec, QuickCheck, time + , timezone-olson, timezone-series + }: mkDerivation { pname = "hora"; - version = "1.1.1"; - sha256 = "9f375a418afca764c29a46c86beaef73a429fb2902368bc27b9d6072b6cfdbd1"; - libraryHaskellDepends = [ base binary time ]; - testHaskellDepends = [ base binary hspec QuickCheck time ]; + version = "2.0.2"; + sha256 = "a2d9eb1f89bf71f7060768e715fddd1e9478af192b353977c14c5524f2daba27"; + revision = "1"; + editedCabalFile = "ba7e38c8bb60d028a6869e1d7ecd07354e783b2c8b5da6f135c4ef740ccf41a1"; + libraryHaskellDepends = [ base binary time timezone-series ]; + testHaskellDepends = [ + base binary hspec QuickCheck time timezone-olson timezone-series + ]; homepage = "https://github.com/ciez/hora"; description = "date time"; license = stdenv.lib.licenses.publicDomain; @@ -91705,6 +91985,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "horname" = callPackage + ({ mkDerivation, base, containers, megaparsec, optparse-applicative + , text, these, uniplate, wl-pprint-text + }: + mkDerivation { + pname = "horname"; + version = "0.1.0.0"; + sha256 = "f895b2d91dd1b33bf51a04f92a4d0c295286eccfdab1df3e178b6ea8774fb290"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers megaparsec text these uniplate wl-pprint-text + ]; + executableHaskellDepends = [ base optparse-applicative text ]; + homepage = "https://github.com/cocreature/horname#readme"; + description = "Rename function definitions returned by SMT solvers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hosc" = callPackage ({ mkDerivation, base, binary, blaze-builder, bytestring , data-binary-ieee754, network, QuickCheck, test-framework @@ -93487,8 +93786,8 @@ self: { ({ mkDerivation, attoparsec, base, text, vector }: mkDerivation { pname = "hsbc"; - version = "0.1.0.2"; - sha256 = "0cc76047ced42e4860f3876fdebcc2057d6d95917ebc2401f929308e7ba66e75"; + version = "0.1.0.3"; + sha256 = "20795b5c41fee21afa91c9d5ae4675a8954898f54e7e3a23222d3ebddbe1369a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ attoparsec base text vector ]; @@ -101635,6 +101934,7 @@ self: { homepage = "http://kalli1.faikvm.com/ImplicitCAD/Stable"; description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export.."; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "implicit-logging" = callPackage @@ -102442,6 +102742,7 @@ self: { homepage = "https://tweag.github.io/HaskellR"; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) R;}; "inquire" = callPackage @@ -102715,6 +103016,8 @@ self: { pname = "integer-gmp"; version = "1.0.0.1"; sha256 = "ef11daab7d7007b6be61846350a947173c46475c833623bcac45aa532ec3c121"; + revision = "1"; + editedCabalFile = "616d1775344a82a0ae1db1791fba719f4682a1ace908582ac4026db14231d4d5"; libraryHaskellDepends = [ ghc-prim ]; description = "Integer library based on GMP"; license = stdenv.lib.licenses.bsd3; @@ -104266,6 +104569,7 @@ self: { ]; description = "A brick Widget for selectable summary of many elements on a terminal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iter-stats" = callPackage @@ -104465,8 +104769,8 @@ self: { }: mkDerivation { pname = "ivory"; - version = "0.1.0.4"; - sha256 = "96a056e1f3d766223d93dcd3aaedd6619aa1806f31903c3f46e30a058705583f"; + version = "0.1.0.5"; + sha256 = "437d5bc2fa69037e6fa5beb7d0a7b27f4d7e92404531b698be5a84946294a158"; libraryHaskellDepends = [ array base base-compat containers dlist filepath monadLib pretty template-haskell text th-lift @@ -104484,8 +104788,8 @@ self: { }: mkDerivation { pname = "ivory-artifact"; - version = "0.1.0.4"; - sha256 = "a2aa0b21fa58c5f87d5001f74fcbfda439a6dbfb56577214447c75f3b204ce8c"; + version = "0.1.0.5"; + sha256 = "7a2bac5f9abebc2edbad78b010056a6a75722681ec0c636951bc044774ee7934"; libraryHaskellDepends = [ base directory filepath HStringTemplate text utf8-string ]; @@ -104502,8 +104806,8 @@ self: { }: mkDerivation { pname = "ivory-backend-c"; - version = "0.1.0.4"; - sha256 = "1515d217549af8189b83a5963ddfd6d202b58cdb9f98644a41988e7b67884caf"; + version = "0.1.0.5"; + sha256 = "e07d69634f6b50145f51886b87b7556bd6eb01e21bcd6476f849071a1120e535"; libraryHaskellDepends = [ base base-compat bytestring containers directory filepath ivory ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib @@ -104541,8 +104845,8 @@ self: { }: mkDerivation { pname = "ivory-eval"; - version = "0.1.0.4"; - sha256 = "dd4f92558eea73265d680963bfad48112c782ed144726ee001f547216368e020"; + version = "0.1.0.5"; + sha256 = "059811a8cfe1f77c4bb5c21690999a3a1544dd30fd56f89d7957c71e5534f662"; libraryHaskellDepends = [ base base-compat containers ivory monadLib ]; @@ -104562,10 +104866,8 @@ self: { }: mkDerivation { pname = "ivory-examples"; - version = "0.1.0.4"; - sha256 = "d61091b079166b06537feb0a719d7e4e09718732df3f1f264167af800f72900a"; - revision = "2"; - editedCabalFile = "7b0f9b186a1356c9210ecfe4ae198b1fa3056f1c78188126b83fbd39c09e253f"; + version = "0.1.0.5"; + sha256 = "539b65b7068f7dbcb128401ac4ec8c08ee2a0db074087cd923bbf38daf530356"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104582,8 +104884,8 @@ self: { ({ mkDerivation, base, filepath, ivory, ivory-artifact }: mkDerivation { pname = "ivory-hw"; - version = "0.1.0.4"; - sha256 = "d441e06d61ffaada4719d6b274d090308accba9e71f49bd3d31be608f26193dc"; + version = "0.1.0.5"; + sha256 = "9379da7f7e30587f79d8de501725d9c8b0eeb7105db2362a5889d82163ca4140"; libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; homepage = "http://ivorylang.org"; description = "Ivory hardware model (STM32F4)"; @@ -104597,8 +104899,8 @@ self: { }: mkDerivation { pname = "ivory-opts"; - version = "0.1.0.4"; - sha256 = "14c1337cdd8f4a06ff6e99e050fb5d9bd98ec221c77de510368cb8aa4f7b7019"; + version = "0.1.0.5"; + sha256 = "36bbf696b1f711885a2493233d09a304686572ff32d0e7e8f30c0a8ebc139340"; libraryHaskellDepends = [ base base-compat containers data-reify dlist fgl filepath ivory monadLib pretty @@ -104616,8 +104918,8 @@ self: { }: mkDerivation { pname = "ivory-quickcheck"; - version = "0.2.0.4"; - sha256 = "c7c3e1dcf2c3bbf21612445155f1e869576e5dcd9099b7d4eea0694b327d63a5"; + version = "0.2.0.5"; + sha256 = "9a93f90f18b2a9e508ef4f25d980cdb39e2ac3a11061878cbb9028c40fb953f0"; libraryHaskellDepends = [ base base-compat ivory ivory-backend-c ivory-eval monadLib QuickCheck random @@ -104638,8 +104940,8 @@ self: { }: mkDerivation { pname = "ivory-serialize"; - version = "0.1.0.4"; - sha256 = "bf73dccdcac406b7adc8981e01d9b363df6411ce7e7bb70daf2f6065f17abc12"; + version = "0.1.0.5"; + sha256 = "4ef3bcafba676e83cff6c4ede3b931124069d3baad87568e641cefccb2db1a9a"; libraryHaskellDepends = [ base base-compat filepath ivory ivory-artifact monadLib ]; @@ -104652,8 +104954,8 @@ self: { ({ mkDerivation, base, filepath, ivory, ivory-artifact }: mkDerivation { pname = "ivory-stdlib"; - version = "0.1.0.4"; - sha256 = "912b78ed7b5143ff54517f3c483dd73dab9401cfce2c0a4f43fcdc9ca7413c5b"; + version = "0.1.0.5"; + sha256 = "af6ed58d447a770deb83c854c4a611bd0fee36efb59feb5afc0729ac8be7abe9"; libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; homepage = "http://ivorylang.org"; description = "Ivory standard library"; @@ -105425,7 +105727,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "jose_0_5_0_1" = callPackage + "jose_0_5_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , byteable, bytestring, containers, cryptonite, hspec, lens, memory , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances @@ -105434,8 +105736,8 @@ self: { }: mkDerivation { pname = "jose"; - version = "0.5.0.1"; - sha256 = "be03e97bad8c492bc6e268d917b0c0ea18f12a971a94be8e8c28af636d52c84f"; + version = "0.5.0.2"; + sha256 = "25958a11561f56363bb7dcdcd1ebbc97bf231ee68ed393b117c90fff0cf07abc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105532,19 +105834,19 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, containers - , deepseq, filepath, ghc-prim, http-types, lens, primitive, process - , ref-tf, scientific, stm, template-haskell, text, time + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, containers, deepseq, filepath, ghc-prim, http-types + , lens, primitive, process, ref-tf, scientific, stm, text, time , transformers, unordered-containers, vector }: mkDerivation { pname = "jsaddle"; - version = "0.7.0.0"; - sha256 = "bfbf63663129551b95efc44333e944dd56357ea4e0778b592701480836511554"; + version = "0.8.0.1"; + sha256 = "de68f74a6a546b91ce0a1a74512db7d1a7a583a4455d0de5ef9d300cf179cb3b"; libraryHaskellDepends = [ - aeson attoparsec base bytestring containers deepseq filepath - ghc-prim http-types lens primitive process ref-tf scientific stm - template-haskell text time transformers unordered-containers vector + aeson attoparsec base base64-bytestring bytestring containers + deepseq filepath ghc-prim http-types lens primitive process ref-tf + scientific stm text time transformers unordered-containers vector ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -105590,8 +105892,8 @@ self: { }: mkDerivation { pname = "jsaddle-warp"; - version = "0.7.0.0"; - sha256 = "5f847b737fc542f9b5f8a0b3aa3a384b18d588fd5433cffbc279c7aac52de818"; + version = "0.8.0.0"; + sha256 = "468f4748bdbeb8cf86054ef61260152ce0ef41c23cd2f10d9bb50dbe8732ba50"; libraryHaskellDepends = [ aeson base containers http-types jsaddle stm text time transformers wai wai-websockets warp websockets @@ -105605,12 +105907,50 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jsaddle-webkit2gtk" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, gi-gio + , gi-glib, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base + , jsaddle, text, unix, webkit2gtk3-javascriptcore + }: + mkDerivation { + pname = "jsaddle-webkit2gtk"; + version = "0.8.1.0"; + sha256 = "f21e613da36ad510fce1d609eef6a966e11da97a35bdf81ce7924bca56729da6"; + libraryHaskellDepends = [ + aeson base bytestring directory gi-gio gi-glib gi-gtk + gi-javascriptcore gi-webkit2 haskell-gi-base jsaddle text unix + webkit2gtk3-javascriptcore + ]; + description = "Interface for JavaScript that works with GHCJS and GHC"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "jsaddle-webkitgtk" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, gi-glib + , gi-gtk, gi-javascriptcore, gi-webkit, haskell-gi-base, jsaddle + , text, unix, webkitgtk3-javascriptcore + }: + mkDerivation { + pname = "jsaddle-webkitgtk"; + version = "0.8.1.0"; + sha256 = "baa5ecd99c21046cbe5fe2126d4b072a12419aaf03eb1adf8b97b620c7760437"; + libraryHaskellDepends = [ + aeson base bytestring directory gi-glib gi-gtk gi-javascriptcore + gi-webkit haskell-gi-base jsaddle text unix + webkitgtk3-javascriptcore + ]; + description = "Interface for JavaScript that works with GHCJS and GHC"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jsaddle-wkwebview" = callPackage ({ mkDerivation, aeson, base, bytestring, jsaddle }: mkDerivation { pname = "jsaddle-wkwebview"; - version = "0.7.0.0"; - sha256 = "fa9a722cab4659f00acdad3c50d70b6ecbaf8d457fcc50c44191a60802f8c26d"; + version = "0.8.0.0"; + sha256 = "8770e3f9a452502d62025a142aaabc95ac759625fd56f4600217fc8d9ac69dd1"; libraryHaskellDepends = [ aeson base bytestring jsaddle ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -105690,8 +106030,8 @@ self: { }: mkDerivation { pname = "json-assertions"; - version = "1.0.7"; - sha256 = "0a2b071178b27b8ab295040c22b712c17278986b6829b2a085819b85fdd7e3f4"; + version = "1.0.8"; + sha256 = "d4e060ec54e264581e47d409e303dc3165c311dcfcd6127278c99b7a876ae259"; libraryHaskellDepends = [ aeson base indexed indexed-free lens lens-aeson text ]; @@ -106697,6 +107037,7 @@ self: { homepage = "https://bitbucket.org/functionally/kafka-device"; description = "UI device events via a Kafka message broker"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kafka-device-glut" = callPackage @@ -106714,6 +107055,7 @@ self: { homepage = "https://bitbucket.org/functionally/kafka-device-glut"; description = "GLUT events via a Kafka message broker"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kafka-device-joystick" = callPackage @@ -106735,6 +107077,7 @@ self: { homepage = "https://bitbucket.org/functionally/kafka-device-joystick"; description = "Linux joystick events via a Kafka message broker"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kafka-device-leap" = callPackage @@ -106756,6 +107099,7 @@ self: { homepage = "https://bitbucket.org/functionally/kafka-device-leap"; description = "Leap Motion events via a Kafka message broker"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kafka-device-spacenav" = callPackage @@ -106777,6 +107121,7 @@ self: { homepage = "https://bitbucket.org/functionally/kafka-device-spacenav"; description = "Linux SpaceNavigator events via a Kafka message broker"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kafka-device-vrpn" = callPackage @@ -106792,6 +107137,7 @@ self: { homepage = "https://bitbucket.org/functionally/kafka-device-vrpn"; description = "VRPN events via a Kafka message broker"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kaleidoscope" = callPackage @@ -106836,6 +107182,7 @@ self: { homepage = "https://github.com/idontgetoutmuch/Kalman"; description = "Kalman and particle filters and smoothers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kan-extensions" = callPackage @@ -107020,8 +107367,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.3.1.2"; - sha256 = "d666b12f235c6eb5fa36fa1cfc5a48ec001996a4ad6e4abf5ff0601ee3d9cea5"; + version = "0.3.1.3"; + sha256 = "8a733a9888157781c60ec3b223bf0256839fb923e41473f3118289ab175413fa"; libraryHaskellDepends = [ aeson auto-update base bytestring containers either exceptions hostname microlens microlens-th monad-control mtl old-locale @@ -108238,6 +108585,7 @@ self: { homepage = "https://github.com/krapsh/kraps-haskell"; description = "Haskell bindings for Spark Dataframes and Datasets"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "krpc" = callPackage @@ -108552,8 +108900,8 @@ self: { }: mkDerivation { pname = "lambda-calculator"; - version = "0.5.0"; - sha256 = "b6f3da4fbb70574ad0131b0ca2ff509031eebf17b8ab650c71651b2aedda26a1"; + version = "1.0.0"; + sha256 = "c0010570a3f90cd6eb74b36e6787eb19a01f49005fe24de72ca957406909dc86"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec ]; @@ -108644,6 +108992,7 @@ self: { homepage = "https://github.com/maciej-bendkowski/lambda-sampler"; description = "Boltzmann sampler utilities for lambda calculus"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambda-toolbox" = callPackage @@ -110394,6 +110743,7 @@ self: { homepage = "https://github.com/unitb/latex-function-tables"; description = "Function table specifications in latex"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lattices" = callPackage @@ -110571,14 +110921,28 @@ self: { ({ mkDerivation, base, transformers, unsafe }: mkDerivation { pname = "lazyio"; - version = "0.1.0.3"; - sha256 = "bb8d8c0c14ab35d80d0eee69e51b9111fea975eabe171c37a0f680adaff708be"; + version = "0.1.0.4"; + sha256 = "8b54f0bccdc1c836393ce667ea0f1ad069d52c04762e61fad633d4d44916cf6c"; libraryHaskellDepends = [ base transformers unsafe ]; homepage = "http://www.haskell.org/haskellwiki/Lazy_IO"; description = "Run IO actions lazily while respecting their order"; license = stdenv.lib.licenses.bsd3; }) {}; + "lazyset" = callPackage + ({ mkDerivation, base, containers, data-ordlist, HUnit }: + mkDerivation { + pname = "lazyset"; + version = "0.1.0.0"; + sha256 = "9e62ccd181117484c63920b8dfb8d385d23119e11595ab2aa045b272c55f4bad"; + libraryHaskellDepends = [ base containers data-ordlist ]; + testHaskellDepends = [ base containers data-ordlist HUnit ]; + homepage = "https://github.com/happyherp/lazyset"; + description = "Set and Map from lazy/infinite lists"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lazysmallcheck" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -110787,6 +111151,7 @@ self: { libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base tasty tasty-hunit time ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leapseconds-announced" = callPackage @@ -111982,33 +112347,36 @@ self: { "liblawless" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, binary - , bytestring, containers, containers-unicode-symbols, contravariant - , data-textual, directory, exceptions, filepath, hjsonschema, lens - , machines, mtl, parsers, path, path-io, protolude, QuickCheck - , random, semigroups, stm, stm-containers, temporary - , test-framework, test-framework-quickcheck2, test-framework-th - , text, text-icu, text-icu-normalized, text-printer, time - , transformers, yaml, zippers + , boomerang, bytestring, containers, containers-unicode-symbols + , contravariant, data-default, data-textual, directory, dns + , exceptions, filepath, hjsonschema, lens, machines, mtl, network + , network-ip, parsers, protolude, QuickCheck, random, semigroups + , stm, stm-containers, temporary, test-framework + , test-framework-quickcheck2, test-framework-th, text, text-icu + , text-icu-normalized, text-printer, time, transformers, zippers }: mkDerivation { pname = "liblawless"; - version = "0.13.3"; - sha256 = "b1c3660a40a50db947712b3768a8cf3ceb8c614e5d71cdf18e4bceedff90a16b"; + version = "0.16.0"; + sha256 = "4cca43195f8b30c0aa06840d402a61e2af1592b61c89aadf369f6390e841a856"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson base base-unicode-symbols binary bytestring containers - containers-unicode-symbols contravariant data-textual directory - exceptions filepath hjsonschema lens machines mtl parsers path - path-io protolude random semigroups stm stm-containers temporary - text text-icu text-icu-normalized text-printer time transformers - yaml zippers + aeson base base-unicode-symbols binary boomerang bytestring + containers containers-unicode-symbols contravariant data-default + data-textual directory dns exceptions filepath hjsonschema lens + machines mtl network network-ip parsers protolude QuickCheck random + semigroups stm stm-containers temporary text text-icu + text-icu-normalized text-printer time transformers zippers ]; testHaskellDepends = [ - base binary bytestring exceptions filepath QuickCheck semigroups - temporary test-framework test-framework-quickcheck2 + aeson base binary bytestring exceptions filepath network QuickCheck + semigroups temporary test-framework test-framework-quickcheck2 test-framework-th text time transformers ]; description = "Prelude based on protolude for GHC 8 and beyond"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "liblinear-enumerator" = callPackage @@ -112069,6 +112437,7 @@ self: { ]; description = "Prelude based on protolude for GHC 8 and beyond"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libmpd" = callPackage @@ -113478,8 +113847,8 @@ self: { }: mkDerivation { pname = "liquid"; - version = "0.1.0.1"; - sha256 = "f2c7cbfb26acbc9abd1856286997c7175ea20c4584225c287d4c75938898f18d"; + version = "0.1.0.2"; + sha256 = "7679068f8753564b193df76ad32680e59214a4e04c2f45869e57d7dcabc741b9"; libraryHaskellDepends = [ aeson attoparsec base lens lens-aeson mtl scientific semigroups text unordered-containers validation vector @@ -114759,6 +115128,7 @@ self: { homepage = "https://github.com/scrive/log"; description = "Structured logging solution (Elasticsearch back end)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-postgres" = callPackage @@ -114779,6 +115149,7 @@ self: { homepage = "https://github.com/scrive/log"; description = "Structured logging solution (PostgreSQL back end)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-utils" = callPackage @@ -116237,14 +116608,14 @@ self: { "machinecell" = callPackage ({ mkDerivation, arrows, base, free, hspec, mtl, profunctors - , QuickCheck, semigroups + , QuickCheck, semigroups, transformers }: mkDerivation { pname = "machinecell"; - version = "3.2.0"; - sha256 = "507f367bd35ea9b0b2c81af1b1ec14f4aa68fae4309f71c69c9c58715405bddd"; + version = "3.3.0"; + sha256 = "22c6cb0f81a4290e72d0fa266b71f094a6377cdc6518833a11dcc8cf8d131932"; libraryHaskellDepends = [ - arrows base free mtl profunctors semigroups + arrows base free mtl profunctors semigroups transformers ]; testHaskellDepends = [ arrows base hspec mtl profunctors QuickCheck semigroups @@ -117602,8 +117973,8 @@ self: { }: mkDerivation { pname = "marvin"; - version = "0.0.2"; - sha256 = "93cb2eaeb405ed22c165ff2d546e3cc34892663361ef4bf39e4ce03262be8643"; + version = "0.0.4"; + sha256 = "76c0af008fd2b2c691abe29541b392fe47f59f8a004b837bb8e398f916df1bae"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118241,6 +118612,7 @@ self: { homepage = "https://github.com/linearray/mealstrom"; description = "Manipulate FSMs and store them in PostgreSQL"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "means" = callPackage @@ -118751,6 +119123,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memory_0_14" = callPackage + ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "memory"; + version = "0.14"; + sha256 = "ca0248c9a889906a5a8fc95ce3c549b27abc3edb4d85d03893aef56934148e1d"; + libraryHaskellDepends = [ + base bytestring deepseq foundation ghc-prim + ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + homepage = "https://github.com/vincenthz/hs-memory"; + description = "memory and related abstraction stuff"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -121879,6 +122269,7 @@ self: { homepage = "https://github.com/jpvillaisaza/money"; description = "Money"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mongoDB" = callPackage @@ -123437,6 +123828,7 @@ self: { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; description = "Generic programming for families of recursive datatypes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multirec-alt-deriver" = callPackage @@ -124317,6 +124709,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mysql-haskell-nem" = callPackage + ({ mkDerivation, base, bytestring, io-streams, mysql-haskell + , scientific, text, time + }: + mkDerivation { + pname = "mysql-haskell-nem"; + version = "0.1.0.0"; + sha256 = "7a0868b76edc96a7aff7860f96436b9040f6cb9319dd67f68bfd700948721f0d"; + libraryHaskellDepends = [ + base bytestring io-streams mysql-haskell scientific text time + ]; + homepage = "https://github.com/lorenzo/mysql-haskell-nem#readme"; + description = "Adds a interface like mysql-simple to mysql-haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mysql-haskell-openssl" = callPackage ({ mkDerivation, base, HsOpenSSL, io-streams, mysql-haskell , network, tcp-streams, tcp-streams-openssl, wire-streams @@ -125704,6 +126112,7 @@ self: { homepage = "https://github.com/ziocroc/netwire-input-javascript"; description = "JavaScript instance of netwire-input"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire-vinylglfw-examples" = callPackage @@ -131316,6 +131725,7 @@ self: { homepage = "https://github.com/mb21/pandoc-placetable"; description = "Pandoc filter to include CSV files"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-plantuml-diagrams" = callPackage @@ -134399,6 +134809,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pgp-wordlist_0_1_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , HUnit, tasty, tasty-hunit, tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "pgp-wordlist"; + version = "0.1.0.2"; + sha256 = "e28b6fe85222adf1247d5870ab47c68c3d25df3f9ceda104bfb64e1414a92466"; + libraryHaskellDepends = [ base bytestring containers text vector ]; + testHaskellDepends = [ + base bytestring deepseq doctest HUnit tasty tasty-hunit + tasty-quickcheck text + ]; + homepage = "https://github.com/quchen/pgp-wordlist"; + description = "Translate between binary data and a human-readable collection of words"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pgsql-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, binary , blaze-builder, blaze-textual, bytestring, containers @@ -134550,8 +134979,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.10.0"; - sha256 = "6c002069fa4416c1767affe099102a031e495e74f7ff904ed3d14eef74335916"; + version = "0.0.11.0"; + sha256 = "d9d5e2b94ac48b2a7aaa50526b66dfe47de9c368147b64865c3dc2d65c17defb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -138973,6 +139402,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pretty-simple" = callPackage + ({ mkDerivation, base, doctest, Glob, lens, mono-traversable, mtl + , parsec, semigroups, transformers + }: + mkDerivation { + pname = "pretty-simple"; + version = "0.1.0.0"; + sha256 = "baaf4d5d8aba866e2419b66a67ed3b55a35f9e8e1f40c6c77e2dab21dda1caae"; + libraryHaskellDepends = [ + base lens mono-traversable mtl parsec semigroups transformers + ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/cdepillabout/pretty-simple"; + description = "Simple pretty printer for any datatype with a 'Show' instance"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pretty-sop" = callPackage ({ mkDerivation, base, generics-sop, pretty-show }: mkDerivation { @@ -139745,19 +140191,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "profiteur_0_4_0_0" = callPackage + "profiteur_0_4_1_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath - , text, unordered-containers, vector + , js-jquery, text, unordered-containers, vector }: mkDerivation { pname = "profiteur"; - version = "0.4.0.0"; - sha256 = "8198f5905f8da27ada8c0bce0f5dab39bd1d7d8a802b70a974febc6366e7b91d"; + version = "0.4.1.0"; + sha256 = "c9e67c15761d06df8088cdbdfaf56a31f3b7b4c169e5c50418c8cd3a29fd8ef7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson attoparsec base bytestring filepath text unordered-containers - vector + aeson attoparsec base bytestring filepath js-jquery text + unordered-containers vector ]; homepage = "http://github.com/jaspervdj/profiteur"; description = "Treemap visualiser for GHC prof files"; @@ -141807,6 +142253,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "qr-repa" = callPackage + ({ mkDerivation, aeson, base, bytestring, cryptonite, directory + , haskell-qrencode, jose-jwt, lens, repa, repa-devil, vector + }: + mkDerivation { + pname = "qr-repa"; + version = "0.1.0.0"; + sha256 = "5e84243d64121ddc9ed8554a5783680abb2a228846744bd64ce36e2c90776d37"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cryptonite directory haskell-qrencode + jose-jwt lens repa repa-devil vector + ]; + executableHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/vmchale/QRRepa#readme"; + description = "Library to generate QR codes from bytestrings and objects and scale image files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "qrcode" = callPackage ({ mkDerivation, array, base, containers, mtl, vector }: mkDerivation { @@ -141838,12 +142305,12 @@ self: { qtc_opengl = null; qtc_script = null; qtc_tools = null;}; "qtah-cpp-qt5" = callPackage - ({ mkDerivation, base, qtah-generator, qtbase }: + ({ mkDerivation, base, process, qtah-generator, qtbase }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.1.2"; - sha256 = "1a99a2c0c5eb8cb60d162298600ee2bba993ce3224ac412cf9eeec386503e258"; - libraryHaskellDepends = [ base qtah-generator ]; + version = "0.2.0"; + sha256 = "d6daf6813855a41d87884cfba1afd21f100aeb5581dbc0edd4148c3a7e77efda"; + libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; homepage = "http://khumba.net/projects/qtah"; description = "Qt bindings for Haskell - C++ library"; @@ -141857,8 +142324,8 @@ self: { }: mkDerivation { pname = "qtah-examples"; - version = "0.1.2"; - sha256 = "eebe064bfa0b93dd850c127632ca59ffa8f269f886ec7e247ec22530e007b442"; + version = "0.2.0"; + sha256 = "a2f8e4b352742f97beae28eae0a5d8adbb939b51654274a7e26e3769b2f5f835"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141872,18 +142339,18 @@ self: { "qtah-generator" = callPackage ({ mkDerivation, base, containers, directory, filepath, haskell-src - , hoppy-generator, hoppy-std, mtl, process + , hoppy-generator, hoppy-std, mtl, process, transformers }: mkDerivation { pname = "qtah-generator"; - version = "0.1.2"; - sha256 = "77ef82acf21be83855ad04c40dfe6aa66439eb6f42f58774687c9d4f5f94c56f"; + version = "0.2.1"; + sha256 = "e478535736e46ab6e373dc32993ee139043b64bbe05197d8a8fbc674174b2fef"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base containers directory filepath haskell-src hoppy-generator - hoppy-std mtl process + hoppy-std mtl process transformers ]; doHaddock = false; homepage = "http://khumba.net/projects/qtah"; @@ -141898,8 +142365,8 @@ self: { }: mkDerivation { pname = "qtah-qt5"; - version = "0.1.2"; - sha256 = "320c98e0d90381f56ce992fea845839bd966e030d6afa066c83123d40c73da5e"; + version = "0.2.0"; + sha256 = "8647a34799bb129436c91a566b6d18ca728fd5943bdebbfc12d90871bc16c68a"; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator ]; @@ -143094,6 +143561,8 @@ self: { pname = "raketka"; version = "1.1.1"; sha256 = "00de213d145e568d11272776d9c394339aee1b28358995cffb606056bf3c1572"; + revision = "1"; + editedCabalFile = "5f63d0731a5172a670fd30076cd7081a63c0237dd940a2d7938a12c6c1fdbea9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143109,7 +143578,7 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/ciez/raketka"; - description = "basic distributed-process node with configurable peers"; + description = "distributed-process node"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -149002,6 +149471,7 @@ self: { homepage = "https://github.com/RoboticsHS/rosmsg-bin#readme"; description = "ROS message management tools"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rospkg" = callPackage @@ -154721,8 +155191,8 @@ self: { }: mkDerivation { pname = "setdown"; - version = "0.1.0.1"; - sha256 = "afe89e857793e3189b1fde9372a33fb3edff9c1c82ccc5d2a8b67a74c3620780"; + version = "0.1.0.3"; + sha256 = "c41ded101e6bd0bb17106674f49c0a4a06e8a042dcce443cd772e959c6bd98e4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155680,8 +156150,8 @@ self: { }: mkDerivation { pname = "shellmate-extras"; - version = "0.3.4"; - sha256 = "46aecef64462ab34789f63dd338dc1b72aff77f4eaa2ecbf97c32dd9b6130b52"; + version = "0.3.4.1"; + sha256 = "f3dd62394e99af6cf92cb50c8ce1f3cd819448eda3009e8c11bb312e26f9b82e"; libraryHaskellDepends = [ base bytestring feed http-conduit http-types mime-types shellmate tagsoup text utf8-string xml @@ -155800,6 +156270,7 @@ self: { homepage = "https://github.com/icidasset/shikensu#README"; description = "A small toolset for building static websites"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shine" = callPackage @@ -158944,21 +159415,21 @@ self: { "snaplet-i18n" = callPackage ({ mkDerivation, base, bytestring, configurator, filepath, heist - , lens, snap, snap-loader-static, text, xmlhtml + , lens, mtl, snap, snap-loader-static, text, transformers, xmlhtml }: mkDerivation { pname = "snaplet-i18n"; - version = "0.0.5"; - sha256 = "62b279c4b82358d62273911c917a21f96386c8198a8db5d95738dc32f746827a"; + version = "0.1.0"; + sha256 = "8933941904b222dd880b46a34af7c6612f47182e38b24022dbed6c6e505c4e3a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base configurator filepath heist lens snap snap-loader-static text - xmlhtml + base configurator filepath heist lens mtl snap snap-loader-static + text transformers xmlhtml ]; executableHaskellDepends = [ base bytestring configurator filepath heist lens snap - snap-loader-static text xmlhtml + snap-loader-static text transformers xmlhtml ]; homepage = "https://github.com/HaskellCNOrg/snaplet-i18n"; description = "snaplet-i18n"; @@ -159786,6 +160257,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "soap_0_2_3_3" = callPackage + ({ mkDerivation, base, bytestring, conduit, configurator + , data-default, exceptions, hspec, http-client, http-types, HUnit + , iconv, mtl, resourcet, text, unordered-containers, xml-conduit + , xml-conduit-writer, xml-types + }: + mkDerivation { + pname = "soap"; + version = "0.2.3.3"; + sha256 = "2d1759c83bc75cacc470ffc64af218f971d55875a61c2de10be1276bd9845979"; + libraryHaskellDepends = [ + base bytestring conduit configurator data-default exceptions + http-client http-types iconv mtl resourcet text + unordered-containers xml-conduit xml-conduit-writer xml-types + ]; + testHaskellDepends = [ + base bytestring hspec HUnit text unordered-containers xml-conduit + xml-conduit-writer + ]; + homepage = "https://bitbucket.org/dpwiz/haskell-soap"; + description = "SOAP client tools"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "soap-openssl" = callPackage ({ mkDerivation, base, configurator, data-default, HsOpenSSL , http-client, http-client-openssl, soap, text @@ -159901,8 +160397,8 @@ self: { }: mkDerivation { pname = "socket-io"; - version = "1.3.5"; - sha256 = "1604797a7095ef26b733cdff8922bf373fac551ab157c9756b031d191f90903f"; + version = "1.3.6"; + sha256 = "6ec1577c7f701253bc85a9df03379d77ae99c33d1db5ee4f7e6b06972701fb1a"; libraryHaskellDepends = [ aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector @@ -161161,6 +161657,50 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sprinkles" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring + , Cabal, case-insensitive, cereal, classy-prelude, containers, curl + , data-default, directory, filepath, ginger, Glob, hashable, HDBC + , HDBC-mysql, HDBC-postgresql, HDBC-sqlite3, heredoc, hsyslog, HTTP + , http-types, memcached-binary, mime-types, mtl, network-uri + , pandoc, pandoc-creole, pandoc-types, parsec, process + , random-shuffle, regex-base, regex-pcre, safe, scientific + , system-locale, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, temporary, text, time, transformers + , unix-compat, unordered-containers, utf8-string, vector, wai + , wai-extra, wai-handler-fastcgi, warp, yaml + }: + mkDerivation { + pname = "sprinkles"; + version = "0.3.5.0"; + sha256 = "b6e75244028d2de256583a581fb0f12d5bec1d6447cb1d539ca37caa7b2658f7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty array base bytestring Cabal case-insensitive + cereal classy-prelude containers curl data-default directory + filepath ginger Glob hashable HDBC HDBC-mysql HDBC-postgresql + HDBC-sqlite3 hsyslog HTTP http-types memcached-binary mime-types + mtl network-uri pandoc pandoc-creole pandoc-types parsec process + random-shuffle regex-base regex-pcre safe scientific system-locale + template-haskell text time transformers unix-compat + unordered-containers utf8-string vector wai wai-extra + wai-handler-fastcgi warp yaml + ]; + executableHaskellDepends = [ + base classy-prelude data-default parsec safe + ]; + testHaskellDepends = [ + base classy-prelude data-default directory filepath heredoc + regex-base regex-pcre tasty tasty-hunit tasty-quickcheck temporary + wai-extra + ]; + homepage = "https://bitbucket.org/tdammers/sprinkles"; + description = "JSON API to HTML website wrapper"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {pandoc-creole = null;}; + "spritz" = callPackage ({ mkDerivation, base, lens, mtl, vector }: mkDerivation { @@ -161245,6 +161785,7 @@ self: { ]; description = "Secure HTTP proxy for authenticating users via OAuth2"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spsa" = callPackage @@ -163382,8 +163923,8 @@ self: { }: mkDerivation { pname = "stomp-queue"; - version = "0.2.2"; - sha256 = "2ca9ab331d657f1efae64295084fbf3eac05efdb96e186a7f7ba497f24e7d5cf"; + version = "0.3.1"; + sha256 = "47dd7f332f2544aaee66fa37ff889cd666c98a8401cec1deeede01b0730b20bb"; libraryHaskellDepends = [ attoparsec base bytestring conduit conduit-extra mime mtl network-conduit-tls split stompl time utf8-string @@ -163457,6 +163998,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "storable-endian_0_2_6" = callPackage + ({ mkDerivation, base, byteorder }: + mkDerivation { + pname = "storable-endian"; + version = "0.2.6"; + sha256 = "3743ac8f084ed3187b83f17b4fac280e77c5df01f7910f42b6a1bf09d5a65489"; + libraryHaskellDepends = [ base byteorder ]; + description = "Storable instances with endianness"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "storable-record" = callPackage ({ mkDerivation, base, transformers, utility-ht }: mkDerivation { @@ -163704,15 +164257,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_3_0" = callPackage + "stratosphere_0_3_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.3.0"; - sha256 = "628b988750e237e3c1d26de2ccf03753b964fb84f3f46320d2d6a7665aa557a9"; + version = "0.3.1"; + sha256 = "dc72586e7cc78d9be49afc9ae99a9713933fd10fa524d55e22ce9ee34e399130"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring hashable lens template-haskell text unordered-containers @@ -167751,6 +168304,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-ant-xml_1_0_3" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers + , xml + }: + mkDerivation { + pname = "tasty-ant-xml"; + version = "1.0.3"; + sha256 = "34a55d29a962a24aa1d5150795a0cae7a4769950c7ecb7cc1facf3bb0b067562"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving ghc-prim mtl + stm tagged tasty transformers xml + ]; + homepage = "http://github.com/ocharles/tasty-ant-xml"; + description = "Render tasty output to XML for Jenkins"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-dejafu" = callPackage ({ mkDerivation, base, dejafu, tagged, tasty }: mkDerivation { @@ -169799,17 +170371,24 @@ self: { }) {inherit (pkgs) icu;}; "text-icu-normalized" = callPackage - ({ mkDerivation, base, base-unicode-symbols, bytestring, lens, text - , text-icu + ({ mkDerivation, base, base-unicode-symbols, bytestring, containers + , exceptions, filepath, HUnit, lens, parsec, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, text, text-icu }: mkDerivation { pname = "text-icu-normalized"; - version = "0.1.6"; - sha256 = "b5487346dc50fc9a70160277ae9f32306a4f517f06815785bcc6d0fa47ce94e8"; + version = "0.3.0"; + sha256 = "2a82c5bad47e6b75551a70535aeb574214834b0b4fb190f1f10af750a3245ef0"; libraryHaskellDepends = [ base base-unicode-symbols bytestring lens text text-icu ]; - homepage = "https://gitlab.com/theunixman/text-icu-normalized"; + testHaskellDepends = [ + base base-unicode-symbols bytestring containers exceptions filepath + HUnit lens parsec QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text text-icu + ]; + homepage = "https://www.lambdanow.us/browser/text-icu-normalized"; description = "Dealing with Strict Text in NFC normalization"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -171725,14 +172304,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_7" = callPackage + "time_1_7_0_1" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, test-framework , test-framework-quickcheck2, unix }: mkDerivation { pname = "time"; - version = "1.7"; - sha256 = "a30e1ea20cc59f3bf6ee2d5fd0a0dfa58f1ec865681d762cf1bb1103562e2a7a"; + version = "1.7.0.1"; + sha256 = "2730197c3665a1e5af87475de7a57cf0dd8ddbd339167251b4a44cb3b61407ca"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck test-framework test-framework-quickcheck2 @@ -171920,6 +172499,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "time-parsers_0_1_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, parsec, parsers + , tasty, tasty-hunit, template-haskell, text, time + }: + mkDerivation { + pname = "time-parsers"; + version = "0.1.2.0"; + sha256 = "4e50d40f13f8e6c5175be22b91586f909607ecb631f8209ff45bce2031bb3c24"; + libraryHaskellDepends = [ base parsers template-haskell time ]; + testHaskellDepends = [ + attoparsec base bifunctors parsec parsers tasty tasty-hunit + template-haskell text time + ]; + homepage = "https://github.com/phadej/time-parsers#readme"; + description = "Parsers for types in `time`"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "time-patterns" = callPackage ({ mkDerivation, base, intervals, lens, thyme, vector-space }: mkDerivation { @@ -172344,23 +172942,24 @@ self: { }) {}; "timeseries" = callPackage - ({ mkDerivation, base, bytestring, bytestring-time, Cabal, cassava - , hspec, QuickCheck, text, time, vector + ({ mkDerivation, base, bytestring, Cabal, cassava, hspec + , QuickCheck, statistics, text, text-time, time, vector }: mkDerivation { pname = "timeseries"; - version = "0.1.0"; - sha256 = "2aef662eb22472b18b4de81d763a2e98a2f2feb8d1658651376c0709c7b088a0"; + version = "0.3.0"; + sha256 = "0e59e55b0c1346593f752d88fa69ea9c35fb2942ef13f984727a26ede69d1896"; libraryHaskellDepends = [ - base bytestring bytestring-time cassava text time vector + base bytestring cassava statistics text text-time time vector ]; testHaskellDepends = [ - base bytestring bytestring-time Cabal cassava hspec QuickCheck text - time vector + base bytestring Cabal cassava hspec QuickCheck statistics text + text-time time vector ]; homepage = "https://github.com/klangner/timeseries"; description = "Library for Time Series processing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timespan" = callPackage @@ -172472,6 +173071,7 @@ self: { timezone-series ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timing-convenience" = callPackage @@ -172706,6 +173306,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls_1_3_9" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring + , cereal, cryptonite, data-default-class, hourglass, memory, mtl + , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509 + , x509-store, x509-validation + }: + mkDerivation { + pname = "tls"; + version = "1.3.9"; + sha256 = "81355e16528796d3097719e74f7f1f8cae50daed06926d1995731bab8e02267b"; + libraryHaskellDepends = [ + asn1-encoding asn1-types async base bytestring cereal cryptonite + data-default-class memory mtl network transformers x509 x509-store + x509-validation + ]; + testHaskellDepends = [ + base bytestring cereal cryptonite data-default-class hourglass mtl + QuickCheck tasty tasty-quickcheck x509 x509-validation + ]; + homepage = "http://github.com/vincenthz/hs-tls"; + description = "TLS/SSL protocol native implementation (Server and Client)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-debug" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, time, tls, x509, x509-store, x509-system @@ -173454,6 +174079,7 @@ self: { ]; description = "Text transformer and interpreter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transformations" = callPackage @@ -173685,6 +174311,7 @@ self: { homepage = "http://www.fpcomplete.com/user/agocorona"; description = "Remote execution and map-reduce: distributed computing for Transient"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "translatable-intset" = callPackage @@ -175326,6 +175953,7 @@ self: { homepage = "https://github.com/lexi-lambda/type-assertions#readme"; description = "Runtime type assertions for testing"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-booleans" = callPackage @@ -177626,8 +178254,8 @@ self: { ({ mkDerivation, base, directory, text }: mkDerivation { pname = "unlit"; - version = "0.3.2.1"; - sha256 = "b3cdceb5878989c323e0b45a1f08897d7e29e98a553ce59d694c3889aa5fa852"; + version = "0.4.0.0"; + sha256 = "489ecde4843f1911ebdaac3099241d703bb1161f3d386e2b5143f2fd6c355515"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory text ]; @@ -178415,6 +179043,7 @@ self: { ]; description = "A mysql-haskell backend for the users library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "users-persistent" = callPackage @@ -178750,8 +179379,8 @@ self: { pname = "uuid"; version = "1.3.12"; sha256 = "ed62f1b3f0b19f0d548655ffef5aff066ad5c430fe11e909a1a7e8fc115a89ee"; - revision = "2"; - editedCabalFile = "b4efa9a6c09c77d595c054fa1008820922c497e9063c3a8fe20c6949a20143f6"; + revision = "3"; + editedCabalFile = "5444a4c5a15bdfd193d50fa7cc6c248fe18cc18810fb3f878a0e3d4dc81a8f21"; libraryHaskellDepends = [ base binary bytestring cryptonite memory network-info random text time uuid-types @@ -178765,6 +179394,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uuid_1_3_13" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptohash-md5 + , cryptohash-sha1, entropy, HUnit, network-info, QuickCheck, random + , tasty, tasty-hunit, tasty-quickcheck, text, time, uuid-types + }: + mkDerivation { + pname = "uuid"; + version = "1.3.13"; + sha256 = "dfac808a7026217d018b408eab18facc6a85c6183be308d4ac7877e80599b027"; + libraryHaskellDepends = [ + base binary bytestring cryptohash-md5 cryptohash-sha1 entropy + network-info random text time uuid-types + ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck random tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/hvr/uuid"; + description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uuid-aeson" = callPackage ({ mkDerivation, aeson, base, text, uuid }: mkDerivation { @@ -182552,6 +183204,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wave" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers + , data-default-class, hspec, QuickCheck, temporary, transformers + }: + mkDerivation { + pname = "wave"; + version = "0.1.0"; + sha256 = "93c38138c1e85124544eadf0d381ce4ce0505a441060d226e8f09baddc4c5915"; + libraryHaskellDepends = [ + base bytestring cereal containers data-default-class transformers + ]; + testHaskellDepends = [ + base bytestring containers data-default-class hspec QuickCheck + temporary + ]; + homepage = "https://github.com/mrkkrp/wave"; + description = "Work with WAVE and RF64 files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wavefront" = callPackage ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text , transformers, vector @@ -182943,6 +183615,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "web3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring, binary + , bytestring, cryptonite, data-default-class, http-client + , http-client-tls, memory, mtl, template-haskell, text + , transformers, vector + }: + mkDerivation { + pname = "web3"; + version = "0.3.2.1"; + sha256 = "1764b645a09a6a5fdcec05f100cd7c36a542c612da624345100662535783d2b3"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring binary bytestring + cryptonite data-default-class http-client http-client-tls memory + mtl template-haskell text transformers vector + ]; + testHaskellDepends = [ base memory text ]; + homepage = "https://github.com/airalab/hs-web3#readme"; + description = "Ethereum API for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "webapi" = callPackage ({ mkDerivation, aeson, base, binary, blaze-builder, bytestring , bytestring-lexing, bytestring-trie, case-insensitive, containers @@ -183253,6 +183946,7 @@ self: { libraryPkgconfigDepends = [ webkit2gtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {webkit2gtk = null;}; "webkitgtk3" = callPackage @@ -183830,8 +184524,8 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.1.0.3"; - sha256 = "1eed4881d43da9a4169f338d5b503269df8c4c5f92e6da08a12282f2c17f9a36"; + version = "0.1.0.4"; + sha256 = "62b6ca3f4b6fdc19dae22126ff831b2633bf2d5e24c0c5bedc2757ea9a59e45a"; libraryHaskellDepends = [ base containers fold-debounce stm text transformers wild-bind X11 ]; @@ -184270,31 +184964,34 @@ self: { "wolf" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , amazonka-swf, async, base, basic-prelude, bytestring, conduit - , conduit-extra, exceptions, fast-logger, formatting, http-conduit - , http-types, lens, monad-control, monad-logger, mtl, mtl-compat - , optparse-applicative, regex-applicative, regex-compat, resourcet - , safe, shelly, system-filepath, tasty, tasty-hunit, text, time - , transformers, transformers-base, unordered-containers, uuid, yaml - , zlib + , conduit-combinators, conduit-extra, directory, exceptions + , fast-logger, filemanip, formatting, http-conduit, http-types + , lens, lifted-async, lifted-base, monad-control, monad-logger, mtl + , mtl-compat, optparse-applicative, optparse-generic, process + , regex-applicative, regex-compat, resourcet, safe, shake, shelly + , system-filepath, tasty, tasty-hunit, template-haskell, text + , text-manipulate, time, transformers, transformers-base + , unordered-containers, uuid, yaml, zlib }: mkDerivation { pname = "wolf"; - version = "0.2.14"; - sha256 = "0c154567da03ceb1fd748223bce9cb62f6c6b3cede94ab79e1b2693329fcf062"; + version = "0.3.0"; + sha256 = "ec7b4b7f3a8eca648d1b31c637dfac10c40a80afc0d72649cdf0308e1170fcc8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-swf base - basic-prelude bytestring conduit conduit-extra exceptions - fast-logger formatting http-conduit http-types lens monad-control - monad-logger mtl mtl-compat optparse-applicative regex-applicative - regex-compat resourcet safe text time transformers - transformers-base unordered-containers uuid yaml + basic-prelude bytestring conduit conduit-combinators conduit-extra + directory exceptions fast-logger filemanip formatting http-conduit + http-types lens lifted-async lifted-base monad-control monad-logger + mtl mtl-compat optparse-applicative process regex-applicative + regex-compat resourcet safe template-haskell text text-manipulate + time transformers transformers-base unordered-containers uuid yaml ]; executableHaskellDepends = [ - aeson amazonka-core async base basic-prelude bytestring - optparse-applicative resourcet shelly system-filepath text - transformers yaml zlib + aeson amazonka-core async base basic-prelude bytestring directory + optparse-applicative optparse-generic resourcet shake shelly + system-filepath text transformers yaml zlib ]; testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; homepage = "https://github.com/swift-nav/wolf"; @@ -184760,6 +185457,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "writer-cps-mtl_0_1_1_1" = callPackage + ({ mkDerivation, base, mtl, transformers, writer-cps-transformers + }: + mkDerivation { + pname = "writer-cps-mtl"; + version = "0.1.1.1"; + sha256 = "db7f45ebceb3ecb166422c53d0a80a1c9bece8a958a3a9e4d15d75ada02bbf97"; + libraryHaskellDepends = [ + base mtl transformers writer-cps-transformers + ]; + homepage = "https://github.com/minad/writer-cps-mtl#readme"; + description = "MonadWriter orphan instances for writer-cps-transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "writer-cps-transformers" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -186139,6 +186852,7 @@ self: { ]; description = "Generate XML-isomorphic types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-lens" = callPackage @@ -190822,6 +191536,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zip_0_1_4" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, containers, digest, exceptions + , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck + , resourcet, text, time, transformers + }: + mkDerivation { + pname = "zip"; + version = "0.1.4"; + sha256 = "073c9f8320ed16048d099fbec10c42a76ae0bcbd13e344fd0ca99f3a6716db78"; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra containers digest exceptions filepath mtl path + path-io plan-b resourcet text time transformers + ]; + testHaskellDepends = [ + base bytestring conduit containers exceptions filepath hspec path + path-io QuickCheck text time transformers + ]; + homepage = "https://github.com/mrkkrp/zip"; + description = "Operations on zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty @@ -190911,6 +191650,7 @@ self: { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; description = "Generic zipper for families of recursive datatypes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zippers" = callPackage From 708070d2320d04d955b4f5fffa4622ddda3c7e7a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 14 Dec 2016 18:24:53 -0600 Subject: [PATCH 1689/1749] 7.4.2-binary: paxmark ghc binary --- pkgs/development/compilers/ghc/7.4.2-binary.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 25eabc769aa5..100bb87768b5 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -65,6 +65,9 @@ stdenv.mkDerivation rec { find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${stdenv.lib.makeLibraryPath [ "$out" gmp ]}" {} \; + + paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 for prog in ld ar gcc strip ranlib; do From 387066357deb5a98c2c7ad71a6650716b64488ba Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 14 Dec 2016 18:25:58 -0600 Subject: [PATCH 1690/1749] ghc-8.x: paxmark ghc and haddock --- pkgs/development/compilers/ghc/8.0.1.nix | 2 ++ pkgs/development/compilers/ghc/8.0.2.nix | 2 ++ pkgs/development/compilers/ghc/head.nix | 2 ++ 3 files changed, 6 insertions(+) diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 98a81b8e59e2..db9e0682096e 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -57,6 +57,8 @@ stdenv.mkDerivation rec { stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; postInstall = '' + paxmark m $out/lib/${name}/bin/{ghc,haddock} + # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 5a4355084357..9b8645fc1dbd 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -57,6 +57,8 @@ stdenv.mkDerivation rec { stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; postInstall = '' + paxmark m $out/lib/${name}/bin/{ghc,haddock} + # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 23a1b2821492..7573451695c3 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -53,6 +53,8 @@ in stdenv.mkDerivation (rec { stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; postInstall = '' + paxmark m $out/lib/${name}/bin/{ghc,haddock} + # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc From 7906eed27e5d6bb0cc81ebc2f27289ab4063d45b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 18 Dec 2016 13:48:19 +0100 Subject: [PATCH 1691/1749] configuration-hackage2nix.yaml: update list of failing builds --- .../configuration-hackage2nix.yaml | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 099735eb769e..ed9a4d7bddab 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2254,12 +2254,26 @@ dont-distribute-packages: amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-apigateway: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-appstream: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-budgets: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-codebuild: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-elbv2: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-health: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-kinesis-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-lightsail: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-opsworks-cm: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-pinpoint: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-polly: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-rds: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-rekognition: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-servicecatalog: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-shield: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-sms: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-snowball: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-stepfunctions: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-xray: [ i686-linux, x86_64-linux, x86_64-darwin ] + amby: [ i686-linux, x86_64-linux, x86_64-darwin ] AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] amqp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2774,6 +2788,7 @@ dont-distribute-packages: chuchu: [ i686-linux, x86_64-linux, x86_64-darwin ] chunks: [ i686-linux, x86_64-linux, x86_64-darwin ] chunky: [ i686-linux, x86_64-linux, x86_64-darwin ] + cielo: [ i686-linux, x86_64-linux, x86_64-darwin ] cil: [ i686-linux, x86_64-linux, x86_64-darwin ] cinvoke: [ i686-linux, x86_64-linux, x86_64-darwin ] cio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2907,6 +2922,7 @@ dont-distribute-packages: concraft-hr: [ i686-linux, x86_64-linux, x86_64-darwin ] concraft-pl: [ i686-linux, x86_64-linux, x86_64-darwin ] concraft: [ i686-linux, x86_64-linux, x86_64-darwin ] + concrete-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] concrete-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] concurrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] Concurrential: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2922,6 +2938,7 @@ dont-distribute-packages: conduit-resumablesink: [ i686-linux, x86_64-linux, x86_64-darwin ] conf: [ i686-linux, x86_64-linux, x86_64-darwin ] conffmt: [ i686-linux, x86_64-linux, x86_64-darwin ] + config-ini: [ i686-linux, x86_64-linux, x86_64-darwin ] config-select: [ i686-linux, x86_64-linux, x86_64-darwin ] ConfigFileTH: [ i686-linux, x86_64-linux, x86_64-darwin ] Configger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3040,6 +3057,7 @@ dont-distribute-packages: CSPM-Interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-ToProlog: [ i686-linux, x86_64-linux, x86_64-darwin ] cspmchecker: [ i686-linux, x86_64-linux, x86_64-darwin ] + cspretty: [ i686-linux, x86_64-linux, x86_64-darwin ] css: [ i686-linux, x86_64-linux, x86_64-darwin ] csv-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] ctemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3347,6 +3365,7 @@ dont-distribute-packages: dynamic-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] DynamicTimeWarp: [ i686-linux, x86_64-linux, x86_64-darwin ] + dynamodb-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] dynobud: [ i686-linux, x86_64-linux, x86_64-darwin ] DysFRP-Cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] DysFRP-Craftwerk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3388,6 +3407,7 @@ dont-distribute-packages: electrum-mnemonic: [ i686-linux, x86_64-linux, x86_64-darwin ] elevator: [ i686-linux, x86_64-linux, x86_64-darwin ] elision: [ i686-linux, x86_64-linux, x86_64-darwin ] + elm-export-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] elm-export: [ i686-linux, x86_64-linux, x86_64-darwin ] elocrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] emacs-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3571,6 +3591,7 @@ dont-distribute-packages: fixed-point: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-storable-array: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixed-width: [ i686-linux, x86_64-linux, x86_64-darwin ] fixfile: [ i686-linux, x86_64-linux, x86_64-darwin ] fizz-buzz: [ i686-linux, x86_64-linux, x86_64-darwin ] flamethrower: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3689,6 +3710,7 @@ dont-distribute-packages: fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] fuzzytime: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] + fwgl-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ] g-npm: [ i686-linux, x86_64-linux, x86_64-darwin ] gact: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3768,9 +3790,12 @@ dont-distribute-packages: ghcjs-dom-jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-dom-jsffi: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-hplay: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-promise: [ i686-linux, x86_64-linux, x86_64-darwin ] ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-girepository: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gst: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstbase: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3980,7 +4005,9 @@ dont-distribute-packages: gyah-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] h-booru: [ i686-linux, x86_64-linux, x86_64-darwin ] h-gpgme: [ i686-linux, x86_64-linux, x86_64-darwin ] + h-reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] h2048: [ i686-linux, x86_64-linux, x86_64-darwin ] + H: [ i686-linux, x86_64-linux, x86_64-darwin ] haar: [ i686-linux, x86_64-linux, x86_64-darwin ] Hach: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-contrib-press: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4036,12 +4063,14 @@ dont-distribute-packages: hakyll-ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-series: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-shakespeare: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] halberd: [ i686-linux, x86_64-linux, x86_64-darwin ] halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] halma: [ i686-linux, x86_64-linux, x86_64-darwin ] + hamilton: [ i686-linux, x86_64-linux, x86_64-darwin ] HaMinitel: [ i686-linux, x86_64-linux, x86_64-darwin ] hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] hamsql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4105,6 +4134,7 @@ dont-distribute-packages: harvest-api: [ i686-linux, x86_64-linux, x86_64-darwin ] has-th: [ i686-linux, x86_64-linux, x86_64-darwin ] has: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasbolt: [ i686-linux, x86_64-linux, x86_64-darwin ] hascal: [ i686-linux, x86_64-linux, x86_64-darwin ] hascas: [ i686-linux, x86_64-linux, x86_64-darwin ] hascat-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4123,6 +4153,7 @@ dont-distribute-packages: hasim: [ i686-linux, x86_64-linux, x86_64-darwin ] hask-home: [ i686-linux, x86_64-linux, x86_64-darwin ] hask: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskakafka: [ i686-linux, x86_64-linux, x86_64-darwin ] haskanoid: [ i686-linux, x86_64-linux, x86_64-darwin ] haskarrow: [ i686-linux, x86_64-linux, x86_64-darwin ] haskbot-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4163,6 +4194,7 @@ dont-distribute-packages: haskell-tools-ast: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-backend-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-prettyprint: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-refactor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4229,6 +4261,7 @@ dont-distribute-packages: hasql-class: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-cursor-query: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-cursor-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres-options: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4864,6 +4897,7 @@ dont-distribute-packages: ImperativeHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] implicit-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] implicit-params: [ i686-linux, x86_64-linux, x86_64-darwin ] + implicit: [ i686-linux, x86_64-linux, x86_64-darwin ] imports: [ i686-linux, x86_64-linux, x86_64-darwin ] impossible: [ i686-linux, x86_64-linux, x86_64-darwin ] improve: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4886,6 +4920,7 @@ dont-distribute-packages: informative: [ i686-linux, x86_64-linux, x86_64-darwin ] inject-function: [ i686-linux, x86_64-linux, x86_64-darwin ] inline-java: [ i686-linux, x86_64-linux, x86_64-darwin ] + inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ] inserts: [ i686-linux, x86_64-linux, x86_64-darwin ] inspector-wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4938,6 +4973,7 @@ dont-distribute-packages: isobmff-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] isohunt: [ i686-linux, x86_64-linux, x86_64-darwin ] isotope: [ i686-linux, x86_64-linux, x86_64-darwin ] + itemfield: [ i686-linux, x86_64-linux, x86_64-darwin ] iter-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-compress: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4992,6 +5028,8 @@ dont-distribute-packages: jsaddle-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsaddle-webkit2gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsaddle-webkitgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-wkwebview: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] jsc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5037,8 +5075,15 @@ dont-distribute-packages: jvm: [ i686-linux, x86_64-linux, x86_64-darwin ] JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + kafka-device-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] + kafka-device-joystick: [ i686-linux, x86_64-linux, x86_64-darwin ] + kafka-device-leap: [ i686-linux, x86_64-linux, x86_64-darwin ] + kafka-device-spacenav: [ i686-linux, x86_64-linux, x86_64-darwin ] + kafka-device-vrpn: [ i686-linux, x86_64-linux, x86_64-darwin ] + kafka-device: [ i686-linux, x86_64-linux, x86_64-darwin ] kaleidoscope: [ i686-linux, x86_64-linux, x86_64-darwin ] Kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] + kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] kangaroo: [ i686-linux, x86_64-linux, x86_64-darwin ] kanji: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-cores: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5091,6 +5136,7 @@ dont-distribute-packages: kontra-config: [ i686-linux, x86_64-linux, x86_64-darwin ] korfu: [ i686-linux, x86_64-linux, x86_64-darwin ] kqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] + krapsh: [ i686-linux, x86_64-linux, x86_64-darwin ] Kriens: [ i686-linux, x86_64-linux, x86_64-darwin ] krpc: [ i686-linux, x86_64-linux, x86_64-darwin ] KSP: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5109,6 +5155,7 @@ dont-distribute-packages: lambda-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-devs: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-options: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-sampler: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5170,17 +5217,20 @@ dont-distribute-packages: latex-formulae-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-image: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + latex-function-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] LATS: [ i686-linux, x86_64-linux, x86_64-darwin ] launchpad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] layers: [ i686-linux, x86_64-linux, x86_64-darwin ] layout-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] lazyarray: [ i686-linux, x86_64-linux, x86_64-darwin ] + lazyset: [ i686-linux, x86_64-linux, x86_64-darwin ] lazysplines: [ i686-linux, x86_64-linux, x86_64-darwin ] LazyVault: [ i686-linux, x86_64-linux, x86_64-darwin ] lcs: [ i686-linux, x86_64-linux, x86_64-darwin ] ldif: [ i686-linux, x86_64-linux, x86_64-darwin ] leaf: [ i686-linux, x86_64-linux, x86_64-darwin ] leaky: [ i686-linux, x86_64-linux, x86_64-darwin ] + leapseconds: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] leetify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5220,8 +5270,10 @@ dont-distribute-packages: libhbb: [ i686-linux, x86_64-linux, x86_64-darwin ] libjenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] liblastfm: [ i686-linux, x86_64-linux, x86_64-darwin ] + liblawless: [ i686-linux, x86_64-linux, x86_64-darwin ] liblinear-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] libltdl: [ i686-linux, x86_64-linux, x86_64-darwin ] + libmolude: [ i686-linux, x86_64-linux, x86_64-darwin ] liboleg: [ i686-linux, x86_64-linux, x86_64-darwin ] libpafe: [ i686-linux, x86_64-linux, x86_64-darwin ] libpq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5317,6 +5369,8 @@ dont-distribute-packages: loch: [ i686-linux, x86_64-linux, x86_64-darwin ] locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + log-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] log: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5452,6 +5506,7 @@ dont-distribute-packages: mdapi: [ i686-linux, x86_64-linux, x86_64-darwin ] mdcat: [ i686-linux, x86_64-linux, x86_64-darwin ] mdp: [ i686-linux, x86_64-linux, x86_64-darwin ] + mealstrom: [ i686-linux, x86_64-linux, x86_64-darwin ] MeanShift: [ i686-linux, x86_64-linux, x86_64-darwin ] Measure: [ i686-linux, x86_64-linux, x86_64-darwin ] mecab: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5584,6 +5639,7 @@ dont-distribute-packages: Monatron-IO: [ i686-linux, x86_64-linux, x86_64-darwin ] Monatron: [ i686-linux, x86_64-linux, x86_64-darwin ] mondo: [ i686-linux, x86_64-linux, x86_64-darwin ] + money: [ i686-linux, x86_64-linux, x86_64-darwin ] mongodb-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] mongrel2-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5638,6 +5694,7 @@ dont-distribute-packages: multiplate: [ i686-linux, x86_64-linux, x86_64-darwin ] multirec-alt-deriver: [ i686-linux, x86_64-linux, x86_64-darwin ] multirec-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + multirec: [ i686-linux, x86_64-linux, x86_64-darwin ] multisetrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] Munkres-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] muon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5720,6 +5777,7 @@ dont-distribute-packages: nettle-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire-input-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] + netwire-input-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire-input: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire-vinylglfw-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5908,6 +5966,7 @@ dont-distribute-packages: panda: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-csv2table: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-japanese-filters: [ i686-linux, x86_64-linux, x86_64-darwin ] + pandoc-placetable: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-plantuml-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] PandocAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6227,6 +6286,7 @@ dont-distribute-packages: qhull-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] QIO: [ i686-linux, x86_64-linux, x86_64-darwin ] QLearn: [ i686-linux, x86_64-linux, x86_64-darwin ] + qr-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] qt: [ i686-linux, x86_64-linux, x86_64-darwin ] qtah-cpp-qt5: [ i686-linux, x86_64-linux, x86_64-darwin ] qtah-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6480,6 +6540,7 @@ dont-distribute-packages: rope: [ i686-linux, x86_64-linux, x86_64-darwin ] rose-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] roshask: [ i686-linux, x86_64-linux, x86_64-darwin ] + rosmsg-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] rosso: [ i686-linux, x86_64-linux, x86_64-darwin ] rounding: [ i686-linux, x86_64-linux, x86_64-darwin ] roundtrip-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6696,6 +6757,7 @@ dont-distribute-packages: shellish: [ i686-linux, x86_64-linux, x86_64-darwin ] shellmate-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] shelltestrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] + shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ] shoap: [ i686-linux, x86_64-linux, x86_64-darwin ] shorten-strings: [ i686-linux, x86_64-linux, x86_64-darwin ] showdown: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6887,12 +6949,14 @@ dont-distribute-packages: splines: [ i686-linux, x86_64-linux, x86_64-darwin ] split-record: [ i686-linux, x86_64-linux, x86_64-darwin ] splitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-api-ghcjs: [ i686-linux, x86_64-linux, x86_64-darwin ] Spock-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] Spock-digestive: [ i686-linux, x86_64-linux, x86_64-darwin ] spoonutil: [ i686-linux, x86_64-linux, x86_64-darwin ] spoty: [ i686-linux, x86_64-linux, x86_64-darwin ] Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ] spritz: [ i686-linux, x86_64-linux, x86_64-darwin ] + sproxy2: [ i686-linux, x86_64-linux, x86_64-darwin ] spsa: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7210,7 +7274,9 @@ dont-distribute-packages: TimePiece: [ i686-linux, x86_64-linux, x86_64-darwin ] timeplot: [ i686-linux, x86_64-linux, x86_64-darwin ] timeprint: [ i686-linux, x86_64-linux, x86_64-darwin ] + timeseries: [ i686-linux, x86_64-linux, x86_64-darwin ] timestamp-subprocess-lines: [ i686-linux, x86_64-linux, x86_64-darwin ] + timezone-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] TinyLaunchbury: [ i686-linux, x86_64-linux, x86_64-darwin ] tinyMesh: [ i686-linux, x86_64-linux, x86_64-darwin ] TinyURL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7253,6 +7319,7 @@ dont-distribute-packages: traildb: [ i686-linux, x86_64-linux, x86_64-darwin ] trajectory: [ i686-linux, x86_64-linux, x86_64-darwin ] transactional-events: [ i686-linux, x86_64-linux, x86_64-darwin ] + transf: [ i686-linux, x86_64-linux, x86_64-darwin ] transformations: [ i686-linux, x86_64-linux, x86_64-darwin ] TransformeR: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7260,6 +7327,7 @@ dont-distribute-packages: transformers-eff: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-runnable: [ i686-linux, x86_64-linux, x86_64-darwin ] TransformersStepByStep: [ i686-linux, x86_64-linux, x86_64-darwin ] + transient-universe: [ i686-linux, x86_64-linux, x86_64-darwin ] translatable-intset: [ i686-linux, x86_64-linux, x86_64-darwin ] translate: [ i686-linux, x86_64-linux, x86_64-darwin ] travis-meta-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7318,6 +7386,7 @@ dont-distribute-packages: txtblk: [ i686-linux, x86_64-linux, x86_64-darwin ] TYB: [ i686-linux, x86_64-linux, x86_64-darwin ] typalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-assertions: [ i686-linux, x86_64-linux, x86_64-darwin ] type-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] type-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] type-combinators-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7408,6 +7477,7 @@ dont-distribute-packages: usb-hid: [ i686-linux, x86_64-linux, x86_64-darwin ] usb-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] usb-safe: [ i686-linux, x86_64-linux, x86_64-darwin ] + users-mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] users-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] utc: [ i686-linux, x86_64-linux, x86_64-darwin ] utf8-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7554,6 +7624,7 @@ dont-distribute-packages: WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] webify: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + webkit2gtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] webserver: [ i686-linux, x86_64-linux, x86_64-darwin ] websnap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7644,6 +7715,7 @@ dont-distribute-packages: xml-enumerator-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-html-conduit-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-isogen: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7787,6 +7859,7 @@ dont-distribute-packages: zip-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] zipedit: [ i686-linux, x86_64-linux, x86_64-darwin ] zipkin: [ i686-linux, x86_64-linux, x86_64-darwin ] + zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] zlib-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] ZMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] zmcat: [ i686-linux, x86_64-linux, x86_64-darwin ] From 3745be8542591f464f56b73773e3b74be765fb17 Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Mon, 19 Dec 2016 11:03:55 +0100 Subject: [PATCH 1692/1749] zim: fix #21270 (double call of wrapPythonPrograms) Fixes #21270 --- pkgs/applications/office/zim/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index cda8fc63a127..93f51ce3f8b2 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -31,7 +31,6 @@ pythonPackages.buildPythonApplication rec { ''; postFixup = '' - wrapPythonPrograms substituteInPlace $out/bin/.zim-wrapped \ --replace "sys.argv[0] = 'zim'" "sys.argv[0] = '$out/bin/zim'" ''; From b02e6cc70d3e458eccb99ea20c4746238ebf52c2 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 19 Dec 2016 10:00:41 +0100 Subject: [PATCH 1693/1749] libvirt and pythonPackages.libvirt: 2.2.0 -> 2.5.0 --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 891c861c9fe5..658a2e37883a 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -9,11 +9,11 @@ # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "2.2.0"; + version = "2.5.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "168ng4k5sik2jiylrlpmqdj3g8hnmsmvh84y8nvfgc7fdbbah5g3"; + sha256 = "07nbh6zhaxx5i1s1acnppf8rzkzb2ppgv35jw7grbbnnpzpzz7c1"; }; patches = [ ./build-on-bsd.patch ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index be63f65e6a6f..a3c42dd13bf6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28326,13 +28326,13 @@ EOF }; libvirt = let - version = "2.2.0"; + version = "2.5.0"; in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "0xpamw9gjmahvrbfkxjlplgdbhjr35vpp3a942bmw9qqy2rjwsxs"; + sha256 = "1lanyrk4invs5j4jrd7yvy7g8kilihjbcrgs5arx8k3bs9x7izgl"; }; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; From 2fdd4973ec4e867ff76ef6608ac75e89aa0d4514 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 19 Dec 2016 13:10:07 +0100 Subject: [PATCH 1694/1749] parted: disable checks to fix Hydra build (fixes #21281) --- pkgs/tools/misc/parted/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index cfce018a2361..58e7a17a57f3 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -29,7 +29,10 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" ++ stdenv.lib.optional enableStatic "--enable-static"; - doCheck = true; + # Tests are currently failing because Hydra runs builds as uid 0. + # It'd be better to try to fix these tests, but this is blocking + # all NixOS Hydra builds right now. + doCheck = false; preCheck = stdenv.lib.optionalString doCheck From d8d36de635c0e57c1ff6f46abbf3e577427df765 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Mon, 19 Dec 2016 14:56:55 +0000 Subject: [PATCH 1695/1749] Fix typo in beam.xml --- doc/languages-frameworks/beam.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml index 2dc5aa63e458..efb2e60cf3aa 100644 --- a/doc/languages-frameworks/beam.xml +++ b/doc/languages-frameworks/beam.xml @@ -248,7 +248,7 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse development. Many times we need to create a shell.nix file and do our development inside of the environment specified by that file. This file looks a lot - like the packageing described above. The main difference is that + like the packaging described above. The main difference is that src points to project root and we call the package directly. From cc30f5dd5e7a277b2a920878a0fe04a6f103b9c2 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 19 Dec 2016 16:00:46 +0100 Subject: [PATCH 1696/1749] boost: add 1.62.0 (not default yet) --- pkgs/development/libraries/boost/1.62.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/libraries/boost/1.62.nix diff --git a/pkgs/development/libraries/boost/1.62.nix b/pkgs/development/libraries/boost/1.62.nix new file mode 100644 index 000000000000..871ef392c1ae --- /dev/null +++ b/pkgs/development/libraries/boost/1.62.nix @@ -0,0 +1,12 @@ +{ stdenv, callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.62.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_62_0.tar.bz2"; + # long-form SHA256 from www.boost.org + sha256 = "36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0"; + }; + +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77aafb98822a..4e1aa07ec341 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6729,6 +6729,7 @@ in boost155 = callPackage ../development/libraries/boost/1.55.nix { }; boost159 = callPackage ../development/libraries/boost/1.59.nix { }; boost160 = callPackage ../development/libraries/boost/1.60.nix { }; + boost162 = callPackage ../development/libraries/boost/1.62.nix { }; boost = boost160; boost_process = callPackage ../development/libraries/boost-process { }; From ac97fbab3a8225343f8a9594821e66af51af048c Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 19 Dec 2016 09:12:05 +0000 Subject: [PATCH 1697/1749] fte: init at 0.50.02 --- lib/maintainers.nix | 1 + pkgs/applications/editors/fte/default.nix | 29 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/applications/editors/fte/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4144d5f019f7..f88cd1212fb0 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -483,6 +483,7 @@ vlstill = "Vladimír Štill "; vmandela = "Venkateswara Rao Mandela "; volhovm = "Mikhail Volkhov "; + volth = "Jaroslavas Pocepko "; vozz = "Oliver Hunt "; vrthra = "Rahul Gopinath "; wedens = "wedens "; diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix new file mode 100644 index 000000000000..d32a3fb5f1b5 --- /dev/null +++ b/pkgs/applications/editors/fte/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, unzip, perl, libX11, libXpm, gpm, ncurses, slang }: + +stdenv.mkDerivation rec { + name = "fte-0.50.02"; + + buildInputs = [ unzip perl libX11 libXpm gpm ncurses slang ]; + + ftesrc = fetchurl { + url = "mirror://sourceforge/fte/fte-20110708-src.zip"; + sha256 = "17j9akr19w19myglw5mljjw2g3i2cwxiqrjaln82h3rz5ma1qcfn"; + }; + ftecommon = fetchurl { + url = "mirror://sourceforge/fte/fte-20110708-common.zip"; + sha256 = "1xva4kh0674sj2b9rhf2amlr37yxmsvjkgyj89gpcn0rndw1ahaq"; + }; + src = [ ftesrc ftecommon ]; + + buildFlags = "PREFIX=$(out)"; + + installFlags = "PREFIX=$(out) INSTALL_NONROOT=1"; + + meta = with stdenv.lib; { + description = "A free text editor for developers"; + homepage = http://fte.sourceforge.net/; + license = licenses.gpl2; + maintainers = [ maintainers.volth ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e1aa07ec341..a9ed052f1f46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13168,6 +13168,8 @@ in boost = boost155; }; + fte = callPackage ../applications/editors/fte { }; + game-music-emu = callPackage ../applications/audio/game-music-emu { }; gcolor2 = callPackage ../applications/graphics/gcolor2 { }; From 0c7afce7dd69a4ca02591b9d505527cec38dfe69 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 19 Dec 2016 18:30:36 +0000 Subject: [PATCH 1698/1749] goaccess: 1.0 -> 1.1.1 --- pkgs/tools/misc/goaccess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 4b352f512082..424a84637a53 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, geoipWithDatabase, ncurses, glib }: stdenv.mkDerivation rec { - version = "1.0"; + version = "1.1.1"; name = "goaccess-${version}"; src = fetchurl { url = "http://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "1zma9p0gwxwl9kgq47i487fy1q8567fqnpik0zacjhgmpnzry3h0"; + sha256 = "1lxnhvh4xhkgzdv0l2fiza2099phn9zs04p9cqfhhl5k6xq18wsc"; }; configureFlags = [ From a7d425758a1d235615f17fae5c06cb1f87a4b53c Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 19 Dec 2016 09:56:19 +0100 Subject: [PATCH 1699/1749] python/simplebayes: init at 1.5.8 The upstream tag actually says 1.5.7 but the commit actually bumps the version to 1.5.8: https://github.com/hickeroar/simplebayes/commit/b8da72c50d20b6f8c0d We needed to patch the setup.py because the upstream project's setup.py reads in the README.rst for the longDescription. That very README.rst contains non-ASCII characters which in turn throws a decoding error with Python 3 on Nix because I think this has to do with our setup.py wrapper that doesn't seem to recognize the right encoding when using compile(). Tested by building against Python 2.7, 3.3, 3.4, 3.5 and 3.6. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a3c42dd13bf6..f4a425b26733 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23135,6 +23135,35 @@ in { }; }; + simplebayes = buildPythonPackage rec { + name = "simplebayes-${version}"; + version = "1.5.8"; + + # Use GitHub instead of pypi, because it contains tests. + src = pkgs.fetchFromGitHub { + repo = "simplebayes"; + owner = "hickeroar"; + # NOTE: This is actually 1.5.8 but the tag is wrong! + rev = "1.5.7"; + sha256 = "0mp7rvfdmpfxnka4czw3lv5kkh6gdxh6dm4r6hcln1zzfg9lxp4h"; + }; + + checkInputs = [ self.nose self.mock ]; + + postPatch = optionalString isPy3k '' + sed -i -e 's/open *(\([^)]*\))/open(\1, encoding="utf-8")/' setup.py + ''; + + checkPhase = "nosetests tests/test.py"; + + meta = { + description = "Memory-based naive bayesian text classifier"; + homepage = "https://github.com/hickeroar/simplebayes"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + simplegeneric = buildPythonPackage rec { version = "0.8.1"; name = "simplegeneric-${version}"; From 0409ce23303a0b194a10c1cb81971a03066d7770 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 19 Dec 2016 10:47:33 +0100 Subject: [PATCH 1700/1749] python/pyinsane2: init at 2.0.9 The tests require a scanner to be physically attached. Quote from the upstream README: > Tests require at least one scanner with a flatbed and an ADF > (Automatic Document Feeder). > > If possible, they should be run with at least 2 scanners connected. > The first that appear in "scanimage -L" must be the one with the ADF. > > For reference, my current setup is: > > - HP Officejet 4620 (Flatbed + ADF) > - HP Deskjet 2050 J510 series (Flatbed) So we disable the tests even though it might be theoretically possible to use qemu and an emulated scanner. Instead of the upstream tests we just do a quick check whether initialization of the library succeeds. Other than that the library uses ctypes.cdll to dlopen() the libsane shared library, so we need to patch in the right store path. Tested by building against Python 2.7, 3.3, 3.4, 3.5 and 3.6. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4a425b26733..92554e654712 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20422,6 +20422,44 @@ in { }; }; + pyinsane2 = buildPythonPackage rec { + name = "pyinsane2-${version}"; + version = "2.0.9"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/pyinsane2/${name}.tar.gz"; + sha256 = "1g4a1zhrrs7smmnsm7x8j5lvsz0r6rr2jgjykc9c1jlscz3yr747"; + }; + + postPatch = '' + # pyinsane2 forks itself, so we need to re-inject the PYTHONPATH. + sed -i -e '/os.putenv.*PYINSANE_DAEMON/ { + a \ os.putenv("PYTHONPATH", ":".join(sys.path)) + }' src/pyinsane2/sane/abstract_proc.py + + sed -i -e 's,"libsane.so.1","${pkgs.sane-backends}/lib/libsane.so",' \ + src/pyinsane2/sane/rawapi.py + ''; + + # Tests require a scanner to be physically connected, so let's just do a + # quick check whether initialization works. + checkPhase = '' + python -c 'import pyinsane2; pyinsane2.init()' + ''; + + # This is needed by setup.py regardless of whether tests are enabled. + buildInputs = [ self.nose ]; + + propagatedBuildInputs = [ self.pillow ]; + + meta = { + homepage = "https://github.com/jflesch/pyinsane"; + description = "Access and use image scanners"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; + }; + pyjwt = buildPythonPackage rec { version = "1.4.2"; name = "pyjwt-${version}"; From f805209a78a1a38cc13c9deac72a6433b6f5ba7b Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 19 Dec 2016 11:24:59 +0100 Subject: [PATCH 1701/1749] poppler: Add support for gobject-introspection This optionally adds support for GI, because it's needed for paperwork-backend. The new poppler_gi attribute is also marked as lowPrio so that users won't accidentally install it. Signed-off-by: aszlig Cc: @ttuegel --- pkgs/development/libraries/poppler/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index d3a51acd33aa..89368282f2c9 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -3,6 +3,7 @@ , withData ? false, poppler_data , qt4Support ? false, qt4 ? null , qt5Support ? false, qtbase ? null +, introspectionSupport ? false, gobjectIntrospection ? null , utils ? false , minimal ? false, suffix ? "glib" }: @@ -28,7 +29,8 @@ stdenv.mkDerivation rec { [ zlib freetype fontconfig libjpeg openjpeg ] ++ optionals (!minimal) [ cairo lcms curl ] ++ optional qt4Support qt4 - ++ optional qt5Support qtbase; + ++ optional qt5Support qtbase + ++ optional introspectionSupport gobjectIntrospection; nativeBuildInputs = [ pkgconfig ]; @@ -47,7 +49,8 @@ stdenv.mkDerivation rec { "--disable-poppler-glib" "--disable-poppler-cpp" "--disable-libcurl" ] - ++ optional (!utils) "--disable-utils" ; + ++ optional (!utils) "--disable-utils" + ++ optional introspectionSupport "--enable-introspection"; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9ed052f1f46..3f8a7bebe383 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8926,6 +8926,10 @@ in poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; + poppler_gi = lowPrio (poppler.override { + introspectionSupport = true; + }); + poppler_min = poppler.override { # TODO: maybe reduce even more minimal = true; suffix = "min"; From 68bc260ca2d71a676dd6afdb3524d4fff483016b Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 19 Dec 2016 13:05:30 +0100 Subject: [PATCH 1702/1749] tesseract: 3.02.02 -> 3.04.01 From the upstream changelog: * Tesseract development is now done with Git and hosted at github.com (Previously we used Subversion as a VCS and code.google.com for hosting). So let's move over to the GitHub repository, where the organisation also includes a full repository for tessdata, so we no longer need to fetch it one-by-one. The build also got significantly simpler, because we no longer need to run autoconf, neither do we need to patch the configure script for Leptonica headers. This also has the advantage that we don't need to use the enableLanguages attribute for the test runner anymore. Full upstream changelog can be found at: https://github.com/tesseract-ocr/tesseract/blob/c4d273d33cc36e/ChangeLog Tested against all NixOS tests with enabled OCR (chromium, emacs-daemon, installer.luksroot and lightdm). Signed-off-by: aszlig Cc: @viric --- nixos/lib/testing.nix | 2 +- .../graphics/tesseract/default.nix | 58 ++++++------------- 2 files changed, 19 insertions(+), 41 deletions(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 7fad5cbc3cd9..2efe7a5b879c 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -93,7 +93,7 @@ rec { vms = map (m: m.config.system.build.vm) (lib.attrValues nodes); - ocrProg = tesseract.override { enableLanguages = [ "eng" ]; }; + ocrProg = tesseract; # Generate onvenience wrappers for running the test driver # interactively with the specified network, and for starting the diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index 375b09995488..1f1da9a389f2 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,53 +1,31 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, leptonica, libpng, libtiff -, enableLanguages ? null +{ stdenv, fetchFromGitHub, pkgconfig, leptonica, libpng, libtiff +, icu, pango, opencl-headers }: -with stdenv.lib; - -let - majVersion = "3.02"; - version = "${majVersion}.02"; - - mkLang = lang: sha256: let - src = fetchurl { - url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${majVersion}.${lang}.tar.gz"; - inherit sha256; - }; - in "tar xfvz ${src} -C $out/share/ --strip=1"; - - wantLang = name: const (enableLanguages == null || elem name enableLanguages); - - extraLanguages = mapAttrsToList mkLang (filterAttrs wantLang { - cat = "0d1smiv1b3k9ay2s05sl7q08mb3ln4w5iiiymv2cs8g8333z8jl9"; - rus = "059336mkhsj9m3hwfb818xjlxkcdpy7wfgr62qwz65cx914xl709"; - spa = "1c9iza5mbahd9pa7znnq8yv09v5kz3gbd2sarcgcgc1ps1jc437l"; - nld = "162acxp1yb6gyki2is3ay2msalmfcsnrlsd9wml2ja05k94m6bjy"; - eng = "1y5xf794n832s3lymzlsdm2s9nlrd2v27jjjp0fd9xp7c2ah4461"; - slv = "0rqng43435cly32idxm1lvxkcippvc3xpxbfizwq5j0155ym00dr"; - jpn = "07v8pymd0iwyzh946lxylybda20gsw7p4fsb09jw147955x49gq9"; - }); -in - stdenv.mkDerivation rec { name = "tesseract-${version}"; + version = "3.04.01"; - src = fetchurl { - url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${version}.tar.gz"; - sha256 = "0g81m9y4iydp7kgr56mlkvjdwpp3mb01q385yhdnyvra7z5kkk96"; + src = fetchFromGitHub { + owner = "tesseract-ocr"; + repo = "tesseract"; + rev = version; + sha256 = "0h1x4z1h86n2gwknd0wck6gykkp99bmm02lg4a47a698g4az6ybv"; }; - buildInputs = [ autoconf automake libtool leptonica libpng libtiff ]; + tessdata = fetchFromGitHub { + owner = "tesseract-ocr"; + repo = "tessdata"; + rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d"; + sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7"; + }; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; - preConfigure = '' - ./autogen.sh - substituteInPlace "configure" \ - --replace 'LIBLEPT_HEADERSDIR="/usr/local/include /usr/include"' \ - 'LIBLEPT_HEADERSDIR=${leptonica}/include' - ''; + LIBLEPT_HEADERSDIR = "${leptonica}/include"; - postInstall = concatStringsSep "; " extraLanguages; + postInstall = "cp -Rt \"$out/share/tessdata\" \"$tessdata/\"*"; meta = { description = "OCR engine"; From 02a9da65c9640bd9f61f03d594a360d18541bfad Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 19 Dec 2016 13:53:21 +0100 Subject: [PATCH 1703/1749] nixos: Disable OCR for tests that do not use it Found out during testing of the Tesseract upgrade the kde5 and sddm tests don't actually use OCR, so let's disable support for it. Signed-off-by: aszlig Cc: @ttuegel --- nixos/tests/kde5.nix | 2 -- nixos/tests/sddm.nix | 2 -- 2 files changed, 4 deletions(-) diff --git a/nixos/tests/kde5.nix b/nixos/tests/kde5.nix index 30a0d09d18bb..30db316dba5e 100644 --- a/nixos/tests/kde5.nix +++ b/nixos/tests/kde5.nix @@ -20,8 +20,6 @@ import ./make-test.nix ({ pkgs, ...} : services.xserver.desktopManager.kde5.enable = true; }; - enableOCR = true; - testScript = { nodes, ... }: let xdo = "${pkgs.xdotool}/bin/xdotool"; in '' diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index 22a9e1bd2c7c..041d88fbeae6 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -19,8 +19,6 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.desktopManager.default = "none"; }; - enableOCR = true; - testScript = { nodes, ... }: '' startAll; $machine->waitForFile("/home/alice/.Xauthority"); From e186a8dba99ddb14389018e5a1e842dc9155b3fc Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 19 Dec 2016 15:23:49 +0100 Subject: [PATCH 1704/1749] python/pyocr: init at 0.4.4 This package is a bit more involved because it assumes a lot of paths being there in a FHS compliant way, so we need to patch the data and binary directories for Tesseract and Cuneiform. I've also tried to get the tests working, but they produce different results comparing input/output. This is probably related to the following issue: https://github.com/jflesch/pyocr/issues/52 So I've disabled certain tests that fail but don't generally impede the functionality of pyocr. Tested by building against Python 3.3, 3.4, 3.5 and 3.6. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 58 ++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92554e654712..d672539299db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20538,6 +20538,64 @@ in { }; }; + pyocr = buildPythonPackage rec { + name = "pyocr-${version}"; + version = "0.4.4"; + + # Don't fetch from PYPI because it doesn't contain tests. + src = pkgs.fetchFromGitHub { + owner = "jflesch"; + repo = "pyocr"; + rev = version; + sha256 = "09s7dxin8ams0f3xab60f45l3nn236a8win9yfyq9aqy9mm946ak"; + }; + + postPatch = '' + sed -i \ + -e 's,^\(TESSERACT_CMD *= *\).*,\1"${pkgs.tesseract}/bin/tesseract",' \ + -e 's,^\(CUNEIFORM_CMD *= *\).*,\1"${pkgs.cuneiform}/bin/cuneiform",' \ + -e '/^CUNIFORM_POSSIBLE_PATHS *= *\[/,/^\]$/ { + c CUNIFORM_POSSIBLE_PATHS = ["${pkgs.cuneiform}/share/cuneiform"] + }' src/pyocr/{tesseract,cuneiform}.py + + sed -i -r \ + -e 's,"libtesseract\.so\.3","${pkgs.tesseract}/lib/libtesseract.so",' \ + -e 's,^(TESSDATA_PREFIX *=).*,\1 "${pkgs.tesseract}/share/tessdata",' \ + src/pyocr/libtesseract/tesseract_raw.py + + # Disable specific tests that are probably failing because of this issue: + # https://github.com/jflesch/pyocr/issues/52 + for test in $disabledTests; do + file="''${test%%:*}" + fun="''${test#*:}" + echo "$fun = unittest.expectedFailure($fun)" >> "tests/tests_$file.py" + done + ''; + + disabledTests = [ + "cuneiform:TestTxt.test_basic" + "cuneiform:TestTxt.test_european" + "cuneiform:TestTxt.test_french" + "cuneiform:TestWordBox.test_basic" + "cuneiform:TestWordBox.test_european" + "cuneiform:TestWordBox.test_french" + "libtesseract:TestBasicDoc.test_basic" + "libtesseract:TestDigitLineBox.test_digits" + "libtesseract:TestLineBox.test_japanese" + "libtesseract:TestTxt.test_japanese" + "libtesseract:TestWordBox.test_japanese" + "tesseract:TestDigitLineBox.test_digits" + "tesseract:TestTxt.test_japanese" + ]; + + propagatedBuildInputs = [ self.pillow self.six ]; + + meta = { + homepage = "https://github.com/jflesch/pyocr"; + description = "A Python wrapper for Tesseract and Cuneiform"; + license = licenses.gpl3Plus; + }; + }; pyparsing = buildPythonPackage rec { name = "pyparsing-${version}"; From 1114a6b706f6c4a84c493cc22b874c6720fec40e Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 19 Dec 2016 16:59:15 +0100 Subject: [PATCH 1705/1749] python/pypillowfight: init at 0.2.1 First of all: This is NOT the same package as "pillowfight". I'm not sure why people want to choose this particular name, but well, so be it. I haven't investigated why test_ace and test_all_2 fail, but I've disabled these tests by now and reported the failures upstream at jflesch/libpillowfight#2. Tested by building against Python 3.3, 3.4, 3.5 and 3.6. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 33 ++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d672539299db..a58f0f755415 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8824,6 +8824,39 @@ in { }; }; + pypillowfight = buildPythonPackage rec { + name = "pypillowfight-${version}"; + version = "0.2.1"; + + src = pkgs.fetchFromGitHub { + owner = "jflesch"; + repo = "libpillowfight"; + rev = version; + sha256 = "1rwmajsy9qhl3qhhy5mw0xmr3n8abxcq8baidpn0sxv6yjg2369z"; + }; + + # Disable certain tests. Reported upstream at: + # https://github.com/jflesch/libpillowfight/issues/2 + postPatch = '' + sed -i -e '/test_\(all_2\|ace\)/i \ @unittest.expectedFailure' \ + tests/tests_ace.py tests/tests_all.py + ''; + + # Python 2.x is not supported, see: + # https://github.com/jflesch/libpillowfight/issues/1 + disabled = !isPy3k && !isPyPy; + + # This is needed by setup.py regardless of whether tests are enabled. + buildInputs = [ self.nose ]; + propagatedBuildInputs = [ self.pillow ]; + + meta = { + description = "Library containing various image processing algorithms"; + homepage = "https://github.com/jflesch/libpillowfight"; + license = licenses.gpl3Plus; + }; + }; + python-axolotl = buildPythonPackage rec { name = "python-axolotl-${version}"; version = "0.1.35"; From d331f58b900710164e1681a9d32fa7d75662935e Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 19 Dec 2016 22:00:53 +0100 Subject: [PATCH 1706/1749] python/paperwork-backend: init at 1.0.6 While not explicitly checked by setup.py or by the "chkdeps" command from the project I have added pyinsane2 and pyocr to the list of dependencies as well, because they're referenced in the source. Tested by building against Python 3.3, 3.4, 3.5 and 3.6. The build against Python 3.6 failed because pycairo doesn't build, so it's a non-issue at least for paperwork-backend. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 37 +++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a58f0f755415..3dcf58e606c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8436,7 +8436,42 @@ in { license = licenses.mit; }; }; - + + paperwork-backend = buildPythonPackage rec { + name = "paperwork-backend-${version}"; + version = "1.0.6"; + + src = pkgs.fetchFromGitHub { + owner = "jflesch"; + repo = "paperwork-backend"; + rev = version; + sha256 = "11jbhv9xcpimp9iq2b1hlpljzij73s86rb5lpgzhslqc7zmm5bxn"; + }; + + # Python 2.x is not supported. + disabled = !isPy3k && !isPyPy; + + # Make sure that chkdeps exits with status 1 if a dependency is not found. + postPatch = '' + sed -i -e '/print.*Missing dependencies/,/^ *$/ { + /^ *$/ a \ sys.exit(1) + }' scripts/paperwork-shell + ''; + + preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend"; + + propagatedBuildInputs = with self; [ + pyenchant simplebayes pillow pycountry whoosh termcolor + python-Levenshtein pyinsane2 pygobject3 pyocr pkgs.poppler_gi + ]; + + meta = { + description = "Backend part of Paperwork (Python API, no UI)"; + homepage = "https://github.com/jflesch/paperwork-backend"; + license = licenses.gpl3Plus; + }; + }; + pathtools = buildPythonPackage rec { name = "pathtools-${version}"; version = "0.1.2"; From 7199f1bd9470f6acabcfadddef50d4934727796e Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 19 Dec 2016 22:06:48 +0100 Subject: [PATCH 1707/1749] paperwork: init at 1.0.6.1 I have not yet tested scanning, but the main application works so far. A lot of patching is required here, because the upstream project references some paths from well-known FHS locations which of course are not available on Nix(OS). We also use all available aspell dictionaries right now, which is maybe a bit ugly but it makes language switching easier. Signed-off-by: aszlig --- .../applications/office/paperwork/default.nix | 78 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/applications/office/paperwork/default.nix diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix new file mode 100644 index 000000000000..2c55be55b08b --- /dev/null +++ b/pkgs/applications/office/paperwork/default.nix @@ -0,0 +1,78 @@ +{ lib, python3Packages, fetchFromGitHub, gtk3, cairo +, aspellDicts, buildEnv +, gnome3, hicolor_icon_theme +, xvfb_run, dbus +}: + +python3Packages.buildPythonApplication rec { + name = "paperwork-${version}"; + # Don't forget to also update paperwork-backend when updating this! + version = "1.0.6.1"; + + src = fetchFromGitHub { + repo = "paperwork"; + owner = "jflesch"; + rev = version; + sha256 = "1v1lxyi4crdik4jlwjds9n6lzw4m4l4f9n5azlinv8wb477qpv6h"; + }; + + # Patch out a few paths that assume that we're using the FHS: + postPatch = '' + themeDir="$(echo "${gnome3.defaultIconTheme}/share/icons/"*)" + sed -i -e "s,/usr/share/icons/gnome,$themeDir," src/paperwork/deps.py + + sed -i -e 's,sys\.prefix,"",g' \ + src/paperwork/frontend/aboutdialog/__init__.py \ + src/paperwork/frontend/mainwindow/__init__.py \ + setup.py + + sed -i -e '/^UI_FILES_DIRS = \[/,/^\]$/ { + c UI_FILES_DIRS = ["'"$out/share/paperwork"'"] + }' src/paperwork/frontend/util/__init__.py + + sed -i -e '/^LOCALE_PATHS = \[/,/^\]$/ { + c LOCALE_PATHS = ["'"$out/share/locale"'"] + }' src/paperwork/paperwork.py + + sed -i -e 's/"icon"/"icon-name"/g' \ + src/paperwork/frontend/mainwindow/mainwindow.glade + + sed -i -e 's/"logo"/"logo-icon-name"/g' \ + src/paperwork/frontend/aboutdialog/aboutdialog.glade + ''; + + ASPELL_CONF = "dict-dir ${buildEnv { + name = "aspell-all-dicts"; + paths = lib.collect lib.isDerivation aspellDicts; + }}/lib/aspell"; + + checkInputs = [ xvfb_run dbus.daemon ]; + buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme ]; + + # A few parts of chkdeps need to have a display and a dbus session, so we not + # only need to run a virtual X server + dbus but also have a large enough + # resolution, because the Cairo test tries to draw a 200x200 window. + preCheck = '' + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + paperwork-shell chkdeps paperwork + ''; + + propagatedBuildInputs = with python3Packages; [ + paperwork-backend pypillowfight gtk3 cairo + ]; + + makeWrapperArgs = [ + "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" + "--prefix XDG_DATA_DIRS : \"$out/share\"" + "--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\"" + ]; + + meta = { + description = "A personal document manager for scanned documents"; + homepage = "https://github.com/jflesch/paperwork"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.aszlig ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f8a7bebe383..eb13708d7259 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3168,6 +3168,8 @@ in paper-gtk-theme = callPackage ../misc/themes/paper { }; + paperwork = callPackage ../applications/office/paperwork { }; + par2cmdline = callPackage ../tools/networking/par2cmdline { }; parallel = callPackage ../tools/misc/parallel { }; From bb80d77d8424cf07ba1ca293c81a081017db285b Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Mon, 19 Dec 2016 22:14:47 +0100 Subject: [PATCH 1708/1749] neovim: green :CheckHealth --- pkgs/applications/editors/neovim/default.nix | 24 +++++++++++++------ .../editors/neovim/ruby_provider/Gemfile | 3 +++ .../editors/neovim/ruby_provider/Gemfile.lock | 15 ++++++++++++ .../editors/neovim/ruby_provider/gemset.nix | 19 +++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++-- 5 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/editors/neovim/ruby_provider/Gemfile create mode 100644 pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock create mode 100644 pkgs/applications/editors/neovim/ruby_provider/gemset.nix diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index e76683aa1807..354aaf6db546 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -5,6 +5,7 @@ , withPython ? true, pythonPackages, extraPythonPackages ? [] , withPython3 ? true, python3Packages, extraPython3Packages ? [] , withJemalloc ? true, jemalloc +, withRuby ? true, bundlerEnv , withPyGUI ? false , vimAlias ? false @@ -44,6 +45,14 @@ let }; }; + rubyEnv = bundlerEnv { + name = "neovim-ruby-env"; + gemdir = ./ruby_provider; + }; + + rubyWrapper = ''--suffix PATH : \"${rubyEnv}/bin\" '' + + ''--suffix GEM_HOME : \"${rubyEnv}/${rubyEnv.ruby.gemPath}\" ''; + pythonEnv = pythonPackages.python.buildEnv.override { extraLibs = ( if withPyGUI @@ -52,11 +61,17 @@ let ) ++ extraPythonPackages; ignoreCollisions = true; }; + pythonWrapper = ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" ''; python3Env = python3Packages.python.buildEnv.override { extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages; ignoreCollisions = true; }; + python3Wrapper = ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\" ''; + pythonFlags = optionalString (withPython || withPython3) ''--add-flags "${ + (optionalString withPython pythonWrapper) + + (optionalString withPython3 python3Wrapper) + }"''; neovim = stdenv.mkDerivation rec { name = "neovim-${version}"; @@ -124,13 +139,8 @@ let --prefix PATH : "$out/bin" '' + optionalString withPython3 '' ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3 - '' + optionalString (withPython || withPython3) '' - wrapProgram $out/bin/nvim --add-flags "${ - (optionalString withPython - ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '') + - (optionalString withPython3 - ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\" '') - }" + '' + optionalString (withPython || withPython3 || withRuby) '' + wrapProgram $out/bin/nvim ${rubyWrapper + pythonFlags} ''; meta = { diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile b/pkgs/applications/editors/neovim/ruby_provider/Gemfile new file mode 100644 index 000000000000..eebecf2906fb --- /dev/null +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gem 'neovim' diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock new file mode 100644 index 000000000000..88100b2e8f87 --- /dev/null +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -0,0 +1,15 @@ +GEM + remote: https://rubygems.org/ + specs: + msgpack (1.0.2) + neovim (0.3.1) + msgpack (~> 1.0) + +PLATFORMS + ruby + +DEPENDENCIES + neovim + +BUNDLED WITH + 1.12.5 diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix new file mode 100644 index 000000000000..c3ed45a78481 --- /dev/null +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -0,0 +1,19 @@ +{ + msgpack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fb2my91j08plsbbry5kilsrh7slmzgbbf6f55zy6xk28p9036lg"; + type = "gem"; + }; + version = "1.0.2"; + }; + neovim = { + dependencies = ["msgpack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "018mk4vqaxzbk4anq558h2rgj8prbn2rmi777iwrg3n0v8k5nxqw"; + type = "gem"; + }; + version = "0.3.1"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3dcf58e606c3..715249f036be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -29597,12 +29597,12 @@ EOF }; neovim = buildPythonPackage rec { - version = "0.1.10"; + version = "0.1.12"; name = "neovim-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/neovim/${name}.tar.gz"; - sha256 = "1n6xxh0n250qbvrdl0cw114d890nfv6d0wjk5wpr505sg2bg9jx4"; + sha256 = "1pll4jjqdq54d867hgqnnpiiz4pz4bbjrnh6binbp7djcbgrb8zq"; }; buildInputs = with self; [ nose ]; From 08b01310c69e26b8415d25b5cb82dd01962e6250 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 20 Dec 2016 06:44:56 +0800 Subject: [PATCH 1709/1749] dropbox: 15.4.22 -> 16.4.29 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index edfa9a6d7550..20d50bd0f7a7 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "15.4.22"; + version = "16.4.29"; sha256 = { - "x86_64-linux" = "105a64w6rxhrg2dcpb4h4a2956x2r7flf41rszhw5nnczal0s8gx"; - "i686-linux" = "001c6dfdxip67w19h3zlx8w72kvnkl1hbkj7gqvw9lixmnq82fhr"; + "x86_64-linux" = "0zng19qisbr3c9d312ar43p1b44xidabj4x2l3g3q85i300vj661"; + "i686-linux" = "0hc5fs0akc437valbxwlymk7ncjkdnhc51pja5bbiy48gqmd42bb"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = From 3e92b56be35605923b1f29f3f335aac1e2764065 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 19 Dec 2016 18:04:25 +0100 Subject: [PATCH 1710/1749] tor: 0.2.8.10 -> 0.2.8.12 Notably contains fix for CVE-2016-1254 cc @grahamc --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 46b85aefca5f..da52bde56bd6 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.2.8.10"; + name = "tor-0.2.8.12"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0kcw9hq4xz8p91xwyhjfry5p1dmn7vvnhpfz66vl9gsfndbqr2y8"; + sha256 = "1bsagy4gcf6hgq04q949hv45ljb36j3ylxxn22cwxy4whgr4hmxk"; }; nativeBuildInputs = [ pkgconfig ]; From 6bce0dc23f2bb2d21ff9d0bb23091cf40a4f04b5 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Tue, 20 Dec 2016 01:02:57 +0100 Subject: [PATCH 1711/1749] python/pillow: Disable tests on Darwin --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 715249f036be..82d5649120d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18871,7 +18871,7 @@ in { sha256 = "0ee9975c05602e755ff5000232e0335ba30d507f6261922a658ee11b1cec36d1"; }; - doCheck = !isPyPy; + doCheck = !stdenv.isDarwin && !isPyPy; # Disable imagefont tests, because they don't work well with infinality: # https://github.com/python-pillow/Pillow/issues/1259 From 377cef8d16c47df74d2653432d9bba968236c8a0 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Mon, 19 Dec 2016 19:45:09 -0500 Subject: [PATCH 1712/1749] apple-sdk: 10.9 -> 10.11 --- pkgs/os-specific/darwin/apple-sdk/default.nix | 26 ++++++++++++++----- .../darwin/apple-sdk/frameworks.nix | 3 +++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index c1e09c201114..7f46a3963e04 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,29 +1,42 @@ -{ stdenv, fetchurl, xar, gzip, cpio, pkgs }: +{ stdenv, fetchurl, xar, xz, cpio, pkgs, python }: let + # TODO: make this available to other packages and generalize the unpacking a bit + # from https://gist.github.com/pudquick/ff412bcb29c9c1fa4b8d + unpbzx = fetchurl { + url = "https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py"; + sha256 = "0jgp6qbfl36i0jlz7as5zk2w20z4ca8wlrhdw49lwsld6wi3rfhc"; + }; + # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { - version = "10.9"; + version = "10.11"; name = "MacOS_SDK-${version}"; + # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.11-1.sucatalog, which we found by: + # 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version + # 2. In the resulting file, search for a file called DevSDK ending in .pkg + # 3. ??? + # 4. Profit src = fetchurl { - url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/DevSDK_OSX109.pkg"; - sha256 = "16b7aplha5573yl1d44nl2yxzp0w2hafihbyh7930wrcvba69iy4"; + url = "http://swcdn.apple.com/content/downloads/61/58/031-85396/fsu2775ydsciy13wycm3zngxrjcp0eqsl2/DevSDK_OSX1011.pkg"; + sha256 = "182yh8li653pjrzgk7s2dvsqm7vwkk6ry8n31qqs8c0xr67yrqgl"; }; - buildInputs = [ xar gzip cpio ]; + buildInputs = [ xar xz cpio python ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; unpackPhase = '' xar -x -f $src + python ${unpbzx} Payload ''; installPhase = '' start="$(pwd)" mkdir -p $out cd $out - cat $start/Payload | gzip -d | cpio -idm + cat $start/Payload.*.xz | xz -d | cpio -idm mv usr/* . rmdir usr @@ -110,6 +123,7 @@ let popd >/dev/null } + linkFramework "${name}.framework" ''; diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 3ecb35114220..cc99de258b23 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -52,6 +52,7 @@ with frameworks; with libs; { GSS = []; GameController = []; GameKit = [ Foundation ]; + Hypervisor = []; ICADevices = [ Carbon CF IOBluetooth ]; IMServicePlugIn = []; IOBluetoothUI = [ IOBluetooth ]; @@ -116,4 +117,6 @@ with frameworks; with libs; { OpenDirectory = []; Quartz = [ QuickLook QTKit ]; QuartzCore = [ ApplicationServices CF CoreVideo OpenCL ]; + + vmnet = []; } From f3b65f67d98a2e67c739d4b76b3340eda1dd06f4 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Mon, 19 Dec 2016 19:45:45 -0500 Subject: [PATCH 1713/1749] xhyve: update and fix to use our Hypervisor framework --- .../virtualization/xhyve/default.nix | 20 ++++++++++++------- pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index b7205ac000e2..c519784a6233 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc }: stdenv.mkDerivation rec { - name = "xhyve-${version}"; - version = "0.2.0"; + name = "xhyve-${version}"; + version = "1f1dbe305"; src = fetchurl { - url = "https://github.com/mist64/xhyve/archive/v${version}.tar.gz"; - sha256 = "0g1vknnh88kxc8aaqv3j9wqhq45mm9xxxbn1vcrypj3kk9991hrj"; + url = "https://github.com/mist64/xhyve/archive/1f1dbe3059904f885e4ab2b3328f4bb350ea5c37.tar.gz"; + sha256 = "0hfix8yr90szlv2yyqb2rlq5qsrxyam8kg52sly0adja0cpwfjvx"; }; + buildInputs = [ Hypervisor vmnet xpc libobjc ]; + # Don't use git to determine version - buildFlags = '' - CFLAGS=-DVERSION=\"${version}\" + prePatch = '' + substituteInPlace Makefile \ + --replace 'shell git describe --abbrev=6 --dirty --always --tags' "$version" ''; + + makeFlags = [ "CFLAGS+=-Wno-shift-sign-overflow" ''CFLAGS+=-DVERSION=\"${version}\"'' ]; + installPhase = '' mkdir -p $out/bin cp build/xhyve $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb13708d7259..f90c451e6a7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17657,7 +17657,11 @@ in xcftools = callPackage ../tools/graphics/xcftools { }; - xhyve = callPackage ../applications/virtualization/xhyve { }; + xhyve = callPackage ../applications/virtualization/xhyve { + inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin) libobjc; + }; xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { }; From 3422a7710f43cdacb2ea4978b9c786c3fc6d54c8 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Mon, 19 Dec 2016 19:50:10 -0800 Subject: [PATCH 1714/1749] matrix-synapse: 0.18.4 -> 0.18.5 --- pkgs/servers/matrix-synapse/default.nix | 21 +++++++++++++++---- .../matrix-synapse/matrix-synapse.patch | 8 +++---- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index d1301fad7abc..00f9287bea53 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,15 +9,28 @@ let sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2"; }; }; + matrix-synapse-ldap3 = pythonPackages.buildPythonApplication rec { + name = "matrix-synapse-ldap3-${version}"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "matrix-synapse-ldap3"; + rev = "564eb3f109ce7f1082c47d5f8efaa792d90467f1"; + sha256 = "1mkjlvy7a3rq405m59ihkh1wq7pa4l03fp8hgwwyjnbmz25bqmbk"; + }; + + propagatedBuildInputs = with pythonPackages; [ service-identity ldap3 twisted ]; + }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.18.4"; + version = "0.18.5"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "0hcag9a4wd6a9q0ln5l949xr1bhmk1zrnf9vf3qi3lzxgi0rbm98"; + sha256 = "1l9vfx08alf71323jrfjjvcb7pww613dwxskdgc1bplnva4khj4f"; }; patches = [ ./matrix-synapse.patch ]; @@ -25,9 +38,9 @@ in pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1 pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2 - service-identity signedjson systemd twisted ujson unpaddedbase64 pyyaml + signedjson systemd twisted ujson unpaddedbase64 pyyaml matrix-angular-sdk bleach netaddr jinja2 psycopg2 - ldap3 psutil msgpack lxml + psutil msgpack lxml matrix-synapse-ldap3 ]; # Checks fail because of Tox. diff --git a/pkgs/servers/matrix-synapse/matrix-synapse.patch b/pkgs/servers/matrix-synapse/matrix-synapse.patch index a6a393ea56c3..288e6ff16245 100644 --- a/pkgs/servers/matrix-synapse/matrix-synapse.patch +++ b/pkgs/servers/matrix-synapse/matrix-synapse.patch @@ -3,18 +3,18 @@ new file mode 120000 index 0000000..2f1d413 --- /dev/null +++ b/homeserver -@@ -0,0 +1 @@ +@@ -0,0 +1,1 @@ +synapse/app/homeserver.py \ No newline at end of file diff --git a/setup.py b/setup.py -index 9d24761..f3e6a00 100755 +index b00c2af..c7f6e0a 100755 --- a/setup.py +++ b/setup.py -@@ -85,6 +85,6 @@ setup( +@@ -92,6 +92,6 @@ setup( include_package_data=True, zip_safe=False, long_description=long_description, - scripts=["synctl"] + glob.glob("scripts/*"), + scripts=["synctl", "homeserver"] + glob.glob("scripts/*"), - cmdclass={'test': Tox}, + cmdclass={'test': TestCommand}, ) From 1b79847e75847686d04f135aaf6dac8cf797d080 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 20 Dec 2016 04:10:05 +0000 Subject: [PATCH 1715/1749] ocamlPackages.containers: 0.20 -> 0.22 --- pkgs/development/ocaml-modules/containers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 19d91e44dcde..2e56635f3600 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -6,7 +6,7 @@ let mkpath = p: "${p}/lib/ocaml/${ocaml.version}/site-lib"; - version = "0.20"; + version = "0.22"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "c-cube"; repo = "ocaml-containers"; rev = "${version}"; - sha256 = "1gwflgdbvj293cwi434aafrsgpdgj2sv7r1ghm4l4k5xn17l0qzg"; + sha256 = "1kbf865z484z9nxskmg150xhfspikkvsxk0wbry5vvczqr63cwhq"; }; buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit ocaml_oasis qcheck ]; From ccbce6b11ab0e47c2f701f2539f989a7fd323687 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 20 Dec 2016 10:16:14 +0100 Subject: [PATCH 1716/1749] python/hetzner: 0.7.4 -> 0.7.5 This essentially unbreaks deploying new Hetzner machines with NixOps, because the Hetzner robot has changed its way of handling admin accounts. It also now provides a more helpful error message (instead of an AssertionError) if admin account creation has failed. Signed-off-by: aszlig Reported-by: Graham Christensen Issue: https://github.com/NixOS/nixops/issues/563 --- 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 82d5649120d4..e5d2cc303d6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12441,13 +12441,13 @@ in { hetzner = buildPythonPackage rec { name = "hetzner-${version}"; - version = "0.7.4"; + version = "0.7.5"; src = pkgs.fetchFromGitHub { repo = "hetzner"; owner = "RedMoonStudios"; rev = "v${version}"; - sha256 = "04dlixczzvpimk48p87ix7j9q54jy46cwn4f05n2dlzsyc5vvxin"; + sha256 = "1fw7i1z4a39i1ljd9qd4f5p1p3a4257jfglkdpw90xjwl7fdpq42"; }; # not there yet, but coming soon. From efd5508b8998667dd04a090bc43f8ab6683d4f52 Mon Sep 17 00:00:00 2001 From: Markov Dmitry Date: Tue, 20 Dec 2016 09:21:52 +0300 Subject: [PATCH 1717/1749] systemd: add slice support --- .../modules/system/boot/systemd-unit-options.nix | 16 ++++++++++++++++ nixos/modules/system/boot/systemd.nix | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 4c3fc30358c1..69af23981485 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -465,4 +465,20 @@ in rec { targetOptions = commonUnitOptions; + sliceOptions = commonUnitOptions // { + + sliceConfig = mkOption { + default = {}; + example = { MemoryMax = "2G"; }; + type = types.attrsOf unitOption; + description = '' + Each attribute in this set specifies an option in the + [Slice] section of the unit. See + systemd.slice + 5 for details. + ''; + }; + + }; + } diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index d1f3f923e5e3..a2ee51669715 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -375,6 +375,15 @@ let ''; }; + sliceToUnit = name: def: + { inherit (def) wantedBy requiredBy enable; + text = commonUnitText def + + '' + [Slice] + ${attrsToSection def.sliceConfig} + ''; + }; + in { @@ -458,6 +467,12 @@ in ''; }; + systemd.slices = mkOption { + default = {}; + type = with types; attrsOf (submodule [ { options = sliceOptions; } unitConfig] ); + description = "Definition of slice configurations."; + }; + systemd.generators = mkOption { type = types.attrsOf types.path; default = {}; @@ -748,6 +763,7 @@ in // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers // mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths + // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.slices // listToAttrs (map (v: let n = escapeSystemdPath v.where; in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts) From 8a0843c3c4929d38b9a79f61449fc63c6a27e4a0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Dec 2016 13:40:33 +0100 Subject: [PATCH 1718/1749] qemu-kvm: Mark the version for tests (cherry picked from commit d58a4ec1ba77e390c53c09ba6198b78f8568d495) --- pkgs/applications/virtualization/qemu/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index ce330982bec4..a99b37f0d17d 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -23,7 +23,10 @@ let in stdenv.mkDerivation rec { - name = "qemu-" + stdenv.lib.optionalString x86Only "x86-only-" + version; + name = "qemu-" + + stdenv.lib.optionalString x86Only "x86-only-" + + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-" + + version; src = fetchurl { url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; From aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Dec 2016 13:49:15 +0100 Subject: [PATCH 1719/1749] virtualisation.qemu.program: Remove This option is defined in qemu-vm.nix, but that module is not always imported. http://hydra.nixos.org/build/44817443 (cherry picked from commit 03c55005dfd6fbcd5cf8e00128a3bb6336b3bc0f) --- nixos/lib/testing.nix | 2 +- nixos/modules/testing/test-instrumentation.nix | 3 --- nixos/modules/virtualisation/qemu-vm.nix | 10 +--------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 2efe7a5b879c..0fc3978315cc 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -29,7 +29,7 @@ rec { cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${lib.makeBinPath [ qemu_kvm vde2 netpbm coreutils ]}" \ + --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \ --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" ''; }; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 206df50a4207..099ead3d846c 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -119,9 +119,6 @@ let kernel = config.boot.kernelPackages.kernel; in networking.usePredictableInterfaceNames = false; - # Make sure we use a patched QEMU that ignores file ownership. - virtualisation.qemu.program = "${pkgs.qemu_test}/bin/qemu-kvm"; - # Make it easy to log in as root when running the test interactively. users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 05fe13ba7c71..0bb2e7f36873 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -70,7 +70,7 @@ let '')} # Start QEMU. - exec ${cfg.qemu.program} \ + exec ${pkgs.qemu_test}/bin/qemu-kvm \ -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ @@ -299,14 +299,6 @@ in }; virtualisation.qemu = { - program = mkOption { - type = types.path; - default = "${pkgs.qemu_kvm}/bin/qemu-kvm"; - defaultText = "\${pkgs.qemu_kvm}/bin/qemu-kvm"; - example = literalExample "\${pkgs.qemu_test}/bin/qemu-kvm"; - description = "The QEMU variant used to start the VM."; - }; - options = mkOption { type = types.listOf types.unspecified; From f173da375da9642fb5dd7047e8d4a2e5a9ac5db4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Dec 2016 14:05:54 +0100 Subject: [PATCH 1720/1749] Use only one build of qemu in VM tests Previously we were using two or three (qemu_kvm, qemu_test, and qemu_test with a different dbus when minimal.nix is included). (cherry picked from commit 8bfa4ce82ea7d23a1d4c6073bcc044e6bf9c4dbe) --- nixos/lib/build-vms.nix | 3 +++ nixos/lib/testing.nix | 2 +- nixos/modules/virtualisation/qemu-vm.nix | 12 +++++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 4e044deca217..1a17a080ba45 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -9,6 +9,8 @@ rec { inherit pkgs; + qemu = pkgs.qemu_test; + # Build a virtual network from an attribute set `{ machine1 = # config1; ... machineN = configN; }', where `machineX' is the @@ -27,6 +29,7 @@ rec { [ ../modules/virtualisation/qemu-vm.nix ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs { key = "no-manual"; services.nixosManual.enable = false; } + { key = "qemu"; system.build.qemu = qemu; } ] ++ optional minimal ../modules/testing/minimal-kernel.nix; extraArgs = { inherit nodes; }; }; diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 0fc3978315cc..c1cb5072acad 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -29,7 +29,7 @@ rec { cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \ + --prefix PATH : "${lib.makeBinPath [ qemu vde2 netpbm coreutils ]}" \ --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" ''; }; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 0bb2e7f36873..bd964723d408 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -13,6 +13,8 @@ with lib; let + qemu = config.system.build.qemu or pkgs.qemu_test; + vmName = if config.networking.hostName == "" then "noname" @@ -32,7 +34,7 @@ let NIX_DISK_IMAGE=$(readlink -f ''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}}) if ! test -e "$NIX_DISK_IMAGE"; then - ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \ + ${qemu}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \ ${toString config.virtualisation.diskSize}M || exit 1 fi @@ -47,7 +49,7 @@ let ${if cfg.useBootLoader then '' # Create a writable copy/snapshot of the boot disk. # A writable boot disk can be booted from automatically. - ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 -b ${bootDisk}/disk.img $TMPDIR/disk.img || exit 1 + ${qemu}/bin/qemu-img create -f qcow2 -b ${bootDisk}/disk.img $TMPDIR/disk.img || exit 1 ${if cfg.useEFIBoot then '' # VM needs a writable flash BIOS. @@ -63,14 +65,14 @@ let extraDisks="" ${flip concatMapStrings cfg.emptyDiskImages (size: '' if ! test -e "empty$idx.qcow2"; then - ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M" + ${qemu}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M" fi extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx.qcow2,if=${cfg.qemu.diskInterface},werror=report" idx=$((idx + 1)) '')} # Start QEMU. - exec ${pkgs.qemu_test}/bin/qemu-kvm \ + exec ${qemu}/bin/qemu-kvm \ -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ @@ -121,7 +123,7 @@ let mkdir $out diskImage=$out/disk.img bootFlash=$out/bios.bin - ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 $diskImage "40M" + ${qemu}/bin/qemu-img create -f qcow2 $diskImage "40M" ${if cfg.useEFIBoot then '' cp ${pkgs.OVMF-CSM}/FV/OVMF.fd $bootFlash chmod 0644 $bootFlash From a02bb00156086b45e68c1112008db506734f8649 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Dec 2016 14:16:03 +0100 Subject: [PATCH 1721/1749] Enable virtualisation.writableStore by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This works around: machine: must succeed: nix-store -qR /run/current-system | grep nixos- machine# error: changing ownership of path ‘/nix/store’: Invalid argument Probably Nix shouldn't be anal about the ownership of the store unless it's trying to build/write to the store. http://hydra.nixos.org/build/45093872/nixlog/17/raw (cherry picked from commit 57a0f140643cde409022e297ed05e05f8d34d778) --- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index bd964723d408..6423432c78b6 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -274,7 +274,7 @@ in virtualisation.writableStore = mkOption { - default = false; + default = true; # FIXME description = '' If enabled, the Nix store in the VM is made writable by From fb2a7cd705a6f706872463e6cec481503414bd75 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 20 Dec 2016 12:33:27 +0100 Subject: [PATCH 1722/1749] Revert "apple-sdk: 10.9 -> 10.11" This reverts commit 377cef8d16c47df74d2653432d9bba968236c8a0. --- pkgs/os-specific/darwin/apple-sdk/default.nix | 26 +++++-------------- .../darwin/apple-sdk/frameworks.nix | 3 --- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 7f46a3963e04..c1e09c201114 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,42 +1,29 @@ -{ stdenv, fetchurl, xar, xz, cpio, pkgs, python }: +{ stdenv, fetchurl, xar, gzip, cpio, pkgs }: let - # TODO: make this available to other packages and generalize the unpacking a bit - # from https://gist.github.com/pudquick/ff412bcb29c9c1fa4b8d - unpbzx = fetchurl { - url = "https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py"; - sha256 = "0jgp6qbfl36i0jlz7as5zk2w20z4ca8wlrhdw49lwsld6wi3rfhc"; - }; - # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { - version = "10.11"; + version = "10.9"; name = "MacOS_SDK-${version}"; - # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.11-1.sucatalog, which we found by: - # 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version - # 2. In the resulting file, search for a file called DevSDK ending in .pkg - # 3. ??? - # 4. Profit src = fetchurl { - url = "http://swcdn.apple.com/content/downloads/61/58/031-85396/fsu2775ydsciy13wycm3zngxrjcp0eqsl2/DevSDK_OSX1011.pkg"; - sha256 = "182yh8li653pjrzgk7s2dvsqm7vwkk6ry8n31qqs8c0xr67yrqgl"; + url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/DevSDK_OSX109.pkg"; + sha256 = "16b7aplha5573yl1d44nl2yxzp0w2hafihbyh7930wrcvba69iy4"; }; - buildInputs = [ xar xz cpio python ]; + buildInputs = [ xar gzip cpio ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; unpackPhase = '' xar -x -f $src - python ${unpbzx} Payload ''; installPhase = '' start="$(pwd)" mkdir -p $out cd $out - cat $start/Payload.*.xz | xz -d | cpio -idm + cat $start/Payload | gzip -d | cpio -idm mv usr/* . rmdir usr @@ -123,7 +110,6 @@ let popd >/dev/null } - linkFramework "${name}.framework" ''; diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index cc99de258b23..3ecb35114220 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -52,7 +52,6 @@ with frameworks; with libs; { GSS = []; GameController = []; GameKit = [ Foundation ]; - Hypervisor = []; ICADevices = [ Carbon CF IOBluetooth ]; IMServicePlugIn = []; IOBluetoothUI = [ IOBluetooth ]; @@ -117,6 +116,4 @@ with frameworks; with libs; { OpenDirectory = []; Quartz = [ QuickLook QTKit ]; QuartzCore = [ ApplicationServices CF CoreVideo OpenCL ]; - - vmnet = []; } From 6b4a41a360efe14e6cb632d024467b19e991813c Mon Sep 17 00:00:00 2001 From: Alexander Kjeldaas Date: Sun, 13 Apr 2014 15:46:27 +0200 Subject: [PATCH 1723/1749] libfaketime: make the build reproducible A rebased version of https://github.com/NixOS/nixpkgs/pull/2281/commits/cb8bd05a0172db9c02ba0067b21bbc0ce17cc522 Note: we no longer apply the spurious lrt patch. This allows `nix-build --check -A libfaketime` to succeed. --- pkgs/development/libraries/libfaketime/default.nix | 4 ++++ .../libfaketime/no-date-in-gzip-man-page.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index 7d430614257e..16ee2151faa5 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1dw2lqsv2iqwxg51mdn25b4fjj3v357s0mc6ahxawqp210krg29s"; }; + patches = [ + ./no-date-in-gzip-man-page.patch + ]; + preBuild = '' makeFlagsArray+=(PREFIX="$out" LIBDIRNAME=/lib) ''; diff --git a/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch b/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch new file mode 100644 index 000000000000..7b7e362fbf0f --- /dev/null +++ b/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch @@ -0,0 +1,12 @@ +diff -ur libfaketime-0.9.5.orig/man/Makefile libfaketime-0.9.5/man/Makefile +--- libfaketime-0.9.5.orig/man/Makefile 2013-10-13 11:19:30.000000000 +0200 ++++ libfaketime-0.9.5/man/Makefile 2014-04-13 01:22:14.362296519 +0200 +@@ -6,7 +6,7 @@ + + install: + $(INSTALL) -Dm0644 faketime.1 "${DESTDIR}${PREFIX}/share/man/man1/faketime.1" +- gzip -f "${DESTDIR}${PREFIX}/share/man/man1/faketime.1" ++ gzip -9nf "${DESTDIR}${PREFIX}/share/man/man1/faketime.1" + + uninstall: + rm -f "${DESTDIR}${PREFIX}/share/man/man1/faketime.1.gz" From 49e3190efa3e307f48d3d3ebfefb421bc5956a6b Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 20 Dec 2016 13:02:14 +0100 Subject: [PATCH 1724/1749] Revert "xhyve: update and fix to use our Hypervisor framework" This reverts commit f3b65f67d98a2e67c739d4b76b3340eda1dd06f4. --- .../virtualization/xhyve/default.nix | 20 +++++++------------ pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index c519784a6233..b7205ac000e2 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -1,25 +1,19 @@ -{ stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "xhyve-${version}"; - version = "1f1dbe305"; + name = "xhyve-${version}"; + version = "0.2.0"; src = fetchurl { - url = "https://github.com/mist64/xhyve/archive/1f1dbe3059904f885e4ab2b3328f4bb350ea5c37.tar.gz"; - sha256 = "0hfix8yr90szlv2yyqb2rlq5qsrxyam8kg52sly0adja0cpwfjvx"; + url = "https://github.com/mist64/xhyve/archive/v${version}.tar.gz"; + sha256 = "0g1vknnh88kxc8aaqv3j9wqhq45mm9xxxbn1vcrypj3kk9991hrj"; }; - buildInputs = [ Hypervisor vmnet xpc libobjc ]; - # Don't use git to determine version - prePatch = '' - substituteInPlace Makefile \ - --replace 'shell git describe --abbrev=6 --dirty --always --tags' "$version" + buildFlags = '' + CFLAGS=-DVERSION=\"${version}\" ''; - - makeFlags = [ "CFLAGS+=-Wno-shift-sign-overflow" ''CFLAGS+=-DVERSION=\"${version}\"'' ]; - installPhase = '' mkdir -p $out/bin cp build/xhyve $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f90c451e6a7a..eb13708d7259 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17657,11 +17657,7 @@ in xcftools = callPackage ../tools/graphics/xcftools { }; - xhyve = callPackage ../applications/virtualization/xhyve { - inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; - inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin) libobjc; - }; + xhyve = callPackage ../applications/virtualization/xhyve { }; xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { }; From 5a8147479e794d5932273d01790c3602b8abeedc Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 20 Dec 2016 10:27:13 +0100 Subject: [PATCH 1725/1749] make-initrd: create reproducible initrds To achieve reproducible results, `cpio` archive members are added in sorted order and inodes renumbered. The `cpio-clean.pl` script is made obsolete by setting mtimes via `touch` & using `cpio --reproducible`. Suggested by @dezgeg in https://github.com/NixOS/nixpkgs/pull/21273#issuecomment-268116605. Note that using `--reproducible` means that initial ramdisk creation now requires at least `cpio` version 2.12 (released in 2015). --- pkgs/build-support/kernel/cpio-clean.pl | 17 ----------------- pkgs/build-support/kernel/make-initrd.nix | 7 +++---- pkgs/build-support/kernel/make-initrd.sh | 3 ++- 3 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 pkgs/build-support/kernel/cpio-clean.pl diff --git a/pkgs/build-support/kernel/cpio-clean.pl b/pkgs/build-support/kernel/cpio-clean.pl deleted file mode 100644 index ddc6435a5a81..000000000000 --- a/pkgs/build-support/kernel/cpio-clean.pl +++ /dev/null @@ -1,17 +0,0 @@ -use strict; - -# Make inode number, link info and mtime consistent in order to get a consistent hash. -# -# Author: Alexander Kjeldaas - -use Archive::Cpio; - -my $cpio = Archive::Cpio->new; -my $IN = \*STDIN; -my $ino = 1; -$cpio->read_with_handler($IN, sub { - my ($e) = @_; - $e->{mtime} = 1; - $cpio->write_one(\*STDOUT, $e); - }); -$cpio->write_trailer(\*STDOUT); diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 895160616b79..092ab4586b38 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -12,10 +12,10 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{ stdenv, perl, perlArchiveCpio, cpio, contents, ubootChooser, compressor, prepend }: +{ stdenv, perl, cpio, contents, ubootChooser, compressor, prepend }: let - inputsFun = ubootName : [perl cpio perlArchiveCpio ] + inputsFun = ubootName : [ perl cpio ] ++ stdenv.lib.optional (ubootName != null) [ (ubootChooser ubootName) ]; makeUInitrdFun = ubootName : (ubootName != null); in @@ -30,12 +30,11 @@ stdenv.mkDerivation { objects = map (x: x.object) contents; symlinks = map (x: x.symlink) contents; suffices = map (x: if x ? suffix then x.suffix else "none") contents; - + # For obtaining the closure of `contents'. exportReferencesGraph = map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents; pathsFromGraph = ./paths-from-graph.pl; - cpioClean = ./cpio-clean.pl; crossAttrs = { nativeBuildInputs = inputsFun stdenv.cross.platform.uboot; diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 89021caa5834..0aeaedeb3724 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -39,7 +39,8 @@ mkdir -p $out for PREP in $prepend; do cat $PREP >> $out/initrd done -(cd root && find * -print0 | cpio -o -H newc -R 0:0 --null | perl $cpioClean | $compressor >> $out/initrd) +(cd root && find * -print0 | xargs -0r touch -h -d '@1') +(cd root && find * -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null | $compressor >> $out/initrd) if [ -n "$makeUInitrd" ]; then mv $out/initrd $out/initrd.gz From b9d3898995f2a86f0b11c84d3b68bb12bb08d090 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Dec 2016 13:13:39 -0600 Subject: [PATCH 1726/1749] qt57: 5.7.0 -> 5.7.1 --- pkgs/development/libraries/qt-5/5.7/fetch.sh | 2 +- .../libraries/qt-5/5.7/qtbase/default.nix | 1 - pkgs/development/libraries/qt-5/5.7/srcs.nix | 306 +++++++++--------- 3 files changed, 154 insertions(+), 155 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.7/fetch.sh b/pkgs/development/libraries/qt-5/5.7/fetch.sh index 282fe742fd05..0f7d123aeb23 100644 --- a/pkgs/development/libraries/qt-5/5.7/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.7/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.7/5.7.0/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix index 06bec5a0faf1..934203950b09 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -114,7 +114,6 @@ stdenv.mkDerivation { -widgets -opengl desktop -qml-debug - -nis -iconv -icu -pch diff --git a/pkgs/development/libraries/qt-5/5.7/srcs.nix b/pkgs/development/libraries/qt-5/5.7/srcs.nix index e7710ce82d6a..fe497555874d 100644 --- a/pkgs/development/libraries/qt-5/5.7/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.7/srcs.nix @@ -1,4 +1,4 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh { fetchurl, mirror }: { @@ -11,299 +11,299 @@ }; }; qt3d = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qt3d-opensource-src-5.7.0.tar.xz"; - sha256 = "0a9y4fxm4xmdl5hsv4hfvxcw7jmshy0mwd4j1r2ylqdmg4bql958"; - name = "qt3d-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qt3d-opensource-src-5.7.1.tar.xz"; + sha256 = "1sh7yz8nb9iqz3bp6bfc2kmji70zq39d9c0sfxnhif3p2x1wyx0x"; + name = "qt3d-opensource-src-5.7.1.tar.xz"; }; }; qtactiveqt = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtactiveqt-opensource-src-5.7.0.tar.xz"; - sha256 = "149wj6a5i35k750129kz77y4r8q3hpxqzn1c676fcn9wpmfhay4v"; - name = "qtactiveqt-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtactiveqt-opensource-src-5.7.1.tar.xz"; + sha256 = "1md14jdgwsdczpfvc0qkk5agxqk7a9qs91k41zj15ykkw86r428c"; + name = "qtactiveqt-opensource-src-5.7.1.tar.xz"; }; }; qtandroidextras = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtandroidextras-opensource-src-5.7.0.tar.xz"; - sha256 = "1caimhfyag96v98j1b07pfzjl5inhsyfi9kxzy9nj0pkvpjdgi4g"; - name = "qtandroidextras-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtandroidextras-opensource-src-5.7.1.tar.xz"; + sha256 = "1wq9m7a3dh9k8z006cw6m96awc53yf5vnq3wdqf5yfclfz696lhg"; + name = "qtandroidextras-opensource-src-5.7.1.tar.xz"; }; }; qtbase = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtbase-opensource-src-5.7.0.tar.xz"; - sha256 = "0ip6xnizsn269r4s1nq9lkx8cdxkjqr1fidwrj3sa8xb7h96syry"; - name = "qtbase-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz"; + sha256 = "0zjmcrmnnmaz1lr9wc5i6y565hsvl8ycn790ivqaz62dv54zbkgd"; + name = "qtbase-opensource-src-5.7.1.tar.xz"; }; }; qtcanvas3d = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtcanvas3d-opensource-src-5.7.0.tar.xz"; - sha256 = "15xxwciyiy8rwrwgb7bgcbxdiiaba3l4cxxm7rdiqmhs9kyv6wbq"; - name = "qtcanvas3d-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtcanvas3d-opensource-src-5.7.1.tar.xz"; + sha256 = "1d5xpq3mhjg4ipxzap7s2vnlfcd02d3yq720npv10xxp2ww0i1x8"; + name = "qtcanvas3d-opensource-src-5.7.1.tar.xz"; }; }; qtcharts = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtcharts-opensource-src-5.7.0.tar.xz"; - sha256 = "0hsj5m9in4w9wzyvbs76v7zc67n9ja641ljc5vgfpbn7fmrsij1b"; - name = "qtcharts-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtcharts-opensource-src-5.7.1.tar.xz"; + sha256 = "1qrzcddwff2hxsbxrraff16j4abah2zkra2756s1mvydj9lyxzl5"; + name = "qtcharts-opensource-src-5.7.1.tar.xz"; }; }; qtconnectivity = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtconnectivity-opensource-src-5.7.0.tar.xz"; - sha256 = "00r7lc1w3snfp2qfqmviqzv0cw16zd8m1sfpvxvpl65yqmzcli4q"; - name = "qtconnectivity-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtconnectivity-opensource-src-5.7.1.tar.xz"; + sha256 = "0rmr7bd4skby7bax9hpj2sid2bq3098nkw7xm02mdp04hc3bks5k"; + name = "qtconnectivity-opensource-src-5.7.1.tar.xz"; }; }; qtdatavis3d = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtdatavis3d-opensource-src-5.7.0.tar.xz"; - sha256 = "18p82vh5s9bdshmxxkh7r9482i5vaih8nfya9f81l8ff7lw7lpcs"; - name = "qtdatavis3d-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdatavis3d-opensource-src-5.7.1.tar.xz"; + sha256 = "1y00p0wyj5cw9c2925y537vpmmg9q3kpf7qr1s7sv67dvvf8bzqv"; + name = "qtdatavis3d-opensource-src-5.7.1.tar.xz"; }; }; qtdeclarative = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtdeclarative-opensource-src-5.7.0.tar.xz"; - sha256 = "1x7rij423g5chlfd2kix54f393vxwjvdfsn1c7sybqmfycwn5pl6"; - name = "qtdeclarative-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz"; + sha256 = "0mjxfwnplpx60jc6y94krg00isddl9bfwc7dayl981njb4qds4zx"; + name = "qtdeclarative-opensource-src-5.7.1.tar.xz"; }; }; qtdeclarative-render2d = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtdeclarative-render2d-opensource-src-5.7.0.tar.xz"; - sha256 = "1qf893i7z2iyjpqpaxfhji4cgzlmpgh0w3vdqarpn51vcn7jj4q6"; - name = "qtdeclarative-render2d-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-render2d-opensource-src-5.7.1.tar.xz"; + sha256 = "0zwch9vn17f3bpy300jcfxx6cx9qymk5j7khx0x9k1xqid4166c3"; + name = "qtdeclarative-render2d-opensource-src-5.7.1.tar.xz"; }; }; qtdoc = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtdoc-opensource-src-5.7.0.tar.xz"; - sha256 = "0d7c7137jvxlwl91c2hh33l4falmjvkmsy1f7lyi73x6nnqzdz8i"; - name = "qtdoc-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdoc-opensource-src-5.7.1.tar.xz"; + sha256 = "1nyrgfw3d8ja2cqb12vyq5mwryw89976f3xkpdhy49mvsws03ysm"; + name = "qtdoc-opensource-src-5.7.1.tar.xz"; }; }; qtgamepad = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtgamepad-opensource-src-5.7.0.tar.xz"; - sha256 = "0g36nlnnq19p9svl6pvklxybpwig7r7z4hw0d5dwc2id02ygg62q"; - name = "qtgamepad-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtgamepad-opensource-src-5.7.1.tar.xz"; + sha256 = "10lijbsg9xx5ddbbjymdgl41nxz99yn1qgiww2kkggxwwdjj2axv"; + name = "qtgamepad-opensource-src-5.7.1.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtgraphicaleffects-opensource-src-5.7.0.tar.xz"; - sha256 = "1rwdjg5mk6xpadmxfq64xfp573zp5lrj9illb9105ra5wff565n8"; - name = "qtgraphicaleffects-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtgraphicaleffects-opensource-src-5.7.1.tar.xz"; + sha256 = "1j2drnx7zp3w6cgvy7bn00fyk5v7vw1j1hidaqcg78lzb6zgls1c"; + name = "qtgraphicaleffects-opensource-src-5.7.1.tar.xz"; }; }; qtimageformats = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtimageformats-opensource-src-5.7.0.tar.xz"; - sha256 = "1rb27x7i2pmvsck6wax2cg31gqpzaakciy45wm5l3lcl86j48czg"; - name = "qtimageformats-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtimageformats-opensource-src-5.7.1.tar.xz"; + sha256 = "1x3p1xmw7spxa4bwriyrwsfrq31jabsdjsi5fras9y39naia55sg"; + name = "qtimageformats-opensource-src-5.7.1.tar.xz"; }; }; qtlocation = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtlocation-opensource-src-5.7.0.tar.xz"; - sha256 = "0rd898gndn41jrp78203lxd94ybfv693l0qg0myag4r46ikk69vh"; - name = "qtlocation-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtlocation-opensource-src-5.7.1.tar.xz"; + sha256 = "17zkzffzwbg6aqhsggs23cmwzq4y45m938842lsc423hfm7fdsgr"; + name = "qtlocation-opensource-src-5.7.1.tar.xz"; }; }; qtmacextras = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtmacextras-opensource-src-5.7.0.tar.xz"; - sha256 = "1p439sqnchrypggaqkfq3rvfk7xmvqgck4nhwv762jk3kgp48ccq"; - name = "qtmacextras-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtmacextras-opensource-src-5.7.1.tar.xz"; + sha256 = "0rr6nl1j6bq47lcq87zsqyma3cdqysamnngwbaccxvpznpcx7jhx"; + name = "qtmacextras-opensource-src-5.7.1.tar.xz"; }; }; qtmultimedia = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtmultimedia-opensource-src-5.7.0.tar.xz"; - sha256 = "0ndmhiflmyr144nq8drd5njsdi282ixsm4730q5n0ji2v9dp1bh5"; - name = "qtmultimedia-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtmultimedia-opensource-src-5.7.1.tar.xz"; + sha256 = "1vvxmgmvjnz9w1h2ph1j2fy77ij141ycx5fric60lq02pxzifax5"; + name = "qtmultimedia-opensource-src-5.7.1.tar.xz"; }; }; qtpurchasing = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtpurchasing-opensource-src-5.7.0.tar.xz"; - sha256 = "1db44q3d02nhmrh0fd239n2nsm74myac8saa6jqx1pcap4y4llby"; - name = "qtpurchasing-opensource-src-5.7.0.tar.xz"; - }; - }; - qtquickcontrols2 = { - version = "5.7.0"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtquickcontrols2-opensource-src-5.7.0.tar.xz"; - sha256 = "0i8h933vhvx1bmniqdx0idg6vk82w9byd3dq0bb2phwjg5vv1xb3"; - name = "qtquickcontrols2-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtpurchasing-opensource-src-5.7.1.tar.xz"; + sha256 = "0hkvrgafz1hx9q4yc3nskv3pd3fszghvvd5a7mj33ynf55wpb57n"; + name = "qtpurchasing-opensource-src-5.7.1.tar.xz"; }; }; qtquickcontrols = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtquickcontrols-opensource-src-5.7.0.tar.xz"; - sha256 = "0cpcrmz9n5b4bgmshmk093lirl9xwqb23inchnai1zqg21vrmqfq"; - name = "qtquickcontrols-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols-opensource-src-5.7.1.tar.xz"; + sha256 = "17cyfyqzjbm9dhq9pjscz36y84y16rmxwk6h826gjfprddrimsvg"; + name = "qtquickcontrols-opensource-src-5.7.1.tar.xz"; + }; + }; + qtquickcontrols2 = { + version = "5.7.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols2-opensource-src-5.7.1.tar.xz"; + sha256 = "1v77ydy4k15lksp3bi2kgha2h7m79g4n7c2qhbr09xnvpb8ars7j"; + name = "qtquickcontrols2-opensource-src-5.7.1.tar.xz"; }; }; qtscript = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtscript-opensource-src-5.7.0.tar.xz"; - sha256 = "0040890p5ilyrmcpndz1hhp08x2ms5gw4lp4n5iax2a957yy2i4w"; - name = "qtscript-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtscript-opensource-src-5.7.1.tar.xz"; + sha256 = "09m41n95448pszr7inlg03ycb66s1a9hzfylaka92382acf1myav"; + name = "qtscript-opensource-src-5.7.1.tar.xz"; }; }; qtscxml = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtscxml-opensource-src-5.7.0.tar.xz"; - sha256 = "1waidk96vp9510g94fry0sv1vm2lgzgpwybf6c2xybcsdkbi62rp"; - name = "qtscxml-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtscxml-opensource-src-5.7.1.tar.xz"; + sha256 = "135kknqdmib2cjryfmvfgv7a2qx9pyba3m7i7nkbc5d742r4mbcx"; + name = "qtscxml-opensource-src-5.7.1.tar.xz"; }; }; qtsensors = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtsensors-opensource-src-5.7.0.tar.xz"; - sha256 = "1gii6wg2xd3bkb86y5hgpmwcpl04xav030zscpl6fhscl9kcqg98"; - name = "qtsensors-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtsensors-opensource-src-5.7.1.tar.xz"; + sha256 = "041v1x8pwfzpyk6y0sy5zgm915pi15xdhiy18fd5wqayvcp99cyc"; + name = "qtsensors-opensource-src-5.7.1.tar.xz"; }; }; qtserialbus = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtserialbus-opensource-src-5.7.0.tar.xz"; - sha256 = "0f2xq6fm8lmvd88lc3l37kybqp4wqp71kdch14bwz79y7777lhrc"; - name = "qtserialbus-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtserialbus-opensource-src-5.7.1.tar.xz"; + sha256 = "0mxi43l2inpbar8rmg21qjg33bv3f1ycxjgvzjf12ncnybhdnzkj"; + name = "qtserialbus-opensource-src-5.7.1.tar.xz"; }; }; qtserialport = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtserialport-opensource-src-5.7.0.tar.xz"; - sha256 = "0rc2l14s59qskp16wqlkizfai32s41qlm7a86r3qahx28gc51qaw"; - name = "qtserialport-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtserialport-opensource-src-5.7.1.tar.xz"; + sha256 = "09jsryc0z49cz9783kq48rkn42f10c6krzivp812ddwjsfdy3mbn"; + name = "qtserialport-opensource-src-5.7.1.tar.xz"; }; }; qtsvg = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtsvg-opensource-src-5.7.0.tar.xz"; - sha256 = "10fqrlqkiq83xhx79g8d2sjy7hjdnp28067z8f4byj7db81rzy51"; - name = "qtsvg-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtsvg-opensource-src-5.7.1.tar.xz"; + sha256 = "0irr9h566hl9nx8p919rz276zbfvvd6vqdb6i9g6b3piikdigw5h"; + name = "qtsvg-opensource-src-5.7.1.tar.xz"; }; }; qttools = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qttools-opensource-src-5.7.0.tar.xz"; - sha256 = "004m9l7bgh7qnncbyl3d5fkggdrqx58ib21xv4hflvvarxrssibg"; - name = "qttools-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz"; + sha256 = "1b6zqa5690b8lqms7rrhb8rcq0xg5hp117v3m08qngbcd0i706b4"; + name = "qttools-opensource-src-5.7.1.tar.xz"; }; }; qttranslations = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qttranslations-opensource-src-5.7.0.tar.xz"; - sha256 = "0vasg5ycg5rhj8ljk3aqg1sxfrlz3602n38fr14ip853yqld83ha"; - name = "qttranslations-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qttranslations-opensource-src-5.7.1.tar.xz"; + sha256 = "1rsq0bp6p8yf41h1nxrbclxr4xq8v025cbi0lq7yh917ac4xpv0n"; + name = "qttranslations-opensource-src-5.7.1.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtvirtualkeyboard-opensource-src-5.7.0.tar.xz"; - sha256 = "0bzzci32f8ji94p2n6n16n838lrykyy3h822gfw77c93ivk3shyz"; - name = "qtvirtualkeyboard-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz"; + sha256 = "1p9acm75am5lybmn8j2339vck808dmayk4xwbr67jpfigs9qp2xj"; + name = "qtvirtualkeyboard-opensource-src-5.7.1.tar.xz"; }; }; qtwayland = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwayland-opensource-src-5.7.0.tar.xz"; - sha256 = "04dynjcr6gxi3hcqdf688a4hkabi2l17slpcx9k0f3dxygwcgf96"; - name = "qtwayland-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwayland-opensource-src-5.7.1.tar.xz"; + sha256 = "1iq1c89y4ggq0dxjlf62jyhh8a9l3x7y914x84w5pby8h3hwagzj"; + name = "qtwayland-opensource-src-5.7.1.tar.xz"; }; }; qtwebchannel = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwebchannel-opensource-src-5.7.0.tar.xz"; - sha256 = "05lqfidlh1ahdd1j9y20p2037qbcq51zkdzj2m8fwhn7ghbwvd1s"; - name = "qtwebchannel-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebchannel-opensource-src-5.7.1.tar.xz"; + sha256 = "16rij92dxy4k5231l3dpmhy7cnz0cjkn50cpzaf014zrdz3kmav3"; + name = "qtwebchannel-opensource-src-5.7.1.tar.xz"; }; }; qtwebengine = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwebengine-opensource-src-5.7.0.tar.xz"; - sha256 = "0pfwsqjh107jqdw1mzzrhn38jxl64d8lljk4586im2ndypzn4mwq"; - name = "qtwebengine-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebengine-opensource-src-5.7.1.tar.xz"; + sha256 = "0ayc3j17nampy7pg464nbi09wr2d3pfbpqql789m0av37lz8h091"; + name = "qtwebengine-opensource-src-5.7.1.tar.xz"; }; }; qtwebsockets = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwebsockets-opensource-src-5.7.0.tar.xz"; - sha256 = "0hwb2l7iwf4wf7l95dli8j3b7h0nffp56skfg1x810kzj0df26vl"; - name = "qtwebsockets-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebsockets-opensource-src-5.7.1.tar.xz"; + sha256 = "1laj0slwibs0bg69kgrdhc9k1s6yisq3pcsr0r9rhbkzisv7aajw"; + name = "qtwebsockets-opensource-src-5.7.1.tar.xz"; }; }; qtwebview = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwebview-opensource-src-5.7.0.tar.xz"; - sha256 = "1i2ikv1ah4g3rc1pivxiw77p0yj79lialqww91fj781g66pky6l0"; - name = "qtwebview-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebview-opensource-src-5.7.1.tar.xz"; + sha256 = "17qmyayy67ji4d3i3cq0wb8s7hqjrw224zr2blzjc1827rlzkg5k"; + name = "qtwebview-opensource-src-5.7.1.tar.xz"; }; }; qtwinextras = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwinextras-opensource-src-5.7.0.tar.xz"; - sha256 = "1fh7kqfwgwi9pcfg9b6hp2fpgvs938wl96ppqan79apxlhqy5awd"; - name = "qtwinextras-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwinextras-opensource-src-5.7.1.tar.xz"; + sha256 = "1k7kiq0k7qwsn06p6sg13lr8hnnz7lvvsx18gas46dggkyj66514"; + name = "qtwinextras-opensource-src-5.7.1.tar.xz"; }; }; qtx11extras = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtx11extras-opensource-src-5.7.0.tar.xz"; - sha256 = "1yrkn8pqdbvbqykas3wx1vdfimhjkgx3s5jgdxib9dgmgyx6vjzw"; - name = "qtx11extras-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtx11extras-opensource-src-5.7.1.tar.xz"; + sha256 = "09z49jm70f5i0gcdz9a16z00pg96x8pz7vri5wpirh3fqqn0qnjz"; + name = "qtx11extras-opensource-src-5.7.1.tar.xz"; }; }; qtxmlpatterns = { - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtxmlpatterns-opensource-src-5.7.0.tar.xz"; - sha256 = "02z2qxamslg6sphnaykjcjfpypq4b69pb586s43vw4fplm72m21q"; - name = "qtxmlpatterns-opensource-src-5.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtxmlpatterns-opensource-src-5.7.1.tar.xz"; + sha256 = "1rgqnpg64gn5agmvjwy0am8hp5fpxl3cdkixr1yrsdxi5a6961d8"; + name = "qtxmlpatterns-opensource-src-5.7.1.tar.xz"; }; }; } From 168fe999e71efa89326ce1df75e0df249e454ab2 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 20 Dec 2016 15:15:06 +0100 Subject: [PATCH 1727/1749] make-system-tarball: create reproducible tarballs Ensure that archive members are added in sorted order with a fixed mtime. This allows `nix-build --check` to succeed (when building a tarball of a simple system configuration). We also remove env-vars which doesn't appear to do much apart from capture a bunch of store paths we probably don't want. This is an alternative to https://github.com/NixOS/nixpkgs/pull/2281/commits/4b78a5b5fb8584347999832b3c67d1276488140b --- nixos/lib/make-system-tarball.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index e04455e889b0..efb83d914287 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -52,9 +52,10 @@ $extraCommands mkdir -p $out/tarball -tar cvJf $out/tarball/$fileName.tar.xz * $extraArgs +rm env-vars + +tar --sort=name --mtime='1970-01-01' -cvJf $out/tarball/$fileName.tar.xz * $extraArgs mkdir -p $out/nix-support echo $system > $out/nix-support/system echo "file system-tarball $out/tarball/$fileName.tar.xz" > $out/nix-support/hydra-build-products - From 6758d157d23dfb548d43c896a6f9092039684517 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 19 Dec 2016 14:31:06 +0100 Subject: [PATCH 1728/1749] multipath-tools: ensure gzip does not capture timestamp gzip is originally called as 'gzip -9 -c' This is a port of https://github.com/NixOS/nixpkgs/pull/2281/commits/a8e7ddd1dfaae4b3ce97fdefe4614a3e31c04501 Note that it does not seem to make a difference to `nix-build --check`. --- pkgs/os-specific/linux/multipath-tools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index f60ece0fceca..0e0178e8845b 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { ' libmultipath/defaults.h sed -i -e 's,\$(DESTDIR)/\(usr/\)\?,$(prefix)/,g' \ kpartx/Makefile libmpathpersist/Makefile + sed -i -e "s,GZIP = .*, GZIP = gzip -9n -c," \ + Makefile.inc ''; nativeBuildInputs = [ gzip ]; From 8246a845b43035b8715c7c2bf4a7341805eee00e Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 19 Dec 2016 14:34:53 +0100 Subject: [PATCH 1729/1749] zerotierone: gzip -9 -> gzip -9n Note that it does not seem to make a difference to `nix-build --check`. --- pkgs/tools/networking/zerotierone/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index ba41fcdd687a..d97a60497452 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mkdir -p $man/share/man/man8 for cmd in zerotier-one.8 zerotier-cli.1 zerotier-idtool.1; do - cat doc/$cmd | gzip -9 > $man/share/man/man8/$cmd.gz + cat doc/$cmd | gzip -9n > $man/share/man/man8/$cmd.gz done ''; From a34eae0ecb939f3ec8e04b5f98830a3deec06065 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 19 Dec 2016 14:35:01 +0100 Subject: [PATCH 1730/1749] stun: gzip -9 -> gzip -9n Note that it does not seem to make a difference to `nix-build --check`. --- pkgs/tools/networking/stun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 3eade48a614c..8f9636041fff 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { preBuild = '' tar Jxvf ${srcManpages} debian/manpages - gzip -9 debian/manpages/stun.1 - gzip -9 debian/manpages/stund.8 + gzip -9n debian/manpages/stun.1 + gzip -9n debian/manpages/stund.8 ''; installPhase = '' From cbe8ff1a7280aa40c5811e30a6808f57d63416d1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 20 Dec 2016 12:48:56 -0500 Subject: [PATCH 1731/1749] minecraft-server: 1.11 -> 1.11.1 --- pkgs/games/minecraft-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 8590f9a7420b..781dc5e31d83 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "minecraft-server-${version}"; - version = "1.11"; + version = "1.11.1"; src = fetchurl { url = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar"; - sha256 = "10vgvkklv3l66cvin2ikva2nj86gjl6p9ffizd6r89ixv1grcxrj"; + sha256 = "161cwwcv73zisac1biz9arrby8y8n0j4bn9hz9rvy8dszlrbq0l0"; }; preferLocalBuild = true; From 5ed1aee3af6ce80c63e534fc26d7ee611d4ca50d Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 20 Dec 2016 18:54:52 +0100 Subject: [PATCH 1732/1749] python/pypillowfight: Disable tests entirely This is getting entirely different results on i686-linux: https://hydra.nixos.org/build/45122757/nixlog/6/raw According to @jflesch the reference system these tests are built for is Debian GNU/Linux (possibly only x86_64-linux I guess): https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174 So let's disable them until they're more deterministic and less platform/distro-specific. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e5d2cc303d6b..da2c6ac366e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8870,12 +8870,9 @@ in { sha256 = "1rwmajsy9qhl3qhhy5mw0xmr3n8abxcq8baidpn0sxv6yjg2369z"; }; - # Disable certain tests. Reported upstream at: - # https://github.com/jflesch/libpillowfight/issues/2 - postPatch = '' - sed -i -e '/test_\(all_2\|ace\)/i \ @unittest.expectedFailure' \ - tests/tests_ace.py tests/tests_all.py - ''; + # Disable tests because they're designed to only work on Debian: + # https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174 + doCheck = false; # Python 2.x is not supported, see: # https://github.com/jflesch/libpillowfight/issues/1 From 06cfff71dd104d06470375619ebc364a6fc61caa Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 20 Dec 2016 21:57:28 +0100 Subject: [PATCH 1733/1749] parted: re-enable checks --- pkgs/tools/misc/parted/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 58e7a17a57f3..68240210e746 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -29,10 +29,9 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" ++ stdenv.lib.optional enableStatic "--enable-static"; - # Tests are currently failing because Hydra runs builds as uid 0. - # It'd be better to try to fix these tests, but this is blocking - # all NixOS Hydra builds right now. - doCheck = false; + # Tests were previously failing due to Hydra running builds as uid 0. + # That should hopefully be fixed now. + doCheck = true; preCheck = stdenv.lib.optionalString doCheck From 3fb785b0ad6902d765601e489e5f695411d2752f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 20 Dec 2016 23:17:46 +0100 Subject: [PATCH 1734/1749] nixos: unbreak prometheus test target_groups was renamed to static_configs in d459916504 ("prometheus service: rename values to match prometheus 1.0 naming."). Catch up. --- nixos/tests/prometheus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index 7605227100d2..ade097597bb8 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -10,7 +10,7 @@ import ./make-test.nix { }; scrapeConfigs = [{ job_name = "prometheus"; - target_groups = [{ + static_configs = [{ targets = [ "127.0.0.1:9090" ]; labels = { instance = "localhost"; }; }]; From 8021c1f429a1d5465bf6fef7b48ae0176552e777 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Tue, 20 Dec 2016 23:56:29 +0100 Subject: [PATCH 1735/1749] meld: 3.16.2 -> 3.16.4 --- pkgs/applications/version-management/meld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index d13457ef927a..05db6d964c3a 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -5,14 +5,14 @@ let minor = "3.16"; - version = "${minor}.2"; + version = "${minor}.4"; inherit (python2Packages) python buildPythonApplication pycairo pygobject3; in buildPythonApplication rec { name = "meld-${version}"; src = fetchurl { url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; - sha256 = "2dd3f58b95444bf721e0c912668c29cf8f47a402440b772ea12c4b9a0c94966f"; + sha256 = "0rwflfkfnb9ydnk4k591x0il29d4dvz95cjs2f279blx64lgki4k"; }; buildInputs = [ From caa476b35760f095d3ed4faa910939a136d73356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 21 Dec 2016 00:06:42 +0100 Subject: [PATCH 1736/1749] nixos/prometheus: add services.prometheus.configText option The structured options are incomplete compared to upstream and I think it will be a maintenance burden to try to keep up. Instead, provide an option for the raw config file contents (prometheus.yml). --- .../monitoring/prometheus/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 82b97bd92f87..d692dd5fc793 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -25,9 +25,16 @@ let scrape_configs = cfg.scrapeConfigs; }; + generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig; + + prometheusYml = + if cfg.configText != null then + pkgs.writeText "prometheus.yml" cfg.configText + else generatedPrometheusYml; + cmdlineArgs = cfg.extraFlags ++ [ "-storage.local.path=${cfg.dataDir}/metrics" - "-config.file=${writePrettyJSON "prometheus.yml" promConfig}" + "-config.file=${prometheusYml}" "-web.listen-address=${cfg.listenAddress}" "-alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" "-alertmanager.timeout=${toString cfg.alertmanagerTimeout}s" @@ -359,6 +366,16 @@ in { ''; }; + configText = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + If non-null, this option defines the text that is written to + prometheus.yml. If null, the contents of prometheus.yml is generated + from the structured config options. + ''; + }; + globalConfig = mkOption { type = promTypes.globalConfig; default = {}; From de683845b812c6352c37c742935cb2c620470b63 Mon Sep 17 00:00:00 2001 From: Mikhail Volkhov Date: Wed, 21 Dec 2016 10:39:05 +0300 Subject: [PATCH 1737/1749] scudcloud: 1.35 -> 1.38 --- .../instant-messengers/scudcloud/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index 229e3497ea4b..5e5c2fe8eed6 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchgit, python3Packages }: python3Packages.buildPythonPackage { - name = "scudcloud-1.35"; - namePrefix = ""; + name = "scudcloud-1.38"; - # Version 1.35, branch 254-port-to-qt5 - # https://github.com/raelgc/scudcloud/commit/6d924b5c23597c94d1a8e829a8a5d917806a5bc9 + # Branch 254-port-to-qt5 + # https://github.com/raelgc/scudcloud/commit/6bcd877daea3d679cd5fd2c946c2d933940c48d9 src = fetchgit { url = https://github.com/raelgc/scudcloud/; - rev = "6d924b5c23597c94d1a8e829a8a5d917806a5bc9"; - sha256 = "01k5am3067l3p1c91mdrh2fk3cgr20dhppa6flqi5b2ygzrc1i8q"; + rev = "6bcd877daea3d679cd5fd2c946c2d933940c48d9"; + sha256 = "1884svz6m5vl06d0yac5zjb2phxwg6bjva72y15fw4larkjnh72s"; }; propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ]; From 7e317d4ff8ca9050ce0c7f0f4f18160d51fe1b8e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Dec 2016 11:17:13 +0100 Subject: [PATCH 1738/1749] LTS Haskell 7.14 --- .../configuration-hackage2nix.yaml | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ed9a4d7bddab..ae4fbca8c2e4 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.13 + # LTS Haskell 7.14 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -51,7 +51,7 @@ default-package-overrides: - adjunctions ==4.3 - adler32 ==0.1.1.0 - aeson ==0.11.2.1 - - aeson-better-errors ==0.9.0.1 + - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.0.5 - aeson-compat ==0.3.6 - aeson-generic-compat ==0.0.1.0 @@ -324,7 +324,7 @@ default-package-overrides: - clckwrks-theme-bootstrap ==0.4.2 - cli ==0.1.2 - clientsession ==0.9.1.2 - - Clipboard ==2.3.0.1 + - Clipboard ==2.3.0.2 - clock ==0.7.2 - clumpiness ==0.17.0.0 - ClustalParser ==1.1.4 @@ -393,6 +393,8 @@ default-package-overrides: - cryptohash ==0.11.9 - cryptohash-conduit ==0.1.1 - cryptohash-cryptoapi ==0.1.4 + - cryptohash-md5 ==0.11.100.1 + - cryptohash-sha1 ==0.11.100.1 - cryptohash-sha256 ==0.11.100.1 - cryptol ==2.4.0 - cryptonite ==0.19 @@ -433,7 +435,7 @@ default-package-overrides: - dependent-sum ==0.3.2.2 - dependent-sum-template ==0.0.0.5 - derive ==2.5.26 - - deriving-compat ==0.3.4 + - deriving-compat ==0.3.5 - descriptive ==0.9.4 - diagrams ==1.3.0.1 - diagrams-cairo ==1.3.1.1 @@ -476,7 +478,7 @@ default-package-overrides: - docvim ==0.3.2.1 - dotenv ==0.3.1.0 - dotnet-timespan ==0.0.1.0 - - double-conversion ==2.0.1.0 + - double-conversion ==2.0.2.0 - download ==0.3.2.5 - dpor ==0.2.0.0 - drawille ==0.1.2.0 @@ -586,7 +588,7 @@ default-package-overrides: - foreign-store ==0.2 - formatting ==6.2.4 - fortran-src ==0.1.0.4 - - Frames ==0.1.8 + - Frames ==0.1.9 - free ==4.12.4 - free-vl ==0.1.4 - freenect ==1.2.1 @@ -847,6 +849,7 @@ default-package-overrides: - highlighting-kate ==0.6.3 - hinotify ==0.3.9 - hint ==0.6.0 + - hip ==1.2.0.0 - histogram-fill ==0.8.4.1 - hit ==0.6.3 - hjsmin ==0.2.0.2 @@ -1320,7 +1323,7 @@ default-package-overrides: - persistent-refs ==0.4 - persistent-sqlite ==2.6 - persistent-template ==2.5.1.6 - - pgp-wordlist ==0.1.0.1 + - pgp-wordlist ==0.1.0.2 - phantom-state ==0.2.1.2 - picoparsec ==0.1.2.3 - pinboard ==0.9.6 @@ -1591,7 +1594,7 @@ default-package-overrides: - snap-core ==1.0.1.0 - snap-server ==1.0.1.1 - snowflake ==0.1.1.1 - - soap ==0.2.3.2 + - soap ==0.2.3.3 - soap-openssl ==0.1.0.2 - soap-tls ==0.1.1.2 - socket ==0.6.1.0 @@ -1638,7 +1641,7 @@ default-package-overrides: - STMonadTrans ==0.3.4 - stopwatch ==0.1.0.3 - storable-complex ==0.2.2 - - storable-endian ==0.2.5 + - storable-endian ==0.2.6 - storable-record ==0.0.3.1 - store ==0.2.1.2 - store-core ==0.2.0.2 @@ -1689,7 +1692,7 @@ default-package-overrides: - tar ==0.5.0.3 - tardis ==0.4.1.0 - tasty ==0.11.0.4 - - tasty-ant-xml ==1.0.2 + - tasty-ant-xml ==1.0.3 - tasty-dejafu ==0.3.0.2 - tasty-expected-failure ==0.11.0.4 - tasty-golden ==2.3.1.1 @@ -1746,7 +1749,7 @@ default-package-overrides: - th-reify-many ==0.1.6 - th-to-exp ==0.0.1.0 - th-utilities ==0.2.0.1 - - these ==0.7.2 + - these ==0.7.3 - threads ==0.5.1.4 - through-text ==0.1.0.0 - thumbnail-plus ==1.0.5 @@ -1755,7 +1758,7 @@ default-package-overrides: - time-compat ==0.1.0.3 - time-lens ==0.4.0.1 - time-locale-compat ==0.1.1.3 - - time-parsers ==0.1.1.0 + - time-parsers ==0.1.2.0 - timeit ==1.0.0.0 - timelens ==0.2.0.2 - timemap ==0.0.4 @@ -1842,7 +1845,7 @@ default-package-overrides: - utility-ht ==0.0.12 - uu-interleaved ==0.2.0.0 - uu-parsinglib ==2.9.1.1 - - uuid ==1.3.12 + - uuid ==1.3.13 - uuid-orphans ==1.4.1 - uuid-types ==1.0.3 - vado ==0.0.7 @@ -1864,7 +1867,7 @@ default-package-overrides: - versions ==3.0.0 - vhd ==0.2.2 - ViennaRNAParser ==1.2.9 - - vinyl ==0.5.2 + - vinyl ==0.5.3 - vinyl-utils ==0.3.0.0 - void ==0.7.1 - vty ==5.11.3 @@ -1930,7 +1933,7 @@ default-package-overrides: - Workflow ==0.8.3 - wrap ==0.0.0 - wreq ==0.4.1.0 - - writer-cps-mtl ==0.1.1.0 + - writer-cps-mtl ==0.1.1.1 - writer-cps-transformers ==0.1.1.0 - wuss ==1.1.3 - X11 ==1.6.1.2 @@ -1982,7 +1985,7 @@ default-package-overrides: - yesod-gitrev ==0.1.0.0 - yesod-job-queue ==0.3.0.1 - yesod-newsfeed ==1.6 - - yesod-persistent ==1.4.0.6 + - yesod-persistent ==1.4.1.0 - yesod-sitemap ==1.4.0.1 - yesod-static ==1.5.1.1 - yesod-static-angular ==0.1.8 @@ -1996,7 +1999,7 @@ default-package-overrides: - yjtools ==0.9.18 - zero ==0.1.4 - zeromq4-haskell ==0.6.5 - - zip ==0.1.3 + - zip ==0.1.4 - zip-archive ==0.3.0.5 - zippers ==0.2.2 - zlib ==0.6.1.2 From 8809fa30b54ce3db4e39d6c8e8b5c982662a6ff6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Dec 2016 11:30:08 +0100 Subject: [PATCH 1739/1749] configuration-hackage2nix.yaml: update list of failing builds --- .../configuration-hackage2nix.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ae4fbca8c2e4..f766b2be8f56 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2679,6 +2679,7 @@ dont-distribute-packages: cabalvchk: [ i686-linux, x86_64-linux, x86_64-darwin ] cabocha: [ i686-linux, x86_64-linux, x86_64-darwin ] cached-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] caffegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3069,6 +3070,7 @@ dont-distribute-packages: cubicbezier: [ i686-linux, x86_64-linux, x86_64-darwin ] cuboid: [ i686-linux, x86_64-linux, x86_64-darwin ] cudd: [ i686-linux, x86_64-linux, x86_64-darwin ] + cue-sheet: [ i686-linux, x86_64-linux, x86_64-darwin ] currency-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3271,6 +3273,7 @@ dont-distribute-packages: direct-http: [ i686-linux, x86_64-linux, x86_64-darwin ] direct-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] directed-cubical: [ i686-linux, x86_64-linux, x86_64-darwin ] + directory-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] dirfiles: [ i686-linux, x86_64-linux, x86_64-darwin ] discogs-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] discordian-calendar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4273,6 +4276,7 @@ dont-distribute-packages: haste-gapi: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] haste: [ i686-linux, x86_64-linux, x86_64-darwin ] + hastily: [ i686-linux, x86_64-linux, x86_64-darwin ] hat: [ i686-linux, x86_64-linux, x86_64-darwin ] Hate: [ i686-linux, x86_64-linux, x86_64-darwin ] hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4578,6 +4582,7 @@ dont-distribute-packages: hpasteit: [ i686-linux, x86_64-linux, x86_64-darwin ] HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] hpath: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ] HPi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4713,6 +4718,7 @@ dont-distribute-packages: hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ] hspread: [ i686-linux, x86_64-linux, x86_64-darwin ] hspresent: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5724,6 +5730,7 @@ dont-distribute-packages: mysnapsession-example: [ i686-linux, x86_64-linux, x86_64-darwin ] mysnapsession: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + mysql-haskell-nem: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-haskell-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6088,6 +6095,7 @@ dont-distribute-packages: pipes-async: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-attoparsec-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6847,9 +6855,11 @@ dont-distribute-packages: snap-cors: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-error-collector: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-loader-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-predicates: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-web-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6887,6 +6897,7 @@ dont-distribute-packages: snaplet-scoped-session: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-sedna: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-ses-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-sqlite-simple-jwt-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-sqlite-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6959,6 +6970,7 @@ dont-distribute-packages: spoty: [ i686-linux, x86_64-linux, x86_64-darwin ] Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ] spritz: [ i686-linux, x86_64-linux, x86_64-darwin ] + sproxy-web: [ i686-linux, x86_64-linux, x86_64-darwin ] sproxy2: [ i686-linux, x86_64-linux, x86_64-darwin ] spsa: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7583,6 +7595,7 @@ dont-distribute-packages: wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-route: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-static-caching: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-static: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-responsible: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7600,6 +7613,7 @@ dont-distribute-packages: watchdog: [ i686-linux, x86_64-linux, x86_64-darwin ] watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] + wave: [ i686-linux, x86_64-linux, x86_64-darwin ] WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ] wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] wavy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7623,7 +7637,9 @@ dont-distribute-packages: webcrank-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank: [ i686-linux, x86_64-linux, x86_64-darwin ] + webdriver-angular: [ i686-linux, x86_64-linux, x86_64-darwin ] webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] + webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] webify: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] From 3dad7633e24e2e56539cf48d78df2a1e927d2fcc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Dec 2016 15:34:19 +0100 Subject: [PATCH 1740/1749] python-pyflakes: trigger re-build to fix transient error on Hydra --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da2c6ac366e9..3d44ad0707f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20128,6 +20128,7 @@ in { buildInputs = with self; [ unittest2 ]; doCheck = !isPyPy; + force-rebuild = 1; # fix transient test suite error at http://hydra.nixos.org/build/45083762 meta = { homepage = https://launchpad.net/pyflakes; From 17f42ee50f24a942cf64c077b9cf81f4b46b77ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 20 Dec 2016 14:08:15 +0100 Subject: [PATCH 1741/1749] git-annex: switch to yesod-persistent-1.4.1.1 to fix build --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index eee8f9df457d..a9ad1a695acb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -57,6 +57,8 @@ self: super: { rev = drv.version; }; })).overrideScope (self: super: { + # https://github.com/yesodweb/yesod/issues/1324 + yesod-persistent = self.yesod-persistent_1_4_1_1; # https://github.com/prowdsponsor/esqueleto/issues/137 persistent = self.persistent_2_2_4_1; persistent-template = self.persistent-template_2_1_8_1; From 076b90d5eea5a77e9039359bccc659b9836aae47 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Dec 2016 11:34:47 +0100 Subject: [PATCH 1742/1749] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.4 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/c9f5faab757090abc4dd991af69cc0a38196b2a4. --- .../haskell-modules/hackage-packages.nix | 1144 ++++++++++------- 1 file changed, 710 insertions(+), 434 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 65a6a47d9bf7..1bdf1256369a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2743,18 +2743,6 @@ self: { }) {}; "Clipboard" = callPackage - ({ mkDerivation, base, directory, unix, utf8-string, X11 }: - mkDerivation { - pname = "Clipboard"; - version = "2.3.0.1"; - sha256 = "f559fa28d98f98355b6478b583f8f111e00573fd5b70111ad6ca11c12388ee1c"; - libraryHaskellDepends = [ base directory unix utf8-string X11 ]; - homepage = "http://haskell.org/haskellwiki/Clipboard"; - description = "System clipboard interface"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Clipboard_2_3_0_2" = callPackage ({ mkDerivation, base, directory, unix, utf8-string, X11 }: mkDerivation { pname = "Clipboard"; @@ -2764,7 +2752,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Clipboard"; description = "System clipboard interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ClustalParser" = callPackage @@ -5447,22 +5434,6 @@ self: { }) {}; "Frames" = callPackage - ({ mkDerivation, base, ghc-prim, pipes, primitive, readable - , template-haskell, text, transformers, vector, vinyl - }: - mkDerivation { - pname = "Frames"; - version = "0.1.8"; - sha256 = "5b695c025c1e153d40b5ac8a526ca4986b1b4ae9350354e6373593b15d9c3e57"; - libraryHaskellDepends = [ - base ghc-prim pipes primitive readable template-haskell text - transformers vector vinyl - ]; - description = "Data frames For working with tabular data files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Frames_0_1_9" = callPackage ({ mkDerivation, base, directory, ghc-prim, hspec, htoml, pipes , pretty, primitive, readable, regex-applicative, template-haskell , temporary, text, transformers, unordered-containers, vector @@ -5482,7 +5453,6 @@ self: { ]; description = "Data frames For working with tabular data files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Frank" = callPackage @@ -5730,6 +5700,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; + "GLURaw_2_0_0_3" = callPackage + ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }: + mkDerivation { + pname = "GLURaw"; + version = "2.0.0.3"; + sha256 = "582cf8c0c1b8c0123ee9a8a06eba65fffded6decfe4e2e08bfea308f55f7ccee"; + libraryHaskellDepends = [ base OpenGLRaw transformers ]; + librarySystemDepends = [ freeglut mesa ]; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A raw binding for the OpenGL graphics system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; + "GLUT" = callPackage ({ mkDerivation, array, base, containers, OpenGL, StateVar , transformers @@ -8417,6 +8401,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HaTeX_3_17_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, matrix, parsec + , QuickCheck, tasty, tasty-quickcheck, text, transformers + , wl-pprint-extras + }: + mkDerivation { + pname = "HaTeX"; + version = "3.17.1.0"; + sha256 = "c497c6b2853018b09016c4422f22d18956881fc774066626d7c43c8b8f0917c3"; + libraryHaskellDepends = [ + base bytestring containers matrix parsec QuickCheck text + transformers wl-pprint-extras + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck text + ]; + homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md"; + description = "The Haskell LaTeX library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HaTeX-meta" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc , haddock, haskell-src-exts, mtl, parsec @@ -11444,8 +11450,8 @@ self: { }: mkDerivation { pname = "MiniAgda"; - version = "0.2014.9.12"; - sha256 = "16e457ddf76d11c05905e057381fccb0373c021dbccfbcabeb31f2929a9e0792"; + version = "0.2016.12.19"; + sha256 = "c182c028ecf764a4f363426fbd101eb1e3c9283d5558cae898cdbd45847d4fca"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -20064,26 +20070,6 @@ self: { }) {}; "aeson-better-errors" = callPackage - ({ mkDerivation, aeson, base, bytestring, dlist, mtl, scientific - , text, transformers, transformers-compat, unordered-containers - , vector, void - }: - mkDerivation { - pname = "aeson-better-errors"; - version = "0.9.0.1"; - sha256 = "125f4453f945b5b051fa596cd148b7db0414942cdfbe1d6fd0359989ab45d8e6"; - revision = "1"; - editedCabalFile = "8aa3d1ad76116aad051bc6adce10e2798191bdd6ecf84145687e5c77d3a7a2c2"; - libraryHaskellDepends = [ - aeson base bytestring dlist mtl scientific text transformers - transformers-compat unordered-containers vector void - ]; - homepage = "https://github.com/hdgarrood/aeson-better-errors"; - description = "Better error messages when decoding JSON values"; - license = stdenv.lib.licenses.mit; - }) {}; - - "aeson-better-errors_0_9_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, dlist, mtl, scientific , text, transformers, transformers-compat, unordered-containers , vector, void @@ -20099,7 +20085,6 @@ self: { homepage = "https://github.com/hdgarrood/aeson-better-errors"; description = "Better error messages when decoding JSON values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-bson" = callPackage @@ -25994,6 +25979,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "apioiaf-client" = callPackage + ({ mkDerivation, aeson, base, bytestring, lens, wreq }: + mkDerivation { + pname = "apioiaf-client"; + version = "0.1.0.0"; + sha256 = "8493248ae0d1303afba5f600e7c38fb29b6811d2348f994af056413a3ebbd0ff"; + libraryHaskellDepends = [ aeson base bytestring lens wreq ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/kberger/anapioficeandfire-haskell#readme"; + description = "Consumer library for anapioficeandfire.com"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "apis" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory , ecma262, exceptions, filemanip, filepath, hslogger, hxt, mtl @@ -35172,6 +35170,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "buchhaltung" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, array, async, base, boxes + , bytestring, Cabal, cassava, containers, data-default, Decimal + , deepseq, directory, edit-distance, file-embed, filepath + , formatting, hashable, haskeline, hint, hledger, hledger-lib, lens + , lifted-base, ListLike, megaparsec, MissingH, monad-control, mtl + , optparse-applicative, parsec, process, regex-compat, regex-tdfa + , regex-tdfa-text, safe, semigroups, split, strict, temporary, text + , time, transformers, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "buchhaltung"; + version = "0.0.1"; + sha256 = "fd2dd47210a9d7200c0d4259646963b6bc848ff656255b66b14648b949dec70f"; + isLibrary = false; + isExecutable = true; + setupHaskellDepends = [ base Cabal ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint array async base boxes bytestring cassava + containers data-default Decimal deepseq directory edit-distance + file-embed filepath formatting hashable haskeline hint hledger + hledger-lib lens lifted-base ListLike megaparsec MissingH + monad-control mtl optparse-applicative parsec process regex-compat + regex-tdfa regex-tdfa-text safe semigroups split strict temporary + text time transformers unordered-containers vector yaml + ]; + homepage = "http://johannesgerer.com/buchhaltung"; + description = "Automates most of your plain text accounting data entry in ledger format"; + license = stdenv.lib.licenses.mit; + }) {}; + "buffer-builder" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, HTF, mtl, quickcheck-instances, text @@ -37239,6 +37268,30 @@ self: { homepage = "https://github.com/centromere/cacophony"; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cacophony_0_9_0" = callPackage + ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring + , cryptonite, deepseq, directory, exceptions, free, hlint, lens + , memory, monad-coroutine, mtl, safe-exceptions, text, transformers + }: + mkDerivation { + pname = "cacophony"; + version = "0.9.0"; + sha256 = "7394383af54b84ff5efdb491cafa6ffc569266c522c7395ee099a45bbd0588cb"; + libraryHaskellDepends = [ + base bytestring cryptonite deepseq exceptions free lens memory + monad-coroutine mtl safe-exceptions transformers + ]; + testHaskellDepends = [ + aeson async base base16-bytestring bytestring directory free hlint + lens memory mtl text + ]; + homepage = "https://github.com/centromere/cacophony"; + description = "A library implementing the Noise protocol"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "caf" = callPackage @@ -41097,6 +41150,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clckwrks-cli_0_2_17_1" = callPackage + ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl + , network, parsec + }: + mkDerivation { + pname = "clckwrks-cli"; + version = "0.2.17.1"; + sha256 = "d3f5546425c363b8d25d9d5060839431176829c017994709fc0060868ced25ea"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + acid-state base clckwrks haskeline mtl network parsec + ]; + homepage = "http://www.clckwrks.com/"; + description = "a command-line interface for adminstrating some aspects of clckwrks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clckwrks-dot-com" = callPackage ({ mkDerivation, base, clckwrks, clckwrks-plugin-media , clckwrks-plugin-page, clckwrks-theme-clckwrks, containers @@ -41194,6 +41266,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clckwrks-plugin-media_0_6_16_1" = callPackage + ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal + , clckwrks, containers, directory, filepath, gd, happstack-server + , hsp, hsx2hs, ixset, magic, mtl, reform, reform-happstack + , reform-hsp, safecopy, text, web-plugins, web-routes + , web-routes-th + }: + mkDerivation { + pname = "clckwrks-plugin-media"; + version = "0.6.16.1"; + sha256 = "acd1df19bf6b98d18202c925f7cf6800d378c190d36e5a88422dda3e19eaf079"; + libraryHaskellDepends = [ + acid-state attoparsec base blaze-html cereal clckwrks containers + directory filepath gd happstack-server hsp ixset magic mtl reform + reform-happstack reform-hsp safecopy text web-plugins web-routes + web-routes-th + ]; + libraryToolDepends = [ hsx2hs ]; + homepage = "http://clckwrks.com/"; + description = "media plugin for clckwrks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clckwrks-plugin-page" = callPackage ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks , containers, directory, filepath, happstack-hsp, happstack-server @@ -41220,6 +41316,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clckwrks-plugin-page_0_4_3_7" = callPackage + ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks + , containers, directory, filepath, happstack-hsp, happstack-server + , hsp, hsx2hs, ixset, mtl, old-locale, random, reform + , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell + , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins + , web-routes, web-routes-happstack, web-routes-th + }: + mkDerivation { + pname = "clckwrks-plugin-page"; + version = "0.4.3.7"; + sha256 = "4f621eea6793307fb025ac9738f273c61c0e643f604bd2489b2bdf6fc06639d7"; + libraryHaskellDepends = [ + acid-state aeson attoparsec base clckwrks containers directory + filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl + old-locale random reform reform-happstack reform-hsp safecopy + tagsoup template-haskell text time time-locale-compat uuid + uuid-orphans web-plugins web-routes web-routes-happstack + web-routes-th + ]; + homepage = "http://www.clckwrks.com/"; + description = "support for CMS/Blogging in clckwrks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clckwrks-theme-bootstrap" = callPackage ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins @@ -41238,6 +41360,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clckwrks-theme-bootstrap_0_4_2_1" = callPackage + ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp + , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins + }: + mkDerivation { + pname = "clckwrks-theme-bootstrap"; + version = "0.4.2.1"; + sha256 = "44c1fda59c72b807c4abe63d19c98de1b0523d78dd3392bb68064dd3f18878d6"; + libraryHaskellDepends = [ + base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro + mtl text web-plugins + ]; + homepage = "http://www.clckwrks.com/"; + description = "simple bootstrap based template for clckwrks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clckwrks-theme-clckwrks" = callPackage ({ mkDerivation, base, clckwrks, containers, happstack-authenticate , hsp, hsx2hs, mtl, text, web-plugins @@ -41531,8 +41671,8 @@ self: { }: mkDerivation { pname = "clit"; - version = "0.1.1.0"; - sha256 = "fc9feafd9f09fe9899af922c6a230d658b675621e5a5fe4da77af916a2ccca6f"; + version = "0.1.1.1"; + sha256 = "bb2be5226f6659b709b87ebe593c7c1a2b9447d2b681dc9c97130254ba4e4a61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43789,6 +43929,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "concurrent-output_1_7_8" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix + }: + mkDerivation { + pname = "concurrent-output"; + version = "1.7.8"; + sha256 = "8c9b0ab30ff9ea930039efcd9cc3d8541f0647c617afc17370de9de793ca9a6f"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix + ]; + description = "Ungarble output from several threads or commands"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-rpc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -44961,15 +45118,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "containers_0_5_8_1" = callPackage + "containers_0_5_9_1" = callPackage ({ mkDerivation, array, base, ChasingBottoms, deepseq, ghc-prim , HUnit, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers }: mkDerivation { pname = "containers"; - version = "0.5.8.1"; - sha256 = "f7e65874f5592c7fd7c24aaca67d8ccf87887e5a69ea8e97890c40c3bb07f142"; + version = "0.5.9.1"; + sha256 = "132d2ab0d56a631fc883bc843c5661380135e19992f724897d24cf6ead450a23"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck @@ -48268,6 +48425,7 @@ self: { homepage = "https://github.com/mrkkrp/cue-sheet"; description = "Support for construction, rendering, and parsing of CUE sheets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cufft" = callPackage @@ -50788,8 +50946,8 @@ self: { }: mkDerivation { pname = "datasets"; - version = "0.2.2"; - sha256 = "d79ae10e42a208a4413f8b4851c18cff671ec0f578108f2f71bbf7cba215f127"; + version = "0.2.3"; + sha256 = "f155d4aea31d03fd14c7050793d9e90685ba8858460ce7c3716919bd00c12ea4"; libraryHaskellDepends = [ aeson base bytestring cassava directory file-embed filepath hashable microlens stringsearch text time vector wreq @@ -51711,15 +51869,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "declarative_0_3_4" = callPackage + "declarative_0_4_0" = callPackage ({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types , mighty-metropolis, mwc-probability, pipes, primitive , speedy-slice, transformers }: mkDerivation { pname = "declarative"; - version = "0.3.4"; - sha256 = "4d731ea4199f322fa8028a44ed3e5155e2ae58f27542f1e8a8f0ee4116ec226b"; + version = "0.4.0"; + sha256 = "e771c452cbc7f91b67d078a87349de36182fc5e25a9185f18cff7346941c713c"; libraryHaskellDepends = [ base hasty-hamiltonian lens mcmc-types mighty-metropolis mwc-probability pipes primitive speedy-slice transformers @@ -52637,28 +52795,6 @@ self: { }) {}; "deriving-compat" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-boot-th, ghc-prim, hspec, QuickCheck, template-haskell - , transformers, transformers-compat - }: - mkDerivation { - pname = "deriving-compat"; - version = "0.3.4"; - sha256 = "77c68a5c69be9c4385a163501da2d8dacf590a3d948bb1d01f570ef4abb0bf3d"; - libraryHaskellDepends = [ - base containers ghc-boot-th ghc-prim template-haskell transformers - transformers-compat - ]; - testHaskellDepends = [ - base base-compat base-orphans hspec QuickCheck template-haskell - transformers transformers-compat - ]; - homepage = "https://github.com/haskell-compat/deriving-compat"; - description = "Backports of GHC deriving extensions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "deriving-compat_0_3_5" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, QuickCheck, tagged , template-haskell, transformers, transformers-compat @@ -52678,7 +52814,6 @@ self: { homepage = "https://github.com/haskell-compat/deriving-compat"; description = "Backports of GHC deriving extensions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derp" = callPackage @@ -53881,6 +54016,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diff3_0_3_0" = callPackage + ({ mkDerivation, base, Diff, QuickCheck, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "diff3"; + version = "0.3.0"; + sha256 = "8dc57a5f7070efe7227d3afaf5cf4d084c134e2cc0426e98421cdb720cacea25"; + libraryHaskellDepends = [ base Diff ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + homepage = "http://github.com/ocharles/diff3.git"; + description = "Perform a 3-way difference of documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diffarray" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -54583,6 +54736,7 @@ self: { homepage = "http://brandon.si/code/directory-tree-module-released/"; description = "A simple directory-like tree datatype, with useful IO functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dirfiles" = callPackage @@ -56228,25 +56382,6 @@ self: { }) {}; "double-conversion" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, integer-gmp - , test-framework, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "double-conversion"; - version = "2.0.1.0"; - sha256 = "0072b5b05631081c2eb73cda9dd660e384a7e988d3867b8b05540ef7648a920c"; - libraryHaskellDepends = [ - base bytestring ghc-prim integer-gmp text - ]; - testHaskellDepends = [ - base bytestring test-framework test-framework-quickcheck2 text - ]; - homepage = "https://github.com/bos/double-conversion"; - description = "Fast conversion between double precision floating point and text"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "double-conversion_2_0_2_0" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, HUnit, test-framework , test-framework-hunit, test-framework-quickcheck2, text }: @@ -56262,7 +56397,6 @@ self: { homepage = "https://github.com/bos/double-conversion"; description = "Fast conversion between double precision floating point and text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "double-metaphone" = callPackage @@ -56687,6 +56821,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "drifter-postgresql_0_1_0" = callPackage + ({ mkDerivation, base, containers, drifter, either, mtl + , postgresql-simple, tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "drifter-postgresql"; + version = "0.1.0"; + sha256 = "10df8309986c23f947949a28f9fb16ec6632f1d509ab0fe010a74f9068b90325"; + libraryHaskellDepends = [ + base containers drifter either mtl postgresql-simple time + ]; + testHaskellDepends = [ + base drifter either postgresql-simple tasty tasty-hunit text + ]; + homepage = "http://github.com/michaelxavier/drifter-postgresql"; + description = "PostgreSQL support for the drifter schema migration tool"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "drmaa" = callPackage ({ mkDerivation, base, drmaa, inline-c, shelly, text }: mkDerivation { @@ -64342,15 +64496,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "flat-mcmc_1_4_2" = callPackage + "flat-mcmc_1_5_0" = callPackage ({ mkDerivation, base, formatting, mcmc-types, monad-par , monad-par-extras, mwc-probability, pipes, primitive, text , transformers, vector }: mkDerivation { pname = "flat-mcmc"; - version = "1.4.2"; - sha256 = "0da3a4fc0d29b994c7aa8a9e5d3f902f15e5a61bde143300438ecaa2318631fa"; + version = "1.5.0"; + sha256 = "87cea9deac6e2d32d9984741ba222ccb2fb0d5f8c58e843684476bfe7632f1fd"; libraryHaskellDepends = [ base formatting mcmc-types monad-par monad-par-extras mwc-probability pipes primitive text transformers vector @@ -69736,8 +69890,8 @@ self: { ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.7.0.3"; - sha256 = "e2c65cfafc438029ef8e9ad504ca01e9c92168d9e6f863411a3e8c6ea62cde33"; + version = "0.7.0.4"; + sha256 = "1c9e57e7de17179c2aca7c6a0417304fa2229b498431f1137dc0a606d8315bac"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; @@ -69779,8 +69933,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.7.0.3"; - sha256 = "77ecc2d8ee887d4a35cf6161106e278613fe7552569af3a49f136c64dddde0be"; + version = "0.7.0.4"; + sha256 = "2a44162bf30cb0ebee18b76db5831804add52d3a4bba4c183d0229b975c15619"; isLibrary = false; isExecutable = false; description = "DOM library using JSFFI and GHCJS"; @@ -70838,10 +70992,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.3.8.0"; - sha256 = "938391f36b50a5fafe7f2668f25d08a4db77cdcc43cb6b15644dedfb81ed7625"; - revision = "1"; - editedCabalFile = "39afd3a71efabe33c2a2f5d3fd11906a0f8e1e8c4931acc230c8a9794ef6d676"; + version = "0.3.9.1"; + sha256 = "28f26b37cd2daedd841516f0e538877f84932a9813096a34e8c820de44c0323c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71252,6 +71404,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "git-mediate" = callPackage + ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory + , filepath, mtl, optparse-applicative, process, unix + }: + mkDerivation { + pname = "git-mediate"; + version = "1.0"; + sha256 = "0ec4f74b30997f05059ac4dc1433a3618cd40240bbb93b6ec434d90f40390790"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base base-compat Diff directory filepath mtl + optparse-applicative process unix + ]; + homepage = "https://github.com/ElastiLotem/git-mediate"; + description = "Remove trivial conflict markers in a git repository"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "git-monitor" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , gitlib, gitlib-libgit2, lifted-async, logging, old-locale @@ -72148,26 +72319,24 @@ self: { }) {}; "glirc" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring, Cabal - , config-value, containers, data-default-class, directory, filepath - , gitrev, hashable, hookup, HsOpenSSL, HUnit, irc-core - , kan-extensions, lens, memory, network, process, regex-tdfa, socks - , split, stm, text, time, transformers, unix, unordered-containers - , vector, vty + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , bytestring, Cabal, config-value, containers, data-default-class + , directory, filepath, gitrev, hashable, hookup, HsOpenSSL, HUnit + , irc-core, kan-extensions, lens, network, process, regex-tdfa + , socks, split, stm, text, time, transformers, unix + , unordered-containers, vector, vty }: mkDerivation { pname = "glirc"; - version = "2.20.1.1"; - sha256 = "63f0f8d82ea8d2f90103faf9ccd9fa301275b9400bbf1c3db62f8c51cbfa40fe"; - revision = "3"; - editedCabalFile = "d9ff6df2f3d84db85981806342ea6a4022a155283f9d4569753ac7ecf5535005"; + version = "2.20.2"; + sha256 = "acefc316a6075dbeb2fa95bf1ee99a8e4c3097eaf5be9273d676719d07a94b00"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ - async attoparsec base bytestring config-value containers - data-default-class directory filepath gitrev hashable hookup - HsOpenSSL irc-core kan-extensions lens memory network process + async attoparsec base base64-bytestring bytestring config-value + containers data-default-class directory filepath gitrev hashable + hookup HsOpenSSL irc-core kan-extensions lens network process regex-tdfa socks split stm text time transformers unix unordered-containers vector vty ]; @@ -85297,6 +85466,7 @@ self: { homepage = "http://bitbucket.org/sras/hastily"; description = "A program to download subtitle files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasty-hamiltonian" = callPackage @@ -85316,6 +85486,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasty-hamiltonian_1_2_0" = callPackage + ({ mkDerivation, ad, base, lens, mcmc-types, mwc-probability, pipes + , primitive, transformers + }: + mkDerivation { + pname = "hasty-hamiltonian"; + version = "1.2.0"; + sha256 = "602e6bff253cae2151b6c4eb8c81a19dc0a2525bf63bdbd5b12396358548cdda"; + libraryHaskellDepends = [ + base lens mcmc-types mwc-probability pipes primitive transformers + ]; + testHaskellDepends = [ ad base mwc-probability ]; + homepage = "http://github.com/jtobin/hasty-hamiltonian"; + description = "Speedy traversal through parameter space"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hat" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskeline, haskell-src-exts, old-locale, old-time, polyparse @@ -89091,6 +89279,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hip_1_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour + , deepseq, directory, filepath, hspec, JuicyPixels, netpbm + , primitive, process, QuickCheck, repa, temporary, vector + }: + mkDerivation { + pname = "hip"; + version = "1.3.0.0"; + sha256 = "ee4e288bcb2ab1937d3eaa5bcf8017bff07debc8aeda3e768fe542923696b9bf"; + libraryHaskellDepends = [ + base bytestring Chart Chart-diagrams colour deepseq directory + filepath JuicyPixels netpbm primitive process repa temporary vector + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/lehins/hip"; + description = "Haskell Image Processing (HIP) Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hipbot" = callPackage ({ mkDerivation, aeson, base, bifunctors, blaze-builder, bytestring , either, exceptions, http-client, http-client-tls, http-types, jwt @@ -91991,8 +92199,8 @@ self: { }: mkDerivation { pname = "horname"; - version = "0.1.0.0"; - sha256 = "f895b2d91dd1b33bf51a04f92a4d0c295286eccfdab1df3e178b6ea8774fb290"; + version = "0.1.3.0"; + sha256 = "e9a6cfb0ba87f063f04a7273d476b200905625ce60b00d87c8995332b1b7f218"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92536,6 +92744,7 @@ self: { homepage = "https://github.com/guillaume-nargeot/hpc-coveralls"; description = "Coveralls.io support for Haskell."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpc-strobe" = callPackage @@ -96104,6 +96313,7 @@ self: { homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; description = "Write end2end web application tests using webdriver and hspec"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec2" = callPackage @@ -103147,14 +103357,14 @@ self: { }: mkDerivation { pname = "interlude-l"; - version = "0.1.0.7"; - sha256 = "0cef80ef63038b398438f8e3ab60760ef17fab380f5d8534d595237a07cb0bb7"; + version = "0.1.0.8"; + sha256 = "5eb16c248a0528543702ae17452c8cdb31d525f1bc95b4e9ea146682fab93100"; libraryHaskellDepends = [ aeson base exceptions lens monad-control MonadRandom mtl protolude string-conv text transformers witherable ]; description = "Prelude replacement based on protolude"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; }) {}; "intern" = callPackage @@ -104077,16 +104287,16 @@ self: { }) {}; "irc-core" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hashable, HUnit - , memory, primitive, text, time, vector + ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring + , hashable, HUnit, primitive, text, time, vector }: mkDerivation { pname = "irc-core"; - version = "2.2.0.0"; - sha256 = "2e491a8a9d3c0dbb3413c8bebc1e37d0636d2cb8367f4b257141f891107b4834"; + version = "2.2.0.1"; + sha256 = "6c160d1073ee40b12d294f1e4dbb4691aedb73150eebf027475db05ce1efa20a"; libraryHaskellDepends = [ - attoparsec base bytestring hashable memory primitive text time - vector + attoparsec base base64-bytestring bytestring hashable primitive + text time vector ]; testHaskellDepends = [ base hashable HUnit text ]; homepage = "https://github.com/glguy/irc-core"; @@ -104264,8 +104474,8 @@ self: { }: mkDerivation { pname = "iridium"; - version = "0.1.5.5"; - sha256 = "161d533ebde52dd4854a8d8e46f1d4c506178a94672a61948f1f70ed6db1b726"; + version = "0.1.5.6"; + sha256 = "18a0ee5f08996a263dcf484bb48749d6a3df502729a7c386b5b7133b80f23577"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104278,7 +104488,7 @@ self: { base extra multistate text transformers unordered-containers yaml ]; homepage = "https://github.com/lspitzner/iridium"; - description = "Automated Local Testing and Package Uploading"; + description = "Automated Local Cabal Package Testing and Uploading"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -104771,6 +104981,8 @@ self: { pname = "ivory"; version = "0.1.0.5"; sha256 = "437d5bc2fa69037e6fa5beb7d0a7b27f4d7e92404531b698be5a84946294a158"; + revision = "1"; + editedCabalFile = "0fa37aeb8c009a31030e0fe7fbb278907c41909c0f06d74b9942adbf58fc446f"; libraryHaskellDepends = [ array base base-compat containers dlist filepath monadLib pretty template-haskell text th-lift @@ -104808,6 +105020,8 @@ self: { pname = "ivory-backend-c"; version = "0.1.0.5"; sha256 = "e07d69634f6b50145f51886b87b7556bd6eb01e21bcd6476f849071a1120e535"; + revision = "1"; + editedCabalFile = "d628f3ab8d4d61816af6f9ff9fb34bf8cbcf28d2ff75246aa86303a59c457d1a"; libraryHaskellDepends = [ base base-compat bytestring containers directory filepath ivory ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib @@ -104868,6 +105082,8 @@ self: { pname = "ivory-examples"; version = "0.1.0.5"; sha256 = "539b65b7068f7dbcb128401ac4ec8c08ee2a0db074087cd923bbf38daf530356"; + revision = "1"; + editedCabalFile = "a83f6151b08ade845ef527ad07fcee41ac20bc02ba02fc8ee3786c278685da39"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -112348,26 +112564,26 @@ self: { "liblawless" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, binary , boomerang, bytestring, containers, containers-unicode-symbols - , contravariant, data-default, data-textual, directory, dns - , exceptions, filepath, hjsonschema, lens, machines, mtl, network - , network-ip, parsers, protolude, QuickCheck, random, semigroups - , stm, stm-containers, temporary, test-framework + , contravariant, data-default, data-textual, dns, exceptions + , filepath, hjsonschema, lens, machines, mtl, network, network-ip + , parsers, pathtype, protolude, QuickCheck, random, semigroups, stm + , stm-containers, temporary, test-framework , test-framework-quickcheck2, test-framework-th, text, text-icu , text-icu-normalized, text-printer, time, transformers, zippers }: mkDerivation { pname = "liblawless"; - version = "0.16.0"; - sha256 = "4cca43195f8b30c0aa06840d402a61e2af1592b61c89aadf369f6390e841a856"; + version = "0.16.1"; + sha256 = "9598c6e717b1118057190f6a6f15977903956df374812e94049e78866b40578a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base-unicode-symbols binary boomerang bytestring containers containers-unicode-symbols contravariant data-default - data-textual directory dns exceptions filepath hjsonschema lens - machines mtl network network-ip parsers protolude QuickCheck random - semigroups stm stm-containers temporary text text-icu - text-icu-normalized text-printer time transformers zippers + data-textual dns exceptions hjsonschema lens machines mtl network + network-ip parsers pathtype protolude QuickCheck random semigroups + stm stm-containers temporary text text-icu text-icu-normalized + text-printer time transformers zippers ]; testHaskellDepends = [ aeson base binary bytestring exceptions filepath network QuickCheck @@ -113840,18 +114056,18 @@ self: { }) {}; "liquid" = callPackage - ({ mkDerivation, aeson, attoparsec, base, lens, lens-aeson, mtl - , QuickCheck, scientific, semigroups, tasty, tasty-hunit - , tasty-quickcheck, tasty-th, text, unordered-containers - , validation, vector + ({ mkDerivation, aeson, attoparsec, base, hashable, lens + , lens-aeson, mtl, QuickCheck, scientific, semigroups, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, text + , unordered-containers, validation, vector }: mkDerivation { pname = "liquid"; - version = "0.1.0.2"; - sha256 = "7679068f8753564b193df76ad32680e59214a4e04c2f45869e57d7dcabc741b9"; + version = "0.1.0.3"; + sha256 = "c14d1b3dfbabbc4892369a24f67d29f3a172e9de87ac0132bf3121f86bcee90b"; libraryHaskellDepends = [ - aeson attoparsec base lens lens-aeson mtl scientific semigroups - text unordered-containers validation vector + aeson attoparsec base hashable lens lens-aeson mtl scientific + semigroups text unordered-containers validation vector ]; testHaskellDepends = [ aeson attoparsec base lens lens-aeson mtl QuickCheck scientific @@ -114498,8 +114714,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.7"; - sha256 = "5f2e1fb4a4b8960ff7e10db014de90706e5d10504f88f89dbd8869f9d5921f20"; + version = "0.7.0.1"; + sha256 = "4928e405deff09451edce864558ce7b3276549ca7f1d71dac118dcbcafe15573"; libraryHaskellDepends = [ base containers cpuid llvm-tf non-empty tfp transformers unsafe utility-ht @@ -116612,8 +116828,8 @@ self: { }: mkDerivation { pname = "machinecell"; - version = "3.3.0"; - sha256 = "22c6cb0f81a4290e72d0fa266b71f094a6377cdc6518833a11dcc8cf8d131932"; + version = "3.3.1"; + sha256 = "5911832fa471797e5cbc5b4c98c1078f0bad799ba8cb33dbf0e19c6fae35619c"; libraryHaskellDepends = [ arrows base free mtl profunctors semigroups transformers ]; @@ -117505,6 +117721,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mandrill_0_5_3_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-html + , bytestring, containers, email-validate, http-client + , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck + , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time + , unordered-containers + }: + mkDerivation { + pname = "mandrill"; + version = "0.5.3.0"; + sha256 = "b022383dfbae3b6281a216924f508d9651849250a6dcadcedc9c30465fc5160d"; + libraryHaskellDepends = [ + aeson base base64-bytestring blaze-html bytestring containers + email-validate http-client http-client-tls http-types lens mtl + old-locale QuickCheck text time unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Library for interfacing with the Mandrill JSON API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mandulia" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, GLUT, hslua, time @@ -119969,6 +120210,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mighty-metropolis_1_1_0" = callPackage + ({ mkDerivation, base, containers, mcmc-types, mwc-probability + , pipes, primitive, transformers + }: + mkDerivation { + pname = "mighty-metropolis"; + version = "1.1.0"; + sha256 = "2a8ac91fe51fa440347ce41edafca463fbf0d822fffca89796250e5e79143f6b"; + libraryHaskellDepends = [ + base mcmc-types mwc-probability pipes primitive transformers + ]; + testHaskellDepends = [ base containers mwc-probability ]; + homepage = "http://github.com/jtobin/mighty-metropolis"; + description = "The Metropolis algorithm"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mikmod" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -124723,6 +124982,7 @@ self: { homepage = "https://github.com/lorenzo/mysql-haskell-nem#readme"; description = "Adds a interface like mysql-simple to mysql-haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-haskell-openssl" = callPackage @@ -126330,8 +126590,8 @@ self: { ({ mkDerivation, base, bytestring, network, text, time, vector }: mkDerivation { pname = "network-carbon"; - version = "1.0.6"; - sha256 = "28e0a72d86be8a21637a62a83273311aab446b1d6e4a13f2638101aa6cd19ef6"; + version = "1.0.7"; + sha256 = "9cb794e29273aedf7f3fba7eed81a6a9f83791809095c22c11bf094a687dc9c0"; libraryHaskellDepends = [ base bytestring network text time vector ]; @@ -126895,6 +127155,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-transport-inmemory_0_5_2" = callPackage + ({ mkDerivation, base, bytestring, containers, data-accessor + , network-transport, network-transport-tests, stm + }: + mkDerivation { + pname = "network-transport-inmemory"; + version = "0.5.2"; + sha256 = "8245d795330157d90ad9de599854d119c6d8938a45ab8c4ec89f3160b2e9ef4e"; + libraryHaskellDepends = [ + base bytestring containers data-accessor network-transport stm + ]; + testHaskellDepends = [ + base network-transport network-transport-tests + ]; + homepage = "http://haskell-distributed.github.com"; + description = "In-memory instantiation of Network.Transport"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-transport-tcp" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , network, network-transport, network-transport-tests @@ -127238,6 +127518,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nfc" = callPackage + ({ mkDerivation, base, bytestring, c2hs, nfc }: + mkDerivation { + pname = "nfc"; + version = "0.0.1"; + sha256 = "524f46e2ccaacf26cd6058fbd7b1e9a27aa62a3338154d9209aa3b49d011d731"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ nfc ]; + libraryToolDepends = [ c2hs ]; + homepage = "https://github.com/centromere/nfc#readme"; + description = "libnfc bindings"; + license = stdenv.lib.licenses.publicDomain; + }) {nfc = null;}; + "ngrams-loader" = callPackage ({ mkDerivation, attoparsec, base, machines, mtl, parseargs , resourcet, sqlite-simple, text @@ -128823,15 +129117,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "octane_0_18_0" = callPackage + "octane_0_18_1" = callPackage ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers , data-default-class, file-embed, http-client, http-client-tls , overloaded-records, rattletrap, text }: mkDerivation { pname = "octane"; - version = "0.18.0"; - sha256 = "cf92a63584772d60388b550d93d73f08bac3a26b21c4ad2dc6003837e1e9674f"; + version = "0.18.1"; + sha256 = "0531b90b093b4e89f183801cdf7c4220adf7c118d90aba00db2968d3e0b7604b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130532,17 +130826,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-generic_1_1_3" = callPackage - ({ mkDerivation, base, bytestring, optparse-applicative + "optparse-generic_1_1_4" = callPackage + ({ mkDerivation, base, bytestring, optparse-applicative, semigroups , system-filepath, text, time, transformers, void }: mkDerivation { pname = "optparse-generic"; - version = "1.1.3"; - sha256 = "aa999234f55296f2c82a05f2ba9e7e418065ae60c826569e6590f021be7321a0"; + version = "1.1.4"; + sha256 = "dc69bc73d6e3de52bcc5c4ccd8ce741eebb8d10747bc7f819b38b0cdaf1e520c"; libraryHaskellDepends = [ - base bytestring optparse-applicative system-filepath text time - transformers void + base bytestring optparse-applicative semigroups system-filepath + text time transformers void ]; description = "Auto-generate a command-line parser for your datatype"; license = stdenv.lib.licenses.bsd3; @@ -133606,6 +133900,8 @@ self: { pname = "peano"; version = "0.1.0.1"; sha256 = "31fdd23993a76155738224a7b230a1a6fcfde091b2fbc945df4cb54068eeec7b"; + revision = "1"; + editedCabalFile = "544dd9ba3e8a67303b376ebcd5c000bdcd977c67475c058a2579be75ce8ec469"; libraryHaskellDepends = [ base ]; description = "Peano numbers"; license = "unknown"; @@ -134793,23 +135089,6 @@ self: { }) {}; "pgp-wordlist" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, tasty - , tasty-hunit, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "pgp-wordlist"; - version = "0.1.0.1"; - sha256 = "a3dde976bc94fc83e8dce20cdafe673f5afdc741ac0360098ee8b415a0436d88"; - libraryHaskellDepends = [ base bytestring containers text vector ]; - testHaskellDepends = [ - base bytestring HUnit tasty tasty-hunit tasty-quickcheck text - ]; - homepage = "https://github.com/quchen/pgp-wordlist"; - description = "Translate between binary data and a human-readable collection of words"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pgp-wordlist_0_1_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , HUnit, tasty, tasty-hunit, tasty-quickcheck, text, vector }: @@ -134825,7 +135104,6 @@ self: { homepage = "https://github.com/quchen/pgp-wordlist"; description = "Translate between binary data and a human-readable collection of words"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgsql-simple" = callPackage @@ -135485,14 +135763,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pipes_4_3_1" = callPackage + "pipes_4_3_2" = callPackage ({ mkDerivation, base, exceptions, mmorph, mtl, QuickCheck , test-framework, test-framework-quickcheck2, transformers }: mkDerivation { pname = "pipes"; - version = "4.3.1"; - sha256 = "35a6e296e04f992bcda28ffedf1774e23c866b6ac79025f50ee5226bda3fd001"; + version = "4.3.2"; + sha256 = "7957bb290db7f1dfad0581f363ab97fcd58f7c0b916e1114464cb9a398b8334a"; libraryHaskellDepends = [ base exceptions mmorph mtl transformers ]; @@ -135671,6 +135949,7 @@ self: { homepage = "https://github.com/centromere/pipes-cacophony"; description = "Pipes for Noise-secured network connections"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-cellular" = callPackage @@ -135953,6 +136232,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-http_1_0_5" = callPackage + ({ mkDerivation, base, bytestring, http-client, http-client-tls + , pipes + }: + mkDerivation { + pname = "pipes-http"; + version = "1.0.5"; + sha256 = "49a196466de1638f3806a49bf10fef9eb3c06456ababf09ffd025b6b64f23055"; + libraryHaskellDepends = [ + base bytestring http-client http-client-tls pipes + ]; + description = "HTTP client with pipes interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-illumina" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, pipes , pipes-bgzf @@ -138848,6 +139143,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "preamble" = callPackage + ({ mkDerivation, aeson, base, basic-prelude, exceptions + , fast-logger, lens, monad-control, monad-logger, mtl, resourcet + , safe, shake, template-haskell, text, text-manipulate, time + , transformers-base, unordered-containers + }: + mkDerivation { + pname = "preamble"; + version = "0.0.3"; + sha256 = "5a4a1a4fa8dcad02d6afbdc99b44d4f9e94571b48b88115b7d1ebb266f776a73"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base basic-prelude exceptions fast-logger lens monad-control + monad-logger mtl resourcet safe template-haskell text + text-manipulate time transformers-base unordered-containers + ]; + executableHaskellDepends = [ base basic-prelude shake ]; + homepage = "https://github.com/swift-nav/preamble"; + description = "Yet another prelude"; + license = stdenv.lib.licenses.mit; + }) {}; + "precis" = callPackage ({ mkDerivation, base, Cabal, containers, cpphs, directory , filepath, haskell-src-exts, xhtml @@ -139403,15 +139721,16 @@ self: { }) {}; "pretty-simple" = callPackage - ({ mkDerivation, base, doctest, Glob, lens, mono-traversable, mtl - , parsec, semigroups, transformers + ({ mkDerivation, ansi-terminal, base, doctest, Glob, lens + , mono-traversable, mtl, parsec, semigroups, transformers }: mkDerivation { pname = "pretty-simple"; - version = "0.1.0.0"; - sha256 = "baaf4d5d8aba866e2419b66a67ed3b55a35f9e8e1f40c6c77e2dab21dda1caae"; + version = "0.2.0.0"; + sha256 = "f4f9141b0b816ad56918bb92daba2b62295207eb3119afcc3c2baf2ae46bb4d3"; libraryHaskellDepends = [ - base lens mono-traversable mtl parsec semigroups transformers + ansi-terminal base lens mono-traversable mtl parsec semigroups + transformers ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/cdepillabout/pretty-simple"; @@ -142239,8 +142558,8 @@ self: { }: mkDerivation { pname = "qr-imager"; - version = "0.1.0.0"; - sha256 = "400145049487f03edc3d249bf44afa596db328e98f1e616c378a83f32fbd129a"; + version = "0.1.0.1"; + sha256 = "2936851586f3e63e7e4aa589d06d88cb6968f5e2c5861f71df62a89fc43d7ef9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144212,8 +144531,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "2.0.0"; - sha256 = "a58e5c7b1c5e8318ab552ac204248075cf1d8adb6024555f0b06d99de6c750ba"; + version = "2.1.0"; + sha256 = "d969cf852a2210f11a51f21b75f3c16a47a0dc92b695a6ae11c9287ddfe30588"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147844,6 +148163,26 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "resolve-trivial-conflicts_0_3_2_4" = callPackage + ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory + , filepath, mtl, optparse-applicative, process, unix + }: + mkDerivation { + pname = "resolve-trivial-conflicts"; + version = "0.3.2.4"; + sha256 = "62c38ac7859b1f2201e0e79dbfc5d3446b4fb2fd4164cef8c016093f79ae2221"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base base-compat Diff directory filepath mtl + optparse-applicative process unix + ]; + homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts"; + description = "Remove trivial conflict markers in a git repository"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "resource-effect" = callPackage ({ mkDerivation, base, containers, extensible-effects, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -147966,6 +148305,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "resourcet_1_1_9" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, lifted-base + , mmorph, monad-control, mtl, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "resourcet"; + version = "1.1.9"; + sha256 = "5a1999d26b896603cab8121b77f36723dc50960291872b691ff4a9533e162ef5"; + libraryHaskellDepends = [ + base containers exceptions lifted-base mmorph monad-control mtl + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ base hspec lifted-base transformers ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "respond" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-default-class, exceptions, fast-logger, formatting, HList @@ -149145,7 +149504,7 @@ self: { homepage = "http://github.com/agrafix/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }) {inherit (pkgs) rocksdb;}; "roguestar" = callPackage @@ -151581,6 +151940,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "schema" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "schema"; + version = "0.0.1"; + sha256 = "27466a6eaa757f9f3d2556cff139f64c27e5eb9ff81627fa118467607b92a70c"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://toktok.github.io/"; + description = "Encoding-independent schemas for Haskell data types"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "scholdoc" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, blaze-html , blaze-markup, bytestring, containers, data-default, Diff @@ -154201,19 +154573,19 @@ self: { }) {}; "servant-elm" = callPackage - ({ mkDerivation, aeson, base, data-default, directory, elm-export - , formatting, hspec, interpolate, lens, mockery, process, servant - , servant-foreign, text + ({ mkDerivation, aeson, base, data-default, Diff, directory + , elm-export, hspec, HUnit, interpolate, lens, mockery, process + , servant, servant-foreign, text, wl-pprint-text }: mkDerivation { pname = "servant-elm"; - version = "0.2.0.0"; - sha256 = "0a120bc909b14390ef43db690f050b6afd1b9ac72a25586c5734e007c2ea4fda"; + version = "0.3.0.0"; + sha256 = "fc502005a21cb91845c069366f60ddfa77deeb95cb6571bcd2df172e5285439b"; libraryHaskellDepends = [ - base elm-export formatting lens servant servant-foreign text + base elm-export lens servant servant-foreign text wl-pprint-text ]; testHaskellDepends = [ - aeson base data-default directory elm-export formatting hspec + aeson base data-default Diff directory elm-export hspec HUnit interpolate mockery process servant text ]; homepage = "http://github.com/mattjbray/servant-elm#readme"; @@ -154871,6 +155243,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-swagger-ui_0_2_1_2_2_8" = callPackage + ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring + , directory, file-embed, filepath, http-media, lens, servant + , servant-blaze, servant-server, servant-swagger, swagger2 + , template-haskell, text, transformers, transformers-compat, wai + , wai-app-static, warp + }: + mkDerivation { + pname = "servant-swagger-ui"; + version = "0.2.1.2.2.8"; + sha256 = "21a25df5c3527a859a14ae2edf12116d8634e7be1587357f4545f31fc5acb3a4"; + libraryHaskellDepends = [ + base blaze-markup bytestring directory file-embed filepath + http-media servant servant-blaze servant-server servant-swagger + swagger2 template-haskell text transformers transformers-compat + wai-app-static + ]; + testHaskellDepends = [ + aeson base base-compat blaze-markup bytestring directory file-embed + filepath http-media lens servant servant-blaze servant-server + servant-swagger swagger2 template-haskell text transformers + transformers-compat wai wai-app-static warp + ]; + homepage = "https://github.com/phadej/servant-swagger-ui#readme"; + description = "Servant swagger ui"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-yaml" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, http-media , servant, servant-server, wai, warp, yaml @@ -155392,8 +155793,8 @@ self: { ({ mkDerivation, base, bytestring, template-haskell, text }: mkDerivation { pname = "sext"; - version = "0.1.0.2"; - sha256 = "b5101154373eac70dee9d56854333ea33735a88b7697f2877846c746dd048c3a"; + version = "0.1.1"; + sha256 = "d954401c7c416ff8d6c8783c074c061f8268fb0042d553253afd82881284151d"; libraryHaskellDepends = [ base bytestring template-haskell text ]; homepage = "http://github.com/dzhus/sext/"; description = "Lists, Texts and ByteStrings with type-encoded length"; @@ -158996,6 +159397,7 @@ self: { homepage = "http://snapframework.com/"; description = "Snap dynamic loader"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-loader-static" = callPackage @@ -159108,6 +159510,7 @@ self: { homepage = "http://snapframework.com/"; description = "Scaffolding CLI for the Snap Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-testing" = callPackage @@ -159868,6 +160271,7 @@ self: { homepage = "https://github.com/nurpax/snaplet-sqlite-simple-jwt-auth#readme"; description = "Snaplet for JWT authentication with snaplet-sqlite-simple"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-stripe" = callPackage @@ -160234,30 +160638,6 @@ self: { }) {}; "soap" = callPackage - ({ mkDerivation, base, bytestring, conduit, configurator - , data-default, exceptions, hspec, http-client, http-types, HUnit - , iconv, mtl, resourcet, text, unordered-containers, xml-conduit - , xml-conduit-writer, xml-types - }: - mkDerivation { - pname = "soap"; - version = "0.2.3.2"; - sha256 = "e7e5d21f70d67f14806a44f7328350d0f06b39ad4cbbc5a514437c5ddfb95395"; - libraryHaskellDepends = [ - base bytestring conduit configurator data-default exceptions - http-client http-types iconv mtl resourcet text - unordered-containers xml-conduit xml-conduit-writer xml-types - ]; - testHaskellDepends = [ - base bytestring hspec HUnit text unordered-containers xml-conduit - xml-conduit-writer - ]; - homepage = "https://bitbucket.org/dpwiz/haskell-soap"; - description = "SOAP client tools"; - license = stdenv.lib.licenses.mit; - }) {}; - - "soap_0_2_3_3" = callPackage ({ mkDerivation, base, bytestring, conduit, configurator , data-default, exceptions, hspec, http-client, http-types, HUnit , iconv, mtl, resourcet, text, unordered-containers, xml-conduit @@ -160279,7 +160659,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "SOAP client tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap-openssl" = callPackage @@ -161256,6 +161635,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "speedy-slice_0_2_0" = callPackage + ({ mkDerivation, base, containers, lens, mcmc-types + , mwc-probability, pipes, primitive, transformers + }: + mkDerivation { + pname = "speedy-slice"; + version = "0.2.0"; + sha256 = "9ae1b3241624bfb5e656347cca1f598ae9b67b1abe23b00ddf8d3d5925234963"; + libraryHaskellDepends = [ + base lens mcmc-types mwc-probability pipes primitive transformers + ]; + testHaskellDepends = [ base containers mwc-probability ]; + homepage = "http://github.com/jtobin/speedy-slice"; + description = "Speedy slice sampling"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "spelling-suggest" = callPackage ({ mkDerivation, base, edit-distance, parseargs, phonetic-code , sqlite @@ -161759,6 +162156,7 @@ self: { ]; description = "Web interface to sproxy database"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sproxy2" = callPackage @@ -161968,6 +162366,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sqlite-simple_0_4_12_1" = 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.12.1"; + sha256 = "2f24f4dfea3b3bc1657b26c786666abd041bb89e09c22d084eaea43d67112227"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sqlite-simple-errors" = callPackage ({ mkDerivation, base, mtl, parsec, sqlite-simple, text }: mkDerivation { @@ -163988,17 +164408,6 @@ self: { }) {}; "storable-endian" = callPackage - ({ mkDerivation, base, byteorder }: - mkDerivation { - pname = "storable-endian"; - version = "0.2.5"; - sha256 = "e206eecf9480e937347ad0663f6c588da490606a1e55b871c68da8c7c1b44112"; - libraryHaskellDepends = [ base byteorder ]; - description = "Storable instances with endianness"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "storable-endian_0_2_6" = callPackage ({ mkDerivation, base, byteorder }: mkDerivation { pname = "storable-endian"; @@ -164007,7 +164416,6 @@ self: { libraryHaskellDepends = [ base byteorder ]; description = "Storable instances with endianness"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "storable-record" = callPackage @@ -168288,23 +168696,6 @@ self: { }) {}; "tasty-ant-xml" = callPackage - ({ mkDerivation, base, containers, generic-deriving, ghc-prim, mtl - , stm, tagged, tasty, transformers, xml - }: - mkDerivation { - pname = "tasty-ant-xml"; - version = "1.0.2"; - sha256 = "bbc3cc6741597af6b158bb54345d7356c98b50eb8b493abd38178a471915ff5d"; - libraryHaskellDepends = [ - base containers generic-deriving ghc-prim mtl stm tagged tasty - transformers xml - ]; - homepage = "http://github.com/ocharles/tasty-ant-xml"; - description = "Render tasty output to XML for Jenkins"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-ant-xml_1_0_3" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers , xml @@ -168320,7 +168711,6 @@ self: { homepage = "http://github.com/ocharles/tasty-ant-xml"; description = "Render tasty output to XML for Jenkins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-dejafu" = callPackage @@ -171605,34 +171995,6 @@ self: { }) {}; "these" = callPackage - ({ mkDerivation, aeson, base, bifunctors, binary, containers - , data-default-class, deepseq, hashable, keys, mtl, profunctors - , QuickCheck, quickcheck-instances, semigroupoids, tasty - , tasty-quickcheck, transformers, transformers-compat - , unordered-containers, vector, vector-instances - }: - mkDerivation { - pname = "these"; - version = "0.7.2"; - sha256 = "a1d22644ca30b0bf549ed9881fcadc9f93fac0ec4815008496ca16e83a966dc8"; - revision = "1"; - editedCabalFile = "f1720c052d70f405e05c3c7a022d25c20afc5391dfbe179e80d3e671311594d8"; - libraryHaskellDepends = [ - aeson base bifunctors binary containers data-default-class deepseq - hashable keys mtl profunctors QuickCheck semigroupoids transformers - transformers-compat unordered-containers vector vector-instances - ]; - testHaskellDepends = [ - aeson base bifunctors binary containers hashable QuickCheck - quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector - ]; - homepage = "https://github.com/isomorphism/these"; - description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "these_0_7_3" = callPackage ({ mkDerivation, aeson, base, bifunctors, binary, containers , data-default-class, deepseq, hashable, keys, mtl, profunctors , QuickCheck, quickcheck-instances, semigroupoids, tasty @@ -171656,7 +172018,6 @@ self: { homepage = "https://github.com/isomorphism/these"; description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thespian" = callPackage @@ -172144,8 +172505,8 @@ self: { }: mkDerivation { pname = "tidal-midi"; - version = "0.8"; - sha256 = "dd8d39af0871a730017c712624fc86ba5c25add7737511610ac849d9d54bcd79"; + version = "0.8.2"; + sha256 = "3638e4d7f853d1a73929624ec34b2364469339b0c821567cf8b46c78971c8339"; libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; @@ -172482,24 +172843,6 @@ self: { }) {}; "time-parsers" = callPackage - ({ mkDerivation, attoparsec, base, bifunctors, parsec, parsers - , tasty, tasty-hunit, template-haskell, text, time - }: - mkDerivation { - pname = "time-parsers"; - version = "0.1.1.0"; - sha256 = "872d2ad4727ed7ac00a06b2acb7d7965da04d432c2d45017805fd4e6975d6ab2"; - libraryHaskellDepends = [ base parsers template-haskell time ]; - testHaskellDepends = [ - attoparsec base bifunctors parsec parsers tasty tasty-hunit - template-haskell text time - ]; - homepage = "https://github.com/phadej/time-parsers#readme"; - description = "Parsers for types in `time`"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "time-parsers_0_1_2_0" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, parsec, parsers , tasty, tasty-hunit, template-haskell, text, time }: @@ -172515,7 +172858,6 @@ self: { homepage = "https://github.com/phadej/time-parsers#readme"; description = "Parsers for types in `time`"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-patterns" = callPackage @@ -179371,30 +179713,6 @@ self: { }) {}; "uuid" = callPackage - ({ mkDerivation, base, binary, bytestring, cryptonite, HUnit - , memory, network-info, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, text, time, uuid-types - }: - mkDerivation { - pname = "uuid"; - version = "1.3.12"; - sha256 = "ed62f1b3f0b19f0d548655ffef5aff066ad5c430fe11e909a1a7e8fc115a89ee"; - revision = "3"; - editedCabalFile = "5444a4c5a15bdfd193d50fa7cc6c248fe18cc18810fb3f878a0e3d4dc81a8f21"; - libraryHaskellDepends = [ - base binary bytestring cryptonite memory network-info random text - time uuid-types - ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck random tasty tasty-hunit - tasty-quickcheck - ]; - homepage = "https://github.com/aslatter/uuid"; - description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "uuid_1_3_13" = callPackage ({ mkDerivation, base, binary, bytestring, cryptohash-md5 , cryptohash-sha1, entropy, HUnit, network-info, QuickCheck, random , tasty, tasty-hunit, tasty-quickcheck, text, time, uuid-types @@ -179414,7 +179732,6 @@ self: { homepage = "https://github.com/hvr/uuid"; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuid-aeson" = callPackage @@ -180937,18 +181254,6 @@ self: { }) {}; "vinyl" = callPackage - ({ mkDerivation, base, doctest, ghc-prim, lens, singletons }: - mkDerivation { - pname = "vinyl"; - version = "0.5.2"; - sha256 = "93ac95aada665057df04bd1316c6eb5bef72479420199ebf34715684afe6a70b"; - libraryHaskellDepends = [ base ghc-prim ]; - testHaskellDepends = [ base doctest lens singletons ]; - description = "Extensible Records"; - license = stdenv.lib.licenses.mit; - }) {}; - - "vinyl_0_5_3" = callPackage ({ mkDerivation, base, doctest, ghc-prim, lens, singletons }: mkDerivation { pname = "vinyl"; @@ -180958,7 +181263,6 @@ self: { testHaskellDepends = [ base doctest lens singletons ]; description = "Extensible Records"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vinyl-gl" = callPackage @@ -182504,6 +182808,7 @@ self: { homepage = "https://github.com/scotty-web/wai-middleware-static"; description = "WAI middleware that serves requests to static files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-static-caching" = callPackage @@ -182657,8 +182962,8 @@ self: { }: mkDerivation { pname = "wai-routes"; - version = "0.9.8"; - sha256 = "4152d74a8b0b762b448b112d391e8b760efb7b71444c5b9f58ed714d87331071"; + version = "0.9.9"; + sha256 = "dea8b6b8163fe04bf0ffb9f5a81058eef2017591275735aba7ae448edf689cc9"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive containers cookie data-default-class filepath http-types mime-types @@ -183222,6 +183527,7 @@ self: { homepage = "https://github.com/mrkkrp/wave"; description = "Work with WAVE and RF64 files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wavefront" = callPackage @@ -183392,10 +183698,8 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1"; - sha256 = "8973080f0a59429cf97ed1ac0d1060b864f6a25f577c3e150ff0f0a3635ac8fa"; - revision = "1"; - editedCabalFile = "7e68be5f41dbc5f47d7f38f017f0f676eaf962a8fa56142ce491c8882165d28d"; + version = "0.1.1"; + sha256 = "ee4f71874d82c1868fff17a2276363454594f898f5db8c8c210479e5a5383b9a"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text @@ -183616,19 +183920,18 @@ self: { }) {}; "web3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring, binary - , bytestring, cryptonite, data-default-class, http-client - , http-client-tls, memory, mtl, template-haskell, text - , transformers, vector + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, cryptonite, data-default-class, http-client, memory + , mtl, template-haskell, text, transformers, vector }: mkDerivation { pname = "web3"; - version = "0.3.2.1"; - sha256 = "1764b645a09a6a5fdcec05f100cd7c36a542c612da624345100662535783d2b3"; + version = "0.3.4.0"; + sha256 = "64218b2f2f2319fe137834bbb012e948444f80f88e3da03ee6ecff06b5ecfe27"; libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring binary bytestring - cryptonite data-default-class http-client http-client-tls memory - mtl template-haskell text transformers vector + aeson attoparsec base base16-bytestring bytestring cryptonite + data-default-class http-client memory mtl template-haskell text + transformers vector ]; testHaskellDepends = [ base memory text ]; homepage = "https://github.com/airalab/hs-web3#readme"; @@ -183790,6 +184093,7 @@ self: { homepage = "https://github.com/kallisti-dev/hs-webdriver"; description = "a Haskell client for the Selenium WebDriver protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webdriver-angular" = callPackage @@ -183812,6 +184116,7 @@ self: { homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webdriver-snoy" = callPackage @@ -184967,16 +185272,16 @@ self: { , conduit-combinators, conduit-extra, directory, exceptions , fast-logger, filemanip, formatting, http-conduit, http-types , lens, lifted-async, lifted-base, monad-control, monad-logger, mtl - , mtl-compat, optparse-applicative, optparse-generic, process - , regex-applicative, regex-compat, resourcet, safe, shake, shelly - , system-filepath, tasty, tasty-hunit, template-haskell, text - , text-manipulate, time, transformers, transformers-base + , mtl-compat, optparse-applicative, optparse-generic, preamble + , process, regex-applicative, regex-compat, resourcet, safe, shake + , shelly, system-filepath, tasty, tasty-hunit, template-haskell + , text, text-manipulate, time, transformers, transformers-base , unordered-containers, uuid, yaml, zlib }: mkDerivation { pname = "wolf"; - version = "0.3.0"; - sha256 = "ec7b4b7f3a8eca648d1b31c637dfac10c40a80afc0d72649cdf0308e1170fcc8"; + version = "0.3.1"; + sha256 = "441d7c82cca74e12fd097ebb3b4d5e3c7b2e3dff4145e65e00a9fd9f57ee224b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184984,9 +185289,10 @@ self: { basic-prelude bytestring conduit conduit-combinators conduit-extra directory exceptions fast-logger filemanip formatting http-conduit http-types lens lifted-async lifted-base monad-control monad-logger - mtl mtl-compat optparse-applicative process regex-applicative - regex-compat resourcet safe template-haskell text text-manipulate - time transformers transformers-base unordered-containers uuid yaml + mtl mtl-compat optparse-applicative preamble process + regex-applicative regex-compat resourcet safe template-haskell text + text-manipulate time transformers transformers-base + unordered-containers uuid yaml ]; executableHaskellDepends = [ aeson amazonka-core async base basic-prelude bytestring directory @@ -185443,21 +185749,6 @@ self: { }) {}; "writer-cps-mtl" = callPackage - ({ mkDerivation, base, mtl, transformers, writer-cps-transformers - }: - mkDerivation { - pname = "writer-cps-mtl"; - version = "0.1.1.0"; - sha256 = "c8c17d4112fc851d3b48fd52ee1c5dc44c29b0e85dec73ddc8fa9a2415e99dd3"; - libraryHaskellDepends = [ - base mtl transformers writer-cps-transformers - ]; - homepage = "https://github.com/minad/writer-cps-mtl#readme"; - description = "MonadWriter orphan instances for writer-cps-transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "writer-cps-mtl_0_1_1_1" = callPackage ({ mkDerivation, base, mtl, transformers, writer-cps-transformers }: mkDerivation { @@ -185470,7 +185761,6 @@ self: { homepage = "https://github.com/minad/writer-cps-mtl#readme"; description = "MonadWriter orphan instances for writer-cps-transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "writer-cps-transformers" = callPackage @@ -185693,6 +185983,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wxSimpleCanvas" = callPackage + ({ mkDerivation, base, cubicbezier, wx, wxcore }: + mkDerivation { + pname = "wxSimpleCanvas"; + version = "0.0.0.0"; + sha256 = "a2200569c49f7b6dcefe39ddc374d5325cb1fd9c001772edb340a8ba9b6c2061"; + libraryHaskellDepends = [ base cubicbezier wx wxcore ]; + description = "Simple zoomable canvas for wxHaskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wxc" = callPackage ({ mkDerivation, base, libX11, mesa, split, wxdirect, wxGTK }: mkDerivation { @@ -186491,7 +186792,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "xlsx_0_3_0" = callPackage + "xlsx_0_4_0" = callPackage ({ mkDerivation, base, base64-bytestring, binary-search, bytestring , conduit, containers, data-default, Diff, errors, extra, filepath , groom, lens, mtl, mtl-compat, network-uri, old-locale @@ -186501,8 +186802,8 @@ self: { }: mkDerivation { pname = "xlsx"; - version = "0.3.0"; - sha256 = "6d941e2fdc757384d417c50db35f84aa0413b940baf6ec49fdba597cd68c11b3"; + version = "0.4.0"; + sha256 = "1cb379b7cbc0783831f352d034c307a414bb2f1de158b5aec2a4c7cbebaee16a"; libraryHaskellDepends = [ base base64-bytestring binary-search bytestring conduit containers data-default errors extra filepath lens mtl mtl-compat network-uri @@ -186511,7 +186812,7 @@ self: { ]; testHaskellDepends = [ base bytestring containers Diff groom lens mtl raw-strings-qq - smallcheck tasty tasty-hunit tasty-smallcheck time vector + smallcheck tasty tasty-hunit tasty-smallcheck text time vector xml-conduit ]; homepage = "https://github.com/qrilka/xlsx"; @@ -189616,8 +189917,8 @@ self: { }: mkDerivation { pname = "yesod-persistent"; - version = "1.4.0.6"; - sha256 = "69c1261b49a6448795d569431691115fc6b86f7b296905573f5b2271465dee71"; + version = "1.4.1.0"; + sha256 = "98f422757210b30b2bd0d75828408a9fb1d67fa81e02ec304848c1922da4e91c"; libraryHaskellDepends = [ base blaze-builder conduit persistent persistent-template resource-pool resourcet transformers yesod-core @@ -189631,15 +189932,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-persistent_1_4_1_0" = callPackage + "yesod-persistent_1_4_1_1" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent , persistent-sqlite, persistent-template, resource-pool, resourcet , text, transformers, wai-extra, yesod-core }: mkDerivation { pname = "yesod-persistent"; - version = "1.4.1.0"; - sha256 = "98f422757210b30b2bd0d75828408a9fb1d67fa81e02ec304848c1922da4e91c"; + version = "1.4.1.1"; + sha256 = "dffd2604fc37a6b518c06391c44059df96895e3b484d4de8fbff9ff0869e7551"; libraryHaskellDepends = [ base blaze-builder conduit persistent persistent-template resource-pool resourcet transformers yesod-core @@ -191513,30 +191814,6 @@ self: { }) {}; "zip" = callPackage - ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive - , cereal, conduit, conduit-extra, containers, digest, exceptions - , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck - , resourcet, text, time, transformers - }: - mkDerivation { - pname = "zip"; - version = "0.1.3"; - sha256 = "9e7a79126ab12c198efcae67dd07f860213ce5a6afb2217053f0342ffdb9e6d1"; - libraryHaskellDepends = [ - base bytestring bzlib-conduit case-insensitive cereal conduit - conduit-extra containers digest exceptions filepath mtl path - path-io plan-b resourcet text time transformers - ]; - testHaskellDepends = [ - base bytestring conduit containers exceptions filepath hspec path - path-io QuickCheck text time transformers - ]; - homepage = "https://github.com/mrkkrp/zip"; - description = "Operations on zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "zip_0_1_4" = callPackage ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive , cereal, conduit, conduit-extra, containers, digest, exceptions , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck @@ -191558,7 +191835,6 @@ self: { homepage = "https://github.com/mrkkrp/zip"; description = "Operations on zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zip-archive" = callPackage From 52a220aaa0ee59f632d5b186e7b557edff8ea821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20J=C3=B8rgen=20Br=C3=B8nner?= Date: Wed, 21 Dec 2016 11:22:29 +0100 Subject: [PATCH 1743/1749] nix-zsh-completions: 0.2 -> 0.3 --- pkgs/shells/nix-zsh-completions/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix index af7b4a746f4d..5faca2fa8e84 100644 --- a/pkgs/shells/nix-zsh-completions/default.nix +++ b/pkgs/shells/nix-zsh-completions/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "spwhitt"; repo = "nix-zsh-completions"; - rev = "0.2"; - sha256 = "0wimjdxnkw1lzhjn28zm4pgbij86ym0z17ayivpzz27g0sacimga"; + rev = "0.3"; + sha256 = "1vwkd4nppjrvy6xb0vx4z73awrhaah1433dp6h4ghi3cdrrjn7ri"; }; installPhase = '' @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "ZSH completions for Nix, NixOS, and NixOps"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.spwhitt ]; + maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb ]; }; } From 17322ca4fdc5487b113b2ad4f059e18821937699 Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Tue, 13 Dec 2016 19:00:27 +0800 Subject: [PATCH 1744/1749] certbot: 0.6.0 -> 0.9.3 --- pkgs/tools/admin/certbot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix index 998b8d2e13de..8ff147faacc4 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/tools/admin/certbot/default.nix @@ -4,13 +4,13 @@ python2Packages.buildPythonApplication rec { name = "certbot-${version}"; - version = "0.6.0"; + version = "0.9.3"; src = fetchFromGitHub { owner = "certbot"; repo = "certbot"; rev = "v${version}"; - sha256 = "1x0prlldkgg0hxmya4m5h3k3c872wr0jylmzpr3m04mk339yiw0c"; + sha256 = "03yfr8vlq62l0h14qk03flrkbvbv9mc5cf6rmh37naj8jwpl8cic"; }; propagatedBuildInputs = with python2Packages; [ @@ -32,7 +32,7 @@ python2Packages.buildPythonApplication rec { patchPhase = '' substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail" - substituteInPlace certbot/le_util.py --replace "sw_vers" "/usr/bin/sw_vers" + substituteInPlace certbot/util.py --replace "sw_vers" "/usr/bin/sw_vers" ''; postInstall = '' From 5a31ad1bbf6acceba531f0995de4378370d87e31 Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Sat, 17 Dec 2016 17:14:37 +0800 Subject: [PATCH 1745/1749] simp_le: switch to zenhack/simp_le kuba/simp_le seems unmaintained. fixes #21174 --- pkgs/tools/admin/simp_le/default.nix | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index b4ed398541f0..aef077e21a06 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,26 +1,16 @@ { stdenv, fetchFromGitHub, fetchpatch, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "simp_le-2016-04-17"; + name = "simp_le-2016-12-16"; + # kuba/simp_le seems unmaintained src = fetchFromGitHub { - owner = "kuba"; + owner = "zenhack"; repo = "simp_le"; - rev = "3a103b76f933f9aef782a47401dd2eff5057a6f7"; - sha256 = "0x8gqazn09m30bn1l7xnf8snhbb7yz7sb09imciqmm4jqdvn797z"; + rev = "63a43b8547cd9fbc87db6bcd9497c6e37f73abef"; + sha256 = "04dr8lvcpi797722lsy06nxhlihrxdqgdy187pg3hl1ki2iq3ixx"; }; - patches = [ - (fetchpatch { - url = "https://github.com/kuba/simp_le/commit/4bc788fdd611c4118c3f86b5f546779723aca5a7.patch"; - sha256 = "0036p11qn3plydv5s5z6i28r6ihy1ipjl0y8la0izpkiq273byfc"; - }) - (fetchpatch { - url = "https://github.com/kuba/simp_le/commit/9ec7efe593cadb46348dc6924c1e6a31f0f9e636.patch"; - sha256 = "0n3m94n14y9c42185ly47d061g6awc8vb8xs9abffaigxv59k06j"; - }) - ]; - propagatedBuildInputs = with pythonPackages; [ acme ]; meta = with stdenv.lib; { From f4d1b6f78138dd1b8ed05f58378ea021c1123d57 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Tue, 20 Dec 2016 22:21:10 +0100 Subject: [PATCH 1746/1749] ssrc: init at 1.33 --- pkgs/applications/audio/ssrc/default.nix | 42 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/audio/ssrc/default.nix diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix new file mode 100644 index 000000000000..fa2b54d0e8a1 --- /dev/null +++ b/pkgs/applications/audio/ssrc/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ssrc"; + name = "${pname}-${version}"; + version = "1.33"; + + src = fetchFromGitHub { + owner = "shibatch"; + repo = "SSRC"; + rev = "4adf75116dfc0ef709fef74a0e2f3360bd15007f"; + sha256 = "0hgma66v7sszkpz5jkyscj0q6lmjfqdwf1hw57535c012pa2vdrh"; + }; + + installPhase = '' + mkdir -p $out/bin + cp ssrc ssrc_hp $out/bin + ''; + + meta = with stdenv.lib; { + description = "A high quality audio sampling rate converter"; + longDescription = '' + This program converts sampling rates of PCM wav files. This + program also has a function to apply dither to its output and + extend perceived dynamic range. + + Sampling rates of 44.1kHz and 48kHz are popularly used, but the + ratio between these two frequencies is 147:160, which are not + small numbers. As a result, sampling rate conversion without + degradation of sound quality requires filter with very large + order, and it is difficult to have both quality and speed. This + program quickly converts between these sampling frequencies + without audible degradation. + ''; + + version = "${version}"; + homepage = "http://shibatch.sourceforge.net/"; + license = licenses.gpl2; + maintainers = with maintainers; [ leenaars]; + platforms = with platforms; [ linux ] ; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb13708d7259..d97b5b2a5d80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14810,6 +14810,8 @@ in ssr = callPackage ../applications/audio/soundscape-renderer {}; + ssrc = callPackage ../applications/audio/ssrc { }; + stalonetray = callPackage ../applications/window-managers/stalonetray {}; stp = callPackage ../applications/science/logic/stp {}; From 44a8fb956e1490a5bf99ba977e2827c3cb45e6a9 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Wed, 21 Dec 2016 10:45:19 -0200 Subject: [PATCH 1747/1749] nrg2iso: init at 0.4.0 --- pkgs/tools/cd-dvd/nrg2iso/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/cd-dvd/nrg2iso/default.nix diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix new file mode 100644 index 000000000000..35414f6e776a --- /dev/null +++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "nrg2iso-${version}"; + version = "0.4"; + + src = fetchurl { + url = "gregory.kokanosky.free.fr/v4/linux/${name}.tar.gz"; + sha256 = "18sam7yy50rbfhjixwd7wx7kmfn1x1y5j80vwfxi5v408s39s115"; + }; + + installPhase = '' + mkdir -pv $out/bin/ + cp -v nrg2iso $out/bin/nrg2iso + ''; + + meta = with stdenv.lib; { + description = "A linux utils for converting CD (or DVD) image generated by Nero Burning Rom to ISO format"; + homepage = http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d97b5b2a5d80..7df99796df89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1099,6 +1099,8 @@ in mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { }; + nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { }; + libceph = ceph.lib; ceph = callPackage ../tools/filesystems/ceph { boost = boost159; }; ceph-dev = ceph; From e0d1691ba3ceffe51efb0dfde285a3e29b0002fe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 21 Dec 2016 15:44:50 +0100 Subject: [PATCH 1748/1749] Docs Python: fix examples and links --- doc/languages-frameworks/python.md | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index e7a8b034a112..82aeb112c93e 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -97,7 +97,7 @@ We will first have a look at how Python packages are packaged on Nix. Then, we w #### Python packaging on Nix -On Nix all packages are built by functions. The main function in Nix for building Python packages is [`buildPythonPackage`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix). +On Nix all packages are built by functions. The main function in Nix for building Python packages is [`buildPythonPackage`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/python/build-python-package.nix). Let's see how we would build the `toolz` package. According to [`python-packages.nix`](https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/top-level/python-packages.nix) `toolz` is build using ```nix @@ -141,13 +141,15 @@ with import {}; pkgs.python35Packages.buildPythonPackage rec { name = "toolz-${version}"; - version = "0.7.4"; + version = "0.8.0"; src = pkgs.fetchurl{ url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479"; }; + doCheck = false; + meta = { homepage = "http://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; @@ -170,18 +172,18 @@ with import {}; ( let toolz = pkgs.python35Packages.buildPythonPackage rec { name = "toolz-${version}"; - version = "0.7.4"; + version = "0.8.0"; src = pkgs.fetchurl{ url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479"; }; + doCheck = false; + meta = { homepage = "http://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; }; }; @@ -308,11 +310,10 @@ Note also the line `doCheck = false;`, we explicitly disabled running the test-s #### Develop local package -As a Python developer you're likely aware of [development mode](http://pythonhosted.org/setuptools/setuptools.html#development-mode) (`python setup.py develop`); +As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode) (`python setup.py develop`); instead of installing the package this command creates a special link to the project code. That way, you can run updated code without having to reinstall after each and every change you make. -Development mode is also available on Nix as [explained](http://nixos.org/nixpkgs/manual/#ssec-python-development) in the Nixpkgs manual. -Let's see how you can use it. +Development mode is also available. Let's see how you can use it. In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using From 953fe37009f6117738a8c7f40b3cd7e5969eedfd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Dec 2016 15:42:17 +0100 Subject: [PATCH 1749/1749] gcc: 6.2.0 -> 6.3.0 --- pkgs/development/compilers/gcc/6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index acddc9081be0..3edfb177b118 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -59,7 +59,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "6.2.0"; +let version = "6.3.0"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; @@ -216,7 +216,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "1idpf43988v1a6i8lw9ak1r7igcfg1bm5kn011iydlr2qygmhi4r"; + sha256 = "17xjz30jb65hcf714vn9gcxvrrji8j20xm7n33qg1ywhyzryfsph"; }; inherit patches;